From fee8b958de16b7ae4c308da65cfc5b7019c3e1f7 Mon Sep 17 00:00:00 2001
From: angelblue05 <tamara.angel05@gmail.com>
Date: Sat, 8 Aug 2015 07:16:51 -0500
Subject: [PATCH] Adjust mpaa rating and quick fix for ratio

---
 resources/lib/API.py              | 39 +++++++++++++++++--------------
 resources/lib/WriteKodiVideoDB.py |  4 ++--
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/resources/lib/API.py b/resources/lib/API.py
index af6e5488..4296ad7c 100644
--- a/resources/lib/API.py
+++ b/resources/lib/API.py
@@ -142,9 +142,10 @@ class API():
                     videotrack['height'] = mediaStream.get('Height')
                     videotrack['width'] = mediaStream.get('Width')
                     videotrack['Video3DFormat'] = item.get('Video3DFormat')
-                    try:# Metadata aspect ratio
+                    if item.get('AspectRatio'):
+                        # Metadata aspect ratio
                         videotrack['aspectratio'] = item['AspectRatio']
-                    except: # File aspect ratio
+                    else: # File aspect ratio
                         videotrack['aspectratio'] = mediaStream.get('AspectRatio', "0")
                     if len(videotrack['aspectratio']) >= 3:
                         try:
@@ -296,40 +297,35 @@ class API():
     
     def getDateCreated(self, item):
 
-        dateadded = None
-
         try:
             dateadded = item['DateCreated']
             dateadded = dateadded.split('.')[0].replace('T', " ")
-        except: pass
+        except:
+            dateadded = None
 
         return dateadded
 
     def getPremiereDate(self, item):
 
-        premiere = None
-
         try:
             premiere = item['PremiereDate']
             premiere = premiere.split('.')[0].replace('T', " ")
-        except: pass
+        except:
+            premiere = None
 
         return premiere
 
     def getTagline(self, item):
 
-        tagline = None
-
         try:
             tagline = item['Taglines'][0]
-        except: pass
+        except:
+            tagline = None
 
         return tagline
 
     def getProvider(self, item, providername):
         # Provider Name: imdb or tvdb
-        provider = None
-
         try:
             if "imdb" in providername:
                 provider = item['ProviderIds']['Imdb']
@@ -341,20 +337,29 @@ class API():
                 provider = item['ProviderIds']['MusicBrainzAlbum']
             elif "musicBrainzTrackId" in providername:
                 provider = item['ProviderIds']['MusicBrainzTrackId']
-        except: pass
+        except:
+            provider = None
 
         return provider
 
     def getCountry(self, item):
 
-        country = None
-
         try:
             country = item['ProductionLocations'][0]
-        except: pass
+        except:
+            country = None
 
         return country
 
+    def getMpaa(self, item):
+        # Convert more complex cases
+        mpaa = item.get('OfficialRating', "")
+        if "NR" in mpaa:
+            # Kodi seems to not like NR, but will accept Rated Not Rated
+            mpaa = "Rated Not Rated"
+
+        return mpaa
+
     def getArtworks(self, data, type, mediaType = "", index = "0", getAll = False):
 
         """
diff --git a/resources/lib/WriteKodiVideoDB.py b/resources/lib/WriteKodiVideoDB.py
index 81b8ed05..d6c6a361 100644
--- a/resources/lib/WriteKodiVideoDB.py
+++ b/resources/lib/WriteKodiVideoDB.py
@@ -114,7 +114,7 @@ class WriteKodiVideoDB():
         imdb = API().getProvider(MBitem, "imdb")
         sorttitle = MBitem['SortName']
         runtime = timeInfo.get('TotalTime')
-        mpaa = MBitem.get('OfficialRating')
+        mpaa = API().getMpaa(MBitem)
         genre = " / ".join(genres)
         director = " / ".join(people.get('Director'))
         studio = " / ".join(studios)
@@ -469,7 +469,7 @@ class WriteKodiVideoDB():
         premieredate = API().getPremiereDate(MBitem)
         genre = " / ".join(genres)
         tvdb = API().getProvider(MBitem, "tvdb")
-        mpaa = MBitem.get('OfficialRating')
+        mpaa = API().getMpaa(MBitem)
         studio = " / ".join(studios)
         sorttitle = MBitem['SortName']