Merge pull request #435 from Razzeee/code-cleanup

Code cleanup

.travis.yml

@@ -16,7 +16,7 @@ matrix:
 
 # command to install dependencies
 install:
-  - pip install python-dateutil pytest mock python-coveralls pytest-cov
+  - pip install python-dateutil pytest mock python-coveralls pytest-cov coverage
 # command to run tests
 script:
 - py.test --cov coveralls --cov-report term-missing --cov=resources tests/

addon.xml

@@ -2,7 +2,6 @@
 <addon id="script.trakt" name="Trakt" version="3.2.1" provider-name="Trakt.tv, Razzeee">
 	<requires>
         <import addon="xbmc.python" version="2.24.0"/>
-        <import addon="script.module.simplejson" version="3.3.0"/>
         <import addon="script.module.trakt" version="2.12.0"/>
         <import addon="script.module.dateutil" version="2.4.2"/>
         <import addon="script.module.addon.signals" version="0.0.1"/>

resources/language/resource.language.da_DK/strings.po

@@ -36,10 +36,6 @@ msgctxt "#32006"
 msgid "Rate TV show Episode after watching"
 msgstr "Vurder TV-afsnit efter at være set"
 
-msgctxt "#32007"
-msgid "Rate each playlist item"
-msgstr "Vurder hvert playliste element"
-
 msgctxt "#32008"
 msgid "Minimum percent watched to display rating dialog"
 msgstr "Minimum procent set før vurderings dialog"

resources/language/resource.language.de_DE/strings.po

@@ -36,10 +36,6 @@ msgctxt "#32006"
 msgid "Rate TV show Episode after watching"
 msgstr "Bewertung nach Serien Episode abgeben"
 
-msgctxt "#32007"
-msgid "Rate each playlist item"
-msgstr "Jeden Playlist-Eintrag bewerten"
-
 msgctxt "#32008"
 msgid "Minimum percent watched to display rating dialog"
 msgstr "Minimum Prozent gesehen um Bewertungsdialog anzuzeigen"

resources/language/resource.language.el_GR/strings.po

@@ -36,10 +36,6 @@ msgctxt "#32006"
 msgid "Rate TV show Episode after watching"
 msgstr "Αξιολόγηση Επεισοδίου αφού το δείτε"
 
-msgctxt "#32007"
-msgid "Rate each playlist item"
-msgstr "Αξιολόγηση όλων των αντικειμένων της λίστας αναπ/γής"
-
 msgctxt "#32008"
 msgid "Minimum percent watched to display rating dialog"
 msgstr "Ελάχιστο ποσοστό που πρέπει να έχετε δει, για να βγει το παράθυρο αξιολόγησης"

resources/language/resource.language.en_GB/strings.po

@@ -40,10 +40,6 @@ msgctxt "#32006"
 msgid "Rate TV show Episode after watching"
 msgstr ""
 
-msgctxt "#32007"
-msgid "Rate each playlist item"
-msgstr ""
-
 msgctxt "#32008"
 msgid "Minimum percent watched to display rating dialog"
 msgstr ""

resources/language/resource.language.en_NZ/strings.po

@@ -36,10 +36,6 @@ msgctxt "#32006"
 msgid "Rate TV show Episode after watching"
 msgstr "Rate TV show Episode after watching"
 
-msgctxt "#32007"
-msgid "Rate each playlist item"
-msgstr "Rate each playlist item"
-
 msgctxt "#32008"
 msgid "Minimum percent watched to display rating dialog"
 msgstr "Minimum percent watched to display rating dialogue"

resources/language/resource.language.en_US/strings.po

@@ -36,10 +36,6 @@ msgctxt "#32006"
 msgid "Rate TV show Episode after watching"
 msgstr "Rate TV show Episode after watching"
 
-msgctxt "#32007"
-msgid "Rate each playlist item"
-msgstr "Rate each playlist item"
-
 msgctxt "#32008"
 msgid "Minimum percent watched to display rating dialog"
 msgstr "Minimum percent watched to display rating dialog"

resources/language/resource.language.es_ES/strings.po

@@ -36,10 +36,6 @@ msgctxt "#32006"
 msgid "Rate TV show Episode after watching"
 msgstr "Valorar capítulo después de verlo"
 
-msgctxt "#32007"
-msgid "Rate each playlist item"
-msgstr "Valorar cada elemento de la lista de reproducción"
-
 msgctxt "#32008"
 msgid "Minimum percent watched to display rating dialog"
 msgstr "Porcentaje mínimo para mostrar el cuadro de valoración"

resources/language/resource.language.fi_FI/strings.po

@@ -36,10 +36,6 @@ msgctxt "#32006"
 msgid "Rate TV show Episode after watching"
 msgstr "Arvostele tv-sarjan jakso katsomisen jälkeen"
 
-msgctxt "#32007"
-msgid "Rate each playlist item"
-msgstr "Arvostele soittolistan jokainen kohde"
-
 msgctxt "#32008"
 msgid "Minimum percent watched to display rating dialog"
 msgstr "Minimi prosenttimäärä katsottuna, jolloin arvostelu-ikkuna näytetään"

resources/language/resource.language.fr_CA/strings.po

@@ -36,10 +36,6 @@ msgctxt "#32006"
 msgid "Rate TV show Episode after watching"
 msgstr "Évaluer l'épisode d'émission télé après visualisation"
 
-msgctxt "#32007"
-msgid "Rate each playlist item"
-msgstr "Évaluer chaque élément de la liste de lecture"
-
 msgctxt "#32008"
 msgid "Minimum percent watched to display rating dialog"
 msgstr "Pourcentage de visualisation minimum pour afficher la fenêtre d'évaluation"

resources/language/resource.language.fr_FR/strings.po

@@ -36,10 +36,6 @@ msgctxt "#32006"
 msgid "Rate TV show Episode after watching"
 msgstr "Évaluer l'Épisode de la série TV après visionnage"
 
-msgctxt "#32007"
-msgid "Rate each playlist item"
-msgstr "Évaluer chaque élément de liste de lecture"
-
 msgctxt "#32008"
 msgid "Minimum percent watched to display rating dialog"
 msgstr "Pourcentage minimum vu pour attribuer une note"

resources/language/resource.language.he_IL/strings.po

@@ -36,10 +36,6 @@ msgctxt "#32006"
 msgid "Rate TV show Episode after watching"
 msgstr "דרג פרק סדרה לאחר צפייה"
 
-msgctxt "#32007"
-msgid "Rate each playlist item"
-msgstr "דרג כל פריט רשימת נגינה"
-
 msgctxt "#32008"
 msgid "Minimum percent watched to display rating dialog"
 msgstr "מינימום אחוזי צפייה כדי להציג מסך דירוג"

resources/language/resource.language.hr_HR/strings.po

@@ -36,10 +36,6 @@ msgctxt "#32006"
 msgid "Rate TV show Episode after watching"
 msgstr "Ocijeni TV seriju nakon gledanja"
 
-msgctxt "#32007"
-msgid "Rate each playlist item"
-msgstr "Ocijeni svaku stavku popisa izvođenja"
-
 msgctxt "#32008"
 msgid "Minimum percent watched to display rating dialog"
 msgstr "Najmanji postotak gledanja za prikaz dijaloga ocjene"

resources/language/resource.language.hu_HU/strings.po

@@ -36,10 +36,6 @@ msgctxt "#32006"
 msgid "Rate TV show Episode after watching"
 msgstr "Epizód értékelése lejátszás után"
 
-msgctxt "#32007"
-msgid "Rate each playlist item"
-msgstr "Minden lejátszási lista elem értékelése"
-
 msgctxt "#32008"
 msgid "Minimum percent watched to display rating dialog"
 msgstr "Értékelés ennyi százalék lejátszása után"

resources/language/resource.language.it_IT/strings.po

@@ -36,10 +36,6 @@ msgctxt "#32006"
 msgid "Rate TV show Episode after watching"
 msgstr "Valuta gli episodi delle serie TV dopo la visione"
 
-msgctxt "#32007"
-msgid "Rate each playlist item"
-msgstr "Valuta ogni elemento della playlist"
-
 msgctxt "#32008"
 msgid "Minimum percent watched to display rating dialog"
 msgstr "Percentuale minima per visualizzare la votazione"

resources/language/resource.language.ko_KR/strings.po

@@ -36,10 +36,6 @@ msgctxt "#32006"
 msgid "Rate TV show Episode after watching"
 msgstr "시청 후 TV 쇼 에피소드 평가"
 
-msgctxt "#32007"
-msgid "Rate each playlist item"
-msgstr "재생목록 항목 평가"
-
 msgctxt "#32008"
 msgid "Minimum percent watched to display rating dialog"
 msgstr "평가를 위해 시청해야 할 최소 분량(%)"

resources/language/resource.language.lt_LT/strings.po

@@ -36,10 +36,6 @@ msgctxt "#32006"
 msgid "Rate TV show Episode after watching"
 msgstr "Įvertinti TV laidos epizodą peržiūrėjus"
 
-msgctxt "#32007"
-msgid "Rate each playlist item"
-msgstr "Įvertinti kiekvieną grojaraščio elementą"
-
 msgctxt "#32008"
 msgid "Minimum percent watched to display rating dialog"
 msgstr "Minimalus peržiūrėjimo procentas įvertinimo dialogo rodymui"

resources/language/resource.language.nb_NO/strings.po

@@ -36,10 +36,6 @@ msgctxt "#32006"
 msgid "Rate TV show Episode after watching"
 msgstr "Gi vurdering på Tv-program etter å ha sett"
 
-msgctxt "#32007"
-msgid "Rate each playlist item"
-msgstr "Gi vurdering på alle elementer i spillelisten"
-
 msgctxt "#32008"
 msgid "Minimum percent watched to display rating dialog"
 msgstr "Minimum prosent sett for å spørre om vurdering"

resources/language/resource.language.nl_NL/strings.po

@@ -36,10 +36,6 @@ msgctxt "#32006"
 msgid "Rate TV show Episode after watching"
 msgstr "Geef cijfer aan aflevering na bekijken"
 
-msgctxt "#32007"
-msgid "Rate each playlist item"
-msgstr "Beoordeel ieder afspeellijst item"
-
 msgctxt "#32008"
 msgid "Minimum percent watched to display rating dialog"
 msgstr "Minimum bekeken percentage om beoordelingsscherm te tonen"

resources/language/resource.language.pl_PL/strings.po

@@ -36,10 +36,6 @@ msgctxt "#32006"
 msgid "Rate TV show Episode after watching"
 msgstr "Oceniaj odcinek po obejrzeniu"
 
-msgctxt "#32007"
-msgid "Rate each playlist item"
-msgstr "Oceniaj każdą pozycję listy odtwarzania"
-
 msgctxt "#32008"
 msgid "Minimum percent watched to display rating dialog"
 msgstr "Min. procent obejrzenia do pokazania okna oceny"

resources/language/resource.language.pt_BR/strings.po

@@ -36,10 +36,6 @@ msgctxt "#32006"
 msgid "Rate TV show Episode after watching"
 msgstr "Avaliar o Episódio de TV após assistir"
 
-msgctxt "#32007"
-msgid "Rate each playlist item"
-msgstr "Avaliar cada item da lista de reprodução"
-
 msgctxt "#32008"
 msgid "Minimum percent watched to display rating dialog"
 msgstr "Percentual mínimo de assistido para apresentar o diálogo de avaliação"

resources/language/resource.language.pt_PT/strings.po

@@ -36,10 +36,6 @@ msgctxt "#32006"
 msgid "Rate TV show Episode after watching"
 msgstr "Classificar Episódio após visualização"
 
-msgctxt "#32007"
-msgid "Rate each playlist item"
-msgstr "Classificar cada item da lista de reprodução"
-
 msgctxt "#32008"
 msgid "Minimum percent watched to display rating dialog"
 msgstr "Percentagem mínima para aparecer o diálogo de classificação"

resources/language/resource.language.sk_SK/strings.po

@@ -36,10 +36,6 @@ msgctxt "#32006"
 msgid "Rate TV show Episode after watching"
 msgstr "Ohodnotiť epizódu seriálu po pozretí"
 
-msgctxt "#32007"
-msgid "Rate each playlist item"
-msgstr "Ohodnotiť každú položku playlistu"
-
 msgctxt "#32008"
 msgid "Minimum percent watched to display rating dialog"
 msgstr "Hodnotiť po pozretí minimálne X percent"

resources/language/resource.language.sv_SE/strings.po

@@ -36,10 +36,6 @@ msgctxt "#32006"
 msgid "Rate TV show Episode after watching"
 msgstr "Betygsätt TV-serie avsnitt efter visning"
 
-msgctxt "#32007"
-msgid "Rate each playlist item"
-msgstr "Betygsätt spellistinnehåll "
-
 msgctxt "#32008"
 msgid "Minimum percent watched to display rating dialog"
 msgstr "Minst sedd andel (i procent) för att visa dialogruta för betygsättning"

resources/lib/kodiUtilities.py

@@ -4,17 +4,13 @@
 import xbmc
 import xbmcgui
 import xbmcaddon
+import json
 import re
 import sys
 import logging
 from resources.lib import utilities
 
 
-if sys.version_info >= (2, 7):
-    import json as json
-else:
-    import simplejson as json
-
 # read settings
 __addon__ = xbmcaddon.Addon('script.trakt')
 

resources/lib/rating.py

@@ -13,21 +13,18 @@
 
 __addon__ = xbmcaddon.Addon("script.trakt")
 
-def ratingCheck(media_type, summary_info, watched_time, total_time, playlist_length):
+def ratingCheck(media_type, items_to_rate, watched_time, total_time):
     """Check if a video should be rated and if so launches the rating dialog"""
     logger.debug("Rating Check called for '%s'" % media_type)
     if not kodiUtilities.getSettingAsBool("rate_%s" % media_type):
         logger.debug("'%s' is configured to not be rated." % media_type)
         return
-    if summary_info is None:
+    if items_to_rate is None:
         logger.debug("Summary information is empty, aborting.")
         return
     watched = (watched_time / total_time) * 100
     if watched >= kodiUtilities.getSettingAsFloat("rate_min_view_time"):
-        if (playlist_length <= 1) or kodiUtilities.getSettingAsBool("rate_each_playlist_item"):
-            rateMedia(media_type, summary_info)
-        else:
-            logger.debug("Rate each playlist item is disabled.")
+        rateMedia(media_type, items_to_rate)
     else:
         logger.debug("'%s' does not meet minimum view time for rating (watched: %0.2f%%, minimum: %0.2f%%)" % (media_type, watched, kodiUtilities.getSettingAsFloat("rate_min_view_time")))
 
@@ -88,17 +85,15 @@ def rateMedia(media_type, itemsToRate, unrate=False, rating=None):
         gui = RatingDialog(
             "script-trakt-RatingDialog.xml",
             __addon__.getAddonInfo('path'),
-            media_type=media_type,
-            media=summary_info,
-            rerate=rerate
+            media_type,
+            summary_info,
+            rerate
         )
 
         gui.doModal()
         if gui.rating:
             rating = gui.rating
             if rerate:
-                rating = gui.rating
-
                 if summary_info['user']['ratings'] and summary_info['user']['ratings']['rating'] > 0 and rating == summary_info['user']['ratings']['rating']:
                     rating = 0
 
@@ -183,7 +178,7 @@ class RatingDialog(xbmcgui.WindowXMLDialog):
         11039: 32027
     }
 
-    def __init__(self, xmlFile, resourcePath, forceFallback=False, media_type=None, media=None, rerate=False):
+    def __init__(self, xmlFile, resourcePath, media_type, media, rerate):
         self.media_type = media_type
         self.media = media
         self.rating = None

resources/lib/script.py

@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
-from resources.lib import utilities
-from resources.lib import kodiUtilities
 import xbmc
-from resources.lib import sqlitequeue
 import sys
 import logging
+from resources.lib import utilities
+from resources.lib import kodiUtilities
+from resources.lib import sqlitequeue
 from resources.lib.traktContextMenu import traktContextMenu
 
 logger = logging.getLogger(__name__)

resources/lib/scrobbler.py

@@ -23,7 +23,6 @@ class Scrobbler():
     pausedAt = 0
     curVideo = None
     curVideoInfo = None
-    playlistLength = 1
     playlistIndex = 0
     traktShowSummary = None
     videosToRate = []
@@ -105,11 +104,7 @@ def playbackStarted(self, data):
                 else:
                     self.videoDuration = 1
 
-            self.playlistLength = len(xbmc.PlayList(xbmc.PLAYLIST_VIDEO))
             self.playlistIndex = xbmc.PlayList(xbmc.PLAYLIST_VIDEO).getposition()
-            if self.playlistLength == 0:
-                logger.debug("Warning: Cant find playlist length, assuming that this item is by itself")
-                self.playlistLength = 1
 
             self.isMultiPartEpisode = False
             if utilities.isMovie(self.curVideo['type']):
@@ -246,13 +241,12 @@ def playbackEnded(self):
         if self.watchedTime != 0:
             if 'type' in self.curVideo:
                 self.__scrobble('stop')
-                ratingCheck(self.curVideo['type'], self.videosToRate, self.watchedTime, self.videoDuration, self.playlistLength)
+                ratingCheck(self.curVideo['type'], self.videosToRate, self.watchedTime, self.videoDuration)
             self.watchedTime = 0
             self.isMultiPartEpisode = False
         self.videosToRate = []
         self.curVideoInfo = None
         self.curVideo = None
-        self.playlistLength = 0
         self.playlistIndex = 0
 
     def __calculateWatchedPercent(self):