2.3 - Debugging update/set settings

Author: quead

src/app/app.component.ts

@@ -121,8 +121,8 @@ export class AppComponent implements OnInit {
         // this.getRelatedVideos();
       } else {
         this.setDefaultPlayer();
+        this.shared.getSettings();
       }
-      this.shared.getSettings();
     });
   }
 

src/app/components/category/category.component.ts

@@ -23,7 +23,6 @@ export class CategoryComponent implements OnInit {
   ) {
     // INIT SETTINGS
     this.shared.getSettings();
-    this.shared.setSettings();
   }
 
   ngOnInit() {

src/app/components/youtube-settings.component.ts

@@ -69,11 +69,11 @@ export class SettingsComponent implements OnInit {
                 this.globals.internal_settings[i].value = data.settings[i];
             });
             this.globals.settings.form_settings = this.globals.internal_settings;
-            this.shared.updateSettings();
-            this.shared.setSettings();
 
-            this.app.checkVolumeRange();
+            this.shared.updateLocalStorageSettings();
+            this.shared.getSettings();
 
+            this.app.checkVolumeRange();
             this.shared.triggerNotify('Changed');
         });
     }
@@ -86,7 +86,6 @@ export class SettingsComponent implements OnInit {
     }
 
     getDefaultSettings() {
-        this.shared.getSettings();
         this.globals.internal_settings = this.globals.settings.form_settings;
         this.globals.external_settings = this.globals.settings.api_settings;
         this.initExternalForm();
@@ -104,9 +103,8 @@ export class SettingsComponent implements OnInit {
             this.globals.settings.api_settings = this.globals.external_settings;
             this.globals.feedVideos = null;
 
-            this.shared.updateSettings();
+            this.shared.updateLocalStorageSettings();
             this.shared.getSettings();
-            this.shared.setSettings();
 
             this.category.getFeedVideos();
 

src/app/services/shared.service.ts

@@ -46,6 +46,7 @@ export class SharedService {
         } else {
             this.globals.settings = JSON.parse(localStorage.getItem('settings'));
         }
+        this.setSettings();
     }
 
     setSettings() {
@@ -62,6 +63,7 @@ export class SharedService {
     }
 
     async initFeed() {
+        await this.getSettings();
         const res = await this.youtube.feedVideos();
         this.convertVideoObject(res['items'], 'feedVideos');
     }
@@ -75,7 +77,7 @@ export class SharedService {
         console.log(state);
     }
 
-    updateSettings() {
+    updateLocalStorageSettings() {
         localStorage.setItem('settings', JSON.stringify(this.globals.settings));
         this.setLocalVersion();
     }
@@ -91,7 +93,7 @@ export class SharedService {
 
     setLocalVersion() {
         if (localStorage.getItem('version') === null) {
-            localStorage.setItem('version', '2');
+            localStorage.setItem('version', '1');
         }
     }
 

src/app/services/youtube.service.ts

@@ -54,7 +54,6 @@ export class YoutubeGetVideo {
     }
 
     async categories() {
-        console.log('intra aici');
         if (this.globals.apiKey) {
             const res = await this.http.get(`${this.url}videoCategories?part=snippet&regionCode=${this.globals.regionCode}&key=${this.globals.apiKey}`)
             .map(response => response).toPromise();