From b730bc5adc1921c0fb79365ae4a80dded4c46a00 Mon Sep 17 00:00:00 2001
From: Isaac Abadi <IsaacMGrynsztein@gmail.com>
Date: Fri, 27 Nov 2020 00:25:31 -0500
Subject: [PATCH] Added option to set a default file output - custom file
 output in the advanced expansion panel will override this

---
 backend/app.js                           |  2 +-
 backend/appdata/default.json             |  1 +
 backend/config.js                        |  1 +
 backend/consts.js                        |  4 ++++
 src/app/settings/settings.component.html | 12 +++++++++++-
 5 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/backend/app.js b/backend/app.js
index 1a5e9f1..6bd7774 100644
--- a/backend/app.js
+++ b/backend/app.js
@@ -1379,7 +1379,7 @@ async function downloadFileByURL_normal(url, type, options, sessionID = null) {
 }
 
 async function generateArgs(url, type, options) {
-    var videopath = '%(title)s';
+    var videopath = config_api.getConfigItem('ytdl_default_file_output') ? config_api.getConfigItem('ytdl_default_file_output') : '%(title)s';
     var globalArgs = config_api.getConfigItem('ytdl_custom_args');
     let useCookies = config_api.getConfigItem('ytdl_use_cookies');
     var is_audio = type === 'audio';
diff --git a/backend/appdata/default.json b/backend/appdata/default.json
index c25bba6..46dca1b 100644
--- a/backend/appdata/default.json
+++ b/backend/appdata/default.json
@@ -7,6 +7,7 @@
     "Downloader": {
       "path-audio": "audio/",
       "path-video": "video/",
+      "default_file_output": "",
       "use_youtubedl_archive": false,
       "custom_args": "",
       "safe_download_override": false,
diff --git a/backend/config.js b/backend/config.js
index 0661a9f..c0c9402 100644
--- a/backend/config.js
+++ b/backend/config.js
@@ -184,6 +184,7 @@ DEFAULT_CONFIG = {
       "Downloader": {
         "path-audio": "audio/",
         "path-video": "video/",
+        "default_file_output": "",
         "use_youtubedl_archive": false,
         "custom_args": "",
         "safe_download_override": false,
diff --git a/backend/consts.js b/backend/consts.js
index 2fb5d3d..b0b8b22 100644
--- a/backend/consts.js
+++ b/backend/consts.js
@@ -18,6 +18,10 @@ let CONFIG_ITEMS = {
         'key': 'ytdl_video_folder_path',
         'path': 'YoutubeDLMaterial.Downloader.path-video'
     },
+    'ytdl_default_file_output': {
+        'key': 'ytdl_default_file_output',
+        'path': 'YoutubeDLMaterial.Downloader.default_file_output'
+    },
     'ytdl_use_youtubedl_archive': {
         'key': 'ytdl_use_youtubedl_archive',
         'path': 'YoutubeDLMaterial.Downloader.use_youtubedl_archive'
diff --git a/src/app/settings/settings.component.html b/src/app/settings/settings.component.html
index 53f6802..f551a9d 100644
--- a/src/app/settings/settings.component.html
+++ b/src/app/settings/settings.component.html
@@ -115,9 +115,19 @@
                         </mat-form-field>
                     </div>
 
+                    <div class="col-12 mt-4">
+                        <mat-form-field class="text-field" color="accent">
+                            <input matInput [(ngModel)]="new_config['Downloader']['default_file_output']" matInput placeholder="Default file output" i18n-placeholder="Default file output placeholder">
+                            <mat-hint><a target="_blank" href="https://github.com/ytdl-org/youtube-dl/blob/master/README.md#output-template">
+                                <ng-container i18n="Youtube-dl output template documentation link">Documentation</ng-container></a>.
+                                <ng-container i18n="Custom Output input hint">Path is relative to the above download paths. Don't include extension.</ng-container>
+                            </mat-hint>
+                        </mat-form-field>
+                    </div>
+
                     <div class="col-12 mt-4 mb-5">
                         <mat-form-field class="text-field" style="margin-right: 12px;" color="accent">
-                            <textarea matInput [(ngModel)]="new_config['Downloader']['custom_args']" placeholder="Custom args" i18n-placeholder="Custom args input placeholder"></textarea>
+                            <textarea matInput [(ngModel)]="new_config['Downloader']['custom_args']" placeholder="Global custom args" i18n-placeholder="Custom args input placeholder"></textarea>
                             <mat-hint><ng-container i18n="Custom args setting input hint">Global custom args for downloads on the home page. Args are delimited using two commas like so: ,,</ng-container></mat-hint>
                             <button class="args-edit-button" (click)="openArgsModifierDialog()" mat-icon-button><mat-icon>edit</mat-icon></button>
                         </mat-form-field>