修复打包部署顺序Bug

.appveyor.yml

@@ -5,6 +5,7 @@ cache:
   - node_modules
   - '%APPDATA%\npm-cache'
   - '%LOCALAPPDATA%\electron\Cache'
+  - '%LOCALAPPDATA%\electron-builder\Cache'
 
 install:
   - ps: Install-Product node 12 x64

CHANGELOG.md

@@ -6,6 +6,25 @@ Project versioning adheres to [Semantic Versioning](http://semver.org/).
 Commit convention is based on [Conventional Commits](http://conventionalcommits.org).
 Change log format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## [0.5.0](https://github.com/lyswhut/lx-music-desktop/compare/v0.4.0...v0.5.0) - 2019-09-05
+
+### 新增
+
+- 新增**封面嵌入**（默认开启，可到设置-下载设置关闭）
+- 新增**歌词下载**（默认关闭，可到设置-下载设置开启）
+- 新增单例应用功能（实现软件单开功能，禁止软件多开）
+
+### 优化
+
+- 优化歌单列表动画
+
+### 修复
+
+- 修复歌单无法翻页的问题
+- 修复在某些情况下，添加下载歌曲导致下载列表崩溃的问题
+- 修复版本更新弹窗Bug
+- 修复酷狗歌单推荐歌单出现在其他分类中的Bug
+
 ## [0.4.0](https://github.com/lyswhut/lx-music-desktop/compare/v0.3.5...v0.4.0) - 2019-09-04
 
 

README.md

@@ -44,12 +44,12 @@
 - Mac OS
 - Linux
 
+注意：win7需要开启**透明效果**软件才可使用
+
 软件变化请查看：[更新日志](https://github.com/lyswhut/lx-music-desktop/blob/master/CHANGELOG.md)<br>
 软件下载请转到：[发布页面](https://github.com/lyswhut/lx-music-desktop/releases)<br>
 或者到网盘下载（网盘内有MAC、windows版）：`https://www.lanzous.com/b906260/` 密码：`glqw`
 
-注意：win7需要开启**透明效果**软件才可使用
-
 #### 关于软件更新
 
 软件启动时若发现新版本时会自动从本仓库下载安装包，下载完毕会弹窗提示更新。<br>

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "lx-music-desktop",
-  "version": "0.3.2",
+  "version": "0.4.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -6243,6 +6243,11 @@
         "resolve-dir": "^1.0.1"
       }
     },
+    "flac-metadata": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npm.taobao.org/flac-metadata/download/flac-metadata-0.1.1.tgz",
+      "integrity": "sha1-wC+KBtJL1bad4rhVEsbkW9j5F2w="
+    },
     "flat-cache": {
       "version": "2.0.1",
       "resolved": "https://registry.npm.taobao.org/flat-cache/download/flat-cache-2.0.1.tgz",
@@ -7534,7 +7539,6 @@
       "version": "0.4.24",
       "resolved": "https://registry.npm.taobao.org/iconv-lite/download/iconv-lite-0.4.24.tgz",
       "integrity": "sha1-ICK0sl+93CHS9SSXSkdKr+czkIs=",
-      "dev": true,
       "requires": {
         "safer-buffer": ">= 2.1.2 < 3"
       }
@@ -9410,6 +9414,14 @@
       "integrity": "sha1-bBUsNFzhHFL0ZcKr2VfoY5zWdN8=",
       "dev": true
     },
+    "node-id3": {
+      "version": "0.1.11",
+      "resolved": "https://registry.npm.taobao.org/node-id3/download/node-id3-0.1.11.tgz",
+      "integrity": "sha1-ypuX8MVOQPsjRuUptKxMFaDPFio=",
+      "requires": {
+        "iconv-lite": "^0.4.15"
+      }
+    },
     "node-libs-browser": {
       "version": "2.2.1",
       "resolved": "https://registry.npm.taobao.org/node-libs-browser/download/node-libs-browser-2.2.1.tgz",

package.json

@@ -1,36 +1,36 @@
 {
   "name": "lx-music-desktop",
-  "version": "0.4.0",
+  "version": "0.5.0",
   "description": "一个免费的音乐下载助手",
   "main": "./dist/electron/main.js",
   "productName": "lx-music-desktop",
   "scripts": {
     "pack": "node build-config/pack.js && npm run pack:win",
     "pack:win": "npm run pack:win:setup && npm run pack:win:7z",
-    "pack:win:setup": "cross-env TARGET=Setup ARCH=x64_x86 electron-builder -w=nsis --x64 --ia32",
+    "pack:win:setup": "cross-env TARGET=win_安装版 ARCH=x64_x86 electron-builder -w=nsis --x64 --ia32",
     "pack:win:portable": "npm run pack:win:portable:x64_x86 && npm run pack:win:portable:x64 && npm run pack:win:portable:x86",
     "pack:win:portable:x64_x86": "cross-env TARGET=便携版 ARCH=x64_x86 electron-builder -w=portable --x64 --ia32",
     "pack:win:portable:x64": "cross-env TARGET=便携版 ARCH=x64 electron-builder -w=portable --x64",
     "pack:win:portable:x86": "cross-env TARGET=便携版 ARCH=x86 electron-builder -w=portable --ia32",
     "pack:win:7z": "npm run pack:win:7z:x64 && npm run pack:win:7z:x86",
-    "pack:win:7z:x64": "cross-env TARGET=绿色版 ARCH=x64 electron-builder -w=7z --x64",
-    "pack:win:7z:x86": "cross-env TARGET=绿色版 ARCH=x86 electron-builder -w=7z --ia32",
+    "pack:win:7z:x64": "cross-env TARGET=win_绿色版 ARCH=x64 electron-builder -w=7z --x64",
+    "pack:win:7z:x86": "cross-env TARGET=win_绿色版 ARCH=x86 electron-builder -w=7z --ia32",
     "publish": "node publish",
     "publish:gh": "node build-config/pack.js && npm run publish:win",
-    "publish:win": "npm run publish:win:setup && npm run publish:win:7z",
-    "publish:win:setup": "cross-env TARGET=Setup ARCH=x64_x86 electron-builder -w=nsis --x64 --ia32 -p always",
+    "publish:win": "npm run publish:win:7z && npm run publish:win:setup",
+    "publish:win:setup": "cross-env TARGET=Setup ARCH=x64_x86 electron-builder -w=nsis --x64 --ia32 -p onTagOrDraft",
     "publish:win:portable": "npm run publish:win:portable:x64_x86 && npm run publish:win:portable:x64 && npm run publish:win:portable:x86",
     "publish:win:portable:x64_x86": "cross-env TARGET=portable ARCH=x64_x86 electron-builder -w=portable --x64 --ia32 -p onTagOrDraft",
     "publish:win:portable:x64": "cross-env TARGET=portable ARCH=x64 electron-builder -w=portable --x64 -p onTagOrDraft",
     "publish:win:portable:x86": "cross-env TARGET=portable ARCH=x86 electron-builder -w=portable --ia32 -p onTagOrDraft",
     "publish:win:7z": "npm run publish:win:7z:x64 && npm run publish:win:7z:x86",
-    "publish:win:7z:x64": "cross-env TARGET=green ARCH=win_x64 electron-builder -w=7z --x64 -p onTagOrDraft",
+    "publish:win:7z:x64": "cross-env TARGET=green ARCH=win_x64 electron-builder -w=7z --x64 -p always",
     "publish:win:7z:x86": "cross-env TARGET=green ARCH=win_x86 electron-builder -w=7z --ia32 -p onTagOrDraft",
     "publish:gh:mac": "node build-config/pack.js && npm run publish:mac",
     "publish:mac": "npm run publish:mac:dmg",
     "publish:mac:dmg": "electron-builder -m=dmg -p onTagOrDraft",
     "publish:gh:linux": "node build-config/pack.js && npm run publish:linux",
-    "publish:linux": "npm run publish:linux:appImage && npm run publish:linux:deb",
+    "publish:linux": "npm run publish:linux:deb && npm run publish:linux:appImage",
     "publish:linux:appImage": "cross-env ARCH=x64 electron-builder -l=AppImage -p onTagOrDraft",
     "publish:linux:deb": "npm run publish:linux:deb:x64 && npm run publish:linux:deb:x86",
     "publish:linux:deb:x64": "cross-env ARCH=x64 electron-builder -l=deb --x64 -p onTagOrDraft",
@@ -199,9 +199,11 @@
     "electron-log": "^3.0.7",
     "electron-store": "^4.0.0",
     "electron-updater": "^4.1.2",
+    "flac-metadata": "^0.1.1",
     "js-htmlencode": "^0.3.0",
     "lrc-file-parser": "^0.1.12",
     "node-downloader-helper": "^1.0.10",
+    "node-id3": "^0.1.11",
     "request": "^2.88.0",
     "vue": "^2.6.10",
     "vue-electron": "^1.0.6",

publish/changeLog.md

@@ -1,11 +0,0 @@
-
-### 新增
-
-- 新增**歌单**功能，目前支持酷我、酷狗、百度源歌单
-- 在设置界面-关于洛雪音乐说明部分新增**最新版网盘下载地址**与**打赏地址**
-- 新增酷狗 电音热歌榜、DJ热歌榜
-- 新增版本更新超时功能，对于部分无法访问GitHub的用户做更新超时提醒
-
-### 移除
-
-- **注意**：0.4.0以前的版本即将失效，请更新到0.4.0版本

publish/version.json

@@ -1,7 +1,11 @@
 {
-  "version": "0.4.0",
-  "desc": "<h3>新增</h3>\n<ul>\n<li>新增<strong>歌单</strong>功能，目前支持酷我、酷狗、百度源歌单</li>\n<li>在设置界面-关于洛雪音乐说明部分新增<strong>最新版网盘下载地址</strong>与<strong>打赏地址</strong></li>\n<li>新增酷狗 电音热歌榜、DJ热歌榜</li>\n<li>新增版本更新超时功能，对于部分无法访问GitHub的用户做更新超时提醒</li>\n</ul>\n<h3>移除</h3>\n<ul>\n<li><strong>注意</strong>：0.4.0以前的版本即将失效，请更新到0.4.0版本</li>\n</ul>\n",
+  "version": "0.5.0",
+  "desc": "<h3>新增</h3>\n<ul>\n<li>新增<strong>封面嵌入</strong>（默认开启，可到设置-下载设置关闭）</li>\n<li>新增<strong>歌词下载</strong>（默认关闭，可到设置-下载设置开启）</li>\n<li>新增单例应用功能（实现软件单开功能，禁止软件多开）</li>\n</ul>\n<h3>优化</h3>\n<ul>\n<li>优化歌单列表动画</li>\n</ul>\n<h3>修复</h3>\n<ul>\n<li>修复歌单无法翻页的问题</li>\n<li>修复在某些情况下，添加下载歌曲导致下载列表崩溃的问题</li>\n<li>修复版本更新弹窗Bug</li>\n<li>修复酷狗歌单推荐歌单出现在其他分类中的Bug</li>\n</ul>\n",
   "history": [
+    {
+      "version": "0.4.0",
+      "desc": "<h3>新增</h3>\n<ul>\n<li>新增<strong>歌单</strong>功能，目前支持酷我、酷狗、百度源歌单</li>\n<li>在设置界面-关于洛雪音乐说明部分新增<strong>最新版网盘下载地址</strong>与<strong>打赏地址</strong></li>\n<li>新增酷狗 电音热歌榜、DJ热歌榜</li>\n<li>新增版本更新超时功能，对于部分无法访问GitHub的用户做更新超时提醒</li>\n</ul>\n<h3>移除</h3>\n<ul>\n<li><strong>注意</strong>：0.4.0以前的版本即将失效，请更新到0.4.0版本</li>\n</ul>\n"
+    },
     {
       "version": "0.3.5",
       "desc": "<h3>新增</h3>\n<ul>\n<li>新增<strong>测试接口</strong>，该接口同样速度较慢，但软件的大部分功能可用，<strong>请自行切换到该接口</strong>，找接口辛苦，且用且珍惜！</li>\n</ul>\n<h3>优化</h3>\n<ul>\n<li>取消需要刷新URL时windows任务栏进度显示错误状态（现显示为暂停状态）</li>\n</ul>\n<h3>修复</h3>\n<ul>\n<li>修复使用临时接口时在试听列表双击灰色歌曲仍然会进行播放的Bug</li>\n<li>修复歌词加载Bug</li>\n</ul>\n"

src/main/events/index.js

@@ -1,4 +1,5 @@
 
 require('./request')
-require('./appName')
+// require('./appName')
+require('./musicMeta')
 

src/main/events/musicMeta.js

@@ -0,0 +1,6 @@
+const { mainOn } = require('../../common/icp')
+const { setMeta } = require('../utils/musicMeta')
+
+mainOn('setMusicMeta', (event, { filePath, meta }) => {
+  setMeta(filePath, meta)
+})

src/main/index.js

@@ -1,6 +1,20 @@
 const { app, BrowserWindow, Menu } = require('electron')
 const path = require('path')
 
+// 单例应用程序
+if (!app.requestSingleInstanceLock()) {
+  app.quit()
+  return
+}
+app.on('second-instance', (event, argv, cwd) => {
+  if (mainWindow) {
+    if (mainWindow.isMinimized()) mainWindow.restore()
+    mainWindow.focus()
+  } else {
+    app.quit()
+  }
+})
+
 require('./events')
 const progressBar = require('./events/progressBar')
 const trafficLight = require('./events/trafficLight')
@@ -90,4 +104,3 @@ app.on('activate', () => {
     createWindow()
   }
 })
-

src/main/utils/flacMeta.js

@@ -0,0 +1,38 @@
+const fs = require('fs')
+const flac = require('flac-metadata')
+
+module.exports = (filenPath, meta) => {
+  const reader = fs.createReadStream(filenPath)
+  const tempPath = filenPath + '.lxmtemp'
+  const writer = fs.createWriteStream(tempPath)
+  const processor = new flac.Processor()
+  if (meta.APIC) delete meta.APIC
+
+  const comments = []
+  for (const key in meta) {
+    comments.push(`${key.toUpperCase()}=${meta[key]}`)
+  }
+  const vendor = 'lx-music-desktop'
+
+  processor.on('preprocess', function(mdb) {
+    // Remove existing VORBIS_COMMENT block, if any.
+    if (mdb.type === flac.Processor.MDB_TYPE_VORBIS_COMMENT) {
+      mdb.remove()
+    }
+    // Inject new VORBIS_COMMENT block.
+    if (mdb.removed || mdb.isLast) {
+      let mdbVorbis = flac.data.MetaDataBlockVorbisComment.create(mdb.isLast, vendor, comments)
+      this.push(mdbVorbis.publish())
+    }
+  })
+
+  reader.pipe(processor).pipe(writer).on('finish', () => {
+    fs.unlink(filenPath, err => {
+      if (err) return console.log(err.message)
+      fs.rename(tempPath, filenPath, err => {
+        if (err) console.log(err.message)
+      })
+    })
+  })
+}
+

src/main/utils/mp3Meta.js

@@ -0,0 +1,17 @@
+const NodeID3 = require('node-id3')
+const path = require('path')
+const fs = require('fs')
+const request = require('request')
+const extReg = /^(\.(?:jpe?g|png)).*$/
+
+module.exports = (filePath, meta) => {
+  if (!meta.APIC) return NodeID3.write(meta, filePath)
+  let picPath = path.join(path.dirname(filePath), `${meta.title}-${meta.artist}${path.extname(meta.APIC).replace(extReg, '$1')}`)
+  request(meta.APIC).pipe(fs.createWriteStream(picPath)).on('finish', () => {
+    meta.APIC = picPath
+    NodeID3.write(meta, filePath)
+    fs.unlink(picPath, err => {
+      if (err) console.log(err.message)
+    })
+  })
+}

src/main/utils/musicMeta.js

@@ -0,0 +1,14 @@
+const path = require('path')
+const mp3Meta = require('./mp3Meta')
+const flacMeta = require('./flacMeta')
+
+exports.setMeta = (filePath, meta) => {
+  switch (path.extname(filePath)) {
+    case '.mp3':
+      mp3Meta(filePath, meta)
+      break
+    case '.flac':
+      flacMeta(filePath, meta)
+      break
+  }
+}

src/renderer/App.vue

@@ -98,6 +98,7 @@ export default {
         })
       })
       rendererOn('update-error', () => {
+        if (!this.updateTimeout) return
         this.setVersionModalVisible({ isError: true })
         this.clearUpdateTimeout()
         this.$nextTick(() => {
@@ -109,12 +110,14 @@ export default {
         this.showUpdateModal()
       })
       rendererOn('update-not-available', () => {
+        if (!this.updateTimeout) return
         if (this.setting.ignoreVersion) this.setSetting(Object.assign({}, this.setting, { ignoreVersion: null }))
         this.clearUpdateTimeout()
         this.setNewVersion({
           version: this.version.version,
         })
       })
+      // 更新超时定时器
       this.updateTimeout = setTimeout(() => {
         this.updateTimeout = null
         this.setVersionModalVisible({ isError: true })

src/renderer/components/material/SongList.vue

@@ -175,6 +175,7 @@ export default {
   height: 100%;
   display: flex;
   flex-flow: column nowrap;
+  background-color: @color-theme_2;
 }
 
 .list {
@@ -186,7 +187,6 @@ export default {
 }
 .thead {
   flex: none;
-  background-color: @color-theme_2;
 }
 .tbody {
   flex: auto;

src/renderer/components/material/TagList.vue

@@ -2,7 +2,7 @@
   div(:class="$style.tagList")
     div(:class="$style.label" ref="dom_btn" @click="handleShow") {{value.name}}
     div.scroll(:class="$style.list" @click.stop ref="dom_list" :style="listStyle")
-      div(:class="$style.tag" @click="handleClick(null)") 全部
+      div(:class="$style.tag" @click="handleClick(null)") 默认
       dl(v-for="type in list")
         dt(:class="$style.type") {{type.name}}
         dd(:class="$style.tag" v-for="tag in type.list" @click="handleClick(tag)") {{tag.name}}
@@ -66,7 +66,7 @@ export default {
     handleClick(item) {
       if (!item) {
         item = {
-          name: '全部',
+          name: '默认',
           id: null,
         }
       }
@@ -159,6 +159,7 @@ export default {
   background-color: @color-btn-background;
   padding: 8px 10px;
   border-radius: @radius-progress-border;
+  transition: background-color @transition-theme;
   cursor: pointer;
   &:hover {
     background-color: @color-theme_2-hover;

src/renderer/components/material/VersionModal.vue

@@ -1,7 +1,7 @@
 <template lang="pug">
 material-modal(:show="version.showModal" @close="handleClose")
   main(:class="$style.main" v-if="version.newVersion")
-    h2 {{ version.isError ? '🌟发现新版本🌟' : '🚀程序更新🚀'}}
+    h2 {{ version.isError ? isUnknow ? '❓ 版本信息获取失败 ❓' : '🌟发现新版本🌟' : '🚀程序更新🚀'}}
 
     div.scroll(:class="$style.info")
       div(:class="$style.current")
@@ -16,7 +16,7 @@ material-modal(:show="version.showModal" @close="handleClose")
           p(v-html="ver.desc")
 
     div(:class="$style.footer" v-if="version.isError")
-      div(:class="$style.desc")
+      div(:class="$style.desc" v-if="!isUnknow")
         p 发现有新版本啦，但是自动更新功能出问题了
         p
           | 如果你所用的软件是
@@ -59,6 +59,9 @@ export default {
 
       return arr
     },
+    isUnknow() {
+      return this.version.newVersion.version == '0.0.0'
+    },
   },
   methods: {
     ...mapMutations(['setVersionModalVisible', 'setSetting']),

src/renderer/store/actions.js

@@ -9,7 +9,7 @@ export default {
         if (err) {
           return resolve({
             version: '0.0.0',
-            desc: '<h3>版本获取失败</h3><ul><li>更新信息获取失败，可能是无法访问Github导致的，请手动检查更新！</li><li>检查方法：去设置-关于洛雪音乐打开<strong>开源地址</strong>或<strong>网盘地址</strong>查看<strong>版本号</strong>与当前版本对比是否最新</li></ul>',
+            desc: '<h3>版本信息获取失败</h3><ul><li>更新信息获取失败，可能是无法访问Github导致的，请手动检查更新！</li><li>检查方法：去设置-关于洛雪音乐打开<strong>开源地址</strong>或<strong>网盘地址</strong>查看<strong>版本号</strong>与当前版本对比是否最新</li></ul>',
             history: [],
           })
         }

src/renderer/store/modules/download.js

@@ -3,6 +3,7 @@ import fs from 'fs'
 import path from 'path'
 import music from '../../utils/music'
 import { getMusicType } from '../../utils/music/utils'
+import { setMeta, saveLrc } from '../../utils'
 
 // state
 const state = {
@@ -75,6 +76,43 @@ const getUrl = (downloadInfo, isRefresh) => {
   return url && !isRefresh ? Promise.resolve({ url }) : music[downloadInfo.musicInfo.source].getMusicUrl(downloadInfo.musicInfo, downloadInfo.type).promise
 }
 
+/**
+ * 设置歌曲meta信息
+ * @param {*} downloadInfo
+ * @param {*} filePath
+ * @param {*} isEmbedPic
+ */
+const saveMeta = (downloadInfo, filePath, isEmbedPic) => {
+  if (downloadInfo.type === 'ape') return
+  const promise = isEmbedPic
+    ? downloadInfo.musicInfo.img
+      ? Promise.resolve(downloadInfo.musicInfo.img)
+      : music[downloadInfo.musicInfo.source].getPic(downloadInfo.musicInfo).promise
+    : Promise.resolve()
+  promise.then(url => {
+    setMeta(filePath, {
+      title: downloadInfo.musicInfo.name,
+      artist: downloadInfo.musicInfo.singer,
+      album: downloadInfo.musicInfo.albumName,
+      APIC: url,
+    })
+  })
+}
+
+/**
+ * 保存歌词
+ * @param {*} downloadInfo
+ * @param {*} filePath
+ */
+const downloadLyric = (downloadInfo, filePath) => {
+  const promise = downloadInfo.musicInfo.lrc
+    ? Promise.resolve(downloadInfo.musicInfo.lrc)
+    : music[downloadInfo.musicInfo.source].getLyric(downloadInfo.musicInfo).promise
+  promise.then(lrc => {
+    if (lrc) saveLrc(filePath.replace(/(mp3|flac|ape)$/, 'lrc'), lrc)
+  })
+}
+
 // actions
 const actions = {
   createDownload({ state, rootState, commit }, { musicInfo, type }) {
@@ -133,8 +171,16 @@ const actions = {
       method: 'get',
       override: true,
       onEnd() {
+        if (downloadInfo.progress.progress != '100.00') {
+          delete dls[downloadInfo.key]
+          return this.dispatch('download/startTask', downloadInfo)
+        }
         commit('onEnd', downloadInfo)
         _this.dispatch('download/startTask')
+        const filePath = path.join(options.path, options.fileName)
+
+        saveMeta(downloadInfo, filePath, rootState.setting.download.isEmbedPic)
+        if (rootState.setting.download.isDownloadLrc) downloadLyric(downloadInfo, filePath)
         console.log('on complate')
       },
       onError(err) {

src/renderer/store/modules/songList.js

@@ -67,7 +67,6 @@ const actions = {
     let source = rootState.setting.songList.source
     let key = `${source}${id}${page}`
     if (state.listDetail.list.length && state.listDetail.key == key) return true
-    commit('clearListDetail')
     return music[source].songList.getListDetail(id, page).then(result => commit('setListDetail', { result, key, page }))
   },
 }

src/renderer/utils/index.js

@@ -3,6 +3,7 @@ import { shell, remote, clipboard } from 'electron'
 import path from 'path'
 import os from 'os'
 import crypto from 'crypto'
+import { rendererSend } from '../../common/icp'
 
 /**
  * 获取两个数之间的随机整数，大于等于min，小于max
@@ -162,7 +163,7 @@ export const isChildren = (parent, children) => {
  * @param {*} setting
  */
 export const updateSetting = setting => {
-  const defaultVersion = '1.0.5'
+  const defaultVersion = '1.0.6'
   const defaultSetting = {
     version: defaultVersion,
     player: {
@@ -178,6 +179,8 @@ export const updateSetting = setting => {
       savePath: path.join(os.homedir(), 'Desktop'),
       fileName: '歌名 - 歌手',
       maxDownloadNum: 3,
+      isDownloadLrc: false,
+      isEmbedPic: true,
     },
     leaderboard: {
       source: 'kw',
@@ -187,7 +190,7 @@ export const updateSetting = setting => {
       source: 'kg',
       sortId: '5',
       tagInfo: {
-        name: '全部',
+        name: '默认',
         id: null,
       },
     },
@@ -242,3 +245,23 @@ export const toMD5 = str => crypto.createHash('md5').update(str).digest('hex')
  * @param {*} str
  */
 export const clipboardWriteText = str => clipboard.writeText(str)
+
+/**
+ * 设置音频 meta 信息
+ * @param {*} filePath
+ * @param {*} meta
+ */
+export const setMeta = (filePath, meta) => {
+  rendererSend('setMusicMeta', { filePath, meta })
+}
+
+/**
+ * 保存歌词文件
+ * @param {*} filePath
+ * @param {*} lrc
+ */
+export const saveLrc = (filePath, lrc) => {
+  fs.writeFile(filePath, lrc, 'utf8', err => {
+    if (err) console.log(err)
+  })
+}

src/renderer/utils/music/bd/songList.js

@@ -89,7 +89,7 @@ export default {
   },
   getListUrl(sortType, tagName, page) {
     return this.createUrl({
-      channelname: tagName || '全部',
+      channelname: tagName || '默认',
       from: 'qianqianmini',
       offset: (page - 1) * this.limit_list,
       order_type: sortType,

src/renderer/utils/music/kg/songList.js

@@ -231,7 +231,7 @@ export default {
           return info
         })
     )
-    if (!tagId && page === 1) tasks.push(this.getSongListRecommend()) // 如果是所有类别，则顺便获取推荐列表
+    if (!tagId && page === 1 && sortId === this.sortList[0].id) tasks.push(this.getSongListRecommend()) // 如果是所有类别，则顺便获取推荐列表
     return Promise.all(tasks).then(([list, info, recommendList]) => {
       if (recommendList) list.unshift(...recommendList)
       return {

src/renderer/utils/music/kw/api-temp.js

@@ -3,7 +3,7 @@ import { headers, timeout } from '../options'
 
 const api_temp = {
   getMusicUrl(songInfo, type) {
-    const requestObj = httpFatch(`http://45.32.53.128:3002/m/kw/u/${songInfo.songmid}/${type}`, {
+    const requestObj = httpFatch(`http://temp.tempmusic.tk/url/kw/${songInfo.songmid}/${type}`, {
       method: 'get',
       headers,
       timeout,

src/renderer/utils/music/kw/songList.js

@@ -23,7 +23,6 @@ export default {
   tagsUrl: 'http://wapi.kuwo.cn/api/pc/classify/playlist/getTagList?cmd=rcm_keyword_playlist&user=0&prod=kwplayer_pc_9.0.5.0&vipver=9.0.5.0&source=kwplayer_pc_9.0.5.0&loginUid=0&loginSid=0&appUid=76039576',
   hotTagUrl: 'http://wapi.kuwo.cn/api/pc/classify/playlist/getRcmTagList?loginUid=0&loginSid=0&appUid=76039576',
   getListUrl({ sortId, id, type, page }) {
-    console.log(id, type)
     if (!id) return `http://wapi.kuwo.cn/api/pc/classify/playlist/getRcmPlayList?loginUid=0&loginSid=0&appUid=76039576&&pn=${page}&rn=${this.limit_list}&order=${sortId}`
     switch (type) {
       case '10000': return `http://wapi.kuwo.cn/api/pc/classify/playlist/getTagPlayList?loginUid=0&loginSid=0&appUid=76039576&pn=${page}&id=${id}&rn=${this.limit_list}`
@@ -86,7 +85,6 @@ export default {
     } else {
       id = null
     }
-    console.log(id, type)
     this._requestObj_list = httpFatch(this.getListUrl({ sortId, id, type, page }))
     return this._requestObj_list.promise.then(({ body }) => {
       if (!id || type == '10000') {
@@ -146,7 +144,6 @@ export default {
         desc: item.desc,
       })))
     })
-    console.log(list)
     return list
   },
 

src/renderer/utils/music/utils.js

@@ -15,4 +15,5 @@ export const getMusicType = (info, type) => {
   for (const type of rangeType) {
     if (info._types[type]) return type
   }
+  return '128k'
 }

src/renderer/utils/request.js

@@ -41,8 +41,8 @@ const buildHttpPromose = (url, options) => {
   const obj = {
     promise: p,
     cancelHttp() {
-      console.log('cancel')
       if (!requestObj) return
+      console.log('cancel')
       cancelHttp(requestObj)
       cancelFn(new Error(requestMsg.cancelRequest))
       requestObj = null

src/renderer/views/Download.vue

@@ -23,7 +23,7 @@ div(:class="$style.download")
             td.break(style="width: 28%;") {{item.musicInfo.name}} - {{item.musicInfo.singer}}
             td.break(style="width: 22%;") {{item.progress.progress}}%
             td.break(style="width: 15%;") {{item.statusText}}
-            td.break(style="width: 10%;") {{item.type.toUpperCase()}}
+            td.break(style="width: 10%;") {{item.type && item.type.toUpperCase()}}
             td(style="width: 20%; padding-left: 0; padding-right: 0;")
               material-list-buttons(:index="index" :download-btn="false" :start-btn="!item.isComplate && item.status != downloadStatus.WAITING && (item.status != downloadStatus.RUN)"
                 :pause-btn="!item.isComplate && (item.status == downloadStatus.RUN || item.status == downloadStatus.WAITING)"

src/renderer/views/Setting.vue

@@ -49,6 +49,14 @@ div.scroll(:class="$style.setting")
       div
         material-checkbox(:id="`setting_download_musicName_${item.value}`" :class="$style.gapLeft" name="setting_download_musicName" :value="item.value" :key="item.value" need
             v-model="current_setting.download.fileName" v-for="item in musicNames" :label="item.name")
+    dd(title='封面嵌入')
+      h3 是否将封面嵌入音频文件中（只支持MP3格式）
+      div
+        material-checkbox(id="setting_download_isEmbedPic" v-model="current_setting.download.isEmbedPic" label="是否启用")
+    dd(title='歌词下载')
+      h3 是否同时下载歌词文件
+      div
+        material-checkbox(id="setting_download_isDownloadLrc" v-model="current_setting.download.isDownloadLrc" label="是否启用")
     //- dt 列表设置
     //- dd(title='播放列表是否显示专辑栏')
       h3 专辑栏
@@ -146,6 +154,8 @@ export default {
         download: {
           savePath: '',
           fileName: '歌名 - 歌手',
+          isDownloadLrc: false,
+          isEmbedPic: true,
         },
         themeId: 0,
         sourceId: 0,

src/renderer/views/SongList.vue

@@ -1,12 +1,12 @@
 <template lang="pug">
-  div(:class="$style.leaderboard")
+  div(:class="$style.container")
     div(:class="$style.header")
       material-tag-list(:class="$style.tagList" :list="tagList" v-model="tagInfo")
       material-tab(:class="$style.tab" :list="sorts" item-key="id" item-name="name" v-model="sortId")
       material-select(:class="$style.select" :list="sourceInfo.sources" item-key="id" item-name="name" v-model="source")
-    div(:class="$style.container")
+    div(:class="$style.main")
       transition(enter-active-class="animated-fast fadeIn" leave-active-class="animated-fast fadeOut")
-        div(:class="$style.materialSongList" v-show="isVisibleListDetail")
+        div(:class="$style.songListDetail" v-show="isVisibleListDetail")
           div(:class="$style.songListHeader")
             div(:class="$style.songListHeaderLeft")
               img(:src="selectListInfo.img")
@@ -17,17 +17,18 @@
             div(:class="$style.songListHeaderRight")
               material-btn(:class="$style.closeDetailButton" @click="hideListDetail") 返回
           material-song-list(v-model="selectdData" @action="handleSongListAction" :source="source" :page="listDetail.page" :limit="listDetail.limit" :total="listDetail.total" :list="listDetail.list")
-      div.scroll(:class="$style.content" ref="dom_scrollContent" v-show="!isVisibleListDetail")
-        ul
-          li(:class="$style.item" v-for="(item, index) in listData.list" @click="handleItemClick(index)")
-            div(:class="$style.left")
-              img(:src="item.img")
-            div(:class="$style.right" :src="item.img")
-              h4(:title="item.name") {{item.name}}
-              p(:title="item.desc") {{item.desc}}
-          li(:class="$style.item" style="cursor: default;" v-if="listData.list && listData.list.length && listData.list.length % 3 == 2")
-        div(:class="$style.pagination")
-          material-pagination(:count="listData.total" :limit="listData.limit" :page="listData.page" @btn-click="handleTogglePage")
+      transition(enter-active-class="animated-fast fadeIn" leave-active-class="animated-fast fadeOut")
+        div.scroll(:class="$style.songList" ref="dom_scrollContent" v-show="!isVisibleListDetail")
+          ul
+            li(:class="$style.item" v-for="(item, index) in listData.list" @click="handleItemClick(index)")
+              div(:class="$style.left")
+                img(:src="item.img")
+              div(:class="$style.right" :src="item.img")
+                h4(:title="item.name") {{item.name}}
+                p(:title="item.desc") {{item.desc}}
+            li(:class="$style.item" style="cursor: default;" v-if="listData.list && listData.list.length && listData.list.length % 3 == 2")
+          div(:class="$style.pagination")
+            material-pagination(:count="listData.total" :limit="listData.limit" :page="listData.page" @btn-click="handleToggleListPage")
     material-download-modal(:show="isShowDownload" :musicInfo="musicInfo" @select="handleAddDownload" @close="isShowDownload = false")
     material-download-multiple-modal(:show="isShowDownloadMultiple" :list="selectdData" @select="handleAddDownloadMultiple" @close="isShowDownloadMultiple = false")
 </template>
@@ -41,7 +42,7 @@ export default {
   data() {
     return {
       tagInfo: {
-        name: '全部',
+        name: '默认',
         id: null,
       },
       sortId: undefined,
@@ -102,7 +103,7 @@ export default {
       if (o) {
         this.isToggleSource = true
         this.tagInfo = {
-          name: '全部',
+          name: '默认',
           id: null,
         }
         this.sortId = this.sorts[0] && this.sorts[0].id
@@ -118,7 +119,7 @@ export default {
   methods: {
     ...mapMutations(['setSongList']),
     ...mapActions('songList', ['getTags', 'getList', 'getListDetail']),
-    ...mapMutations('songList', ['setVisibleListDetail', 'setSelectListInfo']),
+    ...mapMutations('songList', ['setVisibleListDetail', 'setSelectListInfo', 'clearListDetail']),
     ...mapActions('download', ['createDownload', 'createDownloadMultiple']),
     ...mapMutations('list', ['defaultListAdd', 'defaultListAddMultiple']),
     ...mapMutations('player', ['setList']),
@@ -170,13 +171,20 @@ export default {
         },
       })
     },
-    handleTogglePage(page) {
+    handleToggleListPage(page) {
       this.getList(page).then(() => {
         this.$nextTick(() => {
           scrollTo(this.$refs.dom_scrollContent, 0)
         })
       })
     },
+    handleToggleListDetailPage(page) {
+      this.getListDetail({ id: this.selectListInfo.id, page }).then(() => {
+        this.$nextTick(() => {
+          scrollTo(this.$refs.dom_scrollContent, 0)
+        })
+      })
+    },
     handleAddDownload(type) {
       this.createDownload({ musicInfo: this.musicInfo, type })
       this.isShowDownload = false
@@ -194,7 +202,10 @@ export default {
     handleItemClick(index) {
       this.setSelectListInfo(this.listData.list[index])
       this.setVisibleListDetail(true)
-      this.getListDetail({ id: this.selectListInfo.id, page: 1 })
+      this.clearListDetail()
+      this.$nextTick(() => {
+        this.getListDetail({ id: this.selectListInfo.id, page: 1 })
+      })
     },
     handleFlowBtnClick(action) {
       switch (action) {
@@ -215,7 +226,7 @@ export default {
         case 'listBtnClick':
           return this.handleListBtnClick(data)
         case 'togglePage':
-          return this.handleTogglePage(data)
+          return this.handleToggleListDetailPage(data)
         case 'flowBtnClick':
           return this.handleFlowBtnClick(data)
         case 'testPlay':
@@ -238,7 +249,7 @@ export default {
 <style lang="less" module>
 @import '../assets/styles/layout.less';
 
-.leaderboard {
+.container {
   height: 100%;
   display: flex;
   flex-flow: column nowrap;
@@ -258,7 +269,7 @@ export default {
   width: 80px;
 }
 
-.container {
+.main {
   flex: auto;
   overflow: hidden;
   // position: relative;
@@ -293,7 +304,7 @@ export default {
   }
 }
 
-.song_list_header_middle {
+.song-list-header-middle {
   flex: auto;
   padding: 5px 7px;
   h3 {
@@ -315,7 +326,7 @@ export default {
   padding-right: 15px;
 }
 
-.material-song-list {
+.song-list-detail {
   position: absolute;
   width: 100%;
   height: 100%;
@@ -325,7 +336,7 @@ export default {
   flex-flow: column nowrap;
 }
 
-.content {
+.songList {
   height: 100%;
   overflow-y: auto;
   padding: 0 15px;