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

Last pre-publish fixes

Browse Source
This commit is contained in:
Tamius Han 2024-06-12 01:55:12 +02:00
parent e839e632fc
commit d6d3a95daf
6 changed files with 41 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/csui/src/PlayerUiPanels/PanelComponents/ExtensionSettings/SiteExtensionSettings.vue
View File

@ -132,11 +132,11 @@
<div class="select"> <div class="select">
<select <select
v-model="siteDefaultCrop" v-model="siteDefaultCrop"
@click="setOption('defaults.crop', $event)" @change="setOption('defaults.crop', $event)"
> >
<option <option
v-if="!isDefaultConfiguration" v-if="!isDefaultConfiguration"
:value="undefined" :value="JSON.stringify({useDefault: true})"
> >
Use default ({{getCommandValue(settings?.active.commands.crop, siteSettings.data.defaults.crop)}}) Use default ({{getCommandValue(settings?.active.commands.crop, siteSettings.data.defaults.crop)}})
</option> </option>
@ -158,11 +158,11 @@
<div class="select"> <div class="select">
<select <select
v-model="siteDefaultStretch" v-model="siteDefaultStretch"
@click="setOption('defaults.stretch', $event)" @change="setOption('defaults.stretch', $event)"
> >
<option <option
v-if="!isDefaultConfiguration" v-if="!isDefaultConfiguration"
:value="undefined" :value="JSON.stringify({useDefault: true})"
> >
Use default ({{getCommandValue(settings?.active.commands.stretch, siteSettings.data.defaults.stretch)}}) Use default ({{getCommandValue(settings?.active.commands.stretch, siteSettings.data.defaults.stretch)}})
</option> </option>
@ -183,11 +183,11 @@
<div class="select"> <div class="select">
<select <select
v-model="siteDefaultAlignment" v-model="siteDefaultAlignment"
@click="setOption('defaults.alignment', $event)" @change="setOption('defaults.alignment', $event)"
> >
<option <option
v-if="!isDefaultConfiguration" v-if="!isDefaultConfiguration"
:value="undefined" :value="JSON.stringify({useDefault: true})"
> >
Use default ({{getAlignmentLabel(siteSettings.data.defaults.alignment)}}) Use default ({{getAlignmentLabel(siteSettings.data.defaults.alignment)}})
</option> </option>
@ -268,13 +268,14 @@ export default {
} }
}, },
siteDefaultCrop() { siteDefaultCrop() {
return this.siteSettings.raw?.defaults?.crop ? JSON.stringify(this.siteSettings.raw?.defaults?.crop) : undefined; // console.log('Getting default site crop:', this.siteSettings.raw?.defaults?.crop ? 'yay' : '{useDefault}', this.siteSettings.raw?.defaults?.crop)
return this.siteSettings.raw?.defaults?.crop ? JSON.stringify(this.siteSettings.raw?.defaults?.crop) : JSON.stringify({useDefault: true});
}, },
siteDefaultStretch() { siteDefaultStretch() {
return this.siteSettings.raw?.defaults?.stretch ? JSON.stringify(this.siteSettings.raw?.defaults?.stretch) : undefined; return this.siteSettings.raw?.defaults?.stretch ? JSON.stringify(this.siteSettings.raw?.defaults?.stretch) : JSON.stringify({useDefault: true});
}, },
siteDefaultAlignment() { siteDefaultAlignment() {
return this.siteSettings.raw?.defaults?.alignment ? JSON.stringify(this.siteSettings.raw?.defaults?.alignment) : undefined; return this.siteSettings.raw?.defaults?.alignment ? JSON.stringify(this.siteSettings.raw?.defaults?.alignment) : JSON.stringify({useDefault: true});
}, },
siteDefaultCropPersistence() { siteDefaultCropPersistence() {
return this.siteSettings.raw?.persistCSA ?? undefined; return this.siteSettings.raw?.persistCSA ?? undefined;
@ -386,17 +387,24 @@ export default {
getOption(option) { getOption(option) {
}, },
setOption(option, $event) { async setOption(option, $event) {
const value = $event.target.value;
let commandArguments; let commandArguments;
// if argument is json, parse json. Otherwise, pass the value as-is // if argument is json, parse json. Otherwise, pass the value as-is
try { try {
commandArguments = $event.target.value !== undefined ? JSON.parse($event.target.value) : undefined; commandArguments = value !== undefined ? JSON.parse(value) : undefined;
} catch(e) { } catch(e) {
commandArguments = $event.target.value; commandArguments = value;
} }
this.siteSettings.set(option, commandArguments); if (commandArguments.useDefault) {
commandArguments = undefined;
}
// console.log('setting option', option, 'to cmd:', commandArguments, 'event data in:', value);
await this.siteSettings.set(option, commandArguments);
this.$nextTick( () => this.$forceUpdate() );
}, },
setExtensionMode(component, event) { setExtensionMode(component, event) {
const option = event.target.value; const option = event.target.value;

2
src/csui/src/PlayerUiPanels/PanelComponents/VideoSettings/CropOptionsPanel.vue
View File

@ -120,7 +120,7 @@
<div class="select"> <div class="select">
<select <select
:value="siteDefaultCrop" :value="siteDefaultCrop"
@click="setDefaultCrop($event, 'site')" @change="setDefaultCrop($event, 'site')"
> >
<option <option
v-for="(command, index) of settings?.active.commands.crop" v-for="(command, index) of settings?.active.commands.crop"

2
src/csui/src/PlayerUiPanels/PanelComponents/VideoSettings/StretchOptionsPanel.vue
View File

@ -134,7 +134,7 @@
<div class="select"> <div class="select">
<select <select
v-model="siteDefaultStretchMode" v-model="siteDefaultStretchMode"
@click="setDefaultStretchingMode($event, 'site')" @change="setDefaultStretchingMode($event, 'site')"
> >
<option <option
v-for="(command, index) of settings?.active.commands.stretch" v-for="(command, index) of settings?.active.commands.stretch"

9
src/ext/conf/ExtConfPatches.ts
View File

@ -273,6 +273,15 @@ const ExtensionConfPatch = [
userOptions.sites['@global'].defaultType = 'unknown'; userOptions.sites['@global'].defaultType = 'unknown';
userOptions.sites['@empty'].defaultType = 'modified'; userOptions.sites['@empty'].defaultType = 'modified';
} }
}, {
forVersion: '6.0.0',
updateFn: (userOptions: SettingsInterface, defaultOptions) => {
// remove custom CSS, as it is no longer needed
for (const site in userOptions.sites) {
for (const domOption in userOptions.sites[site].DOMConfig)
userOptions.sites[site].DOMConfig[domOption].customCss;
}
}
} }
]; ];

40
src/ext/conf/ExtensionConf.ts
View File

@ -1445,7 +1445,7 @@ const ExtensionConf: SettingsInterface = {
persistCSA: CropModePersistence.Disabled, persistCSA: CropModePersistence.Disabled,
defaults: { defaults: {
crop: {type: AspectRatioType.Reset}, // does NOT override Aard crop: {type: AspectRatioType.Automatic},
stretch: StretchType.NoStretch, stretch: StretchType.NoStretch,
alignment: {x: VideoAlignmentType.Center, y: VideoAlignmentType.Center}, alignment: {x: VideoAlignmentType.Center, y: VideoAlignmentType.Center},
} }
@ -1561,7 +1561,7 @@ const ExtensionConf: SettingsInterface = {
querySelectors: ".btm-media-client-element" querySelectors: ".btm-media-client-element"
} }
}, },
customCss: ".hudson-container { height: 100%; }" // customCss: ".hudson-container { height: 100%; }"
} }
} }
}, },
@ -1584,32 +1584,6 @@ const ExtensionConf: SettingsInterface = {
type: 'official', type: 'official',
defaultType: 'official', defaultType: 'official',
}, },
// "streamable.com": {
// enable: {
// fullscreen: ExtensionMode.Default,
// theater: ExtensionMode.Default,
// normal: ExtensionMode.Default,
// },
// enableAard: {
// fullscreen: ExtensionMode.Default,
// theater: ExtensionMode.Default,
// normal: ExtensionMode.Default,
// },
// enableKeyboard: {
// fullscreen: ExtensionMode.Default,
// theater: ExtensionMode.Default,
// normal: ExtensionMode.Default
// },
// type: 'official',
// type: 'defaultType',
// activeDOMConfig: 'official',
// DOMConfig: {
// 'official': {
// type: 'official',
// customCss: ".player {text-align: left}"
// }
// }
// },
"vimeo.com": { "vimeo.com": {
enable: { enable: {
fullscreen: ExtensionMode.Default, fullscreen: ExtensionMode.Default,
@ -1632,7 +1606,7 @@ const ExtensionConf: SettingsInterface = {
DOMConfig: { DOMConfig: {
'official': { 'official': {
type: 'official', type: 'official',
customCss: ".player_outro_area {\n width: 100% !important;\n display: flex !important;\n justify-content: center !important;\n}\n\n.player_container, .player {\n width: 100% !important; \n}", // customCss: ".player_outro_area {\n width: 100% !important;\n display: flex !important;\n justify-content: center !important;\n}\n\n.player_container, .player {\n width: 100% !important; \n}",
elements: { elements: {
player: { player: {
manual: true, manual: true,
@ -1664,7 +1638,7 @@ const ExtensionConf: SettingsInterface = {
DOMConfig: { DOMConfig: {
'official': { 'official': {
type: 'official', type: 'official',
customCss: 'video {\n width: 100% !important;\n height: 100% !important;\n}', // customCss: 'video {\n width: 100% !important;\n height: 100% !important;\n}',
elements: { elements: {
player: { player: {
manual: false, manual: false,
@ -1696,7 +1670,7 @@ const ExtensionConf: SettingsInterface = {
DOMConfig: { DOMConfig: {
'official': { 'official': {
type: 'official', type: 'official',
customCss: 'video {\n width: 100% !important;\n height: 100% !important;\n}', // customCss: 'video {\n width: 100% !important;\n height: 100% !important;\n}',
elements: { elements: {
player: { player: {
manual: false, manual: false,
@ -1816,7 +1790,7 @@ const ExtensionConf: SettingsInterface = {
DOMConfig: { DOMConfig: {
'community': { 'community': {
type: 'community', type: 'community',
customCss: "body {\n background-color: #000;\n}\n\n.application {\n background-color: #000;\n}" // customCss: "body {\n background-color: #000;\n}\n\n.application {\n background-color: #000;\n}"
} }
} }
}, },
@ -1872,7 +1846,7 @@ const ExtensionConf: SettingsInterface = {
DOMConfig: { DOMConfig: {
'community': { 'community': {
type: 'community', type: 'community',
customCss: ".shaka-video-container {\n flex-direction: column !important;\n}" // customCss: ".shaka-video-container {\n flex-direction: column !important;\n}"
} }
} }
}, },

3
src/ext/lib/settings/SiteSettings.ts
View File

@ -324,7 +324,7 @@ export class SiteSettings {
let iterated = ''; let iterated = '';
for (i = 0; i < pathParts.length - 1; i++) { for (i = 0; i < pathParts.length - 1; i++) {
iterated = `${iterated}.${pathParts[i]}` iterated = `${iterated}.${pathParts[i]}`;
if (!iterator[pathParts[i]]) { // some optional paths may still be undefined, even after cloning empty object if (!iterator[pathParts[i]]) { // some optional paths may still be undefined, even after cloning empty object
iterator[pathParts[i]] = {}; iterator[pathParts[i]] = {};
@ -341,6 +341,7 @@ export class SiteSettings {
await this.settings.save(); await this.settings.save();
} else { } else {
await this.settings.saveWithoutReload(); await this.settings.saveWithoutReload();
this.compileSettingsObject();
} }
} }
} }