🐞 fix: 修复 BBDown 某些情况下导致session无法使用问题

This commit is contained in:
zhiyu1998 2024-08-09 20:10:38 +08:00
parent 210259824a
commit e97ff79210
2 changed files with 7 additions and 6 deletions

View File

@ -118,11 +118,12 @@ export const SUMMARY_CONTENT_ESTIMATOR_PATTERNS = [
{ reg: /(?:https?:\/\/)?(www\.)chinadaily.com.cn\/a\/[a-zA-Z0-9\d._?%&+\-=\/#]*/, name: 'ChinaDaily' } { reg: /(?:https?:\/\/)?(www\.)chinadaily.com.cn\/a\/[a-zA-Z0-9\d._?%&+\-=\/#]*/, name: 'ChinaDaily' }
]; ];
const BILI_CDN_TEMPLATE = "upos-sz-mirror{}.bilivideo.com";
export const BILI_CDN_SELECT_LIST = Object.freeze([ export const BILI_CDN_SELECT_LIST = Object.freeze([
{ label: '不使用', value: 0, sign: '' }, { label: '不使用', value: 0, sign: '' },
{ label: '腾讯CDN【推荐】', value: 1, sign: 'upos-sz-mirrorcos.bilivideo.com' }, { label: '腾讯CDN【推荐】', value: 1, sign: BILI_CDN_TEMPLATE.replace('{}', 'cos') },
{ label: '百度CDN', value: 2, sign: 'upos-sz-mirrorbd.bilivideo.com' }, { label: '百度CDN', value: 2, sign: BILI_CDN_TEMPLATE.replace('{}', 'bd') },
{ label: '华为CDN', value: 3, sign: 'upos-sz-mirrorhw.bilivideo.com' }, { label: '华为CDN', value: 3, sign: BILI_CDN_TEMPLATE.replace('{}', 'hw') },
{ label: '阿卡迈(海外)', value: 4 , sign: 'upos-sz-mirrorakamai.bilivideo.com'}, { label: '阿卡迈(海外)', value: 4 , sign: BILI_CDN_TEMPLATE.replace('{}', 'akamai')},
{ label: 'HK-CDN', value: 5, sign: 'upos-sz-mirroraliov.bilivideo.com' } { label: 'HK-CDN', value: 5, sign: BILI_CDN_TEMPLATE.replace('{}', 'aliov') }
]); ]);

View File

@ -45,7 +45,7 @@ export function startBBDown(videoUrl, downloadDir, BBDownOptions) {
urlObj.search = newParams.toString(); urlObj.search = newParams.toString();
videoUrl = urlObj.toString(); videoUrl = urlObj.toString();
// 说明:-F 自定义名称,-c 自定义Cookie --work-dir 设置下载目录,-M 多p下载的时候命名 // 说明:-F 自定义名称,-c 自定义Cookie --work-dir 设置下载目录,-M 多p下载的时候命名
const command = `BBDown ${videoUrl} --work-dir ${downloadDir} ${biliSessData ? '-c SESSDATA=' + biliSessData : ''} ${pageParam ? '-p ' + pageParam + ' -M \"temp\"' : '-p 1' + ' -M \"temp\"'} -F temp --skip-subtitle --skip-cover ${biliUseAria2 ? '--use-aria2c' : ''} ${biliCDN ? '--upos-host ' + biliCDN : ''}`; const command = `BBDown ${videoUrl} --work-dir ${downloadDir} ${biliSessData ? '-c SESSDATA=\"' + biliSessData + '\"' : ''} ${pageParam ? '-p ' + pageParam + ' -M \"temp\"' : '-p 1' + ' -M \"temp\"'} -F temp --skip-subtitle --skip-cover ${biliUseAria2 ? '--use-aria2c' : ''} ${biliCDN ? '--upos-host ' + biliCDN : ''}`;
logger.info(command); logger.info(command);
// logger.info(command); // logger.info(command);
// 直接调用BBDown因为它已经在系统路径中 // 直接调用BBDown因为它已经在系统路径中