From c7479a9421cf322bd5a6d3792a41c715c0e3313a Mon Sep 17 00:00:00 2001
From: oddluck <39967334+oddluck@users.noreply.github.com>
Date: Sun, 23 Feb 2020 23:06:01 +0000
Subject: [PATCH] SpiffyTitles/IMDB: fix meta/tomato scores

---
 IMDB/.plugin.py.swp    | Bin 0 -> 1024 bytes
 IMDB/config.py         |   2 +-
 IMDB/plugin.py         |  22 ++++++++++++++++++++--
 SpiffyTitles/config.py |   2 +-
 SpiffyTitles/plugin.py |  11 +++++++++--
 5 files changed, 31 insertions(+), 6 deletions(-)
 create mode 100644 IMDB/.plugin.py.swp

diff --git a/IMDB/.plugin.py.swp b/IMDB/.plugin.py.swp
new file mode 100644
index 0000000000000000000000000000000000000000..7b63f830f6db6d6b3ddc6688c09814e11df39921
GIT binary patch
literal 1024
zcmYc?$V<%2S1{HyVn6{tAq)%!l_eQ@NhQT75?DBydBr7(dC94|hFBz#g!D7=b5r$U
srt0Tp=H}%WWhUwt<dmiZ&CvJsb#c;%aP$f)ku;7nM?+vV1ZWZh01_=69RL6T

literal 0
HcmV?d00001

diff --git a/IMDB/config.py b/IMDB/config.py
index 65958b5..062d45a 100644
--- a/IMDB/config.py
+++ b/IMDB/config.py
@@ -28,7 +28,7 @@ def configure(advanced):
 IMDB = conf.registerPlugin('IMDB')
 
 conf.registerGlobalValue(IMDB, 'template',
-     registry.String("\x02\x031,8 IMDb \x0F\x02 | $title ($year, $country, [$rated], $genre, $runtime) | IMDB: $imdbRating MC: $metascore% | http://imdb.com/title/$imdbID | $plot | Director: $director | Writer: $writer | Actors: $actors", _("""Template for the output of a search query.""")))
+     registry.String("\x02\x031,8 IMDb \x0F\x02 | $title ($year, $country, [$rated], $genre, $runtime) | IMDB: $imdbRating | MC: $metascore | RT: $tomatoMeter | http://imdb.com/title/$imdbID | $plot | Director: $director | Writer: $writer | Actors: $actors", _("""Template for the output of a search query.""")))
 
 # alternative template:
 #                     $title ($year - $director) :: [i:$imdbRating r:$tomatoMeter m:$metascore] $plot :: http://imdb.com/title/$imdbID
diff --git a/IMDB/plugin.py b/IMDB/plugin.py
index ab31ef8..149050c 100644
--- a/IMDB/plugin.py
+++ b/IMDB/plugin.py
@@ -78,6 +78,8 @@ class IMDB(callbacks.Plugin):
                 if not_found or unknown_error:
                     self.log.info("IMDB: OMDB error for %s" % (omdb_url))
                 else:
+                    meta = None
+                    tomato = None
                     imdb_template = self.registryValue("template")
                     if sys.version_info[0] < 3:
                         imdb_template = imdb_template.decode("utf-8")
@@ -88,8 +90,19 @@ class IMDB(callbacks.Plugin):
                     imdb_template = imdb_template.replace("$plot", response["Plot"])
                     imdb_template = imdb_template.replace("$imdbID", response["imdbID"])
                     imdb_template = imdb_template.replace("$imdbRating", response["imdbRating"])
-                    imdb_template = imdb_template.replace("$tomatoMeter", response["tomatoMeter"])
-                    imdb_template = imdb_template.replace("$metascore", response["Metascore"])
+                    for rating in response["Ratings"]:
+                        if rating["Source"] == "Rotten Tomatoes":
+                            tomato = rating["Value"]
+                        if rating["Source"] == "Metacritic":
+                            meta = "{0}%".format(rating["Value"].split('/')[0])
+                    if meta:
+                        imdb_template = imdb_template.replace("$metascore", meta)
+                    else:
+                        imdb_template = imdb_template.replace("$metascore", "N/A")
+                    if tomato:
+                        imdb_template = imdb_template.replace("$tomatoMeter", tomato)
+                    else:
+                        imdb_template = imdb_template.replace("$tomatoMeter", "N/A")
                     imdb_template = imdb_template.replace("$released",response["Released"])
                     imdb_template = imdb_template.replace("$genre",response["Genre"])
                     imdb_template = imdb_template.replace("$released",response["Released"])
@@ -98,6 +111,11 @@ class IMDB(callbacks.Plugin):
                     imdb_template = imdb_template.replace("$rated",response["Rated"])
                     imdb_template = imdb_template.replace("$runtime",response["Runtime"])
                     imdb_template = imdb_template.replace("$writer",response["Writer"])
+                    imdb_template = imdb_template.replace("$votes",response["imdbVotes"])
+                    imdb_template = imdb_template.replace("$boxOffice",response["BoxOffice"])
+                    imdb_template = imdb_template.replace("$production",response["Production"])
+                    imdb_template = imdb_template.replace("$website",response["Website"])
+                    imdb_template = imdb_template.replace("$poster",response["Poster"])
 
                     result = imdb_template
             else:
diff --git a/SpiffyTitles/config.py b/SpiffyTitles/config.py
index a5eae89..1fcdf1e 100644
--- a/SpiffyTitles/config.py
+++ b/SpiffyTitles/config.py
@@ -270,7 +270,7 @@ conf.registerChannelValue(SpiffyTitles.imdb, 'logo',
 
 # IMDB template
 conf.registerChannelValue(SpiffyTitles.imdb, 'template',
-     registry.String("^ {{imdb_logo}} :: {{title}} ({{year}}, {{country}}, [{{rated}}], {{genre}}, {{runtime}}) ::  IMDB: {{imdb_rating}} MC: {{metascore}} :: {{plot}}", _("""IMDB title template""")))
+     registry.String("^ {{imdb_logo}} :: {{title}} ({{year}}, {{country}}, [{{rated}}], {{genre}}, {{runtime}}) ::  IMDB: {{imdb_rating}} | MC: {{metascore}} | RT: {{tomatoMeter}} :: {{plot}}", _("""IMDB title template""")))
 
 
 
diff --git a/SpiffyTitles/plugin.py b/SpiffyTitles/plugin.py
index ce5a2fa..39411cb 100644
--- a/SpiffyTitles/plugin.py
+++ b/SpiffyTitles/plugin.py
@@ -1100,6 +1100,13 @@ class SpiffyTitles(callbacks.Plugin):
                     if not_found or unknown_error:
                         log.debug("SpiffyTitles: OMDB error for %s" % (omdb_url))
                     else:
+                        meta = "N/A"
+                        tomato = "N/A"
+                        for rating in response["Ratings"]:
+                            if rating["Source"] == "Rotten Tomatoes":
+                                tomato = rating["Value"]
+                            if rating["Source"] == "Metacritic":
+                                meta = "{0}%".format(rating["Value"].split('/')[0])
                         template_vars = {
                             "title": response["Title"],
                             "year": response["Year"],
@@ -1108,8 +1115,8 @@ class SpiffyTitles(callbacks.Plugin):
                             "plot": response["Plot"],
                             "imdb_id": response["imdbID"],
                             "imdb_rating": response["imdbRating"],
-                            "tomatoMeter": response["tomatoMeter"],
-                            "metascore": response["Metascore"],
+                            "tomatoMeter": tomato,
+                            "metascore": meta,
                             "released": response["Released"],
                             "genre": response["Genre"],
                             "awards": response["Awards"],