Keep custom arguments, rename option accordingly

Author: trostboot

src/renderer/components/external-player-settings/external-player-settings.js

@@ -37,8 +37,8 @@ export default defineComponent({
     externalPlayerIgnoreWarnings: function () {
       return this.$store.getters.getExternalPlayerIgnoreWarnings
     },
-    externalPlayerIgnoreArgs: function () {
-      return this.$store.getters.getExternalPlayerIgnoreArgs
+    externalPlayerIgnoreDefaultArgs: function () {
+      return this.$store.getters.getExternalPlayerIgnoreDefaultArgs
     },
     externalPlayerCustomArgs: function () {
       return this.$store.getters.getExternalPlayerCustomArgs
@@ -61,7 +61,7 @@ export default defineComponent({
       'updateExternalPlayer',
       'updateExternalPlayerExecutable',
       'updateExternalPlayerIgnoreWarnings',
-      'updateExternalPlayerIgnoreArgs',
+      'updateExternalPlayerIgnoreDefaultArgs',
       'updateExternalPlayerCustomArgs'
     ])
   }

src/renderer/components/external-player-settings/external-player-settings.vue

@@ -22,12 +22,12 @@
         @change="updateExternalPlayerIgnoreWarnings"
       />
       <ft-toggle-switch
-        :label="$t('Settings.External Player Settings.Ignore Arguments')"
-        :default-value="externalPlayerIgnoreArgs"
+        :label="$t('Settings.External Player Settings.Ignore Default Arguments')"
+        :default-value="externalPlayerIgnoreDefaultArgs"
         :disabled="externalPlayer===''"
         :compact="true"
-        :tooltip="$t('Tooltips.External Player Settings.Ignore Arguments')"
-        @change="updateExternalPlayerIgnoreArgs"
+        :tooltip="$t('Tooltips.External Player Settings.Ignore Default Arguments')"
+        @change="updateExternalPlayerIgnoreDefaultArgs"
       />
     </ft-flex-box>
     <ft-flex-box
@@ -45,7 +45,6 @@
       <ft-input
         :placeholder="$t('Settings.External Player Settings.Custom External Player Arguments')"
         :show-action-button="false"
-        :disabled="externalPlayerIgnoreArgs===true"
         :show-label="true"
         :value="externalPlayerCustomArgs"
         :tooltip="externalPlayerCustomArgsTooltip"

src/renderer/store/modules/settings.js

@@ -190,7 +190,7 @@ const state = {
   externalPlayer: '',
   externalPlayerExecutable: '',
   externalPlayerIgnoreWarnings: false,
-  externalPlayerIgnoreArgs: false,
+  externalPlayerIgnoreDefaultArgs: false,
   externalPlayerCustomArgs: '',
   expandSideBar: false,
   forceLocalBackendForLegacy: false,

src/renderer/store/modules/utils.js

@@ -542,11 +542,15 @@ const actions = {
       ? rootState.settings.externalPlayerExecutable
       : cmdArgs.defaultExecutable
     const ignoreWarnings = rootState.settings.externalPlayerIgnoreWarnings
-    const ignoreArgs = rootState.settings.externalPlayerIgnoreArgs
+    const ignoreDefaultArgs = rootState.settings.externalPlayerIgnoreDefaultArgs
     const customArgs = rootState.settings.externalPlayerCustomArgs
 
-    if (ignoreArgs && payload.videoId != null) {
-      args.push(`${cmdArgs.videoUrl}https://www.youtube.com/watch?v=${payload.videoId}`)
+    if (ignoreDefaultArgs) {
+      if (typeof customArgs === 'string' && customArgs !== '') {
+        const custom = customArgs.split(';')
+        args.push(...custom)
+      }
+      if (payload.videoId != null) args.push(`${cmdArgs.videoUrl}https://www.youtube.com/watch?v=${payload.videoId}`)
     } else {
       // Append custom user-defined arguments,
       // or use the default ones specified for the external player.

static/locales/en-US.yaml

@@ -310,7 +310,7 @@ Settings:
     External Player Settings: External Player Settings
     External Player: External Player
     Ignore Unsupported Action Warnings: Ignore Unsupported Action Warnings
-    Ignore Arguments: Ignore Arguments
+    Ignore Default Arguments: Ignore Default Arguments
     Custom External Player Executable: Custom External Player Executable
     Custom External Player Arguments: Custom External Player Arguments
     Players:
@@ -876,8 +876,9 @@ Tooltips:
       be set here.
     Ignore Warnings: Suppress warnings for when the current external player does not support
       the current action (e.g. reversing playlists, etc.).
-    Ignore Arguments: Do not send any additional arguments to the external player
+    Ignore Default Arguments: Do not send any default arguments to the external player
       aside from the video URL (e.g. playback rate, playlist URL, etc.).
+      Custom arguments will still be passed on.
     Custom External Player Arguments: Any custom command line arguments, separated by semicolons (';'),
       you want to be passed to the external player.
     DefaultCustomArgumentsTemplate: "(Default: '{defaultCustomArguments}')"

static/locales/en_GB.yaml

@@ -301,7 +301,7 @@ Settings:
     External Player Settings: External Player Settings
     External Player: External Player
     Ignore Unsupported Action Warnings: Ignore Unsupported Action Warnings
-    Ignore Arguments: Ignore Arguments
+    Ignore Default Arguments: Ignore Default Arguments
     Custom External Player Executable: Custom External Player Executable
     Custom External Player Arguments: Custom External Player Arguments
     Players:
@@ -954,8 +954,9 @@ Tooltips:
       custom path can be set here.
     Ignore Warnings: Suppress warnings for when the current external player does not
       support the current action (e.g. reversing playlists, etc.).
-    Ignore Arguments: Do not send any additional arguments to the external player
+    Ignore Default Arguments: Do not send any default arguments to the external player
       aside from the video URL (e.g. playback rate, playlist URL, etc.).
+      Custom arguments will still be passed on.
     Custom External Player Arguments: Any custom command line arguments, separated
       by semicolons (';'), you want to be passed to the external player.
     DefaultCustomArgumentsTemplate: '(Default: ‘{defaultCustomArguments}’)'