--- misc/xbmc/plugin.video.todic/default.py	2016/11/21 22:18:33	3142
+++ misc/xbmc/plugin.video.todic/default.py	2016/11/24 18:55:35	3150
@@ -3,7 +3,7 @@
 
 '''
     Todic plugin for XBMC
-    Version 0.0.17
+    Version 0.0.21a
 '''
 
 import sys
@@ -42,41 +42,58 @@
 
     def __init__(self):
         super(TodicMovieDialog, self).__init__()
+        self.position = 0
 
     def onClick(self, controlId):
-        print "OnClick: " + str(controlId)
+        print "[Todic] MovieDialog OnClick: " + str(controlId)
 
         if (controlId == 50):
             self.close()
-            play_real_video(self.url, self.name)
+            play_real_video(self.url, self.name, 0)
+
+        if (controlId == 51):
+            self.close()
+            play_real_video(self.url, self.name, self.position)
 
         if (controlId == 98):
             self.close()
 
     def onInit(self):
 
-        print "ONINIT"
+        print "[Todic] MovieDialog ONINIT"
         self.getControl(1).setLabel(self.name)
         self.getControl(2).setLabel(self.moviegroups)
         self.getControl(3).setLabel(self.description)
         self.getControl(10).setLabel(self.playlength)
         self.getControl(11).setLabel(self.codecdetails)
 
-        orig_img_width = self.getControl(40).getWidth()
-        self.starwidth = (float(self.imdbrating) / 10.0) * orig_img_width
-        self.getControl(40).setWidth(int(self.starwidth))
+        if (self.position > 0):
+            self.getControl(51).setVisible(True)
+            self.getControl(50).setPosition(100, 570)
+            self.getControl(51).setPosition(450, 570)
+            self.getControl(50).controlLeft( self.getControl(51) )
+            self.getControl(50).controlRight( self.getControl(51) )
+        else:
+            self.getControl(51).setVisible(False)
+
+        #orig_img_width = self.getControl(40).getWidth()
+        #self.starwidth = (float(self.imdbrating) / 10.0) * orig_img_width
+        #self.getControl(40).setWidth(int(self.starwidth))
 
     def setUrl(self, url):
-        print "SETURL:" + url
+        print "[Todic] MovieDialog SETURL:" + url
         self.url = url
         self.fetchClipDetails()
 
+
+
     def fetchClipDetails(self):
         param1 = parse_parameter_string(self.url)
 
         self.clipkey = param1["clipkey"]
         print "CLIPKEY:" + self.clipkey
         detailurl = __backend__ + "&action=clipdetails&clipkey=" + self.clipkey
+        print "[Todic] detailURL = " + detailurl
 
         xml = open_url(detailurl)
 
@@ -85,6 +102,7 @@
         self.moviegroups = getText(doc.getElementsByTagName("moviegroups"))
         self.playlength = getText(doc.getElementsByTagName("playlength"))
         self.codecdetails = getText(doc.getElementsByTagName("codecdetails"))
+        self.position = int( getText(doc.getElementsByTagName("position")) )
 
     def setName(self, name):
         self.name = name
@@ -114,30 +132,33 @@
     def onPlayBackStopped(self):
         self.stopped = True
         print "[TodicPlayer] : stopped"
-        url = __backend__ + "&action=playbacktime&subaction=stopped&time=" + str( self.playingPosition )
-        open_url(url)
+        self.reportPlaytime("stopped")
+#        url = __backend__ + "&action=playbacktime&subaction=stopped&time=" + str( self.playingPosition )
+#        open_url_safe(url)
 
 
     def onPlayBackEnded(self):
         self.stopped = True
         print "[TodicPlayer] : ended"
-        url = __backend__ + "&action=playbacktime&subaction=ended&time="
-        open_url(url)
+        self.reportPlaytime("ended")
+#        url = __backend__ + "&action=playbacktime&subaction=ended&time="
+ #       open_url_safe(url)
 
     def tick(self):
-	if ( self.isPlaying() ):
+        if ( self.isPlaying() ):
             self.playingPosition = self.getTime()
             now = time()
             #print "[Todic] tick " + str(now) + " " + str(self.lastReport) + " : " +str(now - self.lastReport)
             if ( (now - self.lastReport) > 60.0):
-                self.reportPlaytime()
                 self.lastReport = now
+                self.reportPlaytime("playing")
+
             
 
 
-    def reportPlaytime(self):
-        url = __backend__ + "&action=playbacktime&subaction=playing&time=" + str( self.playingPosition )
-        open_url(url)
+    def reportPlaytime(self, subaction):
+        url = __backend__ + "&action=playbacktime&subaction=" + subaction + "&time=" + str( self.playingPosition )
+        open_url_safe(url)
         print "[Todic] reportPlaytime:" + url
 		
 
@@ -162,12 +183,14 @@
             return nodelist[0].childNodes[0].nodeValue
 
 
+
 def SaveFile(path, data):
     file = open(path, 'w')
     file.write(data)
     file.close()
 
 
+
 def open_url(url):
     req = urllib2.Request(url)
     content = urllib2.urlopen(req)
@@ -176,6 +199,16 @@
     return data
 
 
+# wraps open url in a catch-all exception handler
+# usefull for periodic back-reporting that should not interrupt the program flow
+def open_url_safe(url):
+    try:
+        return open_url(url)
+    except:
+        print "[Todic ]Some error during open_url call to ", url
+
+
+
 def rootMenu():
 
     msg = open_url(__backend__ + "&action=messages")
@@ -233,6 +266,7 @@
         description = getText(entry.getElementsByTagName("description"))
         playcount = getText(entry.getElementsByTagName("playcount"))
 
+
         if playcount == '':
             playcount = '0'
         playcount = int(playcount)
@@ -265,7 +299,7 @@
 
 def play_video(url, name, description):
     if (description == None or description == ""):
-        play_real_video(url, name)
+        play_real_video(url, name, 0) 
     else:
         d = TodicMovieDialog()
         d.setUrl(url)
@@ -275,10 +309,11 @@
         d.doModal()
 
 
-def play_real_video(url, name):
+def play_real_video(url, name, position):
     xml = open_url(url)
-    print 'TODIC url: ' + str(url)
-    print 'TODIC xml: ' + xml
+    print '[Todic] url: ' + str(url)
+    print '[Todic] xml: ' + xml
+    print '[Todic] pos: ' + str(position)
 
     doc = parseString(xml)
     url = getText(doc.getElementsByTagName("url"))
@@ -300,6 +335,8 @@
     listitem = xbmcgui.ListItem(
         label=name, iconImage='DefaultVideo.png', thumbnailImage=image)
     listitem.setInfo(type="Video", infoLabels={"Title": name})
+    listitem.setProperty('ResumeTime', '300')
+    listitem.setProperty('TotalTime', '3000')
 
     player = TodicPlayer(xbmc.PLAYER_CORE_AUTO)
     player.play(str(url), listitem)
@@ -307,11 +344,13 @@
     # kan ikke loade subtitles hvis foerend playeren koerer
     count = 0
     while not xbmc.Player().isPlaying():
-        xbmc.sleep(500)
+        xbmc.sleep(250)
         count += 1
         if count > 10:
             break
 
+
+
     if xbmc.Player().isPlaying():
         if os.path.isfile(subtitlesfile):
             player.setSubtitles(subtitlesfile)
@@ -319,14 +358,20 @@
         else:
             player.disableSubtitles()
 
-	#Holder python kørernde indtil at det bliver bedt om at stoppe
-	while (not xbmc.abortRequested):
-		player.tick()
-		xbmc.sleep(100)
+
+        if (position > 0):
+            while (player.getTotalTime() == 0.0): #Vent indtil vi har beregnet hvor langt klippet er
+                xbmc.sleep(250)
+
+            print "[Todic] totalTime " +  str( player.getTotalTime() )
+            player.seekTime(position)
 
 
+    #Holder python kørernde indtil at det bliver bedt om at stoppe
+    while (not xbmc.abortRequested):
+        player.tick()
+        xbmc.sleep(500)
 
-#	player.callbackLoop()
 
 
 def search():
@@ -408,6 +453,9 @@
 mode = None
 description = None
 
+
+#print params
+
 try:
     url = urllib.unquote_plus(params["url"])
 except:
@@ -425,6 +473,9 @@
 except:
     pass
 
+
+
+
 try:
     open_url("http://todic.dk")
 except: