move settings (update imports only)

src/csui/PlayerOverlay.vue

@@ -205,7 +205,7 @@ import GhettoContextMenuItem from '@csui/src/components/GhettoContextMenuItem.vu
 import GhettoContextMenuOption from '@csui/src/components/GhettoContextMenuOption.vue';
 import AlignmentOptionsControlComponent from '@csui/src/PlayerUiPanels/AlignmentOptionsControlComponent.vue';
 import BrowserDetect from '@src/ext/conf/BrowserDetect';
-import Settings from '@src/ext/lib/Settings';
+import Settings from '@src/ext/lib/settings/Settings';
 import EventBus from '@src/ext/lib/EventBus';
 import UIProbeMixin from '@csui/src/utils/UIProbeMixin';
 import KeyboardShortcutParserMixin from '@csui/src/utils/KeyboardShortcutParserMixin';

src/csui/Popup.vue

@@ -123,7 +123,7 @@ import AboutPanel from '@csui/src/popup/panels/AboutPanel.vue'
 import Debug from '../ext/conf/Debug';
 import BrowserDetect from '../ext/conf/BrowserDetect';
 import CommsClient, {CommsOrigin} from '../ext/lib/comms/CommsClient';
-import Settings from '../ext/lib/Settings';
+import Settings from '../ext/lib/settings/Settings';
 import EventBus from '../ext/lib/EventBus';
 import {ChromeShittinessMitigations as CSM} from '../common/js/ChromeShittinessMitigations';
 import SupportLevelIndicator from '@csui/src/components/SupportLevelIndicator.vue'
@@ -193,8 +193,6 @@ export default {
         {
           source: this,
           function: (config, context) => {
-            console.log('set-current-site | this.site:', this.site, 'config.site:', config.site);
-
             if (this.site) {
               if (!this.site.host) {
                 // dunno why this fix is needed, but sometimes it is

src/ext/UWContent.ts

@@ -1,5 +1,5 @@
 import Debug from './conf/Debug';
-import Settings from './lib/Settings';
+import Settings from './lib/settings/Settings';
 import CommsClient from './lib/comms/CommsClient';
 import PageInfo from './lib/video-data/PageInfo';
 import EventBus from './lib/EventBus';

src/ext/UWServer.ts

@@ -1,7 +1,7 @@
 import Debug from './conf/Debug.js';
 import BrowserDetect from './conf/BrowserDetect';
 import CommsServer from './lib/comms/CommsServer';
-import Settings from './lib/Settings';
+import Settings from './lib/settings/Settings';
 import { sleep } from '../common/js/utils';
 import EventBus, { EventBusCommand } from './lib/EventBus';
 import { ComponentLogger } from './lib/logging/ComponentLogger';

src/ext/lib/aard/Aard.ts

@@ -3,7 +3,7 @@ import ExtensionMode from '@src/common/enums/ExtensionMode.enum';
 import { ArVariant } from '@src/common/interfaces/ArInterface';
 import { ExtensionEnvironment } from '@src/common/interfaces/SettingsInterface';
 import EventBus from '../EventBus';
-import Settings from '../Settings';
+import Settings from '../settings/Settings';
 import { SiteSettings } from '../settings/SiteSettings';
 import VideoData from '../video-data/VideoData';
 import { AardDebugUi } from './AardDebugUi';

src/ext/lib/comms/CommsServer.ts

@@ -1,5 +1,5 @@
 import { ComponentLogger } from './../logging/ComponentLogger';
-import Settings from '../Settings';
+import Settings from '../settings/Settings';
 import EventBus from '../EventBus';
 import { CommsOrigin } from './CommsClient';
 
@@ -148,7 +148,6 @@ class CommsServer {
       }
     }
 
-    console.log('uniq hosts:', hosts)
     return hosts;
   }
 

src/ext/lib/kbm/KbmBase.ts

@@ -1,6 +1,6 @@
 import EventBus, { EventBusCommand } from '../EventBus';
 import { ComponentLogger } from '../logging/ComponentLogger';
-import Settings from '../Settings';
+import Settings from '../settings/Settings';
 import { SiteSettings } from '../settings/SiteSettings';
 
 export class KbmBase {

src/ext/lib/kbm/KeyboardHandler.ts

@@ -1,5 +1,5 @@
 import ExtensionMode from '../../../common/enums/ExtensionMode.enum';
-import Settings from '../Settings';
+import Settings from '../settings/Settings';
 import EventBus, { EventBusCommand } from '../EventBus';
 import KbmBase from './KbmBase';
 import { SiteSettings } from '../settings/SiteSettings';

src/ext/lib/kbm/PlayerMouseHandler.ts

@@ -1,7 +1,7 @@
 import { LogAggregator } from './../logging/LogAggregator';
 import EventBus, { EventBusCommand } from '../EventBus';
 import { ComponentLogger } from '../logging/ComponentLogger';
-import Settings from '../Settings';
+import Settings from '../settings/Settings';
 import { SiteSettings } from '../settings/SiteSettings';
 import KbmBase from './KbmBase';
 

src/ext/lib/settings/SiteSettings.ts

@@ -2,7 +2,7 @@ import CropModePersistence from '../../../common/enums/CropModePersistence.enum'
 import ExtensionMode from '../../../common/enums/ExtensionMode.enum';
 import { SettingsReloadComponent, SettingsReloadFlags, SiteSettingsInterface } from '../../../common/interfaces/SettingsInterface';
 import { _cp } from '../../../common/js/utils';
-import Settings from '../Settings';
+import Settings from './Settings';
 import StretchType from '../../../common/enums/StretchType.enum';
 import VideoAlignmentType from '../../../common/enums/VideoAlignmentType.enum';
 

src/ext/lib/uwui/UI.js

@@ -46,7 +46,6 @@ class UI {
     this.extensionBase = chrome.runtime.getURL('').replace(/\/$/, "");
 
     // UI will be initialized when setUiVisibility is called
-    console.log('ui config:', uiConfig);
     this.init();
   }
 

src/ext/lib/video-data/PageInfo.ts

@@ -1,6 +1,6 @@
 import VideoData from './VideoData';
 import RescanReason from './enums/RescanReason.enum';
-import Settings from '../Settings';
+import Settings from '../settings/Settings';
 import CommsClient from '../comms/CommsClient';
 import EventBus from '../EventBus';
 import { SiteSettings } from '../settings/SiteSettings';

src/ext/lib/video-data/VideoData.ts

@@ -2,7 +2,7 @@ import PlayerData from './PlayerData';
 import Resizer from '../video-transform/Resizer';
 import * as _ from 'lodash';
 import BrowserDetect from '../../conf/BrowserDetect';
-import Settings from '../Settings';
+import Settings from '../settings/Settings';
 import PageInfo from './PageInfo';
 import { sleep } from '../../../common/js/utils';
 import { hasDrm } from '../ar-detect/DrmDetecor';

src/ext/lib/video-transform/Resizer.ts

@@ -9,7 +9,7 @@ import AspectRatioType from '../../../common/enums/AspectRatioType.enum';
 import VideoData from '../video-data/VideoData';
 import EventBus from '../EventBus';
 import { _cp } from '../../../common/js/utils';
-import Settings from '../Settings';
+import Settings from '../settings/Settings';
 import { Ar, ArVariant } from '../../../common/interfaces/ArInterface';
 import { RunLevel } from '../../enum/run-level.enum';
 import * as _ from 'lodash';

src/ext/lib/video-transform/Stretcher.ts

@@ -1,7 +1,7 @@
 import { SiteSettings } from './../settings/SiteSettings';
 import BrowserDetect from '../../conf/BrowserDetect';
 import VideoData from '../video-data/VideoData';
-import Settings from '../Settings';
+import Settings from '../settings/Settings';
 import { Stretch } from '../../../common/interfaces/StretchInterface';
 import { ComponentLogger } from '../logging/ComponentLogger';
 

src/options/App.vue

@@ -111,7 +111,7 @@
 <script>
 import Donate from '../common/misc/Donate.vue';
 import SuperAdvancedSettings from './SuperAdvancedSettings.vue';
-import Settings from '../ext/lib/Settings';
+import Settings from '../ext/lib/settings/Settings';
 import GeneralSettings from './GeneralSettings';
 import ControlsSettings from './controls-settings/ControlsSettings';
 import AddEditActionPopup from './controls-settings/AddEditActionPopup';

src/options/about.vue

@@ -33,7 +33,7 @@
 
 <script>
 import BrowserDetect from '../ext/conf/BrowserDetect';
-import Settings from '../ext/lib/Settings';
+import Settings from '../ext/lib/settings/Settings';
 
 export default {
   data() {