diff --git a/backend/app.js b/backend/app.js
index 9d4e486..c6c064b 100644
--- a/backend/app.js
+++ b/backend/app.js
@@ -2080,7 +2080,6 @@ app.post('/api/getAllFiles', optionalJwt, function (req, res) {
// loop through subscriptions and add videos
for (let i = 0; i < subscriptions.length; i++) {
sub = subscriptions[i];
- console.log(sub);
if (!sub.videos) continue;
// add sub id for UI
for (let j = 0; j < sub.videos.length; j++) {
@@ -2590,7 +2589,7 @@ app.post('/api/downloadFile', optionalJwt, async (req, res) => {
else
basePath = config_api.getConfigItem('ytdl_subscriptions_base_path');
- file = path.join(__dirname, basePath, (subscriptionPlaylist === 'true' ? 'playlists' : 'channels'), subscriptionName, fileNames + ext);
+ file = path.join(__dirname, basePath, (subscriptionPlaylist === true || subscriptionPlaylist === 'true' ? 'playlists' : 'channels'), subscriptionName, fileNames + ext);
}
} else {
for (let i = 0; i < fileNames.length; i++) {
diff --git a/backend/appdata/default.json b/backend/appdata/default.json
index 526dd7f..4791298 100644
--- a/backend/appdata/default.json
+++ b/backend/appdata/default.json
@@ -37,8 +37,7 @@
"Subscriptions": {
"allow_subscriptions": true,
"subscriptions_base_path": "subscriptions/",
- "subscriptions_check_interval": "300",
- "subscriptions_use_youtubedl_archive": true
+ "subscriptions_check_interval": "300"
},
"Users": {
"base_path": "users/",
diff --git a/backend/appdata/encrypted.json b/backend/appdata/encrypted.json
index 4113f4e..18ea4b7 100644
--- a/backend/appdata/encrypted.json
+++ b/backend/appdata/encrypted.json
@@ -37,8 +37,7 @@
"Subscriptions": {
"allow_subscriptions": true,
"subscriptions_base_path": "subscriptions/",
- "subscriptions_check_interval": "300",
- "subscriptions_use_youtubedl_archive": true
+ "subscriptions_check_interval": "300"
},
"Users": {
"base_path": "users/",
diff --git a/backend/config.js b/backend/config.js
index 12e3bda..f226222 100644
--- a/backend/config.js
+++ b/backend/config.js
@@ -214,8 +214,7 @@ DEFAULT_CONFIG = {
"Subscriptions": {
"allow_subscriptions": true,
"subscriptions_base_path": "subscriptions/",
- "subscriptions_check_interval": "300",
- "subscriptions_use_youtubedl_archive": true
+ "subscriptions_check_interval": "300"
},
"Users": {
"base_path": "users/",
diff --git a/backend/consts.js b/backend/consts.js
index 86b5dd8..6311055 100644
--- a/backend/consts.js
+++ b/backend/consts.js
@@ -116,10 +116,6 @@ let CONFIG_ITEMS = {
'key': 'ytdl_subscriptions_check_interval',
'path': 'YoutubeDLMaterial.Subscriptions.subscriptions_check_interval'
},
- 'ytdl_subscriptions_use_youtubedl_archive': {
- 'key': 'ytdl_use_youtubedl_archive',
- 'path': 'YoutubeDLMaterial.Subscriptions.subscriptions_use_youtubedl_archive'
- },
// Users
'ytdl_users_base_path': {
diff --git a/backend/subscriptions.js b/backend/subscriptions.js
index d040dc5..1d07d5c 100644
--- a/backend/subscriptions.js
+++ b/backend/subscriptions.js
@@ -123,7 +123,7 @@ async function getSubscriptionInfo(sub, user_uid = null) {
}
}
- const useArchive = config_api.getConfigItem('ytdl_subscriptions_use_youtubedl_archive');
+ const useArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive');
if (useArchive && !sub.archive) {
// must create the archive
const archive_dir = path.join(__dirname, basePath, 'archives', sub.name);
@@ -197,7 +197,7 @@ async function deleteSubscriptionFile(sub, file, deleteForever, file_uid = null,
basePath = config_api.getConfigItem('ytdl_subscriptions_base_path');
sub_db = db.get('subscriptions').find({id: sub.id});
}
- const useArchive = config_api.getConfigItem('ytdl_subscriptions_use_youtubedl_archive');
+ const useArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive');
const appendedBasePath = getAppendedBasePath(sub, basePath);
const name = file;
let retrievedID = null;
@@ -273,7 +273,7 @@ async function getVideosForSub(sub, user_uid = null) {
else
basePath = config_api.getConfigItem('ytdl_subscriptions_base_path');
- const useArchive = config_api.getConfigItem('ytdl_subscriptions_use_youtubedl_archive');
+ const useArchive = config_api.getConfigItem('ytdl_use_youtubedl_archive');
let appendedBasePath = null
appendedBasePath = getAppendedBasePath(sub, basePath);
diff --git a/src/app/settings/settings.component.html b/src/app/settings/settings.component.html
index 684100a..26b6eab 100644
--- a/src/app/settings/settings.component.html
+++ b/src/app/settings/settings.component.html
@@ -79,11 +79,6 @@
Unit is seconds, only include numbers.
-
-
Use youtube-dl archive
-
With youtube-dl's archive feature, downloaded videos from your subscriptions get recorded in a text file in the subscriptions archive sub-directory.
-
This enables the ability to permanently delete videos from your subscriptions without unsubscribing, and allows you to record which videos you downloaded in case of data loss.
-
Use youtube-dl archive
-
Note: This setting only applies to downloads on the Home page. If you would like to use youtube-dl archive functionality in subscriptions, head to the Main tab and activate this option there.
diff --git a/src/app/subscription/subscription/subscription.component.ts b/src/app/subscription/subscription/subscription.component.ts
index c09fbaf..312e80d 100644
--- a/src/app/subscription/subscription/subscription.component.ts
+++ b/src/app/subscription/subscription/subscription.component.ts
@@ -59,11 +59,6 @@ export class SubscriptionComponent implements OnInit {
this.getSubscription();
}
});
-
- if (!this.initialized) {
- this.getConfig();
- this.getSubscription();
- }
});
if (this.route.snapshot.paramMap.get('id')) {
this.id = this.route.snapshot.paramMap.get('id');
@@ -101,7 +96,7 @@ export class SubscriptionComponent implements OnInit {
}
getConfig() {
- this.use_youtubedl_archive = this.postsService.config['Subscriptions']['subscriptions_use_youtubedl_archive'];
+ this.use_youtubedl_archive = this.postsService.config['Downloader']['use_youtubedl_archive'];
}
goToFile(emit_obj) {
diff --git a/src/assets/default.json b/src/assets/default.json
index ed29d2d..7a31f20 100644
--- a/src/assets/default.json
+++ b/src/assets/default.json
@@ -12,7 +12,7 @@
"Downloader": {
"path-audio": "audio/",
"path-video": "video/",
- "use_youtubedl_archive": false,
+ "use_youtubedl_archive": true,
"custom_args": "",
"safe_download_override": false
},