diff --git a/@types/global/index.d.ts b/@types/global/index.d.ts index c267c7bd6..7a07098c5 100644 --- a/@types/global/index.d.ts +++ b/@types/global/index.d.ts @@ -49,6 +49,9 @@ declare global { skipByDefault: boolean maxDownloadLimit: string } + interface RpcOptionProfile extends RpcOption { + name: string + } interface SearchHistoryItem { keyword: string count: number @@ -334,6 +337,7 @@ declare global { foldComment: boolean, downloadVideoDefaultDanmaku: '无' | 'XML' | 'ASS', aria2RpcOption: RpcOption, + aria2RpcOptionProfiles: RpcOptionProfile[], searchHistory: SearchHistoryItem[], seedsToCoins: boolean, autoSeedsToCoins: boolean, @@ -349,6 +353,7 @@ declare global { } const settings: BilibiliEvolvedSettings; const customNavbarDefaultOrders: CustomNavbarOrders; + const aria2RpcDefaultOption: RpcOption; const languageNameToCode: { [key: string]: string }; const languageCodeToName: { [key: string]: string }; function logError(message: Error | string): void; diff --git a/bilibili-evolved.offline.user.js b/bilibili-evolved.offline.user.js index b2f03d45d..ad27210c6 100644 --- a/bilibili-evolved.offline.user.js +++ b/bilibili-evolved.offline.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name Bilibili Evolved (Offline) -// @version 417.19 +// @version 417.20 // @description Bilibili Evolved 的离线版, 所有功能都已内置于脚本中. // @author Grant Howard, Coulomb-G // @copyright 2019, Grant Howard (https://github.com/the1812) & Coulomb-G (https://github.com/Coulomb-G) @@ -177,6 +177,16 @@ const customNavbarDefaultOrders = { upload: 19, blank3: 20, } +const aria2RpcDefaultOption = { + secretKey: '', + dir: '', + host: '127.0.0.1', + port: '6800', + method: 'get', + skipByDefault: false, + maxDownloadLimit: '', + baseDir: '', +} const settings = { useDarkStyle: false, compactLayout: false, @@ -281,15 +291,8 @@ const settings = { hideCategory: false, foldComment: true, downloadVideoDefaultDanmaku: '无', - aria2RpcOption: { - secretKey: '', - dir: '', - host: '127.0.0.1', - port: '6800', - method: 'get', - skipByDefault: false, - maxDownloadLimit: '', - }, + aria2RpcOption: {...aria2RpcDefaultOption}, + aria2RpcOptionProfiles: [], searchHistory: [], seedsToCoins: true, autoSeedsToCoins: true, diff --git a/bilibili-evolved.preview-offline.user.js b/bilibili-evolved.preview-offline.user.js index 69570da73..41e7883f9 100644 --- a/bilibili-evolved.preview-offline.user.js +++ b/bilibili-evolved.preview-offline.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name Bilibili Evolved (Preview Offline) -// @version 417.19 +// @version 417.20 // @description Bilibili Evolved 的预览离线版, 可以抢先体验新功能, 并且所有功能都已内置于脚本中. // @author Grant Howard, Coulomb-G // @copyright 2019, Grant Howard (https://github.com/the1812) & Coulomb-G (https://github.com/Coulomb-G) @@ -177,6 +177,16 @@ const customNavbarDefaultOrders = { upload: 19, blank3: 20, } +const aria2RpcDefaultOption = { + secretKey: '', + dir: '', + host: '127.0.0.1', + port: '6800', + method: 'get', + skipByDefault: false, + maxDownloadLimit: '', + baseDir: '', +} const settings = { useDarkStyle: false, compactLayout: false, @@ -281,15 +291,8 @@ const settings = { hideCategory: false, foldComment: true, downloadVideoDefaultDanmaku: '无', - aria2RpcOption: { - secretKey: '', - dir: '', - host: '127.0.0.1', - port: '6800', - method: 'get', - skipByDefault: false, - maxDownloadLimit: '', - }, + aria2RpcOption: {...aria2RpcDefaultOption}, + aria2RpcOptionProfiles: [], searchHistory: [], seedsToCoins: true, autoSeedsToCoins: true, diff --git a/bilibili-evolved.preview.user.js b/bilibili-evolved.preview.user.js index 50fec0e86..391bf7e7c 100644 --- a/bilibili-evolved.preview.user.js +++ b/bilibili-evolved.preview.user.js @@ -176,6 +176,16 @@ const customNavbarDefaultOrders = { upload: 19, blank3: 20, } +const aria2RpcDefaultOption = { + secretKey: '', + dir: '', + host: '127.0.0.1', + port: '6800', + method: 'get', + skipByDefault: false, + maxDownloadLimit: '', + baseDir: '', +} const settings = { useDarkStyle: false, compactLayout: false, @@ -280,15 +290,8 @@ const settings = { hideCategory: false, foldComment: true, downloadVideoDefaultDanmaku: '无', - aria2RpcOption: { - secretKey: '', - dir: '', - host: '127.0.0.1', - port: '6800', - method: 'get', - skipByDefault: false, - maxDownloadLimit: '', - }, + aria2RpcOption: {...aria2RpcDefaultOption}, + aria2RpcOptionProfiles: [], searchHistory: [], seedsToCoins: true, autoSeedsToCoins: true, diff --git a/bilibili-evolved.user.js b/bilibili-evolved.user.js index 1cf513c30..502a2176f 100644 --- a/bilibili-evolved.user.js +++ b/bilibili-evolved.user.js @@ -176,6 +176,16 @@ const customNavbarDefaultOrders = { upload: 19, blank3: 20, } +const aria2RpcDefaultOption = { + secretKey: '', + dir: '', + host: '127.0.0.1', + port: '6800', + method: 'get', + skipByDefault: false, + maxDownloadLimit: '', + baseDir: '', +} const settings = { useDarkStyle: false, compactLayout: false, @@ -280,15 +290,8 @@ const settings = { hideCategory: false, foldComment: true, downloadVideoDefaultDanmaku: '无', - aria2RpcOption: { - secretKey: '', - dir: '', - host: '127.0.0.1', - port: '6800', - method: 'get', - skipByDefault: false, - maxDownloadLimit: '', - }, + aria2RpcOption: {...aria2RpcDefaultOption}, + aria2RpcOptionProfiles: [], searchHistory: [], seedsToCoins: true, autoSeedsToCoins: true, diff --git a/min/bundle.zip b/min/bundle.zip index 37500fb19..988362147 100644 Binary files a/min/bundle.zip and b/min/bundle.zip differ diff --git a/src/client/settings.js b/src/client/settings.js index 8a8d90f19..651054a2b 100644 --- a/src/client/settings.js +++ b/src/client/settings.js @@ -21,6 +21,16 @@ export const customNavbarDefaultOrders = { upload: 19, blank3: 20, } +export const aria2RpcDefaultOption = { + secretKey: '', + dir: '', + host: '127.0.0.1', + port: '6800', + method: 'get', + skipByDefault: false, + maxDownloadLimit: '', + baseDir: '', +} export const settings = { useDarkStyle: false, compactLayout: false, @@ -125,15 +135,8 @@ export const settings = { hideCategory: false, foldComment: true, downloadVideoDefaultDanmaku: '无', - aria2RpcOption: { - secretKey: '', - dir: '', - host: '127.0.0.1', - port: '6800', - method: 'get', - skipByDefault: false, - maxDownloadLimit: '', - }, + aria2RpcOption: {...aria2RpcDefaultOption}, + aria2RpcOptionProfiles: [], searchHistory: [], seedsToCoins: true, autoSeedsToCoins: true,