tamius-han/ultrawidify
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Housekeeping/convert some more imports to absolute paths

Browse Source
This commit is contained in:
Tamius Han 2026-01-07 18:04:34 +01:00
parent a71b99ff10
commit 8268c7a7af
17 changed files with 78 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ext/module/ObjectCopy.ts → src/common/utils/ObjectCopy.ts
View File

@ -1,4 +1,4 @@
import Debug from '../conf/Debug'; import Debug from '../../ext/conf/Debug';
class ObjectCopy { class ObjectCopy {
static addNew(current, newValues){ static addNew(current, newValues){

4
src/common/js/utils.ts → src/common/utils/_cp.ts
View File

@ -1,7 +1,3 @@
export async function sleep(timeout) {
return new Promise<void>( (resolve, reject) => setTimeout(() => resolve(), timeout));
}
/** /**
* Creates deep copy of an object * Creates deep copy of an object
* @param obj * @param obj

0
src/ext/util/comparators.ts → src/common/utils/comparators.ts
View File

0
src/ext/util/getElementStyles.ts → src/common/utils/getElementStyles.ts
View File

0
src/ext/util/getHost.ts → src/common/utils/getHost.ts
View File

0
src/ext/module/Util.ts → src/common/utils/sleep.ts
View File

2
src/ext/UWContent.ts
View File

@ -8,7 +8,7 @@ import Settings from '@src/ext/module/settings/Settings';
import { SiteSettings } from '@src/ext/module/settings/SiteSettings'; import { SiteSettings } from '@src/ext/module/settings/SiteSettings';
import UI from '@src/ext/module/uwui/UI'; import UI from '@src/ext/module/uwui/UI';
import PageInfo from '@src/ext/module/video-data/PageInfo'; import PageInfo from '@src/ext/module/video-data/PageInfo';
import { getIframeParentHost, setupHostnameReporting } from '@src/ext/util/getHost'; import { getIframeParentHost, setupHostnameReporting } from '@src/common/utils/getHost';
export default class UWContent { export default class UWContent {
pageInfo: PageInfo; pageInfo: PageInfo;

1
src/ext/UWServer.ts
View File

@ -4,6 +4,7 @@ import Settings from '@src/ext/module/settings/Settings';
import { ComponentLogger } from '@src/ext/module/logging/ComponentLogger'; import { ComponentLogger } from '@src/ext/module/logging/ComponentLogger';
import { BLANK_LOGGER_CONFIG, LogAggregator } from '@src/ext/module/logging/LogAggregator'; import { BLANK_LOGGER_CONFIG, LogAggregator } from '@src/ext/module/logging/LogAggregator';
import CommsServer from '@src/ext/module/comms/CommsServer'; import CommsServer from '@src/ext/module/comms/CommsServer';
import BrowserDetect from '@src/ext/conf/BrowserDetect';
const BASE_LOGGING_STYLES = { const BASE_LOGGING_STYLES = {

6
src/ext/module/EventBus.ts
View File

@ -1,7 +1,7 @@
import { IframeData } from './video-data/IframeManager';
import CommsClient, { CommsOrigin } from './comms/CommsClient';
import CommsServer from './comms/CommsServer';
import { EventBusCommand, EventBusContext } from '@src/common/interfaces/EventBusMessage.interface'; import { EventBusCommand, EventBusContext } from '@src/common/interfaces/EventBusMessage.interface';
import Comms from '@src/ext/module/comms/Comms';
import CommsClient, { CommsOrigin } from '@src/ext/module/comms/CommsClient';
import CommsServer from '@src/ext/module/comms/CommsServer';

12
src/ext/module/Interface.js
View File

@ -1,12 +0,0 @@
class Interface {
constructor(videoData) {
this.conf = videoData;
this.player = videoData.player;
}
injectUi() {
this.detectorDiv = document.createElement('div');
this.uiRoot = document.createElement('div');
this.detectorDiv.appendChild(this.uiRoot);
}
}

21
src/ext/module/settings/Settings.ts
View File

@ -1,14 +1,13 @@
import Debug from '../../conf/Debug'; import AspectRatioType from '@src/common/enums/AspectRatioType.enum';
import ExtensionConf from '../../conf/ExtensionConf'; import StretchType from '@src/common/enums/StretchType.enum';
import ObjectCopy from '../ObjectCopy'; import SettingsInterface from '@src/common/interfaces/SettingsInterface';
import StretchType from '../../../common/enums/StretchType.enum'; import Debug from '@src/ext/conf/Debug';
import ExtensionConfPatch from '../../conf/ExtConfPatches'; import ExtensionConfPatch from '@src/ext/conf/ExtConfPatches';
import SettingsInterface from '../../../common/interfaces/SettingsInterface'; import ExtensionConf from '@src/ext/conf/ExtensionConf';
import AspectRatioType from '../../../common/enums/AspectRatioType.enum'; import { ComponentLogger } from '@src/ext/module/logging/ComponentLogger';
import { GetSiteSettingsOptions, SiteSettings } from './SiteSettings'; import { LogAggregator } from '@src/ext/module/logging/LogAggregator';
import { SettingsSnapshot, SettingsSnapshotManager } from './SettingsSnapshotManager'; import { SettingsSnapshot, SettingsSnapshotManager } from '@src/ext/module/settings/SettingsSnapshotManager';
import { ComponentLogger } from '../logging/ComponentLogger'; import { GetSiteSettingsOptions, SiteSettings } from '@src/ext/module/settings/SiteSettings';
import { LogAggregator } from '../logging/LogAggregator';
import { getDiff } from 'json-difference' import { getDiff } from 'json-difference'
if(process.env.CHANNEL !== 'stable'){ if(process.env.CHANNEL !== 'stable'){

18
src/ext/module/settings/SiteSettings.ts
View File

@ -1,12 +1,12 @@
import CropModePersistence from '../../../common/enums/CropModePersistence.enum'; import CropModePersistence from '@src/common/enums/CropModePersistence.enum';
import ExtensionMode from '../../../common/enums/ExtensionMode.enum'; import EmbeddedContentSettingsOverridePolicy from '@src/common/enums/EmbeddedContentSettingsOverridePolicy.enum';
import { ExtensionEnvironment, SettingsReloadComponent, SettingsReloadFlags, SiteSettingsInterface } from '../../../common/interfaces/SettingsInterface'; import ExtensionMode from '@src/common/enums/ExtensionMode.enum';
import { _cp } from '../../../common/js/utils'; import { SiteSupportLevel } from '@src/common/enums/SiteSupportLevel.enum';
import Settings from './Settings'; import StretchType from '@src/common/enums/StretchType.enum';
import StretchType from '../../../common/enums/StretchType.enum'; import VideoAlignmentType from '@src/common/enums/VideoAlignmentType.enum';
import VideoAlignmentType from '../../../common/enums/VideoAlignmentType.enum'; import { ExtensionEnvironment, SettingsReloadComponent, SettingsReloadFlags, SiteSettingsInterface } from '@src/common/interfaces/SettingsInterface';
import EmbeddedContentSettingsOverridePolicy from '../../../common/enums/EmbeddedContentSettingsOverridePolicy.enum'; import { _cp } from '@src/common/utils/_cp';
import { SiteSupportLevel } from '../../../common/enums/SiteSupportLevel.enum'; import Settings from '@src/ext/module/settings/Settings';
export interface GetSiteSettingsOptions { export interface GetSiteSettingsOptions {

25
src/ext/module/video-data/PlayerData.ts
View File

@ -1,17 +1,14 @@
import Debug from '../../conf/Debug'; import ExtensionMode from '@src/common/enums/ExtensionMode.enum';
import ExtensionMode from '../../../common/enums/ExtensionMode.enum' import { ExtensionEnvironment } from '@src/common/interfaces/SettingsInterface';
import PlayerNotificationUi from '../uwui/PlayerNotificationUI'; import { collectionHas, equalish } from '@src/common/utils/comparators';
import { RunLevel } from '@src/ext/enum/run-level.enum';
import EventBus from '@src/ext/module/EventBus';
import { ComponentLogger } from '@src/ext/module/logging/ComponentLogger';
import { SiteSettings } from '@src/ext/module/settings/SiteSettings';
import UI from '@src/ext/module/uwui/UI';
import PageInfo from '@src/ext/module/video-data/PageInfo';
import VideoData from '@src/ext/module/video-data/VideoData';
import * as _ from 'lodash'; import * as _ from 'lodash';
import { sleep } from '../../../common/js/utils';
import VideoData from './VideoData';
import EventBus from '../EventBus';
import UI from '../uwui/UI';
import { SiteSettings } from '../settings/SiteSettings';
import PageInfo from './PageInfo';
import { RunLevel } from '../../enum/run-level.enum';
import { ExtensionEnvironment } from '../../../common/interfaces/SettingsInterface';
import { ComponentLogger } from '../logging/ComponentLogger';
import { collectionHas, equalish } from '../../util/comparators';
if (process.env.CHANNEL !== 'stable'){ if (process.env.CHANNEL !== 'stable'){
console.info("Loading: PlayerData.js"); console.info("Loading: PlayerData.js");
@ -77,7 +74,7 @@ class PlayerData {
videoData: VideoData; videoData: VideoData;
pageInfo: PageInfo; pageInfo: PageInfo;
siteSettings: SiteSettings; siteSettings: SiteSettings;
notificationService: PlayerNotificationUi; notificationService: any; // TODO: implement this
eventBus: EventBus; eventBus: EventBus;
//#endregion //#endregion

37
src/ext/module/video-data/VideoData.ts
View File

@ -1,23 +1,22 @@
import PlayerData from './PlayerData'; import { Ar } from '@src/common/interfaces/ArInterface';
import Resizer from '../video-transform/Resizer'; import { ExtensionEnvironment } from '@src/common/interfaces/SettingsInterface';
import * as _ from 'lodash'; import { Stretch } from '@src/common/interfaces/StretchInterface';
import BrowserDetect from '../../conf/BrowserDetect'; import { sleep } from '@src/common/utils/sleep';
import Settings from '../settings/Settings'; import BrowserDetect from '@src/ext/conf/BrowserDetect';
import PageInfo from './PageInfo'; import { RunLevel } from '@src/ext/enum/run-level.enum';
import { sleep } from '../../../common/js/utils'; import { Aard } from '@src/ext/module/aard/Aard';
import EventBus from '../EventBus'; import { AardLegacy } from '@src/ext/module/aard/AardLegacy';
import { SiteSettings } from '../settings/SiteSettings';
import { Ar } from '../../../common/interfaces/ArInterface';
import { ExtensionStatus } from './ExtensionStatus';
import { RunLevel } from '../../enum/run-level.enum';
import { Aard } from '../aard/Aard';
import { Stretch } from '../../../common/interfaces/StretchInterface';
import ExtensionMode from '../../../common/enums/ExtensionMode.enum';
import { ExtensionEnvironment } from '../../../common/interfaces/SettingsInterface';
import { LogAggregator } from '../logging/LogAggregator';
import { ComponentLogger } from '../logging/ComponentLogger';
import { AardLegacy } from '../aard/AardLegacy';
import { hasDrm } from '@src/ext/module/ar-detect/DrmDetector'; import { hasDrm } from '@src/ext/module/ar-detect/DrmDetector';
import EventBus from '@src/ext/module/EventBus';
import { ComponentLogger } from '@src/ext/module/logging/ComponentLogger';
import { LogAggregator } from '@src/ext/module/logging/LogAggregator';
import Settings from '@src/ext/module/settings/Settings';
import { SiteSettings } from '@src/ext/module/settings/SiteSettings';
import { ExtensionStatus } from '@src/ext/module/video-data/ExtensionStatus';
import PageInfo from '@src/ext/module/video-data/PageInfo';
import PlayerData from '@src/ext/module/video-data/PlayerData';
import Resizer from '@src/ext/module/video-transform/Resizer';
import * as _ from 'lodash';
/** /**
* VideoData — handles CSS for the video element. * VideoData — handles CSS for the video element.

33
src/ext/module/video-transform/Resizer.ts
View File

@ -1,21 +1,20 @@
import { SiteSettings } from '../settings/SiteSettings'; import AspectRatioType from '@src/common/enums/AspectRatioType.enum';
import Debug from '../../conf/Debug'; import StretchType from '@src/common/enums/StretchType.enum';
import Scaler, { CropStrategy, VideoDimensions } from './Scaler'; import VideoAlignmentType from '@src/common/enums/VideoAlignmentType.enum';
import Stretcher from './Stretcher'; import { Ar, ArVariant } from '@src/common/interfaces/ArInterface';
import Zoom from './Zoom'; import { Stretch } from '@src/common/interfaces/StretchInterface';
import StretchType from '../../../common/enums/StretchType.enum'; import getElementStyles from '@src/common/utils/getElementStyles';
import VideoAlignmentType from '../../../common/enums/VideoAlignmentType.enum'; import Debug from '@src/ext/conf/Debug';
import AspectRatioType from '../../../common/enums/AspectRatioType.enum'; import { RunLevel } from '@src/ext/enum/run-level.enum';
import VideoData from '../video-data/VideoData'; import EventBus from '@src/ext/module/EventBus';
import EventBus from '../EventBus'; import { ComponentLogger } from '@src/ext/module/logging/ComponentLogger';
import { _cp } from '../../../common/js/utils'; import Settings from '@src/ext/module/settings/Settings';
import Settings from '../settings/Settings'; import { SiteSettings } from '@src/ext/module/settings/SiteSettings';
import { Ar, ArVariant } from '../../../common/interfaces/ArInterface'; import VideoData from '@src/ext/module/video-data/VideoData';
import { RunLevel } from '../../enum/run-level.enum'; import Scaler, { VideoDimensions } from '@src/ext/module/video-transform/Scaler';
import Stretcher from '@src/ext/module/video-transform/Stretcher';
import Zoom from '@src/ext/module/video-transform/Zoom';
import * as _ from 'lodash'; import * as _ from 'lodash';
import getElementStyles from '../../util/getElementStyles';
import { Stretch } from '../../../common/interfaces/StretchInterface';
import { ComponentLogger } from '../logging/ComponentLogger';
if(Debug.debug) { if(Debug.debug) {
console.log("Loading: Resizer.js"); console.log("Loading: Resizer.js");

2
src/ui/components/segments/Debugging/Debugging.vue
View File

@ -201,7 +201,7 @@ import UploadJsonFileButton from '@components/common/UploadJsonFileButton.vue';
import { LogAggregator, BLANK_LOGGER_CONFIG } from '@src/ext/module/logging/LogAggregator'; import { LogAggregator, BLANK_LOGGER_CONFIG } from '@src/ext/module/logging/LogAggregator';
import { SettingsSnapshot } from '@src/ext/module/settings/SettingsSnapshotManager'; import { SettingsSnapshot } from '@src/ext/module/settings/SettingsSnapshotManager';
import SettingsInterface from '@src/common/interfaces/SettingsInterface'; import SettingsInterface from '@src/common/interfaces/SettingsInterface';
import { _cp } from '@src/common/js/utils'; import { _cp } from '@src/common/utils/_cp';
export default defineComponent({ export default defineComponent({
components: { components: {

2
src/ui/components/segments/PlayerElementSelection/Panels/PlayerSelectorAdvancedForm.vue
View File

@ -305,7 +305,7 @@ import SupportLevelIndicator from '@components/common/SupportLevelIndicator.vue'
import ConfirmButton from '@components/common/ConfirmButton.vue'; import ConfirmButton from '@components/common/ConfirmButton.vue';
import Popup from '@components/common/Popup.vue'; import Popup from '@components/common/Popup.vue';
import { _cp } from '@src/common/js/utils'; import { _cp } from '@src/common/utils/_cp';
import { SiteDOMSettingsInterface } from '@src/common/interfaces/SettingsInterface'; import { SiteDOMSettingsInterface } from '@src/common/interfaces/SettingsInterface';
import { SiteSupportLevel } from '../../../../../common/enums/SiteSupportLevel.enum'; import { SiteSupportLevel } from '../../../../../common/enums/SiteSupportLevel.enum';