Updated to 1.2.1.2

Made minor fixes to utils.js (rerun-searchfeature). Added button location images.
SpaceK33z · Jun 7, 2018 · c7cac01 · c7cac01
1 parent 6fafb8c
commit c7cac01
Show file tree

Hide file tree

Showing 26 changed files with 33 additions and 27 deletions.
diff --git a/README.md b/README.md
@@ -16,25 +16,25 @@ Optionally, you can configure [Sonarr](https://sonarr.tv/) (TV Shows), [Radarr](
 
 ## Supported sites: *Site (button location)*
 
-- [Movieo](http://movieo.me/) (top of page, by ratings)
-- [IMDb](http://imdb.com/) (bottom right of poster)
-- [Trakt.tv](https://trakt.tv/) (below poster, with other links)
-- [Letterboxd](https://letterboxd.com/) ("watch" section under poster, last item)
-- [Flenix](https://flenix.co/)<sup>1</sup> (several locations: 1 in header, 1 above video, 1 below)
-- [TV Maze](http://www.tvmaze.com/) (below title on far right, by "Gallery")
-- [The TVDb](https://www.thetvdb.com/) (top of info. list, under languages)
-- [The MovieDb](https://www.themoviedb.org/) (far right of icons, before "play trailer")
-- [VRV](https://vrv.co/)<sup>2</sup> (below title, right of "watchlist" button)
-- [Hulu](https://hulu.com/)<sup>2/3/4</sup> (below video, far right of icons)
-- [Google Play Store](https://play.google.com/store/movies/) (right of poster, with purchasing options)
-- [iTunes](https://itunes.apple.com/)<sup>3</sup> (below "watch on iTunes" button)
-- [Metacritic](http://www.metacritic.com/)<sup>4</sup> (last/rightmost social icon)
-- [Fandango](https://www.fandango.com/) (between title and video, left of "more" menu)
-- [Amazon](https://www.amazon.com/) (with purchasing and watchlist options, far right)
-- [Vudu](https://www.vudu.com/) (right of poster, above "synopsis")
-- [Verizon](https://www.tv.verizon.com/) (right of "watch" button, left of poster)
-- [CouchPotato](http://couchpotato.life/) (right of IMDb rating)
-- [Rotten Tomatoes](https://www.rottentomatoes.com/) (under "Collection" or "Episode List" button)
+- [Movieo](http://movieo.me/) [button location](button-locations/movieo.png)
+- [IMDb](http://imdb.com/) [button location](button-locations/imdb.png)
+- [Trakt.tv](https://trakt.tv/) [button location](button-locations/trakt.png)
+- [Letterboxd](https://letterboxd.com/) [button location](button-locations/letterboxd.png)
+- [Flenix](https://flenix.co/)<sup>1</sup> [button locations](button-locations/flenix.png)
+- [TV Maze](http://www.tvmaze.com/) [button location](button-locations/tvmaze.png)
+- [The TVDb](https://www.thetvdb.com/) [button location](button-locations/tvdb.png)
+- [The MovieDb](https://www.themoviedb.org/) [button location](button-locations/tmdb.png)
+- [VRV](https://vrv.co/)<sup>2</sup> [button location](button-locations/vrv.png)
+- [Hulu](https://hulu.com/)<sup>2/3/4</sup> [button location](button-locations/hulu.png)
+- [Google Play Store](https://play.google.com/store/movies/) [button location](button-locations/google.png)
+- [iTunes](https://itunes.apple.com/)<sup>3</sup> [button location](button-locations/itunes.png)
+- [Metacritic](http://www.metacritic.com/)<sup>4</sup> [button location](button-locations/metacritic.png)
+- [Fandango](https://www.fandango.com/) [button location](button-locations/fandango.png)
+- [Amazon](https://www.amazon.com/) [button location](button-locations/amazon.png)
+- [Vudu](https://www.vudu.com/) [button location](button-locations/vudu.png)
+- [Verizon](https://www.tv.verizon.com/) [button location](button-locations/verizon.png)
+- [CouchPotato](http://couchpotato.life/) [button location](button-locations/couch-potato.png)
+- [Rotten Tomatoes](https://www.rottentomatoes.com/) [button location](button-locations/rotten-tomatoes.png)
 
 *Notes*
 
@@ -45,10 +45,12 @@ Optionally, you can configure [Sonarr](https://sonarr.tv/) (TV Shows), [Radarr](
 
 ## In Progress sites (adding support):
 
-- [Netflix](https://netflix.com/)<sup>3</sup>
+- Nothing here... for now
 
 ## En Progress sites (may add support):
 
+- [Netflix](https://netflix.com/)<sup>3</sup>
+
 ## Installing Web to Plex+
 
 - **Download the [CRX](https://github.com/Ephellon/web-to-plex/raw/master/hhkmjeeccipbolailpomhjhmccnnjhkj.crx)**

diff --git a/button-locations/amazon.png b/button-locations/amazon.png
diff --git a/button-locations/couch-potato.png b/button-locations/couch-potato.png
diff --git a/button-locations/fandango.png b/button-locations/fandango.png
diff --git a/button-locations/flenix.png b/button-locations/flenix.png
diff --git a/button-locations/google.png b/button-locations/google.png
diff --git a/button-locations/hulu.png b/button-locations/hulu.png
diff --git a/button-locations/imdb.png b/button-locations/imdb.png
diff --git a/button-locations/itunes.png b/button-locations/itunes.png
diff --git a/button-locations/letterboxd.png b/button-locations/letterboxd.png
diff --git a/button-locations/metacritic.png b/button-locations/metacritic.png
diff --git a/button-locations/movieo.png b/button-locations/movieo.png
diff --git a/button-locations/rotten-tomatoes.png b/button-locations/rotten-tomatoes.png
diff --git a/button-locations/tmdb.png b/button-locations/tmdb.png
diff --git a/button-locations/trakt.png b/button-locations/trakt.png
diff --git a/button-locations/tvdb.png b/button-locations/tvdb.png
diff --git a/button-locations/tvmaze.png b/button-locations/tvmaze.png
diff --git a/button-locations/verizon.png b/button-locations/verizon.png
diff --git a/button-locations/vrv.png b/button-locations/vrv.png
diff --git a/button-locations/vudu.png b/button-locations/vudu.png
diff --git a/hhkmjeeccipbolailpomhjhmccnnjhkj.crx b/hhkmjeeccipbolailpomhjhmccnnjhkj.crx
diff --git a/hhkmjeeccipbolailpomhjhmccnnjhkj.zip b/hhkmjeeccipbolailpomhjhmccnnjhkj.zip
diff --git a/src/deps/itunes/cs.js b/src/deps/itunes/cs.js
@@ -31,9 +31,9 @@ async function initPlexThingy(type) {
 	if (!$button)
 		return;
 
-	let meta = document.querySelector('h1[itemprop="name"], h1'),
-        title = meta.textContent.replace(/\s*\((\d+)\)\s*/, '').trim(),
-        year = +RegExp.$1;
+	let meta = [document.querySelector('h1[itemprop="name"], h1'), document.querySelector('.release-date > *:last-child')],
+        title = meta[0].textContent.replace(/\s*\((\d+)\)\s*/, '').trim(),
+        year = meta[1].textContent.replace(/[^]*(\d{4})[^]*?$/g, '$1').trim();
 
     let Db = await getIDs({ title, year, type }),
         IMDbID = Db.imdb,

diff --git a/src/deps/vudu/cs.js b/src/deps/vudu/cs.js
@@ -67,6 +67,8 @@ async function initPlexThingy(type) {
     title = Db.title;
     year = Db.year;
 
+    console.log(title, year, Db);
+
 	findPlexMedia({ type, title, year, button: $button, IMDbID, TMDbID, TVDbID });
 }
 

diff --git a/src/manifest.json b/src/manifest.json
@@ -6,7 +6,7 @@
     "homepage_url": "https://github.com/Ephellon/web-to-plex/",
 
 	"manifest_version": 2,
-    "version": "1.2.1.1",
+    "version": "1.2.1.2",
 // Firefox Support =>
 //    "applications": {
 //        "gecko": {

diff --git a/src/utils.js b/src/utils.js
@@ -122,7 +122,7 @@ function parseOptions() {
         );
 }
 
-async function getIDs({ title, year, type, IMDbID, TMDbID, TVDbID, APIType, APIID, meta }) {
+async function getIDs({ title, year, type, IMDbID, TMDbID, TVDbID, APIType, APIID, meta, rerun }) {
     let json = {},
         data = {},
         promise,
@@ -152,7 +152,7 @@ async function getIDs({ title, year, type, IMDbID, TMDbID, TVDbID, APIType, APII
     function plus(string) { return string.replace(/\s+/g, '+') }
 
     let url =
-        (rqut === 'imdb' || (rqut === '*' && !iid && title))?
+        (rqut === 'imdb' || (rqut === '*' && !iid && title) || (rqut === 'tvdb' && !iid && title && rerun))?
             (year)?
                 `${ cors }http://theapache64.com/movie_db/search?keyword=${ plus(title) }+${ year }`:
 //                `https://www.omdbapi.com/?t=${ plus(title) }&y=${ year }&apikey=${ api.omdb }`:
@@ -270,7 +270,9 @@ async function getIDs({ title, year, type, IMDbID, TMDbID, TVDbID, APIType, APII
         json = found;
     }
 
-    if(!json)
+    if(!json && !rerun)
+        return json = getIDs({ title, year: YEAR, type, IMDbID, TMDbID, TVDbID, APIType, APIID, meta, rerun: true });
+    else if(!json)
         json = {};
 
     var ei = 'tt-';