diff --git a/.electron-vue/build.js b/.electron-vue/build.js index 37d77a72e..ba59a7770 100644 --- a/.electron-vue/build.js +++ b/.electron-vue/build.js @@ -120,16 +120,20 @@ function greeting () { const cols = process.stdout.columns let text = '' - if (cols > 85) text = 'lets-build' - else if (cols > 60) text = 'lets-|build' - else text = false + if (cols > 85) { + text = 'lets-build' + } else if (cols > 60) { + text = 'lets-|build' + } else { + text = false + } if (text && !isCI) { say(text, { - colors: ['yellow'], + colors: ['magentaBright'], font: 'simple3d', space: false }) - } else console.log(chalk.yellow.bold('\n lets-build')) + } else console.log(chalk.magentaBright.bold('\n lets-build')) console.log() } diff --git a/.electron-vue/dev-runner.js b/.electron-vue/dev-runner.js index 86a957c82..ab1738c83 100644 --- a/.electron-vue/dev-runner.js +++ b/.electron-vue/dev-runner.js @@ -128,17 +128,21 @@ function greeting () { const cols = process.stdout.columns let text = '' - if (cols > 104) text = 'electron-vue' - else if (cols > 76) text = 'electron-|vue' - else text = false + if (cols > 104) { + text = 'motrix-dev' + } else if (cols > 76) { + text = 'motrix-|dev' + } else { + text = false + } if (text) { say(text, { - colors: ['yellow'], + colors: ['magentaBright'], font: 'simple3d', space: false }) - } else console.log(chalk.yellow.bold('\n electron-vue')) + } else console.log(chalk.magentaBright.bold('\n motrix-dev')) console.log(chalk.blue(' getting ready...') + '\n') } diff --git a/extra/darwin/arm64/engine/aria2c b/extra/darwin/arm64/engine/aria2c index 9509bf473..21f757f58 100755 Binary files a/extra/darwin/arm64/engine/aria2c and b/extra/darwin/arm64/engine/aria2c differ diff --git a/extra/darwin/x64/engine/aria2c b/extra/darwin/x64/engine/aria2c index c253b2a4a..62e6b6551 100755 Binary files a/extra/darwin/x64/engine/aria2c and b/extra/darwin/x64/engine/aria2c differ diff --git a/extra/linux/engine/aria2c b/extra/linux/engine/aria2c index 1310525df..f35069c9f 100755 Binary files a/extra/linux/engine/aria2c and b/extra/linux/engine/aria2c differ diff --git a/extra/win32/ia32/engine/aria2c.exe b/extra/win32/ia32/engine/aria2c.exe old mode 100644 new mode 100755 index dcb0669f8..0741331fd Binary files a/extra/win32/ia32/engine/aria2c.exe and b/extra/win32/ia32/engine/aria2c.exe differ diff --git a/extra/win32/x64/engine/aria2c.exe b/extra/win32/x64/engine/aria2c.exe old mode 100644 new mode 100755 index 665a848ef..d950831a0 Binary files a/extra/win32/x64/engine/aria2c.exe and b/extra/win32/x64/engine/aria2c.exe differ diff --git a/package.json b/package.json index 23440d868..58ce00b95 100644 --- a/package.json +++ b/package.json @@ -43,7 +43,7 @@ "electron-store": "^8.1.0", "electron-updater": "^5.3.0", "element-ui": "^2.15.13", - "i18next": "^22.4.12", + "i18next": "^22.4.13", "lodash": "^4.17.21", "node-fetch": "^2.6.1", "normalize.css": "^8.0.1", @@ -85,7 +85,6 @@ "eslint": "^7.32.0", "eslint-friendly-formatter": "^4.0.1", "eslint-plugin-import": "^2.27.5", - "eslint-plugin-n": "^15.6.1", "eslint-plugin-node": "^11.1.0", "eslint-plugin-promise": "^6.1.1", "eslint-plugin-vue": "^9.9.0", @@ -101,9 +100,9 @@ "vue-loader": "^15.10.1", "vue-style-loader": "^4.1.3", "vue-template-compiler": "^2.7.14", - "webpack": "^5.76.2", + "webpack": "^5.77.0", "webpack-cli": "^5.0.1", - "webpack-dev-server": "^4.12.0", + "webpack-dev-server": "^4.13.1", "webpack-hot-middleware": "^2.25.3", "webpack-merge": "^5.8.0", "worker-loader": "^3.0.8" diff --git a/src/main/Application.js b/src/main/Application.js index 990b60cb3..f9809087b 100644 --- a/src/main/Application.js +++ b/src/main/Application.js @@ -713,7 +713,7 @@ export default class Application extends EventEmitter { }) this.on('application:setup-protocols-client', (protocols) => { - if (is.dev() || is.mas()) { + if (is.dev() || is.mas() || !protocols) { return } logger.info('[Motrix] setup protocols client:', protocols) diff --git a/src/main/ui/ThemeManager.js b/src/main/ui/ThemeManager.js index b77dbc43f..e23856c8c 100644 --- a/src/main/ui/ThemeManager.js +++ b/src/main/ui/ThemeManager.js @@ -1,6 +1,5 @@ import { EventEmitter } from 'events' import { nativeTheme } from 'electron' -import is from 'electron-is' import { APP_THEME } from '@shared/constants' import logger from '../core/Logger' @@ -25,10 +24,6 @@ export default class ThemeManager extends EventEmitter { } handleEvents () { - if (!is.macOS()) { - return - } - nativeTheme.on('updated', () => { const theme = getSystemTheme() this.systemTheme = theme diff --git a/src/renderer/components/Preference/Basic.vue b/src/renderer/components/Preference/Basic.vue index 2d8cc7983..aa56ad395 100644 --- a/src/renderer/components/Preference/Basic.vue +++ b/src/renderer/components/Preference/Basic.vue @@ -202,7 +202,7 @@ v-model="form.maxConcurrentDownloads" controls-position="right" :min="1" - :max="10" + :max="maxConcurrentDownloads" :label="$t('preferences.max-concurrent-downloads')"> @@ -273,7 +273,7 @@ convertLineToComma, diffConfig } from '@shared/utils' - import { APP_RUN_MODE } from '@shared/constants' + import { APP_RUN_MODE, ENGINE_MAX_CONCURRENT_DOWNLOADS } from '@shared/constants' import { reduceTrackerString } from '@shared/utils/tracker' const initForm = (config) => { @@ -371,6 +371,9 @@ title () { return this.$t('preferences.basic') }, + maxConcurrentDownloads () { + return ENGINE_MAX_CONCURRENT_DOWNLOADS + }, runModes () { return [ { diff --git a/src/renderer/components/Task/AddTask.vue b/src/renderer/components/Task/AddTask.vue index d380aa3c4..ffb0bf5fd 100644 --- a/src/renderer/components/Task/AddTask.vue +++ b/src/renderer/components/Task/AddTask.vue @@ -1,7 +1,7 @@