Fixing several issues

README.md

@@ -1,53 +1,29 @@
-script.tvtime
-=================
+# Notice ⚠️
+TV Time has officially stopped its API and this addon for Kodi is based on it. Therefore this addon is not work anymore until further notice.
+Please see #5 for more details and alternatives
+
+# script.tvtime
 
 Kodi plugin for [TV Time](http://www.tvtime.com)
 
 This plugin will set TV shows episodes you've seen as watched on TV Time.
 It will also add the new TV show to your account if it was not already there.
 
-install
-=======
-
-This plugin has been submitted to the [official Kodi repository](http://addons.xbmc.org/show/script.tvtime/).
-To install it, just follow this [HOW-TO](http://kodi.wiki/view/HOW-TO:Install_add-ons).
-After that, launch the add-on to login.
-
-build
-=====
-
-If you want to build it manually, here is a simple script to do so:
-```sh
-#!/bin/bash
-
-dest=script.tvtime
-version=$(grep -E "^\s+version" addon.xml | cut -f2 -d'"')
+This fork has been created to be able to apply some fixes on the initial repository (hibernating/dead) but it will never be  submitted to the official Kodi repository.
+Please follow Build or Download steps below to install this version.
 
-if [ -d $dest ]; then
-    rm -r $dest
-fi
+## Build
 
-mkdir $dest
-cp addon.xml $dest/
-cp *.txt $dest/
-cp icon.png $dest/
-cp *.py $dest/
-cp -r resources $dest/
+If you want to build it manually, please follow the steps below:
 
-if [ -f $dest-$version.zip ]; then
-    rm $dest-$version.zip
-fi
+1. Clone this repository `sudo git clone https://github.com/the-lazy-fox/script.tvtime.git`
+2. Enter in script.tvtime `cd script.tvtime`
+3. Make the compile script executable `sudo chmod +x compile.sh`
+4. Launch the compile script `./compile.sh`
 
-zip -r $dest-$version.zip $dest
-rm -r $dest
-````
-It will create a zip file that you can install directly within Kodi.
-Using the GUI of Kodi, choose to install your plugin as a zip file, find your zip file and it's done !
+It will create a zip file which can be installed directly within Kodi by following this [HOW-TO](https://kodi.wiki/view/Add-on_manager#How_to_install_from_a_ZIP_file).
 
-download
-========
+## Download
 
-If you want to download the release package because you can't or don't want to build it, you can do it on this link:
-http://addons.xbmc.org/show/script.tvtime/
-or
-[download](here) the latests version.
+You can down the [last release](https://github.com/alxlaxv/script.tvtime/releases/latest) directly.
+It will download a zip file which can be installed directly within Kodi by following this [HOW-TO](https://kodi.wiki/view/Add-on_manager#How_to_install_from_a_ZIP_file).

addon.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="script.tvtime"
        name="TV Time"
-       version="1.2.0"
-       provider-name="CXII">
+       version="2.0.2"
+       provider-name="the-lazy-fox">
   <requires>
-    <import addon="xbmc.python" version="2.19.0"/>
+    <import addon="xbmc.python" version="3.0.0"/>
   </requires>
   <extension point="xbmc.python.script" library="program.py">
     <provides>executable</provides> 
@@ -19,9 +19,9 @@
     <language>en fr it</language>
     <license>GNU GENERAL PUBLIC LICENSE. Version 2, June 1991</license>
     <forum>http://forum.kodi.tv/showthread.php?tid=199604</forum>
-    <website>https://github.com/cxii-dev/script.tvtime</website>
-    <source>https://github.com/cxii-dev/script.tvtime.git</source>
-    <email>cxii-dev[AT]users[DOT]noreply[DOT]github[DOT]com</email>
+    <website>https://github.com/alxlaxv/script.tvtime</website>
+    <source>https://github.com/alxlaxv/script.tvtime.git</source>
+    <email>alxlaxv[AT]users[DOT]noreply[DOT]github[DOT]com</email>
   </extension>
 </addon>
 

program.py

@@ -6,6 +6,7 @@
 import sys
 import threading
 import xbmc
+import xbmcvfs
 import xbmcgui
 import xbmcaddon
 import unicodedata
@@ -32,7 +33,7 @@
 __version__       = __addon__.getAddonInfo('version')
 __language__      = __addon__.getLocalizedString
 __resource_path__ = os.path.join(__cwd__, 'resources', 'lib')
-__resource__      = xbmc.translatePath(__resource_path__).decode('utf-8')
+__resource__      = xbmcvfs.translatePath(__resource_path__)
 
 __token__ = __addon__.getSetting('token')
 __facebook__ = __addon__.getSetting('facebook')
@@ -42,14 +43,14 @@
 
 def start():
     menuitems = []
-    if __token__ is '':
+    if __token__ == '':
         menuitems.append(__language__(33801))
     else:
         menuitems.append(__language__(33803))
         menuitems.append(__language__(33802))
     startmenu = xbmcgui.Dialog().select(__scriptname__, menuitems)
     if startmenu < 0: return
-    elif startmenu == 0 and __token__ is '':
+    elif startmenu == 0 and __token__ == '':
         _login = GetCode()
         if _login.is_code:
             Authorization(_login.verification_url, _login.user_code, _login.device_code)
@@ -67,7 +68,7 @@ def start():
 
 def Authorization(verification_url, user_code, device_code):
     pDialog = xbmcgui.DialogProgress()
-    pDialog.create(__scriptname__, "%s: %s" % (__language__(33806), verification_url), "%s: %s" % (__language__(33807), user_code))
+    pDialog.create(__scriptname__, "%s: %s\n%s: %s" % (__language__(33806), verification_url, __language__(33807), user_code))
     for i in range(0, 100):
         pDialog.update(i)
         xbmc.sleep(5000)  
@@ -78,7 +79,7 @@ def Authorization(verification_url, user_code, device_code):
             user = GetUserInformations(_authorize.access_token)
             if user.is_authenticated:
                 if __welcome__ == 'true':
-                    xbmcgui.Dialog().ok(__scriptname__, '%s %s' % (__language__(32902), user.username), __language__(33808))
+                    xbmcgui.Dialog().ok(__scriptname__, '%s %s\n%s' % (__language__(32902), user.username, __language__(33808)))
                 __addon__.setSetting('user', user.username)
             return
     pDialog.close()
@@ -141,7 +142,7 @@ def scan(way):
         total = len(tvshowsList) 
         for tvshowList in tvshowsList:
             cpt = cpt + 1
-            pc = (cpt*100)/total
+            pc = int((cpt*100)/total)
             pDialog.update(pc, message=tvshowList['title'])
             xbmc.sleep(100)
             if tvshowList['seen'] == 1:
@@ -164,7 +165,7 @@ def scan(way):
             pDialog.update(0, message=__language__(33908))     
             for showSeen in showsSeen:
                 cpt = cpt + 1
-                pc = (cpt*100)/total
+                pc = int((cpt*100)/total)
                 tempShowsSeen.append({
                     'show_id': int(showSeen['show_id']),
                     'season': showSeen['season'],
@@ -188,7 +189,7 @@ def scan(way):
             pDialog.update(0, message=__language__(33908)) 
             for showNotSeen in showsNotSeen:
                 cpt = cpt + 1
-                pc = (cpt*100)/total
+                pc = int((cpt*100)/total)
                 tempShowsNotSeen.append({
                     'show_id': int(showNotSeen['show_id'])
                 })
@@ -221,7 +222,7 @@ def scan(way):
             for i in range(0, total):
                 for tvshowTime in tvshowTimeList:
                     if int(tvshowList[i]['show_id']) == int(tvshowTime['show_id']):
-                        pDialog.update(((100/total)*(i+1)), message=tvshowTime['title'])
+                        pDialog.update(int((100/total)*(i+1)), message=tvshowTime['title'])
                         log('setTvshowProgress(%s, %s, %s)' % (tvshowTime['show_id'], tvshowTime['season'], tvshowTime['episode']))
                         tvshowProgress = setTvshowProgress(tvshowTime['show_id'], tvshowTime['season'], tvshowTime['episode'])
         pDialog.update(100, message=__language__(33907))
@@ -236,7 +237,7 @@ def getTvshowList():
     tvshows = json.loads(result)
     log('tvshows=%s' % tvshows)  
     tvshowList = []
-    if tvshows.has_key('result') and tvshows['result'] != None and tvshows['result'].has_key('tvshows'):
+    if 'result' in tvshows and tvshows['result'] != None and 'tvshows' in tvshows['result']:
         tvshows = tvshows['result']['tvshows']
         for tvshow in tvshows:
             rpccmd = {'jsonrpc': '2.0', 'method': 'VideoLibrary.GetEpisodes', 'params': {'tvshowid': tvshow['tvshowid'], 'properties': ['season', 'episode', 'playcount']}, 'id': 1}
@@ -245,7 +246,7 @@ def getTvshowList():
             episodes = json.loads(result)
             log('tvshow=%s [%s]' % (tvshow['title'], tvshow['imdbnumber'])) 
             log('episodes[%s]=%s' % (tvshow['imdbnumber'], episodes)) 
-            if episodes.has_key('result') and episodes['result'] != None and episodes['result'].has_key('episodes'):
+            if 'result' in episodes and episodes['result'] != None and 'episodes' in episodes['result']:
                 episodes = episodes['result']['episodes']
                 lastEpisode = None
                 lastSeasonNr = 0
@@ -321,7 +322,7 @@ def setTvshowProgress(show_id, last_season_seen, last_episode_seen):
             rpccmd = json.dumps(rpccmd)
             result = xbmc.executeJSONRPC(rpccmd)
             episodes = json.loads(result)  
-            log('episodes=%s' % episodes)  
+            log('episodes=%s' % episodes)
             if episodes['result']['limits']['total'] > 0:
                 episodes = episodes['result']['episodes']
                 for episode in episodes:

resources/language/English/strings.po

@@ -41,6 +41,10 @@ msgctxt "#32303"
 msgid "Mark the http streams"
 msgstr ""
 
+msgctxt "#32304"
+msgid "Auto-follow the show if not already followed"
+msgstr ""
+
 msgctxt "#33001"
 msgid "Notifications"
 msgstr ""

resources/language/French/strings.po

@@ -41,6 +41,10 @@ msgctxt "#32303"
 msgid "Mark the http streams"
 msgstr "Marquer les flux http"
 
+msgctxt "#32304"
+msgid "Auto-follow the show if not already followed"
+msgstr "Suivre automatiquement le spectacle s'il n'est pas déjà suivi"
+
 msgctxt "#33001"
 msgid "Notifications"
 msgstr "Notifications"
@@ -91,23 +95,23 @@ msgstr "Bien"
 
 msgctxt "#35312"
 msgid "Funk"
-msgstr "Fun"
+msgstr "Drole"
 
 msgctxt "#35313"
 msgid "Wow"
 msgstr "Wow"
 
 msgctxt "#35314"
 msgid "Sad"
-msgstr "triste"
+msgstr "Triste"
 
 msgctxt "#35316"
 msgid "Soso"
-msgstr "Mitigé"
+msgstr "Bof"
 
 msgctxt "#35317"
 msgid "Bad"
-msgstr "Mauvais"
+msgstr "Nul"
 
 msgctxt "#32901"
 msgid "Please login"

resources/language/Italian/strings.po

@@ -41,6 +41,10 @@ msgctxt "#32303"
 msgid "Mark the http streams"
 msgstr "Segna i flussi http"
 
+msgctxt "#32304"
+msgid "Auto-follow the show if not already followed"
+msgstr "Segui automaticamente lo show se non è già seguito"
+
 msgctxt "#33001"
 msgid "Notifications"
 msgstr "Notifiche"