--- misc/xbmc/plugin.video.todic/default.py	2011/12/04 15:06:39	1649
+++ misc/xbmc/plugin.video.todic/default.py	2012/08/19 20:41:20	1830
@@ -1,3 +1,6 @@
+
+# This Python file uses the following encoding: utf-8
+
 '''
     Todic plugin for XBMC
     Version 0.0.2
@@ -13,13 +16,65 @@
 import xbmcgui
 import xbmcplugin
 import urllib
-import urllib2, re
+import urllib2
+
+from xml.dom.minidom import parseString
 
 __addon__ = xbmcaddon.Addon(id='plugin.video.todic')
 __key__ = __addon__.getSetting('xbmckey').lower()
 __backend__ = "http://todic.dk/xbmc.php?xbmckey=" + __key__
 fanartImage = os.path.join(__addon__.getAddonInfo('path'), 'fanart.jpg')
 
+
+class TodicPlayer(xbmc.Player):
+	def __init__(self, *args, **kwargs):
+		#xbmc.Player.__init__(selv,*args,**kwargs)
+		xbmc.Player.__init__(self, xbmc.PLAYER_CORE_MPLAYER )
+		self.stopped = False
+		self.started = False
+		print "[TodicPlayer] init"
+
+#	@catchall	
+	def onPlayBackStarted(self):
+		self.started = True
+		print "[TodicPlayer] : started"
+#		super.onPlayBackStarted()
+
+	def onPlayBackStopped(self):
+		self.stopped = True
+		print "[TodicPlayer] : stopped"
+
+	def onPlayBackEnded(self):
+		self.stopped = True
+		print "[TodicPlayer] : ended"
+
+	def callbackLoop(self):
+		print "[Todic] startLoop"
+		while (self.stopped == False):
+			if (self.started == True ):
+				print "[todic] " + str(self.getTime())
+			xbmc.sleep(5000)
+			
+
+def getText2(nodelist):
+	rc = []
+	for node in nodelist:
+		if node.nodeType == node.TEXT_NODE:
+			rc.append(node.data)
+		else:
+			rc.append( getText(node.childNodes) )
+	return ''.join(rc)
+
+def getText(nodelist):
+	if nodelist.length == 0:
+		return ''
+	else:
+		if nodelist[0].childNodes.length == 0:
+			return ''
+		else:
+			return nodelist[0].childNodes[0].nodeValue
+
+
 def open_url(url):
 	req = urllib2.Request(url)
 	content = urllib2.urlopen(req)
@@ -29,7 +84,14 @@
 
 def rootMenu():
 
-	buildList(__backend__, "") # call default list
+	msg = open_url(__backend__ + "&action=messages")
+	msg = msg.strip()
+
+	if msg != "":
+		dialog = xbmcgui.Dialog()		
+		dialog.ok('XBMC Todic', msg)
+
+	buildList(__backend__, "", False) # call default list
 
 	# Adde xtra items to root menu
 	listitem = xbmcgui.ListItem(label = "Søg film ...", iconImage = 'DefaultFolder.png', thumbnailImage = 'DefaultFolder.png')
@@ -41,48 +103,79 @@
 	xbmcplugin.endOfDirectory(int(sys.argv[1]))
 
 
-def buildList(url,title):
+def buildList(url,title, endlist=True):
         print '[TODIC]:'+str(url)        
+
         link = open_url(url)
-        ty=re.compile('<meta type=\'(.+?)\'').findall(link)
-        print '[TODIC]'+str(ty[0])
+	doc = parseString(link)
+	ty = doc.getElementsByTagName("meta")[0].getAttribute("type")
+        print '[TODIC]'+str(ty)
 
-        if ty[0] == 'clipList':
+        if ty == 'clipList':
                 mode = '50'
                 folder = False
         else:
                 mode = '1'
                 folder = True
 
-        m=re.compile('<title>(.+?)</title><url>(.+?)</url><cover>(.+?)</cover><description>(.*)</description>').findall(link)
-	l=len(m)
-        for name,url,thumb,description in m:                        
-		infoLabels = {}
-		infoLabels['title'] = name
-		infoLabels['plot'] = description	
+
+	entries = doc.getElementsByTagName("entry")
+	l=len(entries)
+	description = ''
+	for entry in entries:
+		name =  getText( entry.getElementsByTagName("title") )
+		url =  getText( entry.getElementsByTagName("url") ) 
+		thumb = getText( entry.getElementsByTagName("cover") )
+		description = getText( entry.getElementsByTagName("description") )
+		playcount = getText( entry.getElementsByTagName("playcount") ) 
+
+		if playcount == '':
+			playcount = '0'
+		playcount = int(playcount)
+
+		name = name.encode('latin-1')
+		description = description.encode('latin-1')
+
+##		print "name:" + name
+#		print "url:" + url
+#		print "thumb:" + thumb
+#		print "description:" + description
+
 
 		listitem = xbmcgui.ListItem(label = name, label2='test', iconImage = 'DefaultFolder.png', thumbnailImage = thumb)
-		listitem.setInfo('video', infoLabels)
 		listitem.setProperty('Fanart_Image', fanartImage)
+		if mode == '50':
+			infoLabels = {}
+			infoLabels['title'] = name
+			infoLabels['plot'] = description
+			infoLabels['playcount'] = playcount
+			listitem.setInfo('video', infoLabels)
 
-		u = sys.argv[0] + "?mode=" + urllib.quote_plus(mode) + "&name=" + urllib.quote_plus(name) + "&url=" + urllib.quote_plus(url)
+		u = sys.argv[0] + "?mode=" + urllib.quote(mode) + "&name=" + urllib.quote(name) + "&url=" + urllib.quote(url)
 		ok = xbmcplugin.addDirectoryItem(handle = int(sys.argv[1]), url = u, listitem = listitem, isFolder = folder, totalItems = l)
-	xbmcplugin.endOfDirectory(int(sys.argv[1]))
+
+	if (endlist == True):	
+		xbmcplugin.endOfDirectory(int(sys.argv[1]))
 
 
 
 
 def play_video(url, name):
-        link = open_url(url)
-        match=re.compile('<url>(.+?)</url>').findall(link)
-        url = match[0]
+        xml = open_url(url)
+
+	doc = parseString(xml)
+	url = getText( doc.getElementsByTagName("url") )
+
         print '[TODIC]:'+str(url)
 	image = xbmc.getInfoImage( 'ListItem.Thumb' )
 	listitem = xbmcgui.ListItem(label = name , iconImage = 'DefaultVideo.png', thumbnailImage = image)
-#	listitem = xbmcgui.ListItem(label = name , iconImage = 'DefaultVideo.png', thumbnailImage = 'DefaultVideo.png')
 	listitem.setInfo( type = "Video", infoLabels={ "Title": name } )
-	xbmc.Player(xbmc.PLAYER_CORE_AUTO).play(str(url), listitem)
-	xbmc.sleep(200)
+
+	player = TodicPlayer(xbmc.PLAYER_CORE_AUTO)
+	player.play(str(url), listitem)
+#	player.callbackLoop()
+
+
 
 def search():
 	search = getUserInput("Todic Søgning")
@@ -141,10 +234,6 @@
 				param[splitparams[0]]=splitparams[1]					
 	return param
 
-params = get_params()
-url = None
-name = None
-mode = None
 
 params = get_params()
 url = None
@@ -164,8 +253,12 @@
 except:
 	pass
 
+if url == 'refresh':
+	xbmc.output("[tvserver] Container.Refresh")
+	xbmc.executebuiltin("Container.Refresh")
+	
 
-if mode == None:
+elif mode == None:
         #build main menu
         rootMenu()
        
@@ -182,5 +275,4 @@
 
 
 
-# xbmcplugin.endOfDirectory(int(sys.argv[1]))