refactor: 移除未使用的metaPath参数并清理代码注释

简化函数签名,移除不再需要的metaPath参数
清理并统一代码注释格式
This commit is contained in:
2026-01-07 08:29:00 +08:00
parent 762cb5412f
commit 34d1934bc6

View File

@@ -118,17 +118,16 @@ function getMimeFromUrl(u) {
* 生成缩略图并缓存
* @param {*} reply
* @param {*} apiData
* @param {*} metaPath
* @param {*} contentPath
* @returns
*/
async function generateThumbAndCache(reply, apiData, metaPath, contentPath) {
async function generateThumbAndCache(reply, apiData, contentPath) {
const srcPath = contentPath;
const dir = path.dirname(srcPath);
const base = path.basename(srcPath);
const thumbFinal = path.join(dir, base.replace('.data', `.thumb`));
const metaThumbPath = metaPath.replace('.meta', '.thumb.meta');
const metaThumbPath = contentPath.replace('.data', '.thumb.meta');
if (fs.existsSync(thumbFinal) && fs.existsSync(metaThumbPath)) {
const st = fs.statSync(thumbFinal);
if (st.size > 0) {
@@ -231,7 +230,7 @@ async function generateThumbAndCache(reply, apiData, metaPath, contentPath) {
}
// Serve existing file
function serveCompletedCache(reply, apiData, metaPath, contentPath) {
function serveCompletedCache(reply, apiData, contentPath) {
const content = contentPath;
const responseHeaders = { ...apiData.data.headers };
if (!responseHeaders['Access-Control-Allow-Origin']) {
@@ -273,7 +272,7 @@ function serveCompletedCache(reply, apiData, metaPath, contentPath) {
}
// Download and Serve logic
async function downloadAndServe(reply, apiData, metaPath, contentPath, key) {
async function downloadAndServe(reply, apiData, contentPath, key) {
let task = activeDownloads.get(key);
@@ -321,7 +320,6 @@ async function downloadAndServe(reply, apiData, metaPath, contentPath, key) {
ws.end();
return ws;
}
fs.writeFileSync(metaPath, JSON.stringify(apiData));
task.totalSize = parseInt(headers['content-length'] || '0', 10);
const fileStream = fs.createWriteStream(task.path);
fileStream.on('error', (err) => {
@@ -371,15 +369,15 @@ async function downloadAndServe(reply, apiData, metaPath, contentPath, key) {
if (task.done && fs.existsSync(contentPath)) {
console.log('Download completed:', key);
if (isValidThumbSpec(apiData.data.thumb)) {
return generateThumbAndCache(reply, apiData, metaPath, contentPath).catch(() => { });
return generateThumbAndCache(reply, apiData, contentPath).catch(() => { });
}
return serveCompletedCache(reply, apiData, metaPath, contentPath);//reply, apiData, metaPath, contentPath
return serveCompletedCache(reply, apiData, contentPath);//reply, apiData, contentPath
}
console.log('Downloading:', key);
if (isValidThumbSpec(apiData.data.thumb)) {
return generateThumbAndCache(reply, apiData, metaPath, contentPath).catch(() => { });
return generateThumbAndCache(reply, apiData, contentPath).catch(() => { });
}
// Serve growing file
@@ -588,13 +586,13 @@ fastify.get('/*', async (request, reply) => {
}
const contentPath = getContentPath(apiData.data.uniqid || key);
if (fs.existsSync(contentPath) && fs.existsSync(metaPath) && !nocache) {
if (fs.existsSync(contentPath) && !nocache) {
if (isValidThumbSpec(apiData.data.thumb)) {
return generateThumbAndCache(reply, apiData, metaPath, contentPath).catch(() => { });
return generateThumbAndCache(reply, apiData, contentPath).catch(() => { });
}
return serveCompletedCache(reply, apiData, metaPath, contentPath);
return serveCompletedCache(reply, apiData, contentPath);
}
return await downloadAndServe(reply, apiData, metaPath, contentPath, key);
return await downloadAndServe(reply, apiData, contentPath, key);
} catch (err) {
request.log.error(err);
reply.code(502);