修复歌曲时文件名过长导致歌曲无法下载的问题（lyswhut#1877）

JJins · May 3, 2024 · b680a89 · b680a89
1 parent ee6a6f4
commit b680a89
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 8 deletions.
diff --git a/publish/changeLog.md b/publish/changeLog.md
@@ -17,6 +17,7 @@
 - 修复Mac下即使开启了托盘， `cmd+w` 仍会中断播放的问题（#1844）
 - 修复播放详情页的歌词无法使用触碰拖动的问题（#1865）
 - 修复与优化繁体中文、英语翻译显示（#1845）
+- 修复歌曲时文件名过长导致歌曲无法下载的问题（#1877）
 
 ### 变更
 

diff --git a/src/common/utils/download/Downloader.ts b/src/common/utils/download/Downloader.ts
@@ -321,7 +321,7 @@ class Task extends EventEmitter {
       if (err) {
         console.log(err)
         this.__handleError(err)
-        void this.stop()
+        return
       }
       if (this.closeWaiting && !this.dataWriteQueueLength) this.ws?.close()
     })

diff --git a/src/renderer/store/download/action.ts b/src/renderer/store/download/action.ts
@@ -192,7 +192,8 @@ const downloadLyric = (downloadInfo: LX.Download.ListItem) => {
         tlrc: appSetting['download.isDownloadTLrc'] && lrcs.tlyric ? lrcs.tlyric : null,
         rlrc: appSetting['download.isDownloadRLrc'] && lrcs.rlyric ? lrcs.rlyric : null,
       }
-      void window.lx.worker.download.saveLrc(lrcData, downloadInfo.metadata.filePath.replace(/(mp3|flac|ape|wav)$/, 'lrc'),
+      void window.lx.worker.download.saveLrc(lrcData,
+        downloadInfo.metadata.filePath.substring(0, downloadInfo.metadata.filePath.lastIndexOf('.')) + '.lrc',
         appSetting['download.lrcFormat'])
     }
   })

diff --git a/src/renderer/worker/download/download.ts b/src/renderer/worker/download/download.ts
@@ -114,7 +114,7 @@ const createTask = async(downloadInfo: LX.Download.ListItem, savePath: string, s
       console.log('on complate')
     },
     onError(err: any) {
-      console.log(err)
+      console.error(err)
       if (err.code == 'EPERM') {
         sendAction(downloadInfo.id, {
           action: 'error',
@@ -157,8 +157,9 @@ const createTask = async(downloadInfo: LX.Download.ListItem, savePath: string, s
         sendAction(downloadInfo.id, { action: 'refreshUrl' })
       } else {
         console.log('Download failed, Attempting Retry')
-        void dls.get(downloadInfo.id)?.start()
-        console.log('正在重试')
+        setTimeout(() => {
+          void dls.get(downloadInfo.id)?.start()
+        }, 1000)
       }
     },
     onFail(response) {

diff --git a/src/renderer/worker/download/utils.ts b/src/renderer/worker/download/utils.ts
@@ -65,7 +65,21 @@ export const getMusicType = (musicInfo: LX.Music.MusicInfoOnline, type: LX.Quali
 // const checkExistList = (list: LX.Download.ListItem[], musicInfo: LX.Music.MusicInfo, type: LX.Quality, ext: string): boolean => {
 //   return list.some(s => s.id === musicInfo.id && (s.metadata.type === type || s.metadata.ext === ext))
 // }
-
+const MAX_NAME_LENGTH = 80
+const MAX_FILE_NAME_LENGTH = 150
+const clipNameLength = (name: string) => {
+  if (name.length <= MAX_NAME_LENGTH || !name.includes('、')) return name
+  const names = name.split('、')
+  let newName = names.shift()!
+  for (const name of names) {
+    if (newName.length + name.length > MAX_NAME_LENGTH) break
+    newName = newName + '、' + name
+  }
+  return newName
+}
+const clipFileNameLength = (name: string) => {
+  return name.length > MAX_FILE_NAME_LENGTH ? name.substring(0, MAX_FILE_NAME_LENGTH) : name
+}
 export const createDownloadInfo = (musicInfo: LX.Music.MusicInfoOnline, type: LX.Quality, fileName: string, savePath: string, qualityList: LX.QualityList) => {
   type = getMusicType(musicInfo, type, qualityList)
   let ext = getExt(type)
@@ -87,9 +101,9 @@ export const createDownloadInfo = (musicInfo: LX.Music.MusicInfoOnline, type: LX
       quality: type,
       ext,
       filePath: '',
-      fileName: filterFileName(`${fileName
+      fileName: filterFileName(`${clipFileNameLength(fileName
         .replace('歌名', musicInfo.name)
-        .replace('歌手', musicInfo.singer)}.${ext}`),
+        .replace('歌手', clipNameLength(musicInfo.singer)))}.${ext}`),
     },
   }
   downloadInfo.metadata.filePath = joinPath(savePath, downloadInfo.metadata.fileName)