Changeset 8953 for ipk/source.sh4/swapplayers_mytube_1_0/var/swap/extensions/MyTube/MyTubeSearch.py

Timestamp:

Aug 19, 2011, 9:48:11 AM (15 years ago)

Author:

bonkel

Message:

fix swapmytube

File:

• ipk/source.sh4/swapplayers_mytube_1_0/var/swap/extensions/MyTube/MyTubeSearch.py (modified) (11 diffs)

ipk/source.sh4/swapplayers_mytube_1_0/var/swap/extensions/MyTube/MyTubeSearch.py

@@ -1 @@
-from __init__ import _
 from MyTubeService import GoogleSuggestions
 from Screens.Screen import Screen
@@ -19 +18 @@
 from threading import Thread
 from threading import Condition
+from xml.etree.cElementTree import parse as cet_parse
+from StringIO import StringIO
 
 
@@ -129 +130 @@
                         self.value = self.suggestionsWindow.activate()
                         self.allmarked = False
-                        #self.marked_pos = -1
                         self.suggestionsListActivated = True
                         ret = True
@@ -267 +267 @@
 class MyTubeSuggestionsListScreen(Screen):
         skin = """
-                <screen name="MyTubeSuggestionsListScreen" position="center,93" zPosition="6" size="610,160" flags="wfNoBorder" >
+                <screen name="MyTubeSuggestionsListScreen" position="60,93" zPosition="6" size="610,160" flags="wfNoBorder" >
+                        <ePixmap position="0,0" zPosition="-1" size="610,160" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MyTube/suggestions_bg.png" alphatest="on" transparent="1" backgroundColor="transparent"/>
                         <widget source="suggestionslist" render="Listbox" position="10,5" zPosition="7" size="580,150" scrollbarMode="showOnDemand" transparent="1" >
                                 <convert type="TemplatedMultiContent">
@@ -290 +291 @@
 
         def update(self, suggestions):
-                if suggestions and len(suggestions[1]) > 0:
+                if suggestions and len(suggestions) > 0:
                         if not self.shown:
                                 self.show()
-                        if suggestions:
+                        suggestions_tree = cet_parse(StringIO(suggestions)).getroot()
+                        if suggestions_tree:
                                 self.list = []
                                 self.suggestlist = []
-                                suggests = suggestions[1]
-                                for suggestion in suggests:
-                                        name = suggestion[0]
-                                        results = suggestion[1].replace(" results", "")
-                                        numresults = results.replace(",", "")
-                                        self.suggestlist.append((name, numresults ))
+                                for suggestion in suggestions_tree.findall("CompleteSuggestion"):
+                                        name = None
+                                        numresults = None
+                                        for subelement in suggestion:
+                                                if subelement.attrib.has_key('data'):
+                                                        name = subelement.attrib['data'].encode("UTF-8")
+                                                if subelement.attrib.has_key('int'):
+                                                        numresults = subelement.attrib['int']
+                                                if name and numresults:
+                                                        self.suggestlist.append((name, numresults ))
                                 if len(self.suggestlist):
                                         self.suggestlist.sort(key=lambda x: int(x[1]))
@@ -361 +367 @@
 class MyTubeSettingsScreen(Screen, ConfigListScreen):
         skin = """
-                <screen name="MyTubeSettingsScreen" position="center,center" size="720,576" title="MyTubePlayerMainScreen..." >
-                        <eLabel backgroundColor="#32000000" position="0,0" size="720,576" zPosition="-1"/>
+                <screen name="MyTubeSettingsScreen" flags="wfNoBorder" position="0,0" size="720,576" title="MyTubePlayerMainScreen..." >
+                        <ePixmap position="0,0" zPosition="-1" size="720,576" pixmap="~/mytubemain_bg.png" alphatest="on" transparent="1" backgroundColor="transparent"/>
                         <widget name="title" position="60,50" size="600,50" zPosition="5" valign="center" halign="left" font="Regular;21" transparent="1" foregroundColor="white" shadowColor="black" shadowOffset="-1,-1" />
                         <widget name="config" zPosition="2" position="60,120" size="610,370" scrollbarMode="showOnDemand" transparent="1" />
 
                         <ePixmap position="100,500" size="100,40" zPosition="0" pixmap="~/plugin.png" alphatest="on" transparent="1" />
-                        <eLabel backgroundColor="red" position="220,500" size="140,3" zPosition="4"/> 
-                <eLabel backgroundColor="green" position="360,500" size="140,3" zPosition="4"/>
+                        <ePixmap position="220,500" zPosition="4" size="140,40" pixmap="skin_default/buttons/red.png" transparent="1" alphatest="on" />
+                        <ePixmap position="360,500" zPosition="4" size="140,40" pixmap="skin_default/buttons/green.png" transparent="1" alphatest="on" />
                         <widget name="key_red" position="220,500" zPosition="5" size="140,40" valign="center" halign="center" font="Regular;21" transparent="1" foregroundColor="white" shadowColor="black" shadowOffset="-1,-1" />
                         <widget name="key_green" position="360,500" zPosition="5" size="140,40" valign="center" halign="center" font="Regular;21" transparent="1" foregroundColor="white" shadowColor="black" shadowOffset="-1,-1" />
@@ -439 +445 @@
         def selectionChanged(self):
                 current = self["config"].getCurrent()
-                #print current
 
         def newConfig(self):
@@ -520 +525 @@
 class MyTubeTasksScreen(Screen):
         skin = """
-                <screen name="MyTubeTasksScreen" position="center,center" size="720,576" title="MyTubePlayerMainScreen..." >
-                        <eLabel backgroundColor="#32000000" position="0,0" size="720,576" zPosition="-1"/>
+                <screen name="MyTubeTasksScreen" flags="wfNoBorder" position="0,0" size="720,576" title="MyTubePlayerMainScreen..." >
+                        <ePixmap position="0,0" zPosition="-1" size="720,576" pixmap="~/mytubemain_bg.png" alphatest="on" transparent="1" backgroundColor="transparent"/>
                         <widget name="title" position="60,50" size="600,50" zPosition="5" valign="center" halign="left" font="Regular;21" transparent="1" foregroundColor="white" shadowColor="black" shadowOffset="-1,-1" />
                         <widget source="tasklist" render="Listbox" position="60,120" size="610,370" zPosition="7" scrollbarMode="showOnDemand" transparent="1" >
@@ -537 +542 @@
                         </widget>
                         <ePixmap position="100,500" size="100,40" zPosition="0" pixmap="~/plugin.png" alphatest="on" transparent="1" />
-                        <eLabel backgroundColor="red" position="220,500" size="140,3" zPosition="4"/>
+                        <ePixmap position="220,500" zPosition="4" size="140,40" pixmap="skin_default/buttons/red.png" transparent="1" alphatest="on" />
                         <widget name="key_red" position="220,500" zPosition="5" size="140,40" valign="center" halign="center" font="Regular;21" transparent="1" foregroundColor="white" shadowColor="black" shadowOffset="-1,-1" />
                 </screen>"""
@@ -570 +575 @@
                 self["title"].setText(_("MyTubePlayer active video downloads"))
                 self.Timer.startLongTimer(2)
-                #self.Timer.start(1000)
 
         def TimerFire(self):
@@ -607 +611 @@
 class MyTubeHistoryScreen(Screen):
         skin = """
-                <screen name="MyTubeHistoryScreen" position="center,93" zPosition="6" size="610,160" flags="wfNoBorder" >
+                <screen name="MyTubeHistoryScreen" position="60,93" zPosition="6" size="610,160" flags="wfNoBorder" >
+                        <ePixmap position="0,0" zPosition="-1" size="610,160" pixmap="/usr/lib/enigma2/python/Plugins/Extensions/MyTube/suggestions_bg.png" alphatest="on" transparent="1" backgroundColor="transparent"/>
                         <widget source="historylist" render="Listbox" position="10,5" zPosition="7" size="580,150" scrollbarMode="showOnDemand" transparent="1" >
                                 <convert type="TemplatedMultiContent">