Settings are now more centralized in the frontend

src/app/app.component.ts

@@ -62,8 +62,7 @@ export class AppComponent implements OnInit {
     }
     });
 
-    this.loadConfig();
+    this.postsService.config_reloaded.subscribe(changed => {
-    this.postsService.settings_changed.subscribe(changed => {
       if (changed) {
         this.loadConfig();
       }
@@ -77,22 +76,17 @@ export class AppComponent implements OnInit {
 
   loadConfig() {
     // loading config
-    this.postsService.loadNavItems().subscribe(res => { // loads settings
+    this.topBarTitle = this.postsService.config['Extra']['title_top'];
-      const result = !this.postsService.debugMode ? res['config_file'] : res;
+    this.settingsPinRequired = this.postsService.config['Extra']['settings_pin_required'];
-      this.topBarTitle = result['YoutubeDLMaterial']['Extra']['title_top'];
+    const themingExists = this.postsService.config['Themes'];
-      this.settingsPinRequired = result['YoutubeDLMaterial']['Extra']['settings_pin_required'];
+    this.defaultTheme = themingExists ? this.postsService.config['Themes']['default_theme'] : 'default';
-      const themingExists = result['YoutubeDLMaterial']['Themes'];
+    this.allowThemeChange = themingExists ? this.postsService.config['Themes']['allow_theme_change'] : true;
-      this.defaultTheme = themingExists ? result['YoutubeDLMaterial']['Themes']['default_theme'] : 'default';
+    this.allowSubscriptions = this.postsService.config['Subscriptions']['allow_subscriptions'];
-      this.allowThemeChange = themingExists ? result['YoutubeDLMaterial']['Themes']['allow_theme_change'] : true;
-      this.allowSubscriptions = result['YoutubeDLMaterial']['Subscriptions']['allow_subscriptions'];
 
     // sets theme to config default if it doesn't exist
     if (!localStorage.getItem('theme')) {
       this.setTheme(themingExists ? this.defaultTheme : 'default');
     }
-    }, error => {
-      console.log(error);
-    });
   }
 
   // theme stuff

src/app/main/main.component.ts

@@ -231,22 +231,20 @@ export class MainComponent implements OnInit {
 
   async loadConfig() {
     // loading config
-    this.postsService.loadNavItems().subscribe(res => { // loads settings
+    this.fileManagerEnabled = this.postsService.config['Extra']['file_manager_enabled'];
-      const result = !this.postsService.debugMode ? res['config_file'] : res;
+    this.downloadOnlyMode = this.postsService.config['Extra']['download_only_mode'];
-      this.fileManagerEnabled = result['YoutubeDLMaterial']['Extra']['file_manager_enabled'];
+    this.allowMultiDownloadMode = this.postsService.config['Extra']['allow_multi_download_mode'];
-      this.downloadOnlyMode = result['YoutubeDLMaterial']['Extra']['download_only_mode'];
+    this.audioFolderPath = this.postsService.config['Downloader']['path-audio'];
-      this.allowMultiDownloadMode = result['YoutubeDLMaterial']['Extra']['allow_multi_download_mode'];
+    this.videoFolderPath = this.postsService.config['Downloader']['path-video'];
-      this.audioFolderPath = result['YoutubeDLMaterial']['Downloader']['path-audio'];
+    this.use_youtubedl_archive = this.postsService.config['Downloader']['use_youtubedl_archive'];
-      this.videoFolderPath = result['YoutubeDLMaterial']['Downloader']['path-video'];
+    this.globalCustomArgs = this.postsService.config['Downloader']['custom_args'];
-      this.use_youtubedl_archive = result['YoutubeDLMaterial']['Downloader']['use_youtubedl_archive'];
+    this.youtubeSearchEnabled = this.postsService.config['API'] && this.postsService.config['API']['use_youtube_API'] &&
-      this.globalCustomArgs = result['YoutubeDLMaterial']['Downloader']['custom_args'];
+        this.postsService.config['API']['youtube_API_key'];
-      this.youtubeSearchEnabled = result['YoutubeDLMaterial']['API'] && result['YoutubeDLMaterial']['API']['use_youtube_API'] &&
+    this.youtubeAPIKey = this.youtubeSearchEnabled ? this.postsService.config['API']['youtube_API_key'] : null;
-          result['YoutubeDLMaterial']['API']['youtube_API_key'];
+    this.allowQualitySelect = this.postsService.config['Extra']['allow_quality_select'];
-      this.youtubeAPIKey = this.youtubeSearchEnabled ? result['YoutubeDLMaterial']['API']['youtube_API_key'] : null;
+    this.allowAdvancedDownload = this.postsService.config['Advanced']['allow_advanced_download'];
-      this.allowQualitySelect = result['YoutubeDLMaterial']['Extra']['allow_quality_select'];
+    this.useDefaultDownloadingAgent = this.postsService.config['Advanced']['use_default_downloading_agent'];
-      this.allowAdvancedDownload = result['YoutubeDLMaterial']['Advanced']['allow_advanced_download'];
+    this.customDownloadingAgent = this.postsService.config['Advanced']['custom_downloading_agent'];
-      this.useDefaultDownloadingAgent = result['YoutubeDLMaterial']['Advanced']['use_default_downloading_agent'];
-      this.customDownloadingAgent = result['YoutubeDLMaterial']['Advanced']['custom_downloading_agent'];
 
 
 
@@ -292,19 +290,13 @@ export class MainComponent implements OnInit {
     }, 500);
 
     return true;
-
-    }, error => {
-      console.log(error);
-
-      return false;
-    });
   }
 
   // app initialization.
   ngOnInit() {
     this.configLoad();
 
-    this.postsService.settings_changed.subscribe(changed => {
+    this.postsService.config_reloaded.subscribe(changed => {
       if (changed) {
         this.loadConfig();
       }

src/app/posts.services.ts

@@ -77,6 +77,10 @@ export class PostsService implements CanActivate {
                 }
             }
         });
+
+        this.reload_config.subscribe(yes_reload => {
+            if (yes_reload) { this.reloadConfig(); }
+        });
     }
     canActivate(route, state): Promise<boolean> {
         return new Promise(resolve => {
@@ -103,6 +107,7 @@ export class PostsService implements CanActivate {
             const result = !this.debugMode ? res['config_file'] : res;
             if (result) {
                 this.config = result['YoutubeDLMaterial'];
+                this.config_reloaded = true;
             }
         });
     }

src/app/settings/settings.component.ts

@@ -51,14 +51,8 @@ export class SettingsComponent implements OnInit {
   }
 
   getConfig() {
-    this.loading_config = true;
+    this.initial_config = this.postsService.config;
-    this.postsService.loadNavItems().subscribe(res => {
-      this.loading_config = false;
-      // successfully loaded config
-
-      this.initial_config = !this.postsService.debugMode ? res['config_file']['YoutubeDLMaterial'] : res['YoutubeDLMaterial'];
     this.new_config = JSON.parse(JSON.stringify(this.initial_config));
-    });
   }
 
   settingsSame() {
@@ -70,8 +64,8 @@ export class SettingsComponent implements OnInit {
     this.postsService.setConfig(settingsToSave).subscribe(res => {
       if (res['success']) {
         // sets new config as old config
-        this.postsService.settings_changed.next(true);
         this.initial_config = JSON.parse(JSON.stringify(this.new_config));
+        this.postsService.reload_config.next(true);
       }
     }, err => {
       console.error('Failed to save config!');

src/app/subscription/subscription/subscription.component.ts

@@ -50,8 +50,12 @@ export class SubscriptionComponent implements OnInit {
       this.id = this.route.snapshot.paramMap.get('id');
 
       this.getSubscription();
+      this.postsService.config_reloaded.subscribe(changed => {
+        if (changed) {
           this.getConfig();
         }
+      });
+    }
 
     // set filter property to cached
     const cached_filter_property = localStorage.getItem('filter_property');
@@ -78,10 +82,7 @@ export class SubscriptionComponent implements OnInit {
   }
 
   getConfig() {
-    this.postsService.loadNavItems().subscribe(res => {
+    this.use_youtubedl_archive = this.postsService.config['Subscriptions']['subscriptions_use_youtubedl_archive'];
-      const result = !this.postsService.debugMode ? res['config_file'] : res;
-      this.use_youtubedl_archive = result['YoutubeDLMaterial']['Subscriptions']['subscriptions_use_youtubedl_archive'];
-    });
   }
 
   goToFile(emit_obj) {