0.5j

ChoiceBox.py

@@ -1,233 +0,0 @@
-from Screens.Screen import Screen
-from Components.ActionMap import NumberActionMap
-from Components.Label import Label
-from Components.ChoiceList import ChoiceEntryComponent, ChoiceList
-from Components.Sources.StaticText import StaticText
-from Components.Pixmap import Pixmap
-import enigma
-
-class ChoiceBox2(Screen):
-    skin =  """
-<screen name="ChoiceBox2" position="center,center" size="720,480" title="ChoiceBox" zPosition="5">
-    <widget name="text" position="0,0" size="720,0" font="Regular;30"/>
-    <widget name="list" font="Regular;22" position="10,10" size="710,460" scrollbarMode="showOnDemand" enableWrapAround="1"/>
-    <applet type="onLayoutFinish">
-            self["list"].instance.setItemHeight(25)
-    </applet>
-
-</screen>
-"""
-    #<applet type="onLayoutFinish">
-    #self.autoResize()
-    #</applet>
-    
-    def __init__(self, session, title="", list=None, keys=None, selection=0, skin_name=None, text=""):
-        Screen.__init__(self, session)        
-        #self.setTitle(_("Choice Box"))
-        if not list: list = []
-        if not skin_name: skin_name = []
-        #if isinstance(skin_name, str):
-        #	skin_name = [skin_name]
-        #self.skinName = skin_name + ["ChoiceBox"]
-        self["text"] = Label()
-        self.var = ""
-
-        if title:
-            title = _(title)
-            if len(title) < 55 and title.find('\n') == -1:
-                Screen.setTitle(self, title)
-            elif title.find('\n') != -1:
-                temptext = title.split('\n')
-                if len(temptext[0]) < 55:
-                    Screen.setTitle(self, temptext[0])
-                    count = 2
-                    labeltext = ""
-                    while len(temptext) >= count:
-                        if labeltext:
-                            labeltext += '\n'
-                        labeltext = labeltext + temptext[count-1]
-                        count += 1
-                        print 'count',count
-                    self["text"].setText(labeltext)
-                else:
-                    self["text"] = Label(title)
-            else:
-                self["text"] = Label(title)
-        elif text:
-            self["text"] = Label(_(text))
-        self.list = []
-        self.summarylist = []
-        if keys is None:
-            self.__keys = [ "1", "2", "3", "4", "5", "6", "7", "8", "9", "0", "red", "green", "yellow", "blue" ] + (len(list) - 10) * [""]
-        else:
-            self.__keys = keys + (len(list) - len(keys)) * [""]
-
-        self.keymap = {}
-        pos = 0
-        for x in list:
-            strpos = str(self.__keys[pos])
-            self.list.append(ChoiceEntryComponent(key = strpos, text = x))
-            if self.__keys[pos] != "":
-                self.keymap[self.__keys[pos]] = list[pos]
-            self.summarylist.append((self.__keys[pos], x[0]))
-            pos += 1
-        self["list"] = ChoiceList(list = self.list, selection = selection)
-        self["summary_list"] = StaticText()
-        self["summary_selection"] = StaticText()
-        self.updateSummary(selection)
-
-        self["actions"] = NumberActionMap(["WizardActions", "InputActions", "ColorActions"],
-                                          {
-                                              "ok": self.go,
-                                              "1": self.keyNumberGlobal,
-                                              "2": self.keyNumberGlobal,
-                                              "3": self.keyNumberGlobal,
-                                              "4": self.keyNumberGlobal,
-                                              "5": self.keyNumberGlobal,
-                                              "6": self.keyNumberGlobal,
-                                              "7": self.keyNumberGlobal,
-                                              "8": self.keyNumberGlobal,
-                                              "9": self.keyNumberGlobal,
-                                              "0": self.keyNumberGlobal,
-                                              "red": self.keyRed,
-                                              "green": self.keyGreen,
-                                              "yellow": self.keyYellow,
-                                              "blue": self.keyBlue,
-                                              "up": self.up,
-                                              "down": self.down,
-                                              "left": self.left,
-                                              "right": self.right
-                                              }, -1)
-
-        self["cancelaction"] = NumberActionMap(["WizardActions", "InputActions", "ColorActions"],
-                                               {
-                                                   "back": self.cancel,
-                                                   }, -1)
-        #self.onShown.append(self.onshow)
-
-    def autoResize(self):
-        desktop_w = enigma.getDesktop(0).size().width()
-        desktop_h = enigma.getDesktop(0).size().height()
-        count = len(self.list)
-        itemheight = self["list"].getItemHeight()
-        if count > 15:
-            count = 15
-        if not self["text"].text:
-            # move list
-            textsize = (520, 0)
-            listsize = (520, itemheight*count)
-            self["list"].instance.move(enigma.ePoint(0, 0))
-            self["list"].instance.resize(enigma.eSize(*listsize))
-        else:
-            textsize = self["text"].getSize()
-            if textsize[0] < textsize[1]:
-                textsize = (textsize[1],textsize[0]+10)
-            if textsize[0] > 520:
-                textsize = (textsize[0], textsize[1]+itemheight)
-            else:
-                textsize = (520, textsize[1]+itemheight)
-            listsize = (textsize[0], itemheight*count)
-            # resize label
-            self["text"].instance.resize(enigma.eSize(*textsize))
-            self["text"].instance.move(enigma.ePoint(10, 10))
-            # move list
-            self["list"].instance.move(enigma.ePoint(0, textsize[1]))
-            self["list"].instance.resize(enigma.eSize(*listsize))
-
-        wsizex = textsize[0]
-        wsizey = textsize[1]+listsize[1]
-        wsize = (wsizex, wsizey)
-        self.instance.resize(enigma.eSize(*wsize))
-
-        # center window
-        self.instance.move(enigma.ePoint((desktop_w-wsizex)/2, (desktop_h-wsizey)/2))
-
-    def left(self):
-        if len(self["list"].list) > 0:
-            while 1:
-                self["list"].instance.moveSelection(self["list"].instance.pageUp)
-                self.updateSummary(self["list"].l.getCurrentSelectionIndex())
-                if self["list"].l.getCurrentSelection()[0][0] != "--" or self["list"].l.getCurrentSelectionIndex() == 0:
-                    break
-
-    def right(self):
-        if len(self["list"].list) > 0:
-            while 1:
-                self["list"].instance.moveSelection(self["list"].instance.pageDown)
-                self.updateSummary(self["list"].l.getCurrentSelectionIndex())
-                if self["list"].l.getCurrentSelection()[0][0] != "--" or self["list"].l.getCurrentSelectionIndex() == 0:
-                    break
-
-    def up(self):
-        if len(self["list"].list) > 0:
-            while 1:
-                self["list"].instance.moveSelection(self["list"].instance.moveUp)
-                self.updateSummary(self["list"].l.getCurrentSelectionIndex())
-                if self["list"].l.getCurrentSelection()[0][0] != "--" or self["list"].l.getCurrentSelectionIndex() == 0:
-                    break
-
-    def down(self):
-        if len(self["list"].list) > 0:
-            while 1:
-                self["list"].instance.moveSelection(self["list"].instance.moveDown)
-                self.updateSummary(self["list"].l.getCurrentSelectionIndex())
-                if self["list"].l.getCurrentSelection()[0][0] != "--" or self["list"].l.getCurrentSelectionIndex() == len(self["list"].list) - 1:
-                    break
-
-    # runs a number shortcut
-    def keyNumberGlobal(self, number):
-        self.goKey(str(number))
-
-    # runs the current selected entry
-    def go(self):
-        cursel = self["list"].l.getCurrentSelection()
-        if cursel:
-            self.goEntry(cursel[0])
-        else:
-            self.cancel()
-
-    # runs a specific entry
-    def goEntry(self, entry):
-        if entry and len(entry) > 3 and isinstance(entry[1], str) and entry[1] == "CALLFUNC":
-            arg = entry[3]
-            entry[2](arg)
-        elif entry and len(entry) > 2 and isinstance(entry[1], str) and entry[1] == "CALLFUNC":
-            entry[2](None)
-        else:
-            self.close(entry)
-
-    # lookups a key in the keymap, then runs it
-    def goKey(self, key):
-        if self.keymap.has_key(key):
-            entry = self.keymap[key]
-            self.goEntry(entry)
-
-    # runs a color shortcut
-    def keyRed(self):
-        self.goKey("red")
-
-    def keyGreen(self):
-        self.goKey("green")
-
-    def keyYellow(self):
-        self.goKey("yellow")
-
-    def keyBlue(self):
-        self.goKey("blue")
-
-    def updateSummary(self, curpos=0):
-        pos = 0
-        summarytext = ""
-        for entry in self.summarylist:
-            if curpos-2 < pos < curpos+5:
-                if pos == curpos:
-                    summarytext += ">"
-                    self["summary_selection"].setText(entry[1])
-                else:
-                    summarytext += entry[0]
-                summarytext += ' ' + entry[1] + '\n'
-            pos += 1
-        self["summary_list"].setText(summarytext)
-
-    def cancel(self):
-        self.close(None)

PlayStream.py

@@ -123,7 +123,7 @@ class PSPlayer(MoviePlayer):
         if "callback" in dir(self.stimer):
             self.stimer.callback.append(self.update_subtitles)
         elif "timeout":
-            self.stimer.timeout.connect(self.update_subtitles)
+            self.stimer_conn = self.stimer.timeout.connect(self.update_subtitles)
         else:
             self.stimer = None
         self.stimer_step = 500

PlayStream.wpr

@@ -5069,9 +5069,9 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         'list-files-first': False,
         'tree-states': {'deep': {'expanded-nodes': [(9,),
         (17,),
-        (74,),
-        (109,)],
-                                 'selected-nodes': [(26,)],
+        (75,),
+        (110,)],
+                                 'selected-nodes': [(27,)],
                                  'top-node': (0,)}},
         'tree-style': 'deep'}}),
                               ('snippets',
@@ -5108,7 +5108,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                {'tree-state': []})],
                  'primary_view_state': {'area': 'wide',
         'constraint': None,
-        'current_pages': [1,
+        'current_pages': [7,
                           1],
         'notebook_display': 'normal',
         'notebook_percent': 0.40625,
@@ -5159,7 +5159,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                        'fRegexFlags': 46,
                                        'fReplaceText': u'self.',
                                        'fReverse': False,
-                                       'fSearchText': u'etimer',
+                                       'fSearchText': u'timer',
                                        'fStartPos': 0,
                                        'fStyle': 'text',
                                        'fWholeWords': False,
@@ -5201,6 +5201,10 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                       'wide',
                       0,
                       {}),
+                     ('versioncontrol.git',
+                      'wide',
+                      0,
+                      {}),
                      ('debug-io',
                       'wide',
                       1,
@@ -5278,57 +5282,6 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         'primary_view_state': {'editor_states': ('vertical',
         1.0,
         ({'bookmarks': ([[loc('PlayStream.py'),
-                          {'attrib-starts': [],
-                           'first-line': 23,
-                           'folded-linenos': [],
-                           'sel-line': 31,
-                           'sel-line-start': 1212,
-                           'selection_end': 1212,
-                           'selection_start': 1212},
-                          1480708440.879],
-                         [loc('ContentSources.py'),
-                          {'attrib-starts': [],
-                           'first-line': 173,
-                           'folded-linenos': [],
-                           'sel-line': 192,
-                           'sel-line-start': 6829,
-                           'selection_end': 6829,
-                           'selection_start': 6829},
-                          1480708448.981],
-                         [loc('sources/ltc.py'),
-                          {'attrib-starts': [('Source',
-        24),
-        ('Source.get_streams',
-         401)],
-                           'first-line': 455,
-                           'folded-linenos': [],
-                           'sel-line': 460,
-                           'sel-line-start': 26123,
-                           'selection_end': 26123,
-                           'selection_start': 26123},
-                          1480751941.827],
-                         [loc('PlayStream.py'),
-                          {'attrib-starts': [],
-                           'first-line': 0,
-                           'folded-linenos': [],
-                           'sel-line': 11,
-                           'sel-line-start': 431,
-                           'selection_end': 449,
-                           'selection_start': 449},
-                          1480751956.342],
-                         [loc('PlayStream.py'),
-                          {'attrib-starts': [('PSPlayer',
-        91),
-        ('PSPlayer.__init__',
-         92)],
-                           'first-line': 2,
-                           'folded-linenos': [],
-                           'sel-line': 121,
-                           'sel-line-start': 4996,
-                           'selection_end': 5024,
-                           'selection_start': 5018},
-                          1480756795.819],
-                         [loc('PlayStream.py'),
                           {'attrib-starts': [('PSPlayer',
         91),
         ('PSPlayer.service_info',
@@ -5484,7 +5437,58 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                            'sel-line-start': 28,
                            'selection_end': 82,
                            'selection_start': 51},
-                          1480758835.647]],
+                          1480758835.647],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [('PSPlayer',
+        91),
+        ('PSPlayer.__init__',
+         92)],
+                           'first-line': 131,
+                           'folded-linenos': [],
+                           'sel-line': 138,
+                           'sel-line-start': 5629,
+                           'selection_end': 5663,
+                           'selection_start': 5663},
+                          1480759343.704],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [('MainScreen',
+        324)],
+                           'first-line': 327,
+                           'folded-linenos': [],
+                           'sel-line': 331,
+                           'sel-line-start': 12889,
+                           'selection_end': 12909,
+                           'selection_start': 12909},
+                          1480761919.893],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [('MainScreen',
+        324)],
+                           'first-line': 320,
+                           'folded-linenos': [],
+                           'sel-line': 331,
+                           'sel-line-start': 12889,
+                           'selection_end': 12911,
+                           'selection_start': 12910},
+                          1480761920.764],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [('MainScreen',
+        324)],
+                           'first-line': 320,
+                           'folded-linenos': [],
+                           'sel-line': 331,
+                           'sel-line-start': 12889,
+                           'selection_end': 12930,
+                           'selection_start': 12928},
+                          1480761921.605],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [],
+                           'first-line': 9,
+                           'folded-linenos': [],
+                           'sel-line': 14,
+                           'sel-line-start': 466,
+                           'selection_end': 520,
+                           'selection_start': 515},
+                          1480761922.368]],
                         20),
           'current-loc': loc('PlayStream.py'),
           'editor-state-list': [(loc('plugin.py'),
@@ -5499,14 +5503,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 (loc('PlayStream.py'),
                                  {'attrib-starts': [('PSPlayer',
         91),
-        ('PSPlayer.start_subtitles_timer',
-         217)],
-                                  'first-line': 131,
+        ('PSPlayer.__init__',
+         92)],
+                                  'first-line': 104,
                                   'folded-linenos': [],
-                                  'sel-line': 142,
-                                  'sel-line-start': 5807,
-                                  'selection_end': 5836,
-                                  'selection_start': 5815}),
+                                  'sel-line': 125,
+                                  'sel-line-start': 5157,
+                                  'selection_end': 5188,
+                                  'selection_start': 5188}),
                                 (loc('util.py'),
                                  {'attrib-starts': [('play_video',
         49)],
@@ -5618,7 +5622,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                   'sel-line-start': 28,
                                   'selection_end': 82,
                                   'selection_start': 51})],
-          'has-focus': True,
+          'has-focus': False,
           'locked': False},
          [loc('plugin.py'),
           loc('PlayStream.py'),
@@ -6752,7 +6756,8 @@ proj.pypath = {None: ('custom',
                       u'c:\\Data\\Programming\\enigma2\\python;')}
 search.replace-history = [u'self',
                           u'current']
-search.search-history = [u'etimer',
+search.search-history = [u'timer',
+                         u'etimer',
                          u'text=',
                          u'OptionsScreen',
                          u'title=',
@@ -6770,8 +6775,7 @@ search.search-history = [u'etimer',
                          u'list',
                          u'content',
                          u'autoResize',
-                         u'font',
-                         u'choicebox']
+                         u'font']
 testing.stored-results = (1,
                           [],
                           {})

__init__.py

@@ -0,0 +1,20 @@
+from os import environ
+from gettext import bindtextdomain, dgettext, gettext
+
+from Components.Language import language
+from Tools.Directories import resolveFilename, SCOPE_PLUGINS
+
+
+def localeInit():
+    environ["LANGUAGE"] = language.getLanguage()[:2]
+    bindtextdomain("PlayStream", resolveFilename(SCOPE_PLUGINS, "Extensions/PlayStream/locale"))
+
+def _(txt):
+    t = dgettext("PlayStream", txt)
+    if t == txt:
+        t = gettext(txt)
+    return t
+
+localeInit()
+language.addCallback(localeInit)
+

imake.bat

@@ -0,0 +1,146 @@
+@echo off
+:=== Parameters ===
+set ver=0.5j
+set prog=PlayStream
+set pack_name=enigma2-plugin-extensions-playstream
+set desc=Play online streams from various sources, mostly Latvian
+
+set ext_dir=usr\lib\enigma2\python\Plugins\Extensions\
+set ext_dir2=/usr/lib/enigma2/python/Plugins/Extensions/
+set script_dir=usr\script\
+set ipk_dir=ipkg\
+set release_dir=release\
+
+set AR=\MinGW\bin\ar.exe
+set TAR=\MinGW\msys\1.0\bin\tar.exe
+
+:=== data files ===
+if exist %ipk_dir% rm -r -f %ipk_dir% 
+mkdir %ipk_dir%
+for %%f in (
+readme.txt
+__init__.py
+plugin.py
+plugin.png
+%prog%.py
+%prog%.png
+ContentSources.py
+VideoDownload.py
+enigma2_api.py
+resolver.py
+util.py
+streamproxy.py
+offline.mp4
+demjson.py
+locale\*.*
+sources\__init__.py          
+sources\SourceBase.py        
+sources\cinemalive.py        
+sources\config.py            
+sources\euronews.py          
+sources\filmix.py            
+sources\filmon.py            
+sources\iplayer.py           
+sources\kinofilmnet.py       
+sources\ltc.py               
+sources\mtgplay.py           
+sources\play24.py            
+sources\replay.py            
+sources\serialguru.py        
+sources\tvdom.py             
+sources\ustvnow.py           
+sources\viaplay.py           
+sources\YouTubeVideoUrl.py   
+sources\jsinterp.py          
+sources\swfinterp.py
+sources\streams.cfg
+resolvers\__init__.py
+resolvers\aadecode.py
+resolvers\hqqresolver.py
+resolvers\openload3.py
+resolvers\youtuberesolver.py
+picons\*.*
+) do echo f | xcopy /y /q %%f %ipk_dir%data\%ext_dir%%prog%\%%f
+
+xcopy /y /q streamproxy %ipk_dir%data\etc\init.d\
+
+:=== control file ===
+mkdir %ipk_dir%CONTROL\
+rem xcopy  /v /d /y control %ipk_dir%CONTROL\
+echo 2.0 >%ipk_dir%debian-binary
+(
+echo Version: %ver%
+echo Package: %pack_name%
+echo Description: %desc%
+echo Architecture: all
+echo Section:
+echo Priority: optional
+echo Maintainer: ivars777@gmail.com
+echo Homepage:
+echo Depends: python-json,python-twisted-web,python-simplejson,python-html,python-zlib,python-requests 
+echo Source:
+) >%ipk_dir%CONTROL\control
+dos2unix %ipk_dir%CONTROL\control
+
+:=== preinst file ===
+(
+echo #!/bin/sh
+:echo if [ -d %ext_dir2%%prog% ]; then
+:echo   rm -rf %ext_dir2%%prog%/* ^> /dev/null 2^>^&1
+:echo   rm -rf %ext_dir2%%prog%/sources/*.py* ^> /dev/null 2^>^&1
+:echo   rm -rf %ext_dir2%%prog%/resolvers/*.py* ^> /dev/null 2^>^&1
+:echo fi
+echo if [ -e /etc/init.d/streamproxy ]; then
+echo   rm /etc/init.d/streamproxy ^> /dev/null 2^>^&1
+echo fi
+echo exit 0
+) >%ipk_dir%CONTROL\preinst
+dos2unix %ipk_dir%CONTROL\preinst
+
+:=== postinst file ===
+(
+echo #!/bin/sh
+echo chmod +x /etc/init.d/streamproxy
+echo ln -s /etc/init.d/streamproxy /etc/rc4.d/S50streamproxy
+echo ln -s /etc/init.d/streamproxy /etc/rc3.d/S50streamproxy
+echo ln -s /etc/init.d/streamproxy /usr/bin/streamproxy
+echo exit 0
+) >%ipk_dir%CONTROL\postinst
+dos2unix %ipk_dir%CONTROL\postinst
+
+:=== postrm file ===
+(
+echo #!/bin/sh
+:echo if [ -e /etc/rc4.d/S50streamproxy ]; then
+echo   rm /etc/rc4.d/S50streamproxy ^> /dev/null 2^>^&1
+:echo fi
+echo #!/bin/sh
+:echo if [ -e /etc/rc3.d/S50streamproxy ]; then
+echo   rm /etc/rc3.d/S50streamproxy ^> /dev/null 2^>^&1
+:echo fi
+:echo if [ -e /usr/bin/streamproxyy ]; then
+echo  rm /usr/bin/streamproxy ^> /dev/null 2^>^&1
+:echo fi
+echo if [ -e /etc/init.d/streamproxy ]; then
+echo   rm /etc/init.d/streamproxy ^> /dev/null 2^>^&1
+echo fi
+echo exit 0
+) >%ipk_dir%CONTROL\postrm
+dos2unix %ipk_dir%CONTROL\postrm
+
+:=== conffiles file ===
+(
+echo %ext_dir2%%prog%/sources/streams.cfg
+) >%ipk_dir%CONTROL\conffiles
+dos2unix %ipk_dir%CONTROL\conffiles
+
+:=== create ipk file ===
+if not exist %release_dir% mkdir %release_dir%
+%TAR% -C ipkg\data --mode=777 -czf ipkg\data.tar.gz .
+%TAR% -C ipkg\CONTROL --mode=777 -czf ipkg\control.tar.gz .
+if exist %release_dir%%pack_name%_%ver%.ipk del %release_dir%%pack_name%_%ver%.ipk
+%AR% -r %release_dir%%pack_name%_%ver% ipkg\debian-binary ipkg\data.tar.gz ipkg\control.tar.gz
+@echo on
+mv %release_dir%%pack_name%_%ver% %release_dir%%pack_name%_%ver%.ipk
+git add %release_dir%%pack_name%_%ver%.ipk
+