From 5c9112a07bac6fadc85084cdb90bdd77cffdd3ed Mon Sep 17 00:00:00 2001 From: Tamius Han Date: Mon, 5 Jul 2021 00:48:59 +0200 Subject: [PATCH 1/5] package.json: add npm run dev-[browser] scripts --- package.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/package.json b/package.json index b3461b7..fb05caf 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,9 @@ "build-zip": "node scripts/build-zip.js", "build:dev": "webpack --hide-modules", "dev": "cross-env NODE_ENV=development CHANNEL=dev concurrently \"cross-env BROWSER=firefox npm run build:dev -- --watch\" \"cross-env BROWSER=chrome npm run build:dev -- --watch\" \"cross-env BROWSER=edge npm run build:dev -- --watch\"", + "dev-ff": "cross-env NODE_ENV=development CHANNEL=dev BROWSER=firefox npm run build:dev -- --watch", + "dev-chrome": "cross-env NODE_ENV=development CHANNEL=dev BROWSER=chrome npm run build:dev -- --watch", + "dev-edge": "cross-env NODE_ENV=development CHANNEL=dev BROWSER=edge npm run build:dev -- --watch", "pre-build": "rm -rf ./dist-ff; rm -rf ./dist-chrome; rm -rf ./node_modules; npm ci", "start": "npm run dev" }, From 1cc76ab3b184badb5a294327c5686e1c4b6b3d32 Mon Sep 17 00:00:00 2001 From: Tamius Han Date: Mon, 5 Jul 2021 00:49:35 +0200 Subject: [PATCH 2/5] Improve UI in advanced settings --- src/popup/App.vue | 14 ++-- src/popup/panels/SiteDetailsPanel.vue | 99 +++++++++++++++------------ 2 files changed, 63 insertions(+), 50 deletions(-) diff --git a/src/popup/App.vue b/src/popup/App.vue index f5ed15b..305505f 100644 --- a/src/popup/App.vue +++ b/src/popup/App.vue @@ -8,7 +8,7 @@ non-firefox builds of this extension and be done with it. No need to complicate things further than that. --> -
@@ -20,7 +20,7 @@ Build channel: {{BrowserDetect.processEnvChannel}}
-
-
- @@ -279,7 +279,7 @@ export default { } await this.sleep(5000); - } + } }, async updated() { const body = document.getElementsByTagName('body')[0]; @@ -287,7 +287,7 @@ export default { // ensure that narrowPopup only gets set the first time the popup renders // if popup was rendered before, we don't do anything because otherwise // we'll be causing an unwanted re-render - // + // // another thing worth noting — the popup gets first initialized with // offsetWidth set to 0. This means proper popup will be displayed as a // mini popup if we don't check for that. @@ -695,7 +695,7 @@ html { non-firefox builds of this extension and be done with it. No need to complicate things further than that. - It also seems that Chrome doesn't like if we set the width of the popup all the way to + It also seems that Chrome doesn't like if we set the width of the popup all the way to 800px (probably something something scrollbar), so let's just take away a few px. */ .popup-chrome { diff --git a/src/popup/panels/SiteDetailsPanel.vue b/src/popup/panels/SiteDetailsPanel.vue index 49b5ae4..1f22ecb 100644 --- a/src/popup/panels/SiteDetailsPanel.vue +++ b/src/popup/panels/SiteDetailsPanel.vue @@ -6,7 +6,7 @@ If extension doesn't detect player correctly, you can override it. (NOTE: this currently doesn't work for embedded videos)
- +
Meaning of outlines:
@@ -44,50 +44,59 @@
Manually specify player + +   + (show advanced options) + (hide advanced options) +
-
-
Query selectors for player:
- -
- -
- -
- Player is n-th parent of video: +
+
+
Query selectors for player:
+ +
+ +
+
+ Player is n-th parent of video: +
+ +
+ +
+ + Hint: Player is a HTML element that represents the portion of the page you expect the video to play in. + The correct value for n-th player value should normally between 1-10 (depends on the site). If none of these + values works, then the site probably has a different issue. + Note that you need to save settings and reload the page every time you change the number. +
-
-
- - Hint: Player is a HTML element that represents the portion of the page you expect the video to play in. - You can provide player's query selector, or you can tick the 'player is the n-th parent of video' - checkbox and try entering values 1-12ish and see if anything works. Note that you need to save - settings and reload the page every time you change the number. - -
Do not use monitor AR in fullscreen @@ -116,7 +125,7 @@ >
- +
Video detection settings
for {{site}}
@@ -125,7 +134,7 @@
Detect automatically
@@ -161,7 +170,7 @@
Limit zoom.
@@ -181,7 +190,7 @@ Limit zoom only while in fullscreen
@@ -235,7 +244,7 @@ export default { playerManualQs: false, playerQs: '', playerCss: '', - playerByNodeIndex: false, + playerByNodeIndex: true, playerParentNodeIndex: undefined, usePlayerAr: false, BrowserDetect @@ -253,7 +262,7 @@ export default { } catch (e) { // that's here just in case relevant settings for this site don't exist yet } - + try { this.playerManualQs = this.settings.active.sites[this.site].DOM.player.manual || this.playerManualQs; this.playerQs = this.settings.active.sites[this.site].DOM.player.querySelectors; @@ -278,7 +287,7 @@ export default { const saveButtonBait = document.getElementById('save-banner-observer-bait'); const saveButton = document.getElementById('save-banner'); - const observer = new IntersectionObserver( + const observer = new IntersectionObserver( ([e]) => { // console.log('observer triggered. intersection ratio?', e.intersectionRatio) saveButton.classList.toggle('floating', e.intersectionRatio < 0.95); @@ -380,7 +389,7 @@ export default { } currentMitigationsParent[mitigation[mitigation.length - 1]] = value; - + } else { this.settings.active.mitigations[mitigation] = value; } @@ -434,4 +443,8 @@ export default { box-shadow: 0 2rem 3rem 1rem $selected-color; } } + +.small-samecolor { + font-size: 0.8em; +} From 246743203fe7dc2993fd1d170c235f4fb4edb3ed Mon Sep 17 00:00:00 2001 From: Tamius Han Date: Mon, 5 Jul 2021 00:51:15 +0200 Subject: [PATCH 3/5] whitespace + plex rule --- src/ext/conf/ExtConfPatches.js | 40 ++++++++++---- src/ext/conf/ExtensionConf.ts | 98 ++++++++++++++++++++-------------- 2 files changed, 89 insertions(+), 49 deletions(-) diff --git a/src/ext/conf/ExtConfPatches.js b/src/ext/conf/ExtConfPatches.js index 8174279..d20dbfc 100644 --- a/src/ext/conf/ExtConfPatches.js +++ b/src/ext/conf/ExtConfPatches.js @@ -126,7 +126,7 @@ const ExtensionConfPatch = [ updateFn: (userOptions, defaultOptions) => { // remove 'press P to toggle panning mode' thing const togglePan = userOptions.actions.find(x => x.cmd && x.cmd.length === 1 && x.cmd[0].action === 'toggle-pan'); - if (togglePan) { + if (togglePan) { togglePan.scopes = {}; } @@ -221,7 +221,7 @@ const ExtensionConfPatch = [ show: true, } }); - + // patch shortcuts for non-latin layouts, but only if the user hasn't changed default keys for (const action of userOptions.actions) { if (!action.cmd || action.cmd.length !== 1) { @@ -263,7 +263,7 @@ const ExtensionConfPatch = [ updateFn: (userOptions, defaultOptions) => { try { userOptions.actions.push( - { + { name: 'Stretch source to 4:3', label: '4:3 stretch (src)', cmd: [{ @@ -280,7 +280,7 @@ const ExtensionConfPatch = [ show: true, path: 'crop' } - }, { + }, { name: 'Stretch source to 16:9', label: '16:9 stretch (src)', cmd: [{ @@ -337,7 +337,7 @@ const ExtensionConfPatch = [ if (!userOptions.sites['www.disneyplus.com']) { userOptions.sites['www.disneyplus.com'] = { mode: ExtensionMode.Enabled, - autoar: ExtensionMode.Enabled, + autoar: ExtensionMode.Enabled, override: false, type: 'community', stretch: StretchType.Default, @@ -456,7 +456,7 @@ const ExtensionConfPatch = [ limit: 0.997, fullscreenOnly: true } - } + } } catch (e) { // do nothing } @@ -471,7 +471,7 @@ const ExtensionConfPatch = [ limit: 0.997, fullscreenOnly: true } - } + } } catch (e) { // do nothing } @@ -487,7 +487,7 @@ const ExtensionConfPatch = [ limit: 0.997, fullscreenOnly: true } - } + } } else if (BrowserDetect.chrome) { userOptions.mitigations = { zoomLimit: { @@ -495,7 +495,7 @@ const ExtensionConfPatch = [ limit: 0.997, fullscreenOnly: true } - } + } } } catch (e) { // do nothing @@ -511,6 +511,28 @@ const ExtensionConfPatch = [ videoAncestor: 1 } } + }, { + forVersion: '5.0.5', + sites: { + "app.plex.tv": { + mode: 3, + autoar: 3, + type: "user-added", + stretch: -1, + videoAlignment: -1, + keyboardShortcutsEnabled: 0, + DOM: { + player: { + manual: false, + querySelectors: "", + additionalCss: "", + useRelativeAncestor: false, + playerNodeCss: "" + } + }, + css: "body {\n background-color: #000;\n}\n\n.application {\n background-color: #000;\n}" + } + } } ]; diff --git a/src/ext/conf/ExtensionConf.ts b/src/ext/conf/ExtensionConf.ts index 009fcc0..13b8206 100644 --- a/src/ext/conf/ExtensionConf.ts +++ b/src/ext/conf/ExtensionConf.ts @@ -15,7 +15,7 @@ if(Debug.debug) const ExtensionConf: SettingsInterface = { arDetect: { disabledReason: "", // if automatic aspect ratio has been disabled, show reason - allowedMisaligned: 0.05, // top and bottom letterbox thickness can differ by this much. + allowedMisaligned: 0.05, // top and bottom letterbox thickness can differ by this much. // Any more and we don't adjust ar. allowedArVariance: 0.075, // amount by which old ar can differ from the new (1 = 100%) timers: { // autodetection frequency @@ -46,14 +46,14 @@ const ExtensionConf: SettingsInterface = { }, }, - // samplingInterval: 10, // we sample at columns at (width/this) * [ 1 .. this - 1] + // samplingInterval: 10, // we sample at columns at (width/this) * [ 1 .. this - 1] blackframe: { sufficientColorVariance: 0.10, // calculate difference between average intensity and pixel, for every pixel for every color // component. Average intensity is normalized to where 0 is black and 1 is biggest value for // that component. If sum of differences between normalized average intensity and normalized // component varies more than this % between color components, we can afford to use less strict // cumulative threshold. - cumulativeThresholdLax: 1600, + cumulativeThresholdLax: 1600, cumulativeThresholdStrict: 2560,// if we add values of all pixels together and get more than this, the frame is bright enough. // (note: blackframe is 16x9 px -> 144px total. cumulative threshold can be reached fast) blackPixelsCondition: 0.6, // How much pixels must be black (1 all, 0 none) before we consider frame as black. Takes @@ -93,7 +93,7 @@ const ExtensionConf: SettingsInterface = { randomCols: 0, // we add this many randomly selected columns to the static columns staticRows: 9, // forms grid with staticSampleCols. Determined in the same way. For black frame checks }, - guardLine: { // all pixels on the guardline need to be black, or else we trigger AR recalculation + guardLine: { // all pixels on the guardline need to be black, or else we trigger AR recalculation // (if AR fails to be recalculated, we reset AR) enabled: true, ignoreEdgeMargin: 0.20, // we ignore anything that pokes over the black line this close to the edge @@ -107,14 +107,14 @@ const ExtensionConf: SettingsInterface = { safetyBorderPx: 5, // determines the thickness of safety border in fallback mode noTriggerZonePx: 8 // if we detect edge less than this many pixels thick, we don't correct. }, - arSwitchLimiter: { // to be implemented + arSwitchLimiter: { // to be implemented switches: 2, // we can switch this many times period: 2.0 // per this period }, edgeDetection: { sampleWidth: 8, // we take a sample this wide for edge detection detectionThreshold: 4, // sample needs to have this many non-black pixels to be a valid edge - confirmationThreshold: 1, // + confirmationThreshold: 1, // singleSideConfirmationThreshold: 3, // we need this much edges (out of all samples, not just edges) in order // to confirm an edge in case there's no edges on top or bottom (other // than logo, of course) @@ -128,11 +128,11 @@ const ExtensionConf: SettingsInterface = { // are now. (NOTE: keep this less than 1 in case we implement logo detection) }, pillarTest: { - ignoreThinPillarsPx: 5, // ignore pillars that are less than this many pixels thick. + ignoreThinPillarsPx: 5, // ignore pillars that are less than this many pixels thick. allowMisaligned: 0.05 // left and right edge can vary this much (%) }, textLineTest: { - nonTextPulse: 0.10, // if a single continuous pulse has this many non-black pixels, we aren't dealing + nonTextPulse: 0.10, // if a single continuous pulse has this many non-black pixels, we aren't dealing // with text. This value is relative to canvas width (%) pulsesToConfirm: 10, // this is a threshold to confirm we're seeing text. pulsesToConfirmIfHalfBlack: 5, // this is the threshold to confirm we're seeing text if longest black pulse @@ -171,8 +171,8 @@ const ExtensionConf: SettingsInterface = { // ::: ACTIONS ::: // ----------------------------------------- // Nastavitve za ukaze. Zamenja stare nastavitve za bližnične tipke. - // - // Polje 'shortcut' je tabela, če se slučajno lotimo kdaj delati choordov. + // + // Polje 'shortcut' je tabela, če se slučajno lotimo kdaj delati choordov. actions: [{ name: 'Trigger automatic detection', // name displayed in settings label: 'Automatic', // name displayed in ui (can be overridden in scope/playerUi) @@ -197,7 +197,7 @@ const ExtensionConf: SettingsInterface = { code: 'KeyA', ctrlKey: false, metaKey: false, - altKey: false, + altKey: false, shiftKey: false, onKeyUp: true, onKeyDown: false, @@ -223,7 +223,7 @@ const ExtensionConf: SettingsInterface = { code: 'KeyR', ctrlKey: false, metaKey: false, - altKey: false, + altKey: false, shiftKey: false, onKeyUp: true, onKeyDown: false, @@ -249,7 +249,7 @@ const ExtensionConf: SettingsInterface = { code: 'KeyW', ctrlKey: false, metaKey: false, - altKey: false, + altKey: false, shiftKey: false, onKeyUp: true, onKeyDown: false, @@ -275,7 +275,7 @@ const ExtensionConf: SettingsInterface = { code: 'KeyE', ctrlKey: false, metaKey: false, - altKey: false, + altKey: false, shiftKey: false, onKeyUp: true, onKeyDown: false, @@ -303,7 +303,7 @@ const ExtensionConf: SettingsInterface = { code: 'KeyS', ctrlKey: false, metaKey: false, - altKey: false, + altKey: false, shiftKey: false, onKeyUp: false, onKeyDown: true, @@ -331,7 +331,7 @@ const ExtensionConf: SettingsInterface = { code: 'KeyD', ctrlKey: false, metaKey: false, - altKey: false, + altKey: false, shiftKey: false, onKeyUp: false, onKeyDown: true, @@ -359,7 +359,7 @@ const ExtensionConf: SettingsInterface = { code: 'KeyX', ctrlKey: false, metaKey: false, - altKey: false, + altKey: false, shiftKey: false, onKeyUp: true, onKeyDown: false, @@ -472,7 +472,7 @@ const ExtensionConf: SettingsInterface = { code: 'KeyY', ctrlKey: false, metaKey: false, - altKey: false, + altKey: false, shiftKey: false, onKeyUp: true, onKeyDown: false, @@ -497,7 +497,7 @@ const ExtensionConf: SettingsInterface = { code: 'KeyU', ctrlKey: false, metaKey: false, - altKey: false, + altKey: false, shiftKey: false, onKeyUp: true, onKeyDown: false, @@ -532,7 +532,7 @@ const ExtensionConf: SettingsInterface = { shortcut: [{ ctrlKey: false, metaKey: false, - altKey: false, + altKey: false, shiftKey: true, onKeyDown: false, onKeyUp: false, @@ -657,7 +657,7 @@ const ExtensionConf: SettingsInterface = { } } }, // NEW OPTIONS - { + { name: 'Stretch source to 4:3', label: '4:3 stretch (src)', cmd: [{ @@ -674,7 +674,7 @@ const ExtensionConf: SettingsInterface = { show: true, path: 'crop' } - }, { + }, { name: 'Stretch source to 16:9', label: '16:9 stretch (src)', cmd: [{ @@ -778,7 +778,7 @@ const ExtensionConf: SettingsInterface = { // E N A B L E E X T E N S I O N / A U T O A R // (for sites/extension tab in the popup) // - { + { name: 'Enable extension', label: 'Enable', cmd: [{ @@ -889,7 +889,7 @@ const ExtensionConf: SettingsInterface = { scopes: { global: { show: true, - }, + }, site: { show: true, } @@ -899,7 +899,7 @@ const ExtensionConf: SettingsInterface = { // // Enable/disable keyboard shortcuts // - { + { name: 'Enable keyboard shortcuts', label: 'Enable', cmd: [{ @@ -974,31 +974,31 @@ const ExtensionConf: SettingsInterface = { // ----------------------------------------- // Nastavitve za posamezno stran // Config for a given page: - // + // // : { // status:
-->
@@ -51,11 +49,11 @@ (show advanced options) + >(use advanced options) (hide advanced options) + >(use basic options)
@@ -256,19 +254,19 @@ export default { }, created() { try { - this.videoManualQs = this.settings.active.sites[this.site].DOM.video.manual || this.videoManualQs; - this.videoQs = this.settings.active.sites[this.site].DOM.video.querySelectors; - this.videoCss = this.settings.active.sites[this.site].DOM.video.additionalCss; + this.videoManualQs = this.settings.active.sites[this.site]?.DOM?.video?.manual ?? this.videoManualQs; + this.videoQs = this.settings.active.sites[this.site]?.DOM?.video?.querySelectors; + this.videoCss = this.settings.active.sites[this.site]?.DOM?.video?.additionalCss; } catch (e) { // that's here just in case relevant settings for this site don't exist yet } try { - this.playerManualQs = this.settings.active.sites[this.site].DOM.player.manual || this.playerManualQs; - this.playerQs = this.settings.active.sites[this.site].DOM.player.querySelectors; - this.playerByNodeIndex = this.settings.active.sites[this.site].DOM.player.useRelativeAncestor || this.playerByNodeIndex; - this.playerParentNodeIndex = this.settings.active.sites[this.site].DOM.player.videoAncestor; - this.usePlayerAr = this.settings.active.sites[this.site].usePlayerArInFullscreen; + this.playerManualQs = this.settings.active.sites[this.site]?.DOM?.player?.manual ?? this.playerManualQs; + this.playerQs = this.settings.active.sites[this.site]?.DOM?.player?.querySelectors; + this.playerByNodeIndex = this.settings.active.sites[this.site]?.DOM?.player?.useRelativeAncestor ?? this.playerByNodeIndex; + this.playerParentNodeIndex = this.settings.active.sites[this.site]?.DOM?.player?.videoAncestor; + this.usePlayerAr = this.settings.active.sites[this.site]?.usePlayerArInFullscreen; } catch (e) { // that's here just in case relevant settings for this site don't exist yet }