diff --git a/CHANGELOG.md b/CHANGELOG.md index c10bc96b..ad5c0310 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,38 @@ 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.2.3](https://github.com/lyswhut/lx-music-desktop/compare/v0.2.2...v0.2.3) - 2019-08-22 + +### 新增 + +- 新增任务栏程序标题改变功能(播放歌曲时任务栏标题将显示当前播放的歌曲) + +### 修复 + +- 使用临时接口时,试听列表中的下载按钮仍然能点击的Bug +- 修复某些情况下歌曲链接未能缓存的问题 + +### 移除 + +- 移除临时接口(因服务器被攻击,本接口已关闭) +- 移除列表栏设置的隐藏专辑栏选项(感觉这个设置并没有什么luan用,并且还会打破布局) + +## [0.2.2](https://github.com/lyswhut/lx-music-desktop/compare/v0.2.2...v0.2.2) - 2019-08-22 + +### 新增 + +- 新增任务栏程序标题改变功能(播放歌曲时任务栏标题将显示当前播放的歌曲) + +### 修复 + +- 使用临时接口时,试听列表中的下载按钮仍然能点击的Bug +- 修复某些情况下歌曲链接未能缓存的问题 + +### 移除 + +- 移除临时接口(因服务器被攻击,本接口已关闭) +- 移除列表栏设置的隐藏专辑栏选项(感觉这个设置并没有什么luan用,并且还会打破布局) + ## [0.2.2](https://github.com/lyswhut/lx-music-desktop/compare/v0.2.1...v0.2.2) - 2019-08-21 ### 修复 diff --git a/README.md b/README.md index 1387f3c2..f243c3e9 100644 --- a/README.md +++ b/README.md @@ -38,15 +38,17 @@ - Vue 2.x 软件变化请查看:[更新日志](https://github.com/lyswhut/lx-music-desktop/blob/master/CHANGELOG.md)
-软件下载请转到:[发布页面](https://github.com/lyswhut/lx-music-desktop/releases) - -其他说明:TODO +软件下载请转到:[发布页面](https://github.com/lyswhut/lx-music-desktop/releases)
+或者到网盘下载:
+`https://www.lanzous.com/b906260/`
+`密码:glqw` #### 关于软件更新 软件启动时若发现新版本时会自动从本仓库下载安装包,下载完毕会弹窗提示更新。
若下载未完成时软件被关闭,下次启动软件会再次自动下载。
目前暂未添加跳过更新某个版本的功能。
+**注意:**绿色版的软件更新功能不可用! ### 源码使用方法 diff --git a/appveyor.yml b/appveyor.yml index 1ac2e2f3..0e863c72 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -4,14 +4,14 @@ platform: cache: - node_modules - '%APPDATA%\npm-cache' - # - '%USERPROFILE%\.electron' + - '%LOCALAPPDATA%\electron\Cache' install: - ps: Install-Product node 12 x64 - npm install build_script: - - npm run pub:gh + - npm run publish:gh test: off diff --git a/build-config/main/webpack.config.base.js b/build-config/main/webpack.config.base.js index eb5e67a9..01a2d03d 100644 --- a/build-config/main/webpack.config.base.js +++ b/build-config/main/webpack.config.base.js @@ -7,11 +7,6 @@ module.exports = { libraryTarget: 'commonjs2', path: path.join(__dirname, '../../dist/electron'), }, - externals: [ - // suppress electron-debug warning - // see https://github.com/SimulatedGREG/electron-vue/issues/498 - { 'electron-debug': 'electron-debug' }, - ], resolve: { alias: { common: path.join(__dirname, '../../src/common'), diff --git a/package-lock.json b/package-lock.json index dc796222..ab92ffe5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "lx-music-desktop", - "version": "0.1.4", + "version": "0.2.3", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 16d0608e..e6987fd0 100644 --- a/package.json +++ b/package.json @@ -1,12 +1,31 @@ { "name": "lx-music-desktop", - "version": "0.2.2", + "version": "0.2.3", "description": "一个免费的音乐下载助手", "main": "./dist/electron/main.js", + "productName": "lx-music-desktop", "scripts": { + "pack": "node build-config/pack.js && npm run pack:win:setup", + "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", + "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", "publish": "node publish", - "pub:gh": "node build-config/pack.js && electron-builder --win -p always", - "pack": "node build-config/pack.js && electron-builder -w", + "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: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=x64 electron-builder -w=7z --x64 -p onTagOrDraft", + "publish:win:7z:x86": "cross-env TARGET=green ARCH=x86 electron-builder -w=7z --ia32 -p onTagOrDraft", "pack:linux": "node build-config/pack.js && electron-builder -l", "pack:dir": "node build-config/pack.js && electron-builder --dir", "dev": "node build-config/runner-dev.js", @@ -37,15 +56,7 @@ "win": { "icon": "src/static/icons/lunch.ico", "legalTrademarks": "lyswhut", - "target": [ - { - "arch": [ - "ia32", - "x64" - ], - "target": "nsis" - } - ] + "artifactName": "${productName} v${version} ${env.ARCH} ${env.TARGET}.${ext}" }, "linux": { "target": [ @@ -76,7 +87,8 @@ "language": "2052", "allowToChangeInstallationDirectory": true, "differentialPackage": true, - "license": "./license.rtf" + "license": "./license.rtf", + "shortcutName": "lx-music" }, "publish": [ { @@ -90,8 +102,15 @@ "type": "git", "url": "git+https://github.com/lyswhut/lx-music-desktop.git" }, - "keywords": [], - "author": "lyswhut", + "keywords": [ + "music-player", + "electron-app", + "vuejs2" + ], + "author": { + "name": "lyswhut", + "email": "lyswuhut@qq.com" + }, "license": "Apache-2.0", "bugs": { "url": "https://github.com/lyswhut/lx-music-desktop/issues" diff --git a/publish/changeLog.md b/publish/changeLog.md index 92ec8c11..f0473357 100644 --- a/publish/changeLog.md +++ b/publish/changeLog.md @@ -1,7 +1,13 @@ +### 新增 + +- 新增任务栏程序标题改变功能(播放歌曲时任务栏标题将显示当前播放的歌曲) + ### 修复 - 使用临时接口时,试听列表中的下载按钮仍然能点击的Bug +- 修复某些情况下歌曲链接未能缓存的问题 ### 移除 +- 移除临时接口(因服务器被攻击,本接口已关闭) - 移除列表栏设置的隐藏专辑栏选项(感觉这个设置并没有什么luan用,并且还会打破布局) diff --git a/publish/version.json b/publish/version.json index 46bed0b8..62725432 100644 --- a/publish/version.json +++ b/publish/version.json @@ -1,7 +1,11 @@ { - "version": "0.2.2", - "desc": "

修复

\n\n", + "version": "0.2.3", + "desc": "

新增

\n\n

修复

\n\n

移除

\n\n", "history": [ + { + "version": "0.2.2", + "desc": "

修复

\n\n" + }, { "version": "0.2.1", "desc": "

优化

\n\n

修复

\n\n" diff --git a/src/index.pug b/src/index.pug index ca96d14d..c6a1e122 100644 --- a/src/index.pug +++ b/src/index.pug @@ -3,7 +3,7 @@ html(lang="cn") meta(charset="UTF-8") meta(name="viewport" content="width=device-width, initial-scale=1.0") meta(http-equiv="X-UA-Compatible" content="ie=edge") - title= require('../package.json').name + title 洛雪音乐助手 body #root diff --git a/src/main/utils/autoUpdate.js b/src/main/utils/autoUpdate.js index 5571c667..f49a12ce 100644 --- a/src/main/utils/autoUpdate.js +++ b/src/main/utils/autoUpdate.js @@ -3,6 +3,7 @@ const { autoUpdater } = require('electron-updater') const { mainOn } = require('../../common/icp') autoUpdater.logger = log +// autoUpdater.autoDownload = false autoUpdater.logger.transports.file.level = 'info' log.info('App starting...') @@ -62,12 +63,14 @@ module.exports = win => { }) autoUpdater.on('update-available', (ev, info) => { sendStatusToWindow('Update available.') + // win.webContents.send('update-available') }) autoUpdater.on('update-not-available', (ev, info) => { sendStatusToWindow('Update not available.') }) autoUpdater.on('error', (ev, err) => { sendStatusToWindow('Error in auto-updater.') + // win.webContents.send('update-error') }) autoUpdater.on('download-progress', (ev, progressObj) => { sendStatusToWindow('Download progress...') diff --git a/src/renderer/App.vue b/src/renderer/App.vue index e472b922..31b1f5b6 100644 --- a/src/renderer/App.vue +++ b/src/renderer/App.vue @@ -87,7 +87,7 @@ export default { this.getVersionInfo().then(body => { this.setNewVersion(body) this.$nextTick(() => { - this.setVersionVisible(true) + this.setVersionVisible({ isShow: true }) }) }) }) diff --git a/src/renderer/components/core/Player.vue b/src/renderer/components/core/Player.vue index 96398cc5..16fc17f9 100644 --- a/src/renderer/components/core/Player.vue +++ b/src/renderer/components/core/Player.vue @@ -41,7 +41,7 @@ div(:class="$style.player")