Merge branch 'beta-branch'

Author: Ephellon

moz.xpi

@@ -150,6 +150,8 @@
 
 .web-to-plex-prompt-body {
 	background: #282828;
+    border: 0 !important;
+    border-radius: 3px !important;
 	box-shadow: 0 5px 15px #0008 !important;
 	display: block !important;
 
@@ -278,6 +280,25 @@
     margin-top: 5px !important;
 }
 
+.web-to-plex-permission:after {
+    background: #0000;
+    border-radius: 3px;
+    border: 0;
+    color: #cc7b19;
+    content: "\29eb";
+    display: inline-block;
+    font-size: 150%;
+    padding: 0;
+    text-align: center;
+
+    margin: 0;
+    position: absolute;
+    right: 3%;
+
+    height: 2em;
+    width: 2em;
+}
+
 .web-to-plex-prompt-footer {
 	text-align: right !important;
 	border-bottom-left-radius: 3px !important;
@@ -505,6 +526,10 @@
     margin-top: 0 !important;
 }
 
+.web-to-plex-button.hide.closed li:not(:first-child) {
+    display: none !important;
+}
+
 *:not(#plexit-bookmarklet-frame) + .web-to-plex-button.closed .list-item {
     float: left !important;
     opacity: 0;

moz.zip

@@ -1,38 +1,44 @@
-/** GitHub@alexey-bass
- * Simply compares two string version values.
+/** function compareVer({String|Number} L, {String|Number} R) => {Integer|Boolean};
+ * Simply compares two version values.
  *
- * Example:
+ * Examples:
  * compareVer('1.1', '1.2') => -1
  * compareVer('1.1', '1.1') =>  0
- * compareVer('1.2', '1.1') =>  1
- * compareVer('2.23.3', '2.22.3') => 1
+ * compareVer('1.2', '1.1') => +1
+ * compareVer('2.23.3', '2.22.3') => +1
  *
  * Returns:
- * -1 = left is LOWER = right is GREATER
- *  0 = they are equal
- *  1 = left is GREATER = right is LOWER
- *  And FALSE if one of input versions are not valid
+ * -1    => L < R: L is LOWER <-> R is HIGHER
+ *  0    => L = R: L and R are EQUAL
+ * +1    => L > R: L is HIGHER <-> R is LOWER
+ * false => one of the versions is invalid
  *
  * @function
- * @param {String} left  Version #1
- * @param {String} right Version #2
+ * @param  {String|Number} L Version #1
+ * @param  {String|Number} R Version #2
  * @return {Integer|Boolean}
- * @author Alexey Bass (albass)
- * @since 2011-07-14
+ * @author Alexey Bass (GitHub@alexey-bass)
+ * @since  2011-07-14
  */
-function compareVer(left, right) {
-    if(typeof left + typeof right != 'stringstring')
+function compareVer(L, R) {
+    if(!/^(string|number)(string|number)$/i.test(typeof L + typeof R))
         return false;
 
-    for(let a = left.split('.'), b = right.split('.'), i = 0, l = Math.max(a.length, b.length); i < l; i++) {
-        if((a[i] && !b[i] && parseInt(a[i]) > 0) || (parseInt(a[i]) > parseInt(b[i])))
+    L += '';
+    R += '';
+
+    let pI = Number.parseInt || parseInt || (string => +string.replace(/^\s*(-?\d+)[^]*$/, '$1')),
+        mx = Math.max || ((...numbers) => numbers.sort((a, b) => +a < +b? +1: -1)[0]);
+
+    for(let a = L.split('.'), b = R.split('.'), i = 0, l = mx(a.length, b.length), p = pI; i < l; i++) {
+        if((a[i] && !b[i] && p(a[i]) > 0) || (p(a[i]) > p(b[i])))
             return +1
-            /* left is higher */;
-        else if((b[i] && !a[i] && parseInt(b[i]) > 0) || (parseInt(a[i]) < parseInt(b[i])))
+            /* L > R */;
+        else if((b[i] && !a[i] && p(b[i]) > 0) || (p(a[i]) < p(b[i])))
             return -1
-            /* right is higher */;
+            /* L < R */;
     }
 
     return 0
-    /* equal */;
+    /* L = R */;
 }

moz/common.css

@@ -4,7 +4,7 @@
 	"homepage_url": "https://webtoplex.github.io/",
 
 	"manifest_version": 2,
-	"version": "4.1.1.10",
+	"version": "4.1.1.11",
 	"browser_specific_settings": {
 		"gecko": {
 			"id": "[email protected]",
@@ -103,8 +103,8 @@
 			"matches": ["*://itunes.apple.com/*"],
 			"js": ["utils.js", "itunes$.js"]
 		},{
-			"matches": ["*://*.metacritic.com/*"],
-			"js": ["utils.js", "metacritic$.js"]
+			"matches": ["*://*.shanaproject.com/*"],
+			"js": ["utils.js", "shanaproject$.js"]
 		},{
 			"matches": ["*://*.fandango.com/*"],
 			"js": ["utils.js", "fandango$.js"]
@@ -154,10 +154,7 @@
 			"matches": ["*://*.tubitv.com/*"],
 			"js": ["utils.js", "tubi$.js"]
 		},{
-			"matches": [
-				"*://webtoplex.github.io/web/?*", "*://webtoplex.github.io/web/index.html?*", "*://webtoplex.github.io/web/login.html?*",
-				"*://ephellon.github.io/web.to.plex/?*", "*://ephellon.github.io/web.to.plex/index.html?*", "*://ephellon.github.io/web.to.plex/login.html?*"
-			],
+			"matches": ["*://webtoplex.github.io/web/*", "*://ephellon.github.io/web.to.plex/*"],
 			"js": ["utils.js", "webtoplex$.js"]
 		},{
 			"matches": ["*://app.plex.tv/desktop/*"],

moz/compare.js

@@ -27,6 +27,7 @@ let script = {
 
 			case 'list':
 				/* Not yet implemented */
+				return -1;
 				break;
 
 			default:
@@ -52,9 +53,10 @@ let script = {
 
 if(!top.WaitingOnAbsoluteReady) {
 	top.addEventListener('load', event => {
-		top.AbsoluteReady = true;
-
-		$('.web-to-plex-button a.list-action').first.onclick = event => event;
+		/* Fix event override? */
+		setInterval(() => {
+			top.AbsoluteReady = $('.web-to-plex-button').first.classList.contains('show');
+		}, 1000);
 	});
 
 	top.WaitingOnAbsoluteReady = true;

moz/manifest.json

@@ -695,20 +695,26 @@ code[new], [code][new], [type^="code"i][new] {
 
 /* Release is higher than GitHub */
 #version[status="high"] {
-    border-color: #6cc644 !important;
-    color: #6cc644 !important;
+    /* Blue */
+    border-color: #197bcc !important;
+    color: #197bcc !important;
 }
 
 /* Release is same as GitHub */
 #version[status="same"] {
-    border-color: #197bcc !important;
-    color: #197bcc !important;
+    /* Green */
+    border-color: #6cc644 !important;
+    color: #6cc644 !important;
 }
 
 /* Release is lower than GitHub */
 #version[status="low"] {
+    /* Orange/Red (#f3582c) */
     border-color: #f66a0a !important;
-    color: #f3582c !important;
+    color: #f66a0a !important;
+    /* Grey */
+    /* border-color: #949494 !important;
+    color: #949494 !important; */
 }
 
 /* notifications */

moz/metacritic$.js

@@ -573,19 +573,17 @@ <h3>Login <em>(saved)</em></h3>
 					<summary>Theme Settings</summary>
 
 					<h2>The Button</h2>
-					<!--
 					<section>
 						What shape should the button be?
 						<br>
 						<span class="checkbox" prompt-size="large" prompt-yes="&#9723;" prompt-no="&#9675;">
-							<!-- When true (checked), will be accessed in CSS (/sites/theme.css) as ".button-shape-box { ... }" --/>
+							<!-- When true (checked), will be accessed in CSS (/sites/theme.css) as ".button-shape-box { ... }" -->
 							<input data-option="theme:button-shape" theme="true:box" type="checkbox"/>
 							<label for="theme:button-shape"></label>
 						</span>
 					</section>
-					-->
 					<section>
-						Which direction should the button open (<span orange>&#9711;</span> only)?
+						Which direction should the button open (&#9711; only)?
 						<br>
 						<span class="checkbox" prompt-size="large" prompt-yes="&#8672;" prompt-no="&#8674;">
 							<!-- When true (checked), will be accessed in CSS (/sites/theme.css) as ".button-location-right { ... }" -->
@@ -700,8 +698,8 @@ <h3>
 						<div>
 							When the user presses the Grab button, the extension should:
 							<ul>
-								<li>Grab <em>ALL</em>: Find items not on Plex, and grab them</li>
-								<li><em>ASK</em> user: Find items not on Plex, and grab what the user approves</li>
+								<li>Grab <em>ALL</em> &mdash; Find items not on Plex, and grab them</li>
+								<li><em>ASK</em> user &mdash; Find items not on Plex, and grab what the user approves</li>
 							</ul>
 						</div>
 						<h3>Maximum Auto Grabs</h3>
@@ -816,8 +814,8 @@ <h3>
 							</span>
 						</h3>
 						<ul>
-							<li><em>MIN</em>: when a page is loaded, the extension will keep a small number of IDs on hand to speed up the process of finding media</li>
-							<li><em>ALL</em>: when a page is loaded, the extension will ask for every single ID from your Manager(s)</li>
+							<li><em>MIN</em> &mdash; when a page is loaded, the extension will keep a small number of IDs on hand to speed up the process of finding media</li>
+							<li><em>ALL</em> &mdash; when a page is loaded, the extension will ask for every single ID from your Manager(s)</li>
 						</ul>
 					</section>
 				</details>
@@ -853,7 +851,7 @@ <h3 x-mode>Data Compression</h3>
 							<label for="use-lzw"></label>
 						</div>
 						<div>
-							<em>WARNING</em>: may cause data loss.<br>
+							<em>WARNING</em> &mdash; may cause data loss.<br>
 							Enabling this option will compress your cached search data using the <a href="https://wikipedia.org/wiki/Burrows%E2%80%93Wheeler_transform" target="_blank">BWT (transform)</a> and <a href="https://wikipedia.org/wiki/Lempel%E2%80%93Ziv%E2%80%93Welch" target="_blank">LZW Compression Algorithm</a>.
 						</div>
 					</section>
@@ -893,7 +891,7 @@ <h3>
 			                </span>
 						</h3>
 						<div>
-							<em>WARNING</em>: may cause data loss.<br>
+							<em>WARNING</em> &mdash; may cause data loss.<br>
 							Enables developer (debugging) mode, showing advance errors and logging to the console when possible.
 						</div>
 					</section>

moz/metacritic.js

@@ -120,6 +120,7 @@ const storage = (chrome.storage.sync || chrome.storage.local),
 			// Advance Settings
 			'OMDbAPI',
 			'TMDbAPI',
+			'UseLZW',
 			'DeveloperMode',
 
 			// Hidden values
@@ -157,7 +158,7 @@ const storage = (chrome.storage.sync || chrome.storage.local),
 			'builtin_imdb',
 			'builtin_justwatch',
 			'builtin_letterboxd',
-			'builtin_metacritic',
+			// 'builtin_metacritic', // demoted - 01.18.2020 15:10 MST
 			'builtin_moviemeter',
 			'builtin_movieo',
 			'builtin_netflix',
@@ -178,10 +179,11 @@ const storage = (chrome.storage.sync || chrome.storage.local),
 			'builtin_gostream',
 			'builtin_tubi',
 			'builtin_webtoplex',
+			'builtin_shanaproject',
 
 			// Plugins - End of file, "let plugins ="
 			'plugin_toloka',
-			'plugin_shanaproject',
+			// 'plugin_shanaproject', // promoted - 01.18.2020 15:10 MST
 			'plugin_myanimelist',
 			'plugin_myshows',
 			'plugin_indomovie',
@@ -191,6 +193,7 @@ const storage = (chrome.storage.sync || chrome.storage.local),
 			'plugin_snagfilms',
 			'plugin_freemoviescinema',
 			'plugin_foxsearchlight',
+			'plugin_metacritic',
 
 			// Theme Settings
 			...(() => [...$('[data-option^="theme:"i]', true)].map(e => e.dataset.option))()
@@ -1934,7 +1937,6 @@ let builtins = {
 	"Hulu": "https://hulu.com/",
 	"Flickmetrix": "https://flickmetrix.com/",
 	"TVDb": "https://thetvdb.com/",
-	"Metacritic": "https://www.metacritic.com/",
 	"ShowRSS": "https://showrss.info/",
 	"Vudu": "https://vudu.com/",
 	"Movieo": "https://movieo.me/",
@@ -1950,6 +1952,7 @@ let builtins = {
 	"Web to Plex": ["https://webtoplex.github.io/web/", "https://ephellon.github.io/web.to.plex/"],
 	"Allocine": "https://allocine.fr/",
 	"Plex": "https://app.plex.tv/",
+	"Shana Project": "https://www.shanaproject.com/",
 
 	// Dont' forget to add to the __options__ array!
 }, builtin_array = [], builtin_sites = {}, builtinElement = $('#builtin');
@@ -2056,7 +2059,6 @@ addListener($('#all-builtin'), 'click', event => {
 let plugins = {
 	'Indomovie': ['https://indomovietv.club/', 'https://indomovietv.org/', 'https://indomovietv.net/'],
 	'Toloka': 'https://toloka.to/',
-	'Shana Project': 'https://www.shanaproject.com/',
 	'My Anime List': 'https://myanimelist.net/',
 	'My Shows': 'https://myshows.me/',
 	'Redbox': 'https://www.redbox.com/',
@@ -2065,6 +2067,7 @@ let plugins = {
 	'SnagFilms': 'http://snagfilms.com/',
 	'Free Movies Cinema': 'https://freemoviescinema.com/',
 	'Fox Searchlight': 'http://foxsearchlight.com/',
+	'Metacritic': 'https://www.metacritic.com/',
 
 	// Don't forget to add to the __options__ array!
 }, plugin_array = [], plugin_sites = {}, pluginElement = $('#plugins');
@@ -2544,24 +2547,30 @@ Recall['@0sec'].SetVersionInfo = async() => {
 			status;
 
 		switch(compareVer(remote, local)) {
-			case 0:
-				status = 'same';
-				verEl.setAttribute('title', `The installed version is the most recent. No update required`);
-				break;
-
 			case -1:
 				status = 'high';
-				verEl.setAttribute('title', `The installed version is ahead of GitHub. No update required`);
+				verEl.setAttribute('title', `The installed version (v${ local }) is ahead of GitHub. No update required`);
+				break;
+
+			case 0:
+				status = 'same';
+				verEl.setAttribute('title', `The installed version (v${ local }) is the most recent. No update required`);
 				break;
 
 			case 1:
 				status = 'low';
 				verEl.href += (DM? '': '/latest');
-				verEl.setAttribute('title', `The installed version is behind GitHub. Update available`);
+				verEl.setAttribute('title', `The installed version (v${ local }) is behind GitHub. Update to v${ remote } available`);
 				break;
+
+			default:
+				verEl.setAttribute('title', `An error has occured comparing Web to Plex versions ([v${ local }] \u2194 [v${ remote }])`);
+				verEl.setAttribute('status', 'low');
+				verEl.innerHTML = 'ERROR';
+				return;
 		}
 
-		verEl.innerHTML = `v${ manifest.version }`;
+		verEl.innerHTML = `v${ local }`;
 		verEl.setAttribute('status', status);
 	}