Jerry/rc-plugin
1
0
Fork 0
mirror of https://github.com/Jerryplusy/rc-plugin.git synced 2025-10-14 16:19:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐞 fix：修复部分没有音频的b视频无法发出问题（感谢 @辰 提供样本）

Browse Source
This commit is contained in:
zhiyu1998 2024-10-04 15:55:18 +08:00
parent 16fbdd8ab7
commit 9ad9436a88
2 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/tools.js
View File

@ -483,7 +483,7 @@ export class tools extends plugin {
* @param second * @param second
*/ */
async sendStreamSegment(e, stream_url, second = this.streamDuration) { async sendStreamSegment(e, stream_url, second = this.streamDuration) {
let outputFilePath = `${ this.getCurDownloadPath(e) }/stream_${second}s.flv`; let outputFilePath = `${ this.getCurDownloadPath(e) }/stream_${ second }s.flv`;
// 删除临时文件 // 删除临时文件
if (this.streamCompatibility) { if (this.streamCompatibility) {
await checkAndRemoveFile(outputFilePath.replace("flv", "mp4")); await checkAndRemoveFile(outputFilePath.replace("flv", "mp4"));
@ -899,7 +899,18 @@ export class tools extends plugin {
// 获取下载链接 // 获取下载链接
const data = await getDownloadUrl(url, this.biliSessData); const data = await getDownloadUrl(url, this.biliSessData);
await this.downBili(tempPath, data.videoUrl, data.audioUrl); if (data.audioUrl != null) {
await this.downBili(tempPath, data.videoUrl, data.audioUrl);
} else {
// 处理无音频的情况
await downloadBFile(data.videoUrl, `${ tempPath }.mp4`, _.throttle(
value =>
logger.mark("视频下载进度", {
data: value,
}),
1000,
));
}
// 上传视频 // 上传视频
return this.sendVideoToUpload(e, `${ tempPath }.mp4`); return this.sendVideoToUpload(e, `${ tempPath }.mp4`);

10
utils/bilibili.js
View File

@ -14,6 +14,7 @@ import {
BILI_SCAN_CODE_GENERATE, BILI_SCAN_CODE_GENERATE,
BILI_VIDEO_INFO BILI_VIDEO_INFO
} from "../constants/tools.js"; } from "../constants/tools.js";
import { saveJsonToFile } from "./common.js";
import { mkdirIfNotExists } from "./file.js"; import { mkdirIfNotExists } from "./file.js";
export const BILI_HEADER = { export const BILI_HEADER = {
@ -210,11 +211,16 @@ export async function getDownloadUrl(url, SESSDATA) {
const { video, audio } = dash; const { video, audio } = dash;
const videoData = video?.[0]; const videoData = video?.[0];
const audioData = audio?.[0]; const audioData = audio?.[0];
// saveJsonToFile(dash);
// 提取信息 // 提取信息
const { backupUrl: videoBackupUrl, baseUrl: videoBaseUrl } = videoData; const { backupUrl: videoBackupUrl, baseUrl: videoBaseUrl } = videoData;
const videoUrl = selectAndAvoidMCdnUrl(videoBaseUrl, videoBackupUrl); const videoUrl = selectAndAvoidMCdnUrl(videoBaseUrl, videoBackupUrl);
const { backupUrl: audioBackupUrl,baseUrl: audioBaseUrl } = audioData; // 有部分视频可能存在没有音频，例如：https://www.bilibili.com/video/BV1CxvseRE8n/?p=1
const audioUrl = selectAndAvoidMCdnUrl(audioBaseUrl, audioBackupUrl); let audioUrl = null;
if (audioData != null || audioData !== undefined) {
const { backupUrl: audioBackupUrl, baseUrl: audioBaseUrl } = audioData;
audioUrl = selectAndAvoidMCdnUrl(audioBaseUrl, audioBackupUrl);
}
return { videoUrl, audioUrl }; return { videoUrl, audioUrl };
} }