From cf1de6302c7e2c689c3a887b3b59b09043efc04d Mon Sep 17 00:00:00 2001
From: PrestonN <freetubeapp@protonmail.com>
Date: Sun, 5 Jun 2022 17:25:05 -0400
Subject: [PATCH] Update download-settings.js, download-settings.vue, and 3
 more files...

---
 .../download-settings/download-settings.js    | 23 +++++++++++++++++--
 .../download-settings/download-settings.vue   | 18 ++++++++++++---
 .../watch-video-info/watch-video-info.js      | 18 +++++++++++----
 src/renderer/store/modules/settings.js        |  1 +
 static/locales/en-US.yaml                     |  3 +++
 5 files changed, 53 insertions(+), 10 deletions(-)

diff --git a/src/renderer/components/download-settings/download-settings.js b/src/renderer/components/download-settings/download-settings.js
index 96c675354..7192cd683 100644
--- a/src/renderer/components/download-settings/download-settings.js
+++ b/src/renderer/components/download-settings/download-settings.js
@@ -1,6 +1,7 @@
 import Vue from 'vue'
 import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
 import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
+import FtSelect from '../ft-select/ft-select.vue'
 import FtButton from '../ft-button/ft-button.vue'
 import FtInput from '../ft-input/ft-input.vue'
 import { mapActions } from 'vuex'
@@ -12,19 +13,36 @@ export default Vue.extend({
   components: {
     'ft-toggle-switch': FtToggleSwitch,
     'ft-flex-box': FtFlexBox,
+    'ft-select': FtSelect,
     'ft-button': FtButton,
     'ft-input': FtInput
   },
   data: function () {
     return {
-      askForDownloadPath: this.$store.getters.getDownloadFolderPath === ''
+      askForDownloadPath: false,
+      downloadBehaviorValues: [
+        'download',
+        'open'
+      ]
     }
   },
   computed: {
     downloadPath: function() {
       return this.$store.getters.getDownloadFolderPath
+    },
+    downloadBehaviorNames: function () {
+      return [
+        this.$t('Settings.Download Settings.Download in app'),
+        this.$t('Settings.Download Settings.Open in web browser')
+      ]
+    },
+    downloadBehavior: function () {
+      return this.$store.getters.getDownloadBehavior
     }
   },
+  mounted: function () {
+    this.askForDownloadPath = this.downloadPath === ''
+  },
   methods: {
     handleDownloadingSettingChange: function (value) {
       this.askForDownloadPath = value
@@ -42,7 +60,8 @@ export default Vue.extend({
       this.updateDownloadFolderPath(folder.filePaths[0])
     },
     ...mapActions([
-      'updateDownloadFolderPath'
+      'updateDownloadFolderPath',
+      'updateDownloadBehavior'
     ])
   }
 
diff --git a/src/renderer/components/download-settings/download-settings.vue b/src/renderer/components/download-settings/download-settings.vue
index fe1582654..3cd274bf1 100644
--- a/src/renderer/components/download-settings/download-settings.vue
+++ b/src/renderer/components/download-settings/download-settings.vue
@@ -6,7 +6,19 @@
       </h3>
     </summary>
     <hr>
-    <ft-flex-box class="downloadSettingsFlexBox">
+    <ft-flex-box>
+      <ft-select
+        :placeholder="$t('Settings.Download Settings.Download Behavior')"
+        :value="downloadBehavior"
+        :select-names="downloadBehaviorNames"
+        :select-values="downloadBehaviorValues"
+        @change="updateDownloadBehavior"
+      />
+    </ft-flex-box>
+    <ft-flex-box
+      v-if="downloadBehavior === 'download'"
+      class="downloadSettingsFlexBox"
+    >
       <ft-toggle-switch
         :label="$t('Settings.Download Settings.Ask Download Path')"
         :default-value="askForDownloadPath"
@@ -14,7 +26,7 @@
       />
     </ft-flex-box>
     <ft-flex-box
-      v-if="!askForDownloadPath"
+      v-if="!askForDownloadPath && downloadBehavior === 'download'"
     >
       <ft-input
         class="folderDisplay"
@@ -25,7 +37,7 @@
       />
     </ft-flex-box>
     <ft-flex-box
-      v-if="!askForDownloadPath"
+      v-if="!askForDownloadPath && downloadBehavior === 'download'"
     >
       <ft-button
         :label="$t('Settings.Download Settings.Choose Path')"
diff --git a/src/renderer/components/watch-video-info/watch-video-info.js b/src/renderer/components/watch-video-info/watch-video-info.js
index c33230c7e..8f2518fe9 100644
--- a/src/renderer/components/watch-video-info/watch-video-info.js
+++ b/src/renderer/components/watch-video-info/watch-video-info.js
@@ -179,6 +179,10 @@ export default Vue.extend({
       })
     },
 
+    downloadBehavior: function () {
+      return this.$store.getters.getDownloadBehavior
+    },
+
     formatTypeOptions: function () {
       return [
         {
@@ -415,11 +419,15 @@ export default Vue.extend({
       const linkName = selectedDownloadLinkOption.label
       const extension = this.grabExtensionFromUrl(linkName)
 
-      this.downloadMedia({
-        url: url,
-        title: this.title,
-        extension: extension
-      })
+      if (this.downloadBehavior === 'open') {
+        this.openExternalLink(url)
+      } else {
+        this.downloadMedia({
+          url: url,
+          title: this.title,
+          extension: extension
+        })
+      }
     },
 
     grabExtensionFromUrl: function (url) {
diff --git a/src/renderer/store/modules/settings.js b/src/renderer/store/modules/settings.js
index bc6d84e36..3d63793dd 100644
--- a/src/renderer/store/modules/settings.js
+++ b/src/renderer/store/modules/settings.js
@@ -255,6 +255,7 @@ const state = {
   videoPlaybackRateMouseScroll: false,
   videoPlaybackRateInterval: 0.25,
   downloadFolderPath: '',
+  downloadBehavior: 'download',
   enableScreenshot: false,
   screenshotFormat: 'png',
   screenshotQuality: 95,
diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml
index 5a354beb2..f47df3ad1 100644
--- a/static/locales/en-US.yaml
+++ b/static/locales/en-US.yaml
@@ -364,6 +364,9 @@ Settings:
     Download Settings: Download Settings
     Ask Download Path: Ask for download path
     Choose Path: Choose Path
+    Download Behavior: Download Behavior
+    Download in app: Download in app
+    Open in web browser: Open in web browser
 About:
   #On About page
   About: About