Jerry/crystelf-plugin
1
0
Fork 0
mirror of https://github.com/Jerryplusy/crystelf-plugin.git synced 2025-12-05 15:41:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Sanitize filenames and enhance error handling

Browse Source 
Refactor music file handling to sanitize filenames and improve error logging.
This commit is contained in:
devil233 2025-11-30 06:58:03 +08:00 committed by GitHub
parent a7e701cbb2
commit d0b6b939cd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
apps/music.js
View File

@ -132,7 +132,7 @@ export class CrystelfMusic extends plugin {
return;
}
const adapter = await YunzaiUtils.getAdapter(e);
await Message.emojiLike(e,e.message_id,60,e.group_id,adapter);
await Message.emojiLike(e, e.message_id, 60, e.group_id, adapter);
const result = await musicSearch.handleSelection(e, index);
if (result.success) {
await this.sendMusicResult(e, result);
@ -145,29 +145,44 @@ export class CrystelfMusic extends plugin {
}
}
/**
* 发送音乐结果
/**
* 发送音乐结果 (修复文件名非法字符 + 失败转语音)
* @param {Object} e 事件对象
* @param {Object} result 播放结果
*/
async sendMusicResult(e, result) {
try {
const { song, audioFile, type, quality, message } = result;
//await e.reply(message);
const adapter = await YunzaiUtils.getAdapter(e);
if (type === 'voice' || quality === 1) {
await Group.sendGroupRecord(e, e.group_id, `file://${audioFile}`, adapter);
} else {
const extension = await this.getFileExtension();
const sanitizedTitle = song.displayTitle.replace(/\s+/g, '_');
const sanitizedArtist = song.displayArtist.replace(/\s+/g, '_');
// --- 核心修复开始 ---
// 过滤掉 Windows 文件名非法字符 ( \ / : * ? " < > | )
const sanitize = (str) => str.replace(/[\\/:*?"<>|]/g, '').replace(/\s+/g, '_');
const sanitizedTitle = sanitize(song.displayTitle);
const sanitizedArtist = sanitize(song.displayArtist);
const filename = `${sanitizedTitle} - ${sanitizedArtist}.${extension}`;
await Group.sendGroupFile(e, e.group_id, `file://${audioFile}`, filename, adapter);
// --- 核心修复结束 ---
try {
// 尝试上传文件 (现在的 filename 已经很干净了)
await Group.sendGroupFile(e, e.group_id, `file://${audioFile}`, filename, adapter);
} catch (fileErr) {
logger.warn(`[crystelf-music] 文件发送失败(文件名: ${filename})，尝试转为语音: ${fileErr.message}`);
// 失败兜底：发送语音
await Group.sendGroupRecord(e, e.group_id, `file://${audioFile}`, adapter);
}
}
musicSearch.clearUserSelection(e.group_id, e.user_id);
logger.info(`[crystelf-music] 音乐发送成功: ${song.displayTitle}`);
logger.info(`[crystelf-music] 音乐处理完成: ${song.displayTitle}`);
} catch (error) {
logger.error('[crystelf-music] 发送音乐结果失败:', error);
logger.error('[crystelf-music] 发送音乐结果彻底失败:', error);
await e.reply('发送音乐失败,请稍后重试', true);
}
}
@ -177,7 +192,7 @@ export class CrystelfMusic extends plugin {
* @returns {string} 文件扩展名
*/
async getFileExtension() {
const musicConfig =await ConfigControl.get('music');
const musicConfig = await ConfigControl.get('music');
//if(musicConfig.quality === '3'){
//return 'flac'
//}