From 66c4e62d9b608ca960dcd2b6b1be50d4c3cc7107 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Sat, 16 May 2020 20:39:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/config/api-source.js | 2 + src/renderer/config/defaultSetting.js | 8 +-- src/renderer/config/index.js | 82 --------------------------- src/renderer/utils/index.js | 2 +- 4 files changed, 6 insertions(+), 88 deletions(-) delete mode 100644 src/renderer/config/index.js diff --git a/src/renderer/config/api-source.js b/src/renderer/config/api-source.js index 9f60779d..fecf8992 100644 --- a/src/renderer/config/api-source.js +++ b/src/renderer/config/api-source.js @@ -1,3 +1,5 @@ +// Support qualitys: 128k 320k flac wav + export default [ { id: 'test', diff --git a/src/renderer/config/defaultSetting.js b/src/renderer/config/defaultSetting.js index 543e37db..a614fe06 100644 --- a/src/renderer/config/defaultSetting.js +++ b/src/renderer/config/defaultSetting.js @@ -2,7 +2,7 @@ import path from 'path' import os from 'os' const defaultSetting = { - version: '1.0.24', + version: '1.0.26', player: { togglePlayMethod: 'listLoop', highQuality: false, @@ -14,10 +14,8 @@ const defaultSetting = { list: { isShowAlbumName: true, isShowSource: true, - scroll: { - enable: true, - locations: {}, - }, + prevSelectListId: 'default', + isSaveScrollLocation: true, }, download: { savePath: path.join(os.homedir(), 'Desktop'), diff --git a/src/renderer/config/index.js b/src/renderer/config/index.js deleted file mode 100644 index a614fe06..00000000 --- a/src/renderer/config/index.js +++ /dev/null @@ -1,82 +0,0 @@ -import path from 'path' -import os from 'os' - -const defaultSetting = { - version: '1.0.26', - player: { - togglePlayMethod: 'listLoop', - highQuality: false, - isShowTaskProgess: true, - volume: 1, - mediaDeviceId: 'default', - isMediaDeviceRemovedStopPlay: false, - }, - list: { - isShowAlbumName: true, - isShowSource: true, - prevSelectListId: 'default', - isSaveScrollLocation: true, - }, - download: { - savePath: path.join(os.homedir(), 'Desktop'), - fileName: '歌名 - 歌手', - maxDownloadNum: 3, - isDownloadLrc: false, - isEmbedPic: true, - }, - leaderboard: { - source: 'kw', - tabId: 'kwbiaosb', - }, - songList: { - source: 'kg', - sortId: '5', - tagInfo: { - name: '默认', - id: null, - }, - }, - odc: { - isAutoClearSearchInput: false, - isAutoClearSearchList: false, - }, - search: { - searchSource: 'kw', - tempSearchSource: 'kw', - isShowHotSearch: false, - isShowHistorySearch: false, - isFocusSearchBox: false, - }, - network: { - proxy: { - enable: false, - host: '', - port: '', - username: '', - password: '', - }, - }, - tray: { - isShow: false, - isToTray: false, - }, - windowSizeId: 2, - themeId: 0, - langId: 'cns', - sourceId: 'kw', - apiSource: 'temp', - sourceNameType: 'alias', - randomAnimate: true, - ignoreVersion: null, - isAgreePact: false, -} - -const overwriteSetting = { - -} - -// 使用新年皮肤 -if (new Date().getMonth() < 2) defaultSetting.themeId = 9 - - -export { defaultSetting, overwriteSetting } diff --git a/src/renderer/utils/index.js b/src/renderer/utils/index.js index 4ce549bf..07df96ce 100644 --- a/src/renderer/utils/index.js +++ b/src/renderer/utils/index.js @@ -2,7 +2,7 @@ import fs from 'fs' import { shell, clipboard } from 'electron' import crypto from 'crypto' import { rendererSend, rendererInvoke } from '../../common/ipc' -import { defaultSetting, overwriteSetting } from '../config' +import { defaultSetting, overwriteSetting } from '../config/defaultSetting' import apiSource from '../config/api-source' /**