Updated to 1.3.0.0

Made changes to JS framework: titling, finding, and matching. Made small changes to style (added common.css).
SpaceK33z · Jul 23, 2018 · 2aa9695 · 2aa9695
1 parent 6a4d8a4
commit 2aa9695
Show file tree

Hide file tree

Showing 25 changed files with 57 additions and 420 deletions.
diff --git a/hhkmjeeccipbolailpomhjhmccnnjhkj.crx b/hhkmjeeccipbolailpomhjhmccnnjhkj.crx
diff --git a/hhkmjeeccipbolailpomhjhmccnnjhkj.zip b/hhkmjeeccipbolailpomhjhmccnnjhkj.zip
diff --git a/src/background.js b/src/background.js
@@ -17,7 +17,7 @@ function generateHeaders(auth) {
 function changeStatus({ id, tt, ty, tv, pv, tl, yr }) {
 
     id = id && !/^tt-?$/i.test(id)? id: null;
-    tl = tt.replace(/\-/g, ' ').replace(/\s{2,}/g, ' - ');
+    tl = tt.replace(/\-/g, ' ').replace(/[\s\:]{2,}/g, ' - ');
     tt = tt.replace(/[\-\s]+/g, '-').replace(/[^\w\-]+/g, '');
 
     external = { P: pv, Q: id, T: tt, Y: ty };
@@ -281,31 +281,31 @@ function $searchPlex(connection, headers, options) {
             let Hub = data.MediaContainer.Hub.find(hub => hub.type === type);
 
             if (!Hub || !Hub.Metadata) {
-                return {
-                    found: false
-                };
+                return { found: false };
             }
 
             // We only want to search in Plex libraries with the type "Movie", i.e. not the type "Other Videos".
             // Weirdly enough Plex doesn't seem to have an easy way to filter those libraries so we invent our own hack.
             let movies = Hub.Metadata.filter(
                 meta =>
-                    meta.Country ||
                     meta.Directory ||
                     meta.Genre ||
+                    meta.Country ||
                     meta.Role ||
                     meta.Writer
-            );
+            ),
+                strip = (string) => string.replace(/\W+/g, '').toLowerCase();
 
             // This is messed up, but Plex's definition of a year is year when it was available,
             // not when it was released (which is Movieo's definition).
             // For examples, see Bone Tomahawk, The Big Short, The Hateful Eight.
             // So we'll first try to find the movie with the given year, and then + 1 it.
-            let media = movies.find(meta => meta.year === +options.year),
+            // Added [strip] to prevent mix-ups, see: "Kingsman: The Golden Circle" v. "The Circle"
+            let media = movies.find(meta => ((meta.year === +options.year) && strip(meta.title) === strip(options.title))),
                 key = null;
 
             if (!media) {
-                media = movies.find(meta => meta.year === +options.year + 1);
+                media = movies.find(meta => ((meta.year === +options.year + 1) && strip(meta.title) === strip(options.title)));
             } else {
                 key = media.key.replace('/children', '');
             }

diff --git a/src/deps/amazon/cs.css b/src/deps/amazon/cs.css
@@ -29,23 +29,3 @@
 #tt--0-0:hover {
     background: linear-gradient(180deg, #70767d 0, #696f78 0, #3d444e 100%)!important;
 }
-
-.web-to-plex-notification {
-	cursor: pointer;
-	display: block;
-	position: fixed;
-	top: 80px;
-	left: 50%;
-	margin-left: -175px;
-	width: 350px;
-	background: #21262e;
-	color: #fff;
-	font-size: 20px;
-	padding: 10px;
-	border-radius: 4px;
-	z-index: 999000;
-}
-
-.web-to-plex-warning {
-	background: #fd6a00;
-}
diff --git a/src/deps/common.css b/src/deps/common.css
@@ -0,0 +1,24 @@
+/** Common CSS
+ * Web to Plex+
+ */
+
+.web-to-plex-notification {
+	cursor: pointer;
+	display: block;
+	position: fixed;
+	top: 80px;
+	left: 50%;
+	margin-left: -175px;
+	width: 350px;
+	background: #21262e;
+	color: #fff;
+	font-size: 20px;
+	padding: 10px;
+	border-radius: 4px;
+	z-index: 999000;
+    font-family: arial, verdana, sans-serif;
+}
+
+.web-to-plex-warning {
+	background: #fd6a00;
+}
diff --git a/src/deps/couchpotato/cs.css b/src/deps/couchpotato/cs.css
@@ -21,23 +21,3 @@
 #tt--0-0:hover {
 	color: #888!important;
 }
-
-.web-to-plex-notification {
-	cursor: pointer;
-	display: block;
-	position: fixed;
-	top: 80px;
-	left: 50%;
-	margin-left: -175px;
-	width: 350px;
-	background: #21262e;
-	color: #fff;
-	font-size: 20px;
-	padding: 10px;
-	border-radius: 4px;
-	z-index: 999000;
-}
-
-.web-to-plex-warning {
-	background: #fd6a00;
-}
diff --git a/src/deps/fandango/cs.css b/src/deps/fandango/cs.css
@@ -25,24 +25,3 @@
 #tt--0-0:hover {
     color: #888!important;
 }
-
-.web-to-plex-notification {
-	cursor: pointer;
-	display: block;
-	position: fixed;
-	top: 80px;
-	left: 50%;
-	margin-left: -175px;
-	width: 350px;
-	background: #e5a00d;
-	color: #fff;
-	font-size: 13px;
-	padding: 10px;
-	border-radius: 4px;
-	z-index: 999000;
-	font-family: Verdana, Arial, sans-serif;
-}
-
-.web-to-plex-warning {
-	background: #fd6a00;
-}
diff --git a/src/deps/flenix/cs.css b/src/deps/flenix/cs.css
@@ -42,23 +42,3 @@
 #tt--0-0:hover {
     background: #888!important;
 }
-
-.web-to-plex-notification {
-	cursor: pointer;
-	display: block;
-	position: fixed;
-	top: 80px;
-	left: 50%;
-	margin-left: -175px;
-	width: 350px;
-	background: #21262e;
-	color: #fff;
-	font-size: 20px;
-	padding: 10px;
-	border-radius: 4px;
-	z-index: 999000;
-}
-
-.web-to-plex-warning {
-	background: #fd6a00;
-}
diff --git a/src/deps/google/cs.css b/src/deps/google/cs.css
@@ -67,24 +67,3 @@
 #tt--0-0:hover {
     color: #888!important;
 }
-
-.web-to-plex-notification {
-	cursor: pointer;
-	display: block;
-	position: fixed;
-	top: 80px;
-	left: 50%;
-	margin-left: -175px;
-	width: 350px;
-	background: #e5a00d;
-	color: #fff;
-	font-size: 13px;
-	padding: 10px;
-	border-radius: 4px;
-	z-index: 999000;
-	font-family: Verdana, Arial, sans-serif;
-}
-
-.web-to-plex-warning {
-	background: #fd6a00;
-}
diff --git a/src/deps/hulu/cs.css b/src/deps/hulu/cs.css
@@ -37,24 +37,3 @@
 #tt--0-0:hover {
     color: #888!important;
 }
-
-.web-to-plex-notification {
-	cursor: pointer;
-	display: block;
-	position: fixed;
-	top: 80px;
-	left: 50%;
-	margin-left: -175px;
-	width: 350px;
-	background: #e5a00d;
-	color: #fff;
-	font-size: 13px;
-	padding: 10px;
-	border-radius: 4px;
-	z-index: 999000;
-	font-family: Verdana, Arial, sans-serif;
-}
-
-.web-to-plex-warning {
-	background: #fd6a00;
-}
diff --git a/src/deps/imdb/cs.css b/src/deps/imdb/cs.css
@@ -38,24 +38,3 @@
 #tt--0-0:hover {
     background: #888!important;
 }
-
-.web-to-plex-notification {
-	cursor: pointer;
-	display: block;
-	position: fixed;
-	top: 80px;
-	left: 50%;
-	margin-left: -175px;
-	width: 350px;
-	background: #e5a00d;
-	color: #fff;
-	font-size: 13px;
-	padding: 10px;
-	border-radius: 4px;
-	z-index: 999000;
-	font-family: Verdana, Arial, sans-serif;
-}
-
-.web-to-plex-warning {
-	background: #fd6a00;
-}
diff --git a/src/deps/itunes/cs.css b/src/deps/itunes/cs.css
@@ -36,24 +36,3 @@
 #tt--0-0:hover {
     background: #888!important;
 }
-
-.web-to-plex-notification {
-	cursor: pointer;
-	display: block;
-	position: fixed;
-	top: 80px;
-	left: 50%;
-	margin-left: -175px;
-	width: 350px;
-	background: #e5a00d;
-	color: #fff;
-	font-size: 13px;
-	padding: 10px;
-	border-radius: 4px;
-	z-index: 999000;
-	font-family: Verdana, Arial, sans-serif;
-}
-
-.web-to-plex-warning {
-	background: #fd6a00;
-}
diff --git a/src/deps/letterboxd/cs.css b/src/deps/letterboxd/cs.css
@@ -8,23 +8,3 @@
 .web-to-plex-button:hover {
     color: #f67e56!important;
 }
-
-.web-to-plex-notification {
-	cursor: pointer;
-	display: block;
-	position: fixed;
-	top: 80px;
-	left: 50%;
-	margin-left: -175px;
-	width: 350px;
-	background: #21262e;
-	color: #fff;
-	font-size: 20px;
-	padding: 10px;
-	border-radius: 4px;
-	z-index: 999000;
-}
-
-.web-to-plex-warning {
-	background: #fd6a00;
-}
diff --git a/src/deps/metacritic/cs.css b/src/deps/metacritic/cs.css
@@ -32,23 +32,3 @@
     background: #888!important;
 	border-color: #888!important;
 }
-
-.web-to-plex-notification {
-	cursor: pointer;
-	display: block;
-	position: fixed;
-	top: 80px;
-	left: 50%;
-	margin-left: -175px;
-	width: 350px;
-	background: #21262e;
-	color: #fff;
-	font-size: 20px;
-	padding: 10px;
-	border-radius: 4px;
-	z-index: 999000;
-}
-
-.web-to-plex-warning {
-	background: #fd6a00;
-}
diff --git a/src/deps/movieo/cs.css b/src/deps/movieo/cs.css
@@ -33,23 +33,3 @@
     background: #888!important;
 	border-color: #888!important;
 }
-
-.web-to-plex-notification {
-	cursor: pointer;
-	display: block;
-	position: fixed;
-	top: 80px;
-	left: 50%;
-	margin-left: -175px;
-	width: 350px;
-	background: #21262e;
-	color: #fff;
-	font-size: 20px;
-	padding: 10px;
-	border-radius: 4px;
-	z-index: 999000;
-}
-
-.web-to-plex-warning {
-	background: #fd6a00;
-}
diff --git a/src/deps/rottentomatoes/cs.css b/src/deps/rottentomatoes/cs.css
@@ -53,23 +53,3 @@
 	background-color: #888!important;
     border-color: #888!important;
 }
-
-.web-to-plex-notification {
-	cursor: pointer;
-	display: block;
-	position: fixed;
-	top: 80px;
-	left: 50%;
-	margin-left: -175px;
-	width: 350px;
-	background: #21262e;
-	color: #fff;
-	font-size: 20px;
-	padding: 10px;
-	border-radius: 4px;
-	z-index: 999000;
-}
-
-.web-to-plex-warning {
-	background: #fd6a00;
-}
diff --git a/src/deps/tmdb/cs.css b/src/deps/tmdb/cs.css
@@ -32,23 +32,3 @@
     background: #888!important;
 	border-color: #888!important;
 }
-
-.web-to-plex-notification {
-	cursor: pointer;
-	display: block;
-	position: fixed;
-	top: 80px;
-	left: 50%;
-	margin-left: -175px;
-	width: 350px;
-	background: #21262e;
-	color: #fff;
-	font-size: 20px;
-	padding: 10px;
-	border-radius: 4px;
-	z-index: 999000;
-}
-
-.web-to-plex-warning {
-	background: #fd6a00;
-}