Koda refaktorings (stream0 u.c.)

ContentSources.py

@@ -12,8 +12,6 @@ from  sources.SourceBase import stream_type
 import util
 
 
-stream0 = {'name': '', 'url': '', 'quality': '???', 'surl': '', 'subs': '', 'headers': {}, "desc":"", "img":"", "lang": "", "type": ""}
-
 class ContentSources(object):
     """Wrapper for content sources plugin"""
 
@@ -78,7 +76,7 @@ class ContentSources(object):
             if "::" in data:
                 data = data.split("::")[1]
             content = self.get_content(data)
-            stream = stream0.copy()
+            stream = util.item()
             stream["name"] = data
             stream["url"] = data
             stream["type"] = stream_type(data)
@@ -170,12 +168,16 @@ if __name__ == "__main__":
             cur = history.pop()
         elif sources.is_video(cur2[1]):
             if sources.stream_type(cur2[1]):
-                stream = stream0.copy()
+                stream = util.item()
                 stream["url"] = cur2[1]
                 stream["name"] = cur2[0]
                 streams = [stream]
             else:
-                streams = sources.get_streams(cur2[1])
+                try:
+                    streams = sources.get_streams(cur2[1])
+                except Exception as e:
+                    print str(e)
+                    streams = []
             if streams:
                 util.play_video(streams)
             else:
@@ -190,4 +192,10 @@ if __name__ == "__main__":
                 cur2 = (cur2[0],cur2[1].format(a),cur2[2],cur2[3])
             history.append(cur)
             cur = cur2
-        content = sources.get_content(cur[1])
+        try:
+            content = sources.get_content(cur[1])
+        except Exception as e:
+            print str(e)
+            raw_input("Continue?")
+
+

PlayStream.py

@@ -518,7 +518,7 @@ class MainScreen(Screen):
 
         elif self.sources.is_video(current[1]):
             if self.sources.stream_type(current[1]):
-                stream = stream0.copy()
+                stream = util.item()
                 stream["url"] = current[1]
                 stream["name"] = current[0]
                 streams = [stream]
@@ -711,7 +711,7 @@ class MainScreen(Screen):
 
     def download_video(self,current):
         if self.sources.stream_type(current[1]):
-            stream = stream0.copy()
+            stream = util.item()
             stream["url"] = current[1]
             stream["name"] = current[0]
             streams = [stream]

PlayStream.wpr

@@ -12,7 +12,7 @@ proj.directory-list = [{'dirloc': loc('.'),
                         'watch_for_changes': True}]
 proj.file-type = 'normal'
 proj.launch-config = {loc('ContentSources.py'): ('project',
-        (u'filmix::home',
+        (u'config::home',
          '')),
                       loc('filmix_decode2.py'): ('project',
         (u'XRHzQZe3yvH32Z5ly1b3XakY7RUw7LYl7L60yM2n2ZQLOZtlfZUT2mUW2jkw2xtv2W20fxEMOZcLfW50yM=Va02lynHeDSYPDWDwQWwgDLsL2ZEMyVnmizlgkzkCHEGSXabNmLlzOZA4205laSYIQZch',
@@ -49,7 +49,15 @@ proj.launch-config = {loc('ContentSources.py'): ('project',
          ''))}
 [user attributes]
 cache.last-mime-type = {loc('unknown:<untitled> #1'): 'text/x-diff'}
-debug.breakpoints = {loc('gstreamer/player-minimal.py'): {12: (0,
+debug.breakpoints = {loc('ContentSources.py'): {180L: (0,
+        None,
+        1,
+        0),
+        199L: (0,
+               None,
+               1,
+               0)},
+                     loc('gstreamer/player-minimal.py'): {12: (0,
         None,
         1,
         0)},
@@ -4966,9 +4974,9 @@ debug.err-values = {None: {},
                                     0)},
                     loc('test_sources.py'): {},
                     loc('viaplay/vialib.py'): {}}
-debug.recent-run-args = {loc('ContentSources.py'): [u'filmix::home',
+debug.recent-run-args = {loc('ContentSources.py'): [u'config::home',
+        u'filmix::home',
         u'movieplace::home',
-        u'config::home',
         u'config::movieplace',
         u'ltc::home',
         u'ltc::videonoma/raidijumi/littlest_pet_shop_s1e26?series',
@@ -5077,7 +5085,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                    0],
                  'full-screen': False,
                  'notebook_display': 'normal',
-                 'notebook_percent': 0.25,
+                 'notebook_percent': 0.18151950718685828,
                  'override_title': None,
                  'pagelist': [('project',
                                'tall',
@@ -5112,7 +5120,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                {})],
                  'primary_view_state': {'area': 'wide',
         'constraint': None,
-        'current_pages': [1,
+        'current_pages': [3,
                           0],
         'notebook_display': 'normal',
         'notebook_percent': 0.30000000000000004,
@@ -5228,21 +5236,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         -1,
         -1),
                        'attrib-starts': [],
-                       'first-line': 17L,
+                       'first-line': 0L,
                        'folded-linenos': [],
-                       'history': {None: ['import urllib\n',
-        'urllib.urlencode("~")\n',
-        'urllib.quote("~")\n',
-        'urllib.quote("=")\n',
-        'urllib.quote(":")\n',
-        'urllib.quote(" ")\n',
-        "urllib.unquote('%20')\n",
-        "urllib.unquote('%3A')\n"]},
+                       'history': {},
                        'launch-id': None,
-                       'sel-line': 25L,
-                       'sel-line-start': 597L,
-                       'selection_end': 597L,
-                       'selection_start': 597L}),
+                       'sel-line': 2L,
+                       'sel-line-start': 146L,
+                       'selection_end': 146L,
+                       'selection_start': 146L}),
                      ('bookmarks',
                       'wide',
                       1,
@@ -5255,98 +5256,18 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                       'wide',
                       1,
                       {})],
-        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('PlayStream.py'),
-        {'attrib-starts': [('make_service',
-                            54)],
-         'first-line': 48L,
+        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('sources/viaplay.py'),
+        {'attrib-starts': [('Source',
+                            26),
+                           ('Source.get_streams',
+                            308)],
+         'first-line': 359L,
          'folded-linenos': [],
-         'sel-line': 62L,
-         'sel-line-start': 2423L,
-         'selection_end': 2434L,
-         'selection_start': 2431L},
-        1484607010.339],
-        [loc('resolver.py'),
-         {'attrib-starts': [('resolve',
-                             58)],
-          'first-line': 63L,
-          'folded-linenos': [],
-          'sel-line': 77L,
-          'sel-line-start': 2757L,
-          'selection_end': 2775L,
-          'selection_start': 2770L},
-         1484607107.471],
-        [loc('PlayStream.py'),
-         {'attrib-starts': [('make_service',
-                             54)],
-          'first-line': 48L,
-          'folded-linenos': [],
-          'sel-line': 62L,
-          'sel-line-start': 2423L,
-          'selection_end': 2434L,
-          'selection_start': 2431L},
-         1484607110.911],
-        [loc('resolver.py'),
-         {'attrib-starts': [('resolve',
-                             58)],
-          'first-line': 0L,
-          'folded-linenos': [],
-          'sel-line': 78L,
-          'sel-line-start': 2777L,
-          'selection_end': 2800L,
-          'selection_start': 2800L},
-         1484607694.642],
-        [loc('PlayStream.py'),
-         {'attrib-starts': [('make_service',
-                             54)],
-          'first-line': 48L,
-          'folded-linenos': [],
-          'sel-line': 70L,
-          'sel-line-start': 2693L,
-          'selection_end': 2752L,
-          'selection_start': 2749L},
-         1484607716.008],
-        [loc('resolvers/hqqresolver.py'),
-         {'attrib-starts': [('resolve',
-                             123)],
-          'first-line': 19L,
-          'folded-linenos': [],
-          'sel-line': 186L,
-          'sel-line-start': 7258L,
-          'selection_end': 7304L,
-          'selection_start': 7304L},
-         1484607729.213],
-        [loc('resolver.py'),
-         {'attrib-starts': [('resolve',
-                             58)],
-          'first-line': 0L,
-          'folded-linenos': [],
-          'sel-line': 78L,
-          'sel-line-start': 2777L,
-          'selection_end': 2800L,
-          'selection_start': 2800L},
-         1484607731.627],
-        [loc('PlayStream.py'),
-         {'attrib-starts': [('make_service',
-                             54)],
-          'first-line': 55L,
-          'folded-linenos': [],
-          'sel-line': 70L,
-          'sel-line-start': 2693L,
-          'selection_end': 2752L,
-          'selection_start': 2749L},
-         1484608179.858],
-        [loc('sources/viaplay.py'),
-         {'attrib-starts': [('Source',
-                             26),
-                            ('Source.get_streams',
-                             308)],
-          'first-line': 359L,
-          'folded-linenos': [],
-          'sel-line': 363L,
-          'sel-line-start': 17585L,
-          'selection_end': 17617L,
-          'selection_start': 17617L},
-         1484608183.824],
+         'sel-line': 363L,
+         'sel-line-start': 17585L,
+         'selection_end': 17617L,
+         'selection_start': 17617L},
+        1484608183.824],
         [loc('sources/viaplay.py'),
          {'attrib-starts': [('Source',
                              26),
@@ -5462,9 +5383,94 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
           'sel-line-start': 1951L,
           'selection_end': 1951L,
           'selection_start': 1951L},
-         1484645288.691]],
+         1484645288.691],
+        [loc('sources/filmix.py'),
+         {'attrib-starts': [('Source',
+                             24),
+                            ('Source.get_content',
+                             49)],
+          'first-line': 70L,
+          'folded-linenos': [],
+          'sel-line': 75L,
+          'sel-line-start': 2549L,
+          'selection_end': 2549L,
+          'selection_start': 2549L},
+         1484681063.486],
+        [loc('ContentSources.py'),
+         {'attrib-starts': [('ContentSources',
+                             14),
+                            ('ContentSources.get_content',
+                             47)],
+          'first-line': 0L,
+          'folded-linenos': [],
+          'sel-line': 59L,
+          'sel-line-start': 2432L,
+          'selection_end': 2453L,
+          'selection_start': 2453L},
+         1484681485.732],
+        [loc('sources/filmix.py'),
+         {'attrib-starts': [('Source',
+                             24),
+                            ('Source.get_content',
+                             49)],
+          'first-line': 0L,
+          'folded-linenos': [],
+          'sel-line': 75L,
+          'sel-line-start': 2549L,
+          'selection_end': 2549L,
+          'selection_start': 2549L},
+         1484681490.881],
+        [loc('ContentSources.py'),
+         {'attrib-starts': [],
+          'first-line': 154L,
+          'folded-linenos': [],
+          'sel-line': 179L,
+          'sel-line-start': 6128L,
+          'selection_end': 6163L,
+          'selection_start': 6163L},
+         1484682345.643],
+        [loc('sources/serialguru.py'),
+         {'attrib-starts': [('Source',
+                             21),
+                            ('Source.get_content',
+                             45)],
+          'first-line': 151L,
+          'folded-linenos': [],
+          'sel-line': 165L,
+          'sel-line-start': 9363L,
+          'selection_end': 9363L,
+          'selection_start': 9363L},
+         1484682357.737],
+        [loc('ContentSources.py'),
+         {'attrib-starts': [],
+          'first-line': 176L,
+          'folded-linenos': [],
+          'sel-line': 198L,
+          'sel-line-start': 6811L,
+          'selection_end': 6811L,
+          'selection_start': 6811L},
+         1484683092.344],
+        [loc('util.py'),
+         {'attrib-starts': [('play_video',
+                             49)],
+          'first-line': 57L,
+          'folded-linenos': [],
+          'sel-line': 71L,
+          'sel-line-start': 1951L,
+          'selection_end': 1951L,
+          'selection_start': 1951L},
+         1484683112.755],
+        [loc('ContentSources.py'),
+         {'attrib-starts': [],
+          'first-line': 176L,
+          'folded-linenos': [],
+          'sel-line': 198L,
+          'sel-line-start': 6811L,
+          'selection_end': 6812L,
+          'selection_start': 6812L},
+         1484683129.526]],
         20),
-        'current-loc': loc('sources/filmix.py'),
+        'current-loc': loc('ContentSources.py'),
         'editor-state-list': [(loc('plugin.py'),
                                {'attrib-starts': [('main',
         4)],
@@ -5484,22 +5490,19 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 'selection_end': 2982L,
                                 'selection_start': 2982L}),
                               (loc('ContentSources.py'),
-                               {'attrib-starts': [('ContentSources',
-        15),
-        ('ContentSources.get_content',
-         48)],
-                                'first-line': 47L,
+                               {'attrib-starts': [],
+                                'first-line': 160L,
                                 'folded-linenos': [],
-                                'sel-line': 60L,
-                                'sel-line-start': 2605L,
-                                'selection_end': 2626L,
-                                'selection_start': 2626L}),
+                                'sel-line': 198L,
+                                'sel-line-start': 6811L,
+                                'selection_end': 6812L,
+                                'selection_start': 6812L}),
                               (loc('sources/filmix.py'),
                                {'attrib-starts': [('Source',
         24),
         ('Source.get_content',
          49)],
-                                'first-line': 70L,
+                                'first-line': 0L,
                                 'folded-linenos': [],
                                 'sel-line': 75L,
                                 'sel-line-start': 2549L,
@@ -5578,7 +5581,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                               (loc('util.py'),
                                {'attrib-starts': [('play_video',
         49)],
-                                'first-line': 58L,
+                                'first-line': 57L,
                                 'folded-linenos': [],
                                 'sel-line': 71L,
                                 'sel-line-start': 1951L,
@@ -5592,7 +5595,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 'sel-line-start': 21214L,
                                 'selection_end': 21230L,
                                 'selection_start': 21226L})],
-        'has-focus': False,
+        'has-focus': True,
         'locked': False},
         [loc('plugin.py'),
          loc('PlayStream.py'),
@@ -5607,21 +5610,21 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
          loc('sources/SourceBase.py'),
          loc('util.py'),
          loc('sources/viaplay.py')]),
-                               'open_files': [u'sources/iplayer.py',
+                               'open_files': [u'PlayStream.py',
         u'playstreamproxy.py',
-        u'sources/replay.py',
-        u'sources/SourceBase.py',
         u'plugin.py',
-        u'resolvers/hqqresolver.py',
         u'resolver.py',
-        u'sources/viaplay.py',
-        u'PlayStream.py',
+        u'resolvers/hqqresolver.py',
+        u'sources/SourceBase.py',
+        u'sources/iplayer.py',
         u'sources/movieplace.py',
-        u'ContentSources.py',
+        u'sources/replay.py',
+        u'sources/viaplay.py',
+        u'sources/filmix.py',
         u'util.py',
-        u'sources/filmix.py']},
+        u'ContentSources.py']},
         'saved_notebook_display': None,
-        'split_percents': {0: 0.5},
+        'split_percents': {0: 0.3093198992443325},
         'splits': 2,
         'tab_location': 'top',
         'user_data': {}},
@@ -5634,9 +5637,9 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                          52,
                          2408,
                          1390)}]}
-guimgr.recent-documents = [loc('sources/filmix.py'),
+guimgr.recent-documents = [loc('ContentSources.py'),
                            loc('util.py'),
-                           loc('ContentSources.py'),
+                           loc('sources/filmix.py'),
                            loc('sources/movieplace.py'),
                            loc('PlayStream.py'),
                            loc('sources/viaplay.py'),

PlayStream0.py

@@ -1,684 +0,0 @@
-#!/usr/bin/env python
-# coding=utf8
-#
-#
-# This file is part of PlayStream - enigma2 plugin to play video streams from various sources
-# Copyright (c) 2016 ivars777 (ivars777@gmail.com)
-# Distributed under the GNU GPL v3. For full terms see http://www.gnu.org/licenses/gpl-3.0.en.html
-# Used fragments of code from enigma2-plugin-tv3play by Taapat (https://github.com/Taapat/enigma2-plugin-tv3play)
-#
-
-import os,time,sys,os,os.path
-import datetime,re
-
-from enigma import ePicLoad, eServiceReference, eTimer
-from Components.ActionMap import ActionMap,HelpableActionMap
-from Components.AVSwitch import AVSwitch
-from Components.Label import Label
-from Components.MenuList import MenuList
-from Components.Pixmap import Pixmap
-from Components.Sources.List import List
-from Components.Sources.StaticText import StaticText
-from Components.Button import Button
-from Plugins.Plugin import PluginDescriptor
-from Screens.InfoBar import MoviePlayer
-from Screens.MessageBox import MessageBox
-#from Screens.InputBox import InputBox
-from Screens.ChoiceBox import ChoiceBox
-from Screens.VirtualKeyBoard import VirtualKeyBoard
-from Components.Input import Input
-from Screens.Screen import Screen
-from Tools.BoundFunction import boundFunction
-from Tools.Directories import resolveFilename, SCOPE_PLUGINS
-from Tools.LoadPixmap import LoadPixmap
-from twisted.web.client import downloadPage,defer,reactor
-from Components.Task import job_manager
-
-import ContentSources
-from VideoDownload import downloadJob, HLSDownloadJob,VideoDownloadList
-#import enigma2_api
-
-TMPDIR = "/tmp/playstream/"
-e2 = None
-
-
-def make_service(stream):
-    url = stream["url"]
-    headers = []
-    if stream.has_key("headers"):
-        for h in stream["headers"]:
-            headers.append("%s=%s"%(h,stream["headers"][h]))
-    if headers:
-        headers ="&".jpin(headers)
-        url = url+"#"+headers
-    print url
-    url = url.encode("utf8")
-    service = eServiceReference(4097, 0, url)
-    service.setName( stream["name"])
-    return service
-
-#####################################################################################################################
-class TVPlayer(MoviePlayer):
-    def __init__(self, session, service):
-        
-        MoviePlayer.__init__(self, session, service)
-        self.skinName = "MoviePlayer"
-            
-
-    def leavePlayer(self):
-        self.close()
-        #self.session.openWithCallback(self.leavePlayerConfirmed, MessageBox, _("Stop playing?"))
-
-    def leavePlayerConfirmed(self, answer):
-        if answer:
-            self.close()
-
-    def doEofInternal(self, playing):
-        self.close()
-
-    #def getPluginList(self):
-        #from Components.PluginComponent import plugins
-        #list = []
-        #for p in plugins.getPlugins(where = PluginDescriptor.WHERE_EXTENSIONSMENU):
-            #if p.name != _("TV Play"):
-                #list.append(((boundFunction(self.getPluginName, p.name),
-                    #boundFunction(self.runPlugin, p), lambda: True), None))
-        #return list
-
-    #def showMovies(self):
-        #pass
-
-#####################################################################################################################
-class PSPlayer(TVPlayer):
-    def __init__(self, session, streams):
-        self.session = session
-        self.streams = streams
-        self.cur_stream = self.streams[0] # TODO
-        self.selected = 0
-        
-        service = make_service(self.cur_stream)        
-        TVPlayer.__init__(self, session, service)
-        self["actions"] = ActionMap(["MoviePlayerActions","MovieSelectionActions","ColorActions","InfobarAudioSelectionActions"], {
-            "leavePlayer":self.leavePlayer,
-            "AudioSelection":self.select_stream,
-            "audioSelection":self.select_stream,
-            "green":self.select_stream,
-            "showEventInfo":self.service_info
-        })
-        self.skinName = "MoviePlayer"
-        
-    def play_service(self,service):
-        self.movieSelected(service)
-    
-    def service_info(self):
-        print "########[MoviePlayer] service_info"
-        from Tools import Notifications
-        text = "%s\n%s %s\n%s"%(self.cur_stream["name"],self.cur_stream["lang"],self.cur_stream["quality"],self.cur_stream["desc"])
-        text = text.encode("utf8")
-        #print text
-        type = MessageBox.TYPE_INFO
-        Notifications.AddPopup(text = text, type=None, timeout = 10)
-        #Notifications.MessageBox(self.session, text=text, type=MessageBox.TYPE_INFO, timeout=10, 
-                                #close_on_any_key=True, 
-                                #default=True, 
-                                #enable_input=True, 
-                                #msgBoxID=None, 
-                                #picon=False, 
-                                #simple=False, 
-                                #wizard=False, 
-                                #list=None, 
-                                #skin_name=None, 
-                                #timeout_default=None)
-        #return True
- 
-    def select_stream(self):
-        print "########[MoviePlayer] select_stream"
-        lst = []
-        title = "Select stream"
-        for i,s in enumerate(self.streams):
-            lst.append(("[%s,%s] %s"%(s["lang"],s["quality"],s["name"]),i))
-        self.session.openWithCallback(self.cb_select_stream, ChoiceBox, text = title, list = lst,selection = self.selected)
-
-    def cb_select_stream(self,answer):
-        #print "item_menu_selected",answer
-        if not answer:
-            return
-        self.selected = answer[1]
-        service = make_service(self.streams[self.selected])
-        self.play_service(service)
-
-        
-#####################################################################################################################
-class MainScreen(Screen):
-    skin = """
-<screen position="center,center" size="1015,570" title="Play Stream">
-    <eLabel position="5,0" size="1000,2" backgroundColor="#aaaaaa" />
-    <widget name="title" position="10,2" size="1000,38" font="Regular;30" />
-    <widget source="list" render="Listbox" position="10,55" size="580,470" \
-            scrollbarMode="showOnDemand" >
-            <convert type="TemplatedMultiContent" >
-            {
-                    "template": [MultiContentEntryText(pos=(10, 1), size=(560, 30), \
-                                    font=0, flags=RT_HALIGN_LEFT, text=0)],
-                    "fonts": [gFont("Regular", 20)],
-                    "itemHeight": 30
-            }
-            </convert>
-    </widget>
-    <widget name="pic" position="646,55" size="327,250" alphatest="on" />
-    <widget name="cur" position="610,310" size="400,250" halign="center" font="Regular;20"/>
-
-    <ePixmap name="red"    position="100,530"   zPosition="2" size="140,40" pixmap="skin_default/buttons/red.png" transparent="1" alphatest="on" />
-    <widget name="key_red" position="100,530" size="140,40" valign="center" halign="center" zPosition="4"  foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
-    <ePixmap name="green"  position="240,530" zPosition="2" size="140,40" pixmap="skin_default/buttons/green.png" transparent="1" alphatest="on" />
-    <widget name="key_green" position="240,530" size="140,40" valign="center" halign="center" zPosition="4"  foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
-    <ePixmap name="yellow" position="380,530" zPosition="2" size="140,40" pixmap="skin_default/buttons/yellow.png" transparent="1" alphatest="on" />
-    <widget name="key_yellow" position="380,530" size="140,40" valign="center" halign="center" zPosition="4"  foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
-    <ePixmap name="menu"   position="560,535" zPosition="2" size="140,40"  pixmap="skin_default/buttons/key_menu.png" transparent="1" alphatest="on" />
-    <widget name="key_menu" position="560,530" size="140,40" valign="center" halign="center" zPosition="4"  backgroundColor="blue" foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
-    
-</screen>"""
-
-    def __init__(self, session):
-        Screen.__init__(self, session)
-        #self.setTitle2("Home")
-        self.session = session
-        self.e2 = None
-        self["key_red"] = Button(_("Back"))
-        self["key_green"] = Button(_("Select"))
-        self["key_yellow"] = Button(_("Options"))
-        self["key_menu"] = Button("Menu" )
-        
-        self["actions"] = ActionMap(["OkCancelActions", "ColorActions","MenuActions", "NumberActions"],
-                                    {
-                                        "cancel": self.Cancel,
-                                        "ok": self.Ok,
-                                        "green": self.Ok,
-                                        "red": self.Back,
-                                        "yellow": self.options_screen,
-                                        "blue": self.download_list,
-                                        "menu": self.item_menu,
-                                    })
-        self["list"] = List([])
-        self["list"].onSelectionChanged.append(self.SelectionChanged)
-        self["pic"] = Pixmap()
-        self["cur"] = Label()
-        self["title"] = Label()
-        self.downloading = 0
-        self.activeDownloads = 0
-        if not os.path.exists(TMPDIR):
-            os.mkdir(TMPDIR)
-        self.onLayoutFinish.append(self.LayoutFinish)
-
-    def LayoutFinish(self):
-        self.cur_directory = os.path.dirname(os.path.realpath(__file__))
-        self.defimage = LoadPixmap(os.path.join(self.cur_directory,"PlayStream.png"))
-        #self.defimage = None
-        #sc = AVSwitch().getFramebufferScale()
-        #self.defimage0 = ePicLoad()
-        #self.defimage0.PictureData.get().append(boundFunction(self.FinishDecodeDef, os.path.join(self.cur_directory,"PlayStream.png")))
-        #self.defimage0.setPara((self["pic"].instance.size().width(),self["pic"].instance.size().height(),sc[0], sc[1], False, 0, "#00000000"))
-        #self.defimage0.startDecode("default")
-        
-        self.activeDownloads = 0
-        self.images = {}
-        self.images_url = {}
-        self.picloads = {}
-        self.history = []
-        
-        reload(ContentSources)
-        self.sources = ContentSources.ContentSources(os.path.join(self.cur_directory,"sources"))
-        self.config = self.sources.plugins["config"]
-        self.cur_menu = ("Home","config::home","","Sākums") #
-        try:
-            self.content = self.sources.get_content(self.cur_menu[1])
-        except Exception,e:               
-            self.session. open(MessageBox, "Error - %s"%str(e) , MessageBox.TYPE_INFO)
-            return
-        print self.content
-        self["list"].setList(self.content)
-        self["cur"].setText(self.content[0][3])
-        self.setTitle2(self.cur_menu[0])
-        self.ShowPic(self.content[0][2])
-
-
-    def SelectionChanged(self):
-        current = self["list"].getCurrent()
-        print "[PlayStream] SelectionChanged: current=",current
-        if not current: return
-        self["cur"].setText(current[3]) if current[3] else self["cur"].setText("")
-        if current[2]:
-            self.ShowPic(current[2])
-        else:
-            self.ShowDefPic()
-
-    def setTitle2(self,title):
-        #print self.keys()
-        self["title"].setText(title)
-        
-    def ShowDefPic(self):
-        if self.defimage:
-            self["pic"].instance.setPixmap(self.defimage)
-
-    def ShowPic(self,image_url):
-        if image_url == "default":
-            self.ShowDefPic()
-            return
-        elif self.images.has_key(image_url):
-            if self.images[image_url] in (-1,-2):
-                return
-            elif self.images[image_url] == -3:
-                self.ShowDefPic()
-                return
-            else:
-                self["pic"].instance.setPixmap(self.images[image_url])
-        else:
-            if image_url.startswith("http"):
-                fname = image_url.replace(":","-").replace("/","_")
-                image_path = os.path.join(TMPDIR, fname)
-                self.download_image(image_path, image_url)
-            else: # local file
-                image_path = os.path.join(self.cur_directory,image_url)
-                self.start_decode(image_path,image_url)
-            
-    def start_decode(self,image_path,image_url):
-        self.images[image_url] = -2
-        self.images_url[image_path] = image_url
-        sc = AVSwitch().getFramebufferScale()
-        if  not self.picloads.has_key(image_path):
-            self.picloads[image_path] = ePicLoad()
-            self.picloads[image_path].PictureData.get().append(boundFunction(self.FinishDecode, image_path))
-            self.picloads[image_path].setPara((self["pic"].instance.size().width(),
-                                          self["pic"].instance.size().height(),
-                                          sc[0], sc[1], False, 0, "#00000000"))
-            print image_path,image_url
-            self.picloads[image_path].startDecode(image_path)
-
-    def FinishDecode(self, image_path,picInfo = None):
-        image_url = self.images_url[image_path]
-        del self.images_url[image_path] #III
-        self.images[image_url] = self.picloads[image_path].getData()
-        self["pic"].instance.setPixmap(self.images[image_url])
-        del self.picloads[image_path]
-        if len(self.images)>30:
-            del self.images[self.images.keys()[0]]
-            # self.images.pop()
-            
-    #def FinishDecodeDef(self, image_path,picInfo = None):
-    #    self.defimage = self.defimage0.getData()
-    #    del self.defimage0
-    #    self["pic"].instance.setPixmap(self.defimage)
-        
-    def download_image(self,image_path,image_url):
-        print "Image download started",self.downloading,image_path,image_url
-        self.downloading += 1
-        self.images[image_url] = -1
-        downloadPage(image_url, image_path).addCallback(boundFunction(self.downloadFinished, image_path,image_url)).addErrback(boundFunction(self.downloadFailed, image_path,image_url))
-
-    def downloadFinished(self, image_path, image_url, result):
-        self.downloading -= 1
-        print "[TV Play] Image downloaded finished ",self.downloading,image_path, image_url,result
-        self.start_decode(image_path,image_url)       
-
-    def downloadFailed(self, image_path, image_url,result):
-        self.downloading -= 1
-        print "[TV Play] Image downloaded failed ",self.downloading,image_path, image_url,result
-        self.images[image_url] = -3
-
-
-    def Ok(self):
-        current = self["list"].getCurrent()
-        self.current = current
-        index = self["list"].getIndex()
-        self.index = index
-        print "[PlayStream] - menu selected ", current
-        #if len(current[1].split("::"))<2 or not current[1].split("::")[1]: #
-        #    return # TODO - kaut kā jēdzigak jāapstradā nederigs ieraksts (paziņojums?)
-        if self.sources.is_video(current[1]):
-            if self.sources.stream_type(current[1]):
-                stream = stream0
-                stream["url"] = cur2[1]
-                stream["name"] = cur2[0]
-                streams = [stream]
-            else:
-                try:
-                    streams = self.sources.get_streams(current[1])
-                except Exception,e:              
-                    self.msg("Error - %s"%str(e))
-                    return
-            
-            if streams:
-                print streams
-                self.session.open(PSPlayer, streams)
-            else:
-                self.msg("No stream found - %s"%(self.current[1]))
-                return
-            
-            #if not self.sources.stream_type(current[1]):
-                #current = self.sources.get_content(current[1])
-            #print "Item to play",current
-            #stream_type = self.sources.stream_type(current[1])
-            #url = current[1]
-            #title = current[0] 
-            #if not stream_type: # 
-                #print stream_type
-                #self.msg("No stream found - %s"%(self.current[1]))
-                #return
-            #self.playVideo(current)
-            
-        elif current[1] == "back":
-            cur_menu_old = self.cur_menu
-            self.cur_menu = self.history.pop()
-            new_content = self.sources.get_content(self.cur_menu[1])
-            try:
-                index = zip(*new_content)[1].index(cur_menu_old[1])
-            except:
-                index = 0
-            self.setTitle2(self.cur_menu[0])
-            self.show_content(new_content,index)
-            
-        else:
-            print "selected=",current
-            if "{0}" in current[1]:
-                self.session.openWithCallback(self.cb_input,VirtualKeyBoard, title="Enter value", text="")                 
-                #a = raw_input("Enter value:")
-                #a = "big bang"
-                #current = (current[0],current[1].format(a),current[2],current[3])
-                #self.get_content(current)
-            else:
-                self.get_content(current)
-                
-    def cb_input(self,value):
-        if not value:
-            return
-        current = self.current
-        current = (current[0],current[1].format(value),current[2],current[3])
-        self.get_content(current)
-    
-    def get_content(self,current):            
-            self.history.append(self.cur_menu)
-            self.cur_menu = current
-            try:
-                new_content = self.sources.get_content(self.cur_menu[1])
-            except Exception,e:
-                self.cur_menu = self.history.pop()                
-                self.session. open(MessageBox, "Error - %s"%str(e) , MessageBox.TYPE_INFO)
-                return
-            self.setTitle2(self.cur_menu[0])
-            self.show_content(new_content)
- 
-    def Back(self):
-        self["list"].setIndex(0)
-        self.Ok()
-
-    def show_content(self,content,index=0):
-        self["list"].setList(content)
-        self["list"].setIndex(index)
-        self.SelectionChanged()
-
-    def Cancel(self):
-        #if os.path.exists(TMPDIR):
-            #for name in os.listdir(TMPDIR):
-                #os.remove(os.path.join(TMPDIR, name))
-            #os.rmdir(TMPDIR)
-        self.close()
-            
-    def playVideo(self, current):
-        hlspath = current[1]
-        print "[TV Play] Play:", current
-        ##SERVICE 4097:0:0:0:0:0:0:0:0:0:http%3a//127.0.0.1%3a7777#Cookie1=test3&User-Agent=CustomUserAgent&Cookie=test4:test_headers
-        ref = eServiceReference(4097, 0, hlspath)
-        ref.setName(current[0])
-        self.session.open(TVPlayer, ref)
-    
-    def item_menu(self):
-        print "\n[PlayStream] options\n"
-        self.current = self["list"].getCurrent()
-        self.index = self["list"].getIndex()        
-        #self.session. open(MessageBox, "Item options - %s"%current[0] , MessageBox.TYPE_INFO)
-        #args=[current,self.cur_menu]
-        #self.session.open(ItemMenuScreen,current,index,self)
-        lst = [
-            ("Aditional information","info","Display additional information about item"),
-            ("Add to bouquet","bouquet","Add current item to Enigma2 bouquet"),
-            ("Add to favorites","favorites","Add current item to PlayStrem favorites"),
-            ("Download list","download_list","Show download list")
-        ]
-        if self.sources.is_video(self.current[1]):
-            lst.extend([
-            ("Download video","download","Download video in background"),
-            ])
-        if "config::" in self.cur_menu[1]:
-            lst.extend([
-            ("Rename item","rename","Rename list item"),
-            ("Move item","move","Move list item"),
-            ("Delete item","delete","Delete list item"),
-            ("Add submenu","add_list","Add submenu before selected item"), 
-            ])
-        title = self.current[0]
-        self.session.openWithCallback(self.cb_item_menu, ChoiceBox, text = title, list = lst) #TODO
-
-    def cb_item_menu(self,answer):
-        #print "item_menu_selected",answer
-        if not answer:
-            return
-
-        if answer[1] == "info":
-            self.session.open(MessageBox, "Not yet implemented!", MessageBox.TYPE_INFO)
-            pass # TODO parada papildus info
-        
-        elif answer[1] == "bouquet":
-            #if not e2:
-                #e2 = enigma2_api.DBServices()
-            #print "load_buuquets - ",e2._load_bouquets()
-            self.session.open(MessageBox, "Not yet implemented!", MessageBox.TYPE_INFO)            
-            
-        elif answer[1] == "favorites":
-            lists = self.config.get_lists()
-            lists2 = [(l,l) for l in lists]            
-            self.session.openWithCallback(self.cb_favorites, ChoiceBox, text="Select menu item will be added",list = lists2) 
-                        
-        elif answer[1] == 'download':
-            current = self.current
-            if not self.sources.is_video(current[1]):
-                self.msg("Can not download listst (yet) - %s"%(current[1]))
-                return
-            #if not self.sources.stream_type(current[1]):
-                #current = self.sources.get_content(current[1])
-            try:
-                streams = self.sources.get_streams(current[1])
-            except Exception,e:              
-                self.msg("Error - %s"%str(e))
-                return
-            if not streams:
-                self.msg("No stream found to download - %s"%(self.current[1]))
-                return
-            if len(streams)>1:
-                stream = streams[0] # TODO iespeja izvelēties strīmu, ja to ir vairāki
-            else:
-                stream = streams[0]
-            stream_type = stream["type"] #self.sources.stream_type(stream["url"])
-            if not stream_type: # 
-                self.msg("Not supported stream type found to download - %s"%(self.current[1]))
-                return            
-            title = streams[0]["name"]
-            url = streams[0]["url"]
-            downloadDir = "/media/hdd/movie" #config.plugins.playstream.downloadDir.value TODO
-            if not os.path.exists(downloadDir):
-                self.msg(_('Sorry, download directory "%s" not exist!\nPlease specify in the settings existing directory'%downloadDir))
-                return
-            fname = re.sub("[/\n\r\t,]","_",title)+".mp4"
-            outputfile = os.path.join(downloadDir, fname)
-            if os.path.exists(outputfile):
-                self.msg( _('Sorry, this file already exists:\n%s') % outputfile)
-                return
-            print "Trying to download - ", current   
-            if stream_type in ("http","https"):  
-                print "\n**Download %s - %s"%(title,url)                
-                #reload(downloadJob)
-                job_manager.AddJob(downloadJob(url, outputfile, title[:20], self.video_download_stop))
-                self.activeDownloads += 1
-                self.msg(_('Video download started!'))
-            elif stream_type == "hls":
-                #self.msg("HLS stream download not yet implemented!")
-                print "\n**Download %s - %s"%(title,url)                
-                #reload(HLSDownloadJob)
-                print "HLSDownload", url,outputfile
-                job_manager.AddJob(HLSDownloadJob(url, outputfile, title[:20], self.video_download_stop))
-                self.activeDownloads += 1
-                self.msg(_('Video download started!'))
-                
-            elif stream_type == "rstp":
-                self.msg("RSTP stream download not yet implemented!")
-            else:
-                self.msg("Unkown stream type!")            
-            
-        elif answer[1] == 'download_list':
-            self.download_list()
-
-        elif answer[1] == "delete":
-            lst = self.cur_menu[1].replace("config::","")
-            #print lst
-            self.config.del_item(lst,self.index)
-            self.config.write_streams()
-            txt = "'%s' deleted from favourite stream list '%s'"%(self.current[0],lst)
-            self.session.open(MessageBox, txt, MessageBox.TYPE_INFO,timeout=5)  
-            
-        elif answer[1] == "rename":
-            #name2 = "Renamed"
-            self.session.openWithCallback(self.cb_rename,VirtualKeyBoard, title="Enter new item name", text=self.current[0]) 
-            
-        elif answer[1] == "add_list":
-            self.session.open(MessageBox, "Not yet implemented!", MessageBox.TYPE_INFO,timeout=5)            
-            pass #TODO    
-        return
-    
-    def download_list(self):
-        self.session.open(VideoDownloadList)
-        
-    def cb_rename(self,value):
-        if not value:
-            return
-        lst = self.cur_menu[1].replace("config::","")
-        pos = self.index        
-        print value
-        item2 = list(self.current)
-        item2[0]=value
-        item2 = tuple(item2)
-        self.config.replace_item(lst,item2,pos)
-        self.config.write_streams()
-        txt = "'%s' renamed to '%s'"%(self.current[0],value)
-        self.session.open(MessageBox, txt, MessageBox.TYPE_INFO,timeout=5)     
-        
-    def cb_favorites(self,answer):
-        print "cb_favorites",answer
-        if not answer:
-            return 
-        value = answer[1]
-        self.config.add_item(value,self.current)
-        self.config.write_streams()
-        txt = "'%s' added to favourite stream list '%s'"%(self.current[0],value)
-        self.session.open(MessageBox, txt, MessageBox.TYPE_INFO,timeout=3)
-        #self.session.openWithCallback(self.callMyMsg, MessageBox, _("Do you want to exit the plugin?"), MessageBox.TYPE_INFO)
-        
-    def options_screen(self):
-        source = self.cur_menu[1].split("::")[0]
-        options = self.sources.options_read(source)
-        print source
-        if not options:
-            self.session. open(MessageBox, "No options available for source %s (%s)"%(self.cur_menu[0],source) , MessageBox.TYPE_INFO)
-        else:
-            self.session.open(OptionsScreen,self)        
-        
-    def video_download_stop(self,title):
-        #self.activeDownloads -= 1
-        #self.msg("Download '%s'finished!"%title)
-        print "video_download_stop ", title
-        
-    def msg(self,msg,timeout=10):
-        self.session.open(MessageBox, msg, MessageBox.TYPE_INFO, timeout)
-##########################################################################
-from Components.config import config, ConfigSubsection, ConfigYesNo,\
-     getConfigListEntry, ConfigSelection, ConfigNumber, ConfigDirectory,ConfigText, ConfigSubDict
-from Components.ConfigList import ConfigListScreen
-#from Screens.LocationBox import LocationBox
-
-config.plugins.playstream = ConfigSubDict()
-
-class OptionsScreen(ConfigListScreen,Screen):
-    skin = """
-<screen position="center,center" size="560,400"  >
-	<ePixmap name="red"    position="0,0"   zPosition="2" size="140,40" pixmap="skin_default/buttons/red.png" transparent="1" alphatest="on" />
-	<widget name="key_red" position="0,0" size="140,40" valign="center" halign="center" zPosition="4"  foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
-	<ePixmap name="green"  position="140,0" zPosition="2" size="140,40" pixmap="skin_default/buttons/green.png" transparent="1" alphatest="on" />
-	<widget name="key_green" position="140,0" size="140,40" valign="center" halign="center" zPosition="4"  foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
-	<ePixmap name="yellow" position="280,0" zPosition="2" size="140,40" pixmap="skin_default/buttons/yellow.png" transparent="1" alphatest="on" />
-	<widget name="key_yellow" position="280,0" size="140,40" valign="center" halign="center" zPosition="4"  foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
-	<ePixmap name="blue"   position="420,0" zPosition="2" size="140,40" pixmap="skin_default/buttons/blue.png" transparent="1" alphatest="on" />
-	<widget name="key_blue" position="420,0" size="140,40" valign="center" halign="center" zPosition="4"  foregroundColor="white" font="Regular;20" transparent="1" shadowColor="background" shadowOffset="-2,-2" />
-
-	<widget name="config" position="10,40" size="540,340" scrollbarMode="showOnDemand" />
-</screen>"""
-
-    def __init__(self, session,*args):
-        self.session = session
-        Screen.__init__(self, session)
-        self.main = args[0]
-        self.setTitle(self.main.cur_menu[0]+" Options")
-        self.source = self.main.cur_menu[1].split("::")[0]
-        self.cfg = config.plugins.playstream
-        self.list = []       
-        self.options = self.main.sources.options_read(self.source)
-        if not self.options:
-            #self.session. open(MessageBox, "No options available for source %s (%s)"%(self.main.cur_menu[0],self.source) , MessageBox.TYPE_INFO)
-            self.close(False,self.session)
-        for k in self.options:
-            self.cfg[k]=ConfigText(default=self.options[k],fixed_size=False)
-            self.list.append(getConfigListEntry(k, self.cfg[k]))
-        ConfigListScreen.__init__(self, self.list, session = self.session)
-        
-        self["key_red"] = Button(_("Cancel"))
-        self["key_green"] = Button("Save")
-        self["key_yellow"] = Button("")
-        self["key_blue"] = Button("")
-        self["setupActions"] = ActionMap(["SetupActions", "ColorActions"],
-                                         {
-                                             "red": self.cancel,
-                                             "green": self.save,
-                                             "save": self.save,
-                                             "cancel": self.cancel,
-                                             "ok": self.ok,
-                                             }, -2)
-
-    def getCurrentEntry(self):
-        return self["config"].getCurrent()[0]
-
-    def getCurrentValue(self):
-        return str(self["config"].getCurrent()[1].getText())
-
-    def ok(self):
-        self.save()
-        #if self["config"].getCurrent()[1] == config.plugins.getpicons.folder:
-            #folder  = config.plugins.getpicons.folder.value
-            #self.session.openWithCallback(self.change_dir, LocationBox,"Select Folder")
-        #else:
-            
-
-    #def change_dir(self, folder, select=None):
-        #if folder:
-            ##print "change_dir to %s"%folder
-            #config.plugins.getpicons.folder.value = folder
-
-    def save(self):
-        print "saving"
-        #self.saveAll()
-        for k in self.options.keys():
-            self.options[k]=self.cfg[k].value
-            print "%s=%s"%(k,self.cfg[k].value)
-        self.main.sources.options_write(self.source,self.options)
-        self.close(True,self.session)
-
-    def cancel(self):
-        print "cancel"
-        self.close(False,self.session)
-

changelog.md

@@ -4,6 +4,9 @@
 - kodik, kapnob resolveri priekš movieplace.lv
 - u.c. labojumi
 
+**0.5s** (17.01.2016):
+- koda refaktorings/houskeepings
+
 **0.5n** (15.01.2016):
 - salabots filmix (tagad filmix.me)
 - .ts strīmus spēlē ar service_type = 1 (nevis 4097)
@@ -27,61 +30,61 @@
 **0.4d** (03.08.2016):
 - Euronews live un arhīvs
 .
-**0.4c** (26.07.2016):  
+**0.4c** (26.07.2016):
 - BBC iPlayer saturs (strādā tikai UK vai ar VPN/smartDNS)
 - lejupielādes foldera uzdošana
 - video saraksta lejupielāde (1 limenis zem menu)
 - subtitle lejupielāde (BBC)
 
-**0.4a** (12.07.2016):  
+**0.4a** (12.07.2016):
 - salabots/pārtaisīts lattelecom.tv atbilstoši jaunajam "produktam" (shortut) un API (1.4)
 - pārtaisīts iekšējais source pluginu API (var no sources dabūt vairākus strīmus)
 - iekš UI iespēja playerī imanīt strīmus (audio poga), paskatīties tekošā strīma info (Info poga)
 - citi nebūtiski labojumi
 
-**0.3e** (30.06.2016):  
+**0.3e** (30.06.2016):
 - izlabota kļūda saistībā ar nestrādāšanu ne openPLI imidžos
 
-**0.3c** (14.06.2016):  
+**0.3c** (14.06.2016):
 - izlabotas kļūdas saistība ar nesaderību ar dažādiem skiniem
 - iespēja saglabāt HLS strīmus un video failus (testa variants, var būt problēmas)
 
-**0.3b** (12.06.2016):  
+**0.3b** (12.06.2016):
 - Filmix.net saturs
 - Meklēšana replay, ltc,serialguru, tvdom, filmix.net portālos
 - Tekošā programma ltc TV strīmos
 - Dažādu kļūdu labojumi
 
-**0.3a** (09.06.2016):  
+**0.3a** (09.06.2016):
 - SerialGURU.ru saturs
 - Avotiem ar parolēm (ltc, ustvnow) Options logs paroļu ievadei
 - iespēja pievienot favorītu sarakstiem, sarakstu labošana (pagaidām ierobēžota)
 
-**0.2h**:  
+**0.2h**:
 - pievienots USTVNow live TV
 - izlabotas dažas kļūdas (idoja ārā uz skiniem, kuros nebija skinned loga veida)
 
-**0.2f**:  
+**0.2f**:
 - pievienots TVDom.tv
 - izlabotas dažas kļūdas LTC
 
-**0.2e** (22.05.2016):  
+**0.2e** (22.05.2016):
 - daļēji salabots lattelecom.tv
 - pievienots play24.tv (Riga24V) portāla saturs
 - pievienots FilmON live TV un video on demand saturs (pagaidām tikai bezmaksas saturs)
 
-**0.2b**04.05.2016):  
+**0.2b**04.05.2016):
 - strādā lattelecom.tv 360tv raidījumu videonoma
 
-**0.2a** (03.05.2016):  
+**0.2a** (03.05.2016):
 - pievienots lattelecom.tv saturs
 - novērstas vairākas kļūdas
 
-**0.1d** (26.04.2016):  
+**0.1d** (26.04.2016):
 - novērsta klūda replay.lv skatot YouTube kontentu (ziņu fragmenti), lidoja ārā
 - salabotas atkarības, lai ar roku nav jāinstalē vajadzīgās bibliotēkas
 - pievienota licences informācija un kredīti
 
-**0.1c** (26.04.2016):  
+**0.1c** (26.04.2016):
 - strādā  replay.lv YouTube saturs (pamatā sižeti no ziņu raidījumiem)
 - papildus python moduļi ipk (katram gadījumam, ja tie nav iekļauti defaultā)

imake.bat

@@ -2,7 +2,7 @@
 :=== Parameters ===
 
 if ()==(%1%) (
-    set ver=0.5p
+    set ver=0.5s
 	rem echo Please provide version
 	rem pause
 	rem GOTO:EOF
@@ -19,6 +19,7 @@ set ext_dir2=/usr/lib/enigma2/python/Plugins/Extensions/
 set script_dir=usr\script\
 set ipk_dir=ipkg\
 set release_dir=release\
+set feed_dir=w:\feed\
 
 set AR=\MinGW\bin\ar.exe
 set TAR=\MinGW\msys\1.0\bin\tar.exe
@@ -158,3 +159,10 @@ if exist %release_dir%%pack_name%_%ver%.ipk del %release_dir%%pack_name%_%ver%.i
 mv %release_dir%%pack_name%_%ver% %release_dir%%pack_name%_%ver%.ipk
 git add %release_dir%%pack_name%_%ver%.ipk
 
+copy %release_dir%%pack_name%_%ver%.ipk %feed_dir%%pack_name%_%ver%.ipk
+pushd  %feed_dir%
+python c:\Python27\Scripts\opkg-make-index . >Packages
+dos2unix Packages
+gzip Packages
+popd
+

ipkg/CONTROL/control

@@ -1,4 +1,4 @@
-Version: 0.5p
+Version: 0.5s
 Package: enigma2-plugin-extensions-playstream
 Description: Play online streams from various sources, mostly Latvian
 Architecture: all

ipkg/data/usr/lib/enigma2/python/Plugins/Extensions/PlayStream/ContentSources.py

@@ -7,25 +7,22 @@
 #
 
 import sys,os,re
-import urllib2
 sys.path.insert(0,os.path.dirname(os.path.abspath(__file__)))
 from  sources.SourceBase import stream_type
 import util
 
 
-stream0 = {'name': '', 'url': '', 'quality': '???', 'surl': '', 'subs': '', 'headers': {},"desc":"","img":"","lang":"","type":""}
-
 class ContentSources(object):
     """Wrapper for content sources plugin"""
 
     #----------------------------------------------------------------------
-    def __init__(self,plugin_path):
+    def __init__(self, plugin_path):
         self.plugins = {}
-        self.error_content = [("..atpakaļ","back",None,"Kļūda, atgriezties atpakaļ")]
+        self.error_content = [("..atpakaļ", "back", None, "Kļūda, atgriezties atpakaļ")]
         sys.path.insert(0, plugin_path)
         for f in os.listdir(plugin_path):
             fname, ext = os.path.splitext(f)
-            if fname == "__init__":continue
+            if fname == "__init__": continue
             if ext == '.py':
                 mod = __import__(fname)
                 reload(mod)
@@ -79,7 +76,7 @@ class ContentSources(object):
             if "::" in data:
                 data = data.split("::")[1]
             content = self.get_content(data)
-            stream = stream0.copy()
+            stream = util.item()
             stream["name"] = data
             stream["url"] = data
             stream["type"] = stream_type(data)
@@ -164,19 +161,23 @@ if __name__ == "__main__":
         cur2 = content[n-1]
 
         data0 = cur2[1].split("::")[1] if "::" in cur2[1] else cur2[1]
-        if (not data0):
+        if not data0:
             pass
 
         elif cur2[1] == "back":
             cur = history.pop()
         elif sources.is_video(cur2[1]):
             if sources.stream_type(cur2[1]):
-                stream = stream0.copy()
+                stream = util.item()
                 stream["url"] = cur2[1]
                 stream["name"] = cur2[0]
                 streams = [stream]
             else:
-                streams = sources.get_streams(cur2[1])
+                try:
+                    streams = sources.get_streams(cur2[1])
+                except Exception as e:
+                    print str(e)
+                    streams = []
             if streams:
                 util.play_video(streams)
             else:
@@ -191,4 +192,10 @@ if __name__ == "__main__":
                 cur2 = (cur2[0],cur2[1].format(a),cur2[2],cur2[3])
             history.append(cur)
             cur = cur2
-        content = sources.get_content(cur[1])
+        try:
+            content = sources.get_content(cur[1])
+        except Exception as e:
+            print str(e)
+            raw_input("Continue?")
+
+

ipkg/data/usr/lib/enigma2/python/Plugins/Extensions/PlayStream/PlayStream.py

@@ -518,7 +518,7 @@ class MainScreen(Screen):
 
         elif self.sources.is_video(current[1]):
             if self.sources.stream_type(current[1]):
-                stream = stream0.copy()
+                stream = util.item()
                 stream["url"] = current[1]
                 stream["name"] = current[0]
                 streams = [stream]
@@ -711,7 +711,7 @@ class MainScreen(Screen):
 
     def download_video(self,current):
         if self.sources.stream_type(current[1]):
-            stream = stream0.copy()
+            stream = util.item()
             stream["url"] = current[1]
             stream["name"] = current[0]
             streams = [stream]

ipkg/data/usr/lib/enigma2/python/Plugins/Extensions/PlayStream/resolvers/hqqresolver.py

@@ -21,7 +21,7 @@ try:
     import util
 except:
     pp = os.path.dirname(os.path.abspath(__file__))
-    sys.path.insert(0,os.sep.join(pp.split(os.sep)[:-1]))
+    sys.path.insert(0, os.sep.join(pp.split(os.sep)[:-1]))
     import util
 import requests
 

ipkg/data/usr/lib/enigma2/python/Plugins/Extensions/PlayStream/sources/SourceBase.py

@@ -13,7 +13,7 @@ from collections import OrderedDict
 import ConfigParser
 
 headers2dict = lambda  h: dict([l.strip().split(": ") for l in h.strip().splitlines()])
-stream0 = {'name': '', 'url': '', 'quality': '???', 'surl': '', 'subs': '', 'headers': {},"desc":"","img":"","lang":"","type":"","order":0}        
+stream0 = {'name': '', 'url': '', 'quality': '???', 'surl': '', 'subs': '', 'headers': {},"desc":"","img":"","lang":"","type":"","order":0}
 
 
 class SourceBase(object):
@@ -56,28 +56,28 @@ User-Agent: Mozilla/5.0 (Linux; U; Android 4.4.4; Nexus 5 Build/KTU84P) AppleWeb
         stream["url"] = content[1].encode("utf8") if isinstance(content[1],unicode) else content[1]
         stream["img"] = content[2].encode("utf8") if isinstance(content[2],unicode) else content[2]
         stream["desc"] = content[3].encode("utf8") if isinstance(content[3],unicode) else content[3]
-        stream["type"] = stream_type(content[1]).encode("utf8") 
+        stream["type"] = stream_type(content[1]).encode("utf8")
         return[stream]
 
     def options_read(self):
         if not ("options" in dir(self) and self.options): # process options only if self.options defined, self.config_file should be defined too
             return None
-        config = ConfigParser.ConfigParser()        
+        config = ConfigParser.ConfigParser()
         if os.path.exists(self.config_file):
             config.read(self.config_file)
-            self.options = OrderedDict(config.items(self.name))             
+            self.options = OrderedDict(config.items(self.name))
         else:
             self.options_write(self.options)
         return self.options
 
-    def options_write(self,options):        
-        config = ConfigParser.ConfigParser() 
+    def options_write(self,options):
+        config = ConfigParser.ConfigParser()
         config.add_section(self.name)
         for k in options.keys():
             config.set(self.name, k,options[k])
         with open(self.config_file,"w") as f:
             config.write(f)
-        self.options = OrderedDict(config.items(self.name))        
+        self.options = OrderedDict(config.items(self.name))
 
     def call(self, data,params=None,headers=None,lang=""):
         if not headers: headers = self.headers
@@ -94,14 +94,14 @@ User-Agent: Mozilla/5.0 (Linux; U; Android 4.4.4; Nexus 5 Build/KTU84P) AppleWeb
             raise "No data returned"
 
     def _http_request(self, url,params = None, headers=None):
-        if not headers: 
+        if not headers:
             headers = self.headers if "headers" in dir(self) else headers2dict("User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:49.0) Gecko/20100101 Firefox/49.0")
         try:
             if params:
                 r = requests.post(url, data=params, headers=headers)
             else:
                 r = requests.get(url, headers=headers)
-            return r.content 
+            return r.content
         except Exception as ex:
             if "read" in ex:
                 content = ex.read()
@@ -113,10 +113,6 @@ User-Agent: Mozilla/5.0 (Linux; U; Android 4.4.4; Nexus 5 Build/KTU84P) AppleWeb
     def stream_type(data):
         return stream_type(data)
 
-    @staticmethod
-    def get_stream0():
-        return stream0.copy()
-
     @staticmethod
     def parse_data(data):
         if "::" in data:

ipkg/data/usr/lib/enigma2/python/Plugins/Extensions/PlayStream/sources/euronews.py

@@ -14,13 +14,14 @@ import urllib2, urllib
 import datetime, time,re, sys,os
 from collections import OrderedDict
 from SourceBase import SourceBase
+import util
 
 headers2dict = lambda  h: dict([l.strip().split(": ") for l in h.strip().splitlines()])
 import HTMLParser
 h = HTMLParser.HTMLParser()
-    
+
 class Source(SourceBase):
-    
+
     def __init__(self,language="en"):
         self.name = "euronews"
         self.title = "Euronews"
@@ -42,10 +43,10 @@ Connection: keep-alive
             self.get_languages()
         except:
             pass
-        
+
     def login(self,user="",password=""):
         return True
-            
+
     def get_content(self, data):
         print "[%s] get_content:"%self.name, data
         source,data,path,plist,clist,params,qs = self.parse_data(data)
@@ -53,13 +54,13 @@ Connection: keep-alive
         lang = self.options["language"]
         if not lang in self.get_languages():
             raise Exception("Not valid default language - '%s'"%lang)
-    
+
         content=[]
         content.append(("..return", "back","","Return back"))
-        
+
         if clist=="home":
             content.extend([
-                ("Search", "euronews::content/getSearch?lang=%s&byPage=40&page=1&text={0}"%lang,self.img,"Top stories timeline"),                
+                ("Search", "euronews::content/getSearch?lang=%s&byPage=40&page=1&text={0}"%lang,self.img,"Top stories timeline"),
                 ("Live stream", "euronews::live?lang=%s"%lang,self.img,"Euronews live stream"),
                 ("Just in", "euronews::content/getTimeline?lang=%s&byPage=40&page=1"%lang,self.img,"News timeline"),
                 ("Top stories", "euronews::content/getTopStories?lang=%s"%lang,self.img,"Top stories timeline"),
@@ -71,16 +72,16 @@ Connection: keep-alive
                 ("Programs list", "euronews::content/getPrograms?lang=%s"%lang,self.img,"Programs list"),
              ])
             return content
-        
 
-        ### Video arhīvs ###  
+
+        ### Video arhīvs ###
         elif clist=="content":
             if "lang" in qs:
                 del qs["lang"]
             params = json.dumps(qs)
-            
+
             req = '{"methodName":"content.%s","apiKey":"androidPhoneEuronews-1.0","params":%s,"language":"%s"}'%(plist[1],params,lang)
-            r = self.call(req)    
+            r = self.call(req)
             if not r:
                 return content
             lst = r["timeline"] if "timeline" in r else\
@@ -93,7 +94,7 @@ Connection: keep-alive
                 []
             if not lst:
                 return content
-            
+
             for item in lst:
                 if plist[1] in ("getTimeline"):
                     article = item["article"]
@@ -104,7 +105,7 @@ Connection: keep-alive
                     article = item
                     atype = "article"
                 if plist[1]=="getPrograms":
-                    title = article["title"] 
+                    title = article["title"]
                     id = article["pId"]
                     desc = title
                     img = "http://static.euronews.com/articles/programs/533x360_%s"%article["img"]
@@ -115,7 +116,7 @@ Connection: keep-alive
                     if atype <> "article":
                         title = "[%s] %s"%(atype,title)
                     atime = datetime.datetime.fromtimestamp(int(article["uts"]))
-                    #atime = datetime.datetime.fromtimestamp(int(article["uts"])-time.altzone) 
+                    #atime = datetime.datetime.fromtimestamp(int(article["uts"])-time.altzone)
                     atime = atime.strftime("%Y-%m-%d %H:%M")
                     vert = self.vid[article["vId"]] if "vId" in article else ""
                     ptitle = article["pTitle"] if "pTitle" in article else ""
@@ -129,19 +130,19 @@ Connection: keep-alive
                     content.append((title,self.name+"::"+data2,img,desc))
             if "page=" in data:
                 data2 = re.sub("page=\d+","page=%s"%(int(qs["page"])+1),data)
-                content.append(("Next page",self.name+"::"+data2,self.img,"Next page")) 
-            return content            
+                content.append(("Next page",self.name+"::"+data2,self.img,"Next page"))
+            return content
+
 
-    
     def is_video(self,data):
-        source,data,path,plist,clist,params,qs = self.parse_data(data)        
+        source,data,path,plist,clist,params,qs = self.parse_data(data)
         if path == "live":
             return True
         elif clist=="content" and plist[1]=="getArticle":
             return True
         else:
             return False
-        
+
     def get_streams(self, data):
         print "[euronews] get_streams:", data
         if not self.is_video(data):
@@ -150,10 +151,10 @@ Connection: keep-alive
         #lang = qs["lang"] if "lang" in qs else self.language
         lang = self.options["language"]
         if not lang in self.get_languages():
-            raise Exception("Not valid default language - '%s'"%lang)        
-        
+            raise Exception("Not valid default language - '%s'"%lang)
+
         streams = []
-        
+
         if path == "live":
             url = "http://www.euronews.com/api/watchlive.json"
             r = self._http_request(url)
@@ -169,11 +170,11 @@ Connection: keep-alive
                     raise Exception("No live stream found")
             except:
                 raise Exception("No live stream found")
-            
+
             slist = js["primary"]
-            
+
             for l in slist:
-                stream = self.get_stream0()
+                stream = util.item()
                 stream["url"]=slist[l]["hls"]
                 stream["lang"]=l
                 stream["quality"]="variant"
@@ -181,7 +182,7 @@ Connection: keep-alive
                 stream["desc"]=stream["name"]
                 stream["type"]="hls" #stream_type(url)
                 streams.append(stream)
-                
+
         elif clist=="content" and plist[1] == "getArticle":
             if "lang" in qs:
                 del qs["lang"]
@@ -189,14 +190,14 @@ Connection: keep-alive
             for lang in languages:
                 id = qs["id"]
                 req = '{"methodName":"content.getArticle","apiKey":"androidPhoneEuronews-1.0","params":{"id":"%s"},"language":"%s"}'%(id,lang)
-                r = self.call(req)    
+                r = self.call(req)
                 if not r:
-                    raise Exception("No live stream found") 
+                    raise Exception("No live stream found")
                 if not "articlelist" in r:
                     msg = r["label"] if "label" in r else "No article finde"
                     raise Exception(msg)
                 article = r["articlelist"]
-                stream = self.get_stream0()
+                stream = util.item()
                 stream["url"]=article["videoUri"] if "videoUri" in article else ""
                 if not stream["url"]:
                     return []
@@ -206,13 +207,13 @@ Connection: keep-alive
                 stream["desc"]=article["text"] if "text" in article else article["title"]
                 stream["type"]="http" #stream_type(url)
                 streams.append(stream)
-            
+
         else:
             raise Exception("No live stream found")
-           
+
         ### TODO - sakārtot sarakstu, lai pirmais ir labakais video
         qlist = ["???","lq","mq","hq","hd","variant"]
-        llist = ["fr","en","ru","lv"]        
+        llist = ["fr","en","ru","lv"]
         for s in streams:
             if s["lang"]==self.options["language"]:
                 s["order"] = 10000
@@ -238,11 +239,11 @@ Connection: keep-alive
                 raise Exception("Can not get languages list")
         except:
             raise Exception("Can not get languages list")
-        
+
         slist = js["primary"]
         self.languages=slist.keys()
         return self.languages
-        
+
     def call(self, data,params = None, headers=None):
         if not headers: headers = self.headers
         #if not lang: lang = self.country
@@ -269,7 +270,7 @@ content-disposition: form-data; name=request
                 return None
         else:
             return None
-        
+
 
 if __name__ == "__main__":
     language= "en"

ipkg/data/usr/lib/enigma2/python/Plugins/Extensions/PlayStream/sources/iplayer.py

@@ -13,22 +13,23 @@ import datetime
 import HTMLParser
 import json
 import datetime,time
-from SourceBase import SourceBase, stream_type, stream0
+from SourceBase import SourceBase, stream_type
+import util
 from collections import OrderedDict
 
 API_URL = 'https://m.lattelecom.tv/'
 user_agent = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 5_1_1 like Mac OS X; da-dk) AppleWebKit/534.46.0 (KHTML, like Gecko) CriOS/19.0.1084.60 Mobile/9B206 Safari/7534.48.3"
 headers2dict = lambda  h: dict([l.strip().split(": ") for l in h.strip().splitlines()])
 h = HTMLParser.HTMLParser()
-    
+
 class Source(SourceBase):
-    
+
     def __init__(self):
         self.name = "iplayer"
         self.title = "BBC iPlayer"
         self.img = "http://www.userlogos.org/files/logos/inductiveload/BBC_iPlayer_logo.png"
         self.desc = "BBC iPlayer portal content"
-        
+
         self.api_url = "http://ibl.api.bbci.co.uk/ibl/v1/"
         self.headers = headers2dict("""
 User-Agent: BBCiPlayer/4.19.0.3021 (SM-G900FD; Android 4.4.2)
@@ -38,7 +39,7 @@ Connection: Keep-Alive
 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.102 Safari/537.36
 Connection: Keep-Alive
         """)
-        
+
         self.ch = []
         self.ch_id={}
         self.ch_id2={}
@@ -54,26 +55,26 @@ Connection: Keep-Alive
             "bbc_news24":"http://www.lyngsat-logo.com/hires/bb/bbc_news.png",
             "bbc_parliament":"http://www.lyngsat-logo.com/hires/bb/bbc_parliament.png",
             "bbc_alba":"http://www.lyngsat-logo.com/hires/bb/bbc_alba.png",
-            "s4cpbs":"http://www.lyngsat-logo.com/hires/ss/s4c_uk.png"          
+            "s4cpbs":"http://www.lyngsat-logo.com/hires/ss/s4c_uk.png"
         }
         cur_directory = os.path.dirname(os.path.abspath(__file__))
         self.config_file = os.path.join(cur_directory,self.name+".cfg")
         self.options = OrderedDict([("user","lietotajs"),("password","parole")])
         self.options_read()
-                     
+
     def get_content(self, data):
         print "[iplayer] get_content:", data
         if "::" in data:
-            data = data.split("::")[1] 
+            data = data.split("::")[1]
         path = data.split("?")[0]
         clist = path.split("/")[0]
         params = data[data.find("?"):] if "?" in data else ""
         qs = dict(map(lambda x:x.split("="),re.findall("\w+=[\w-]+",params)))
         #lang = qs["lang"] if "lang" in qs else self.country
-    
+
         content=[]
         content.append(("..return", "back","","Return back"))
-        
+
         ### Home ###
         if data=="home":
             content.extend([
@@ -82,11 +83,11 @@ Connection: Keep-Alive
                 ("Channels", "iplayer::channels","","Programmes by channel/date"),
                 ("Categories", "iplayer::categories","","Programmes by categories"),
                 ("A-Z", "iplayer::a-z","","All programmes by name"),
-                ("Highlights", "iplayer::home/highlights","","Current highlights"),             
-                ("Most popular", "iplayer::groups/popular/episodes?per_page=40&page=1","","Most popular programmes")            
+                ("Highlights", "iplayer::home/highlights","","Current highlights"),
+                ("Most popular", "iplayer::groups/popular/episodes?per_page=40&page=1","","Most popular programmes")
             ])
             return content
-        
+
         ### Search ###
         elif clist=="search":
             data_ = "search-suggest/?q=%s&rights=mobile&initial_child_count=1"%data.split("/")[1]
@@ -95,8 +96,8 @@ Connection: Keep-Alive
                 title,data2,img,desc = self.get_data_element(item)
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
-                        
-        
+
+
         ### Live main ###
         elif data=="live":
             for ch in self.get_channels():
@@ -108,7 +109,7 @@ Connection: Keep-Alive
                 desc = ee[2]
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
-        
+
         ### Categories ###
         elif data == "categories":
             r = self.call(data)
@@ -121,7 +122,7 @@ Connection: Keep-Alive
                 img = self.img
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
-        
+
         ### Catetory root ###
         elif clist == "categories" and len(data.split("/"))==2:
             r = self.call(data)
@@ -132,7 +133,7 @@ Connection: Keep-Alive
             title = "%s - a-z (%s programmes, %s episodes)"%(r["category"]["title"],r["category"]["child_programme_count"],r["category"]["child_episode_count"])
             content.append((title,self.name+"::"+data+"/programmes?rights=mobile&page=1&per_page=40&sort=title&sort_direction=asc&initial_child_count=1&availability=available",self.img,title))
             return content
-        
+
         ### Program/episodes list ###
         elif   re.search("categories/([\w\-]+)/(highlights|programmes).+",data) or\
                re.search("programmes/(\w+)/episodes.+",data) or\
@@ -165,12 +166,12 @@ Connection: Keep-Alive
                 else:
                     title,data2,img,desc = self.get_data_element(el)
                 content.append((title,self.name+"::"+data2,img,desc))
-            
+
             if "&page=" in data and lst["page"]*lst["per_page"]<lst["count"]:
                 data2 = re.sub("&page=\d+","&page=%s"%(lst["page"]+1),data)
-                content.append(("Next page",self.name+"::"+data2,self.img,"Next page")) 
+                content.append(("Next page",self.name+"::"+data2,self.img,"Next page"))
             return content
-        
+
         ### A-z root ###
         elif data=="a-z":
             url = "http://www.bbc.co.uk/programmes/a-z/by/x/all.json?page=1"
@@ -185,7 +186,7 @@ Connection: Keep-Alive
                 data2 = "atoz/%s/programmes?rights=mobile&page=1&per_page=40&initial_child_count=1&sort=title&sort_direction=asc&availability=available"%ch
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
-        
+
         ###  Channels home ###
         elif data=="channels":
             for ch in self.get_channels():
@@ -197,26 +198,26 @@ Connection: Keep-Alive
                 desc = title
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
-        
+
         ### Channel higlihts/progrmmes/days ###
         elif clist=="channels" and len(data.split("/"))==2:
             r = self.call(data)
             chid = data.split("/")[1]
             ch = self.get_channel_by_id(chid)
-            
+
             # Highlights
             title = ch["title"] + " - highlights"
             img = "http://static.bbci.co.uk/mobileiplayerappbranding/1.9/android/images/channels/tv-guide-wide-logo/layout_normal/xxhdpi/%s_tv-guide-wide-logo.png"%ch["id"]
             data2 = "channels/%s/highlights?lang=en&rights=mobile&availability=available"%ch["id"]
             desc = title
             content.append((title,self.name+"::"+data2,img,desc))
-            
+
             #AtoZ
             title = ch["title"] + " - programmes AtoZ"
             data2 = "channels/%s/programmes?rights=mobile&page=1&per_page=40&sort=recent&sort_direction=asc&initial_child_count=1&availability=available"%ch["id"]
             desc = title
             content.append((title,self.name+"::"+data2,img,desc))
-            
+
             day0 = datetime.date.today()
             for i in range(10):
                 day = day0-datetime.timedelta(days=i)
@@ -228,11 +229,11 @@ Connection: Keep-Alive
                 desc = title
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
-        
-            
+
+
     def get_streams(self, data):
         print "[iplayer] get_streams:", data
-        if "::" in data: data = data.split("::")[1]         
+        if "::" in data: data = data.split("::")[1]
         if not self.is_video(data):
             return []
         cmd = data.split("/")
@@ -265,7 +266,7 @@ Connection: Keep-Alive
                     sub["name"] = s["service"] if "service" in s else "captions (taff)"
                     sub["lang"] = "en"
                     captions.append(sub)
-                    
+
             if s["kind"] <> "video":
                 continue
             for c in s["connection"]:
@@ -277,9 +278,9 @@ Connection: Keep-Alive
                 if not r2: continue
                 slist = re.findall("#EXT-X-STREAM-INF:([^\n]+)\n([^\n]+)", r2, re.DOTALL)
                 if not slist:
-                    stream = stream0.copy()
+                    stream = util.item()
                     stream["url"]=url
-                    stream["name"]=title 
+                    stream["name"]=title
                     stream["desc"]=desc
                     stream["img"]=img
                     stream["type"]="hls"
@@ -299,9 +300,9 @@ Connection: Keep-Alive
                             uu = url.split("/")[:-1]
                             uu.append(url2)
                             url2 = "/".join(uu)
-                        stream = stream0.copy()
+                        stream = util.item()
                         stream["url"]=url2
-                        stream["name"]=title 
+                        stream["name"]=title
                         stream["desc"]=desc
                         stream["img"]=img
                         stream["type"]="hls"
@@ -315,7 +316,7 @@ Connection: Keep-Alive
                 s["subs"]=captions
         streams = sorted(streams,key=lambda item: item["order"],reverse=True)
         return streams
-        
+
     def is_video(self,data):
         if "::" in data:
             data = data.split("::")[1]
@@ -326,7 +327,7 @@ Connection: Keep-Alive
             return True
         else:
             return False
-        
+
     def get_data_element(self,item):
         if ("programme" in item["type"] or "group" in item["type"]) and item["count"]>1:
             ep = item.copy()
@@ -354,9 +355,9 @@ Connection: Keep-Alive
             title = "%s [%s episodes]"%(title,ep["count"])
         else:
             data2 = "programmes/%s/episodes?per_page=40&page=1"%ep["id"]
-            title = "%s [%s episodes]"%(title,ep["count"])            
+            title = "%s [%s episodes]"%(title,ep["count"])
         return title,data2,img,desc
-    
+
     def get_epg_video(self,vid):
         data = "episodes/%s"%vid
         r = self.call(data)
@@ -378,7 +379,7 @@ Connection: Keep-Alive
             return title.encode("utf8"),img.encode("utf8"),desc.encode("utf8"),vid.encode("utf8")
         else:
             raise Exception("No video info")
-    
+
     def get_epg_live(self,channelid):
         data = "channels/%s/highlights?live=true"%channelid
         r = self.call(data)
@@ -401,9 +402,9 @@ Connection: Keep-Alive
             title = r["channel_highlights"]["channel"]["title"]
             img = ""
             desc = title
-            
+
         return title.encode("utf8"),img.encode("utf8"),desc.encode("utf8")
-        
+
     def get_channels(self):
         if self.ch:
             return self.ch
@@ -415,31 +416,31 @@ Connection: Keep-Alive
             self.ch_id2[item["master_brand_id"]]=i
             self.ch_name[item["title"]]=i
         return self.ch
-                
+
     def get_channel_by_id(self,chid):
         if not self.ch:
             self.get_channels()
         if not self.ch:
             return None
         return self.ch[self.ch_id[chid]] if self.ch_id.has_key(chid) else None
-    
+
     def get_channel_by_id2(self,chid):
         if not self.ch:
             self.get_channels()
         if not self.ch:
             return None
         return self.ch[self.ch_id2[chid]] if self.ch_id2.has_key(chid) else None
-     
+
     def get_channel_by_name(self,name):
         if not self.ch:
             self.get_channels()
         ch2 = self.get_channel_by_name2(name)
         if not ch2:
             return None
-        ch = self.get_channel_by_id2(ch2["id2"]) 
+        ch = self.get_channel_by_id2(ch2["id2"])
         return ch
-                
-        
+
+
     def call(self, data,params = None, headers=None):
         if not headers: headers = self.headers
         #if not lang: lang = self.country
@@ -453,7 +454,7 @@ Connection: Keep-Alive
                 return None
         else:
             return None
-        
+
     def call2(self, data,params = None, headers=None):
         if not headers: headers = self.headers2
         #if not lang: lang = self.country
@@ -467,7 +468,7 @@ Connection: Keep-Alive
         try:
             r = requests.get(url, headers=headers)
             return r.content
-        
+
         except Exception as ex:
             if ex.code==403:
                 return ex.read()
@@ -481,17 +482,17 @@ def gt(dt_str):
     #us= int(us.rstrip("Z"), 10)
     #r = dt + datetime.timedelta(microseconds=us)a
     return dt
-   
+
 if __name__ == "__main__":
     c = Source()
     from subprocess import call
     #ch = c.get_channels()
     #c.get_epg_live("bbc_two_england")
-    
+
     if len(sys.argv)>1 and  not "iplayer::" in sys.argv[1]:
-        
+
         vid = sys.argv[1]
-        print "login - %s"%c.login("ivars777","xxx")        
+        print "login - %s"%c.login("ivars777","xxx")
         vid = "1069"
         vid = "1462566072086"
         channelid="101"
@@ -499,9 +500,9 @@ if __name__ == "__main__":
         #data = c.get_stream_url(vid,"vod")
         #call([r"c:\Program Files\VideoLAN\VLC\vlc.exe",data["stream"]])
         pass
- 
 
-        
+
+
     else:
         if len(sys.argv)>1:
             data= sys.argv[1]

ipkg/data/usr/lib/enigma2/python/Plugins/Extensions/PlayStream/sources/ltc.py

@@ -21,15 +21,15 @@ API_URL = 'https://m.lattelecom.tv/'
 user_agent = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 5_1_1 like Mac OS X; da-dk) AppleWebKit/534.46.0 (KHTML, like Gecko) CriOS/19.0.1084.60 Mobile/9B206 Safari/7534.48.3"
 headers2dict = lambda  h: dict([l.strip().split(": ") for l in h.strip().splitlines()])
 h = HTMLParser.HTMLParser()
-    
+
 class Source(SourceBase):
-    
+
     def __init__(self):
         self.name = "ltc"
         self.title = "Shortcut.lv (lattelecom.tv)"
         self.img = "picons/shortcut.png"
         self.desc = "Shortcut.lv (lattelecom.tv) satura skatīšanās"
-        
+
         self.token = "" # manstv.lattelecom.tv
         self.session_id = ""  # www.lattelecom.tv
         self.api_url = "https://manstv.lattelecom.tv/api/v1.4/get/"
@@ -46,7 +46,7 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0
 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.102 Safari/537.36
 Accept-Language: en-US,en;q=0.8
         """)
-        
+
         self.channels = None
         ### specific service info ###
         self.ch=[]
@@ -60,38 +60,38 @@ Accept-Language: en-US,en;q=0.8
         self.epg_date={}
         self.epg_ch={}
         self.epgdates = []
-        
+
         self.today = datetime.date.today()
-        self.today2 = self.today.strftime("%d.%m.%Y") 
+        self.today2 = self.today.strftime("%d.%m.%Y")
 
         cur_directory = os.path.dirname(os.path.abspath(__file__))
         self.config_file = os.path.join(cur_directory,self.name+".cfg")
         self.options = OrderedDict([("user","lietotajs"),("password","parole")])
         self.options_read()
-               
+
     def get_content(self, data):
         print "[ltc] get_content:", data
         if "::" in data:
-            data = data.split("::")[1] 
+            data = data.split("::")[1]
         path = data.split("?")[0]
         clist = path.split("/")[0]
         params = data[data.find("?"):] if "?" in data else ""
         qs = dict(map(lambda x:x.split("="),re.findall("\w+=[\w-]+",params)))
         #lang = qs["lang"] if "lang" in qs else self.country
-    
+
         content=[]
         content.append(("..return", "back","","Return back"))
-        
+
         if clist=="home":
             content.extend([
                 ("Search TV", "ltc::search/{0}","","Search in TV archive"),
                 ("Search Video", "ltc::meklet?q={0}","","Search in video"),
                 ("Live streams", "ltc::tiesraide","","TV live streams"),
                 ("Archive", "ltc::arhivs","","TV live archive"),
-                ("Video", "ltc::videonoma","","Video on demand"),             
+                ("Video", "ltc::videonoma","","Video on demand"),
             ])
             return content
-        
+
         ### Meklēt TV (1.4 API)
         elif clist == "search": #TODO vod/search/{q}
             #r = self.call("vod/"+data)
@@ -100,12 +100,12 @@ Accept-Language: en-US,en;q=0.8
         ### Meklēsana video (www )###
         elif clist == "meklet": #TODO vod/search/{q}
             r = self.call2(data)
-            
+
             for res in re.findall('<div class="(program follow|movie forward)-link">(.+?</div></div>.*?)</div>', r, re.DOTALL):
                 r2 = res[1]
                 if "movie" in res[0]:
                     #if not "permalink" in r2:
-                        #continue                    
+                        #continue
                     m = re.search('<a class="title" href="([^"]+)/">([^<]+)</a>', r2, re.DOTALL)
                     if not m: continue
                     title = m.group(2)
@@ -118,7 +118,7 @@ Accept-Language: en-US,en;q=0.8
                     m = re.search('class="genre".+?>([^<]+)<', r2, re.DOTALL)
                     if m:
                         desc = m.group(1)+"\n"+desc
-                    
+
                 else:
                     m = re.search('<a href="/([^"]+)" class="title">([^<]+)</a>', r2, re.DOTALL)
                     if not m: continue
@@ -140,7 +140,7 @@ Accept-Language: en-US,en;q=0.8
                     desc = title
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
-            
+
         ### Tiešraides kanānālu saraksts ###
         elif data=="tiesraide":
             r = self.call2(data)
@@ -159,7 +159,7 @@ Accept-Language: en-US,en;q=0.8
                     desc = title
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
-            
+
         ### TV arhīva sākums ###
         elif data=="archive" or data=="arhivs":
             #self.get_epg()
@@ -169,7 +169,7 @@ Accept-Language: en-US,en;q=0.8
                 #("Archive - dates", "ltc::archive/dates","","TV live archive by dates"),
             ])
             return content
-                
+
         ### Arhīva kategorijas
         elif data=="archive/categories":
             #https://manstv.lattelecom.tv/api/v1.3/get/archive/records/?filter[category]=13&limit=10&until_id=1458681019238
@@ -182,7 +182,7 @@ Accept-Language: en-US,en;q=0.8
                 desc = title
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
-        
+
         ### Arhīva kategoriju video
         elif "archive/records" in data:
             #https://manstv.lattelecom.tv/api/v1.3/get/archive/records/?filter[category]=13&limit=10&until_id=1458681019238
@@ -203,7 +203,7 @@ Accept-Language: en-US,en;q=0.8
                     if not item["channel_id"] in self.epg_ch:
                         self.epg_ch[item["channel_id"]]=[]
                     self.epg_ch[item["channel_id"]].append(index)
-                item = self.get_epg_id(item["id"])                     
+                item = self.get_epg_id(item["id"])
                 ch = self.get_channel_by_id2(item["channel_id"])
                 ch_name = ch["name"] if ch else item["channel_id"]
                 title = u"[%s %s-%s] %s - %s"%(item["date"],item["time_start2"].strftime("%H:%M"),item["time_stop2"].strftime("%H:%M"),ch_name,item["title"])
@@ -217,7 +217,7 @@ Accept-Language: en-US,en;q=0.8
                 data2 = re.sub("until_id=\d+","until_id="+item["id"],data)
             else:
                 data2 = data + "&until_id=%s"%item["id"]
-            content.append(("Next page",self.name+"::"+data2,"","Go to next page"))                 
+            content.append(("Next page",self.name+"::"+data2,"","Go to next page"))
             return content
 
         ### Arhīva kanānālu saraksts
@@ -232,7 +232,7 @@ Accept-Language: en-US,en;q=0.8
             return content
 
         ### Arhīva kanānāla video saraksta
-        elif "archive/channel/" in data: 
+        elif "archive/channel/" in data:
             chid = path.split("/")[2]
             for item in self.get_epg_date(qs["date"],chid):
                 #if item["is_archive"]=='0':continue
@@ -251,18 +251,18 @@ Accept-Language: en-US,en;q=0.8
                 data2 = re.sub("date=[\d-]+","date="+date2,data)
             else:
                 data2 = data + "&date=%s"%date2
-            content.append(("Previous day (%s)"%date2,self.name+"::"+data2,"","Go previous day"))                 
+            content.append(("Previous day (%s)"%date2,self.name+"::"+data2,"","Go previous day"))
             return content
-        
-        ### Arhīva datumi 
+
+        ### Arhīva datumi
         elif clist=="arhivs" and len(data.split("/"))==2: # TODO - pasreiz nestrada
             ch = data.split("/")[1]
-            r= self.call(data)            
+            r= self.call(data)
             m = re.search('class="spac no_select">([^<]+)</span>', r, re.IGNORECASE)
             if m:
                 ch_name = m.group(1)
             else:
-                ch_name = ""            
+                ch_name = ""
             today =  datetime.date.today()
             for i in range(7):
                 date = today-datetime.timedelta(i)
@@ -277,12 +277,12 @@ Accept-Language: en-US,en;q=0.8
         elif clist=="arhivs" and len(data.split("/"))==3: # TODO - nestrādā
             ch = data.split("/")[1]
             date = data.split("/")[2]
-            r= self.call(data) 
+            r= self.call(data)
             m = re.search('class="spac no_select">([^<]+)</span>', r, re.IGNORECASE)
             if m:
                 ch_name = m.group(1)
             else:
-                ch_name = ""                        
+                ch_name = ""
             for item in re.findall('(?i)href="/([^"]+?)" id="" class="archive_programm_a"><div class="archive_programm "><div class="chanel_time"><span>([^<]+)</span></div><div class="archive_programm_one"><span>([^<]+)', r):
                 title = "%s - %s"%(item[1],item[2])
                 data2 = item[0]
@@ -290,8 +290,8 @@ Accept-Language: en-US,en;q=0.8
                 desc = "%s (%s)\n%s"%(ch_name,date,title)
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
-                
-        
+
+
         ### Videonoma galvenā
         elif data=="videonoma":
             content.extend([
@@ -315,7 +315,7 @@ Accept-Language: en-US,en;q=0.8
                 ("Koncerti - pēc nosaukuma", "ltc::videonoma?page=0&genre=19&sorts=title&cnt=40&clear=true&filter={}","https://www.lattelecom.tv/images/redesign/videonoma_dropdown_koncerti.png","Koncerti pēc pēc nosaukuma"),
             ])
             return content
-        
+
         ### Videonomas saraksti
         elif path == "videonoma":
             url = "https://www.lattelecom.tv/movies-snippet.json"+params
@@ -328,19 +328,19 @@ Accept-Language: en-US,en;q=0.8
             for item in js["movies"]:
                 if not item["title"]:
                     continue
-                title = item["title"].encode("utf8") 
+                title = item["title"].encode("utf8")
                 data2 = item["url"][1:].encode("utf8")
                 if data2[-1]=="/": data2=data2[:-1]
                 if "/raidijumi/" in data2:
                     data2 += "?series"
                 img = "https://www.lattelecom.tv"+item["image"].encode("utf8")
                 desc = "%s\n%s"%(title,item["genre"].encode("utf8"))
-                content.append((title,self.name+"::"+data2,img,desc)) 
+                content.append((title,self.name+"::"+data2,img,desc))
             m = re.search("page=(\d+)",data)
             if m:
                 page = int(m.group(1))
                 data2 = re.sub("page=\d+","page=%s"%(page+1),data)
-                content.append(("Next page",self.name+"::"+data2,"","Go to next page"))                 
+                content.append(("Next page",self.name+"::"+data2,"","Go to next page"))
             return content
 
         ### Sērijas
@@ -353,7 +353,7 @@ Accept-Language: en-US,en;q=0.8
             raidijums = m.group(1) + " - " if m else ""
             m = re.search('data-bid="([^"]+)',r)
             if m:
-                url = "https://www.lattelecom.tv/episode-loader.json?bcast_ids=%s"%(m.group(1)) 
+                url = "https://www.lattelecom.tv/episode-loader.json?bcast_ids=%s"%(m.group(1))
                 r = self._http_request(url,headers=self.headers2)
                 i1 = r.find('{"total":')
                 i2 = r.find('}<div class=')
@@ -363,16 +363,16 @@ Accept-Language: en-US,en;q=0.8
                     data2 = item["url"][1:]
                     img = "https://www.lattelecom.tv"+item["img"]
                     desc = title
-                    content.append((title,self.name+"::"+data2,img,desc))                                     
+                    content.append((title,self.name+"::"+data2,img,desc))
             else:
-                for item in re.findall('(?si)<a class="elementxxx forward-link[^"]*" href="([^"]+)">.*?<img src="([^"]+)" class="img"><span class="titlez">([^<]+)</span><span class="epizode_number">([^<]+)</span>', r):                
+                for item in re.findall('(?si)<a class="elementxxx forward-link[^"]*" href="([^"]+)">.*?<img src="([^"]+)" class="img"><span class="titlez">([^<]+)</span><span class="epizode_number">([^<]+)</span>', r):
                     title = "%s%s (%s)"%(raidijums,item[2],item[3])
                     data2 = item[0][1:]
                     img = "https://www.lattelecom.tv"+item[1]
                     desc = title
                     content.append((title,self.name+"::"+data2,img,desc))
-            return content           
-            
+            return content
+
         ### Videonomas video
         elif clist=="videonoma" and len(data.split("/"))>1:
             ch = data.split("/")[1]
@@ -391,20 +391,20 @@ Accept-Language: en-US,en;q=0.8
             if m:
                 title = m.group(1)
             else:
-                title = ""  
+                title = ""
             desc = title
             content = (title,data2,"",desc)
             return content
 
         else:
             return content
-        
+
     def get_streams(self, data):
         print "[ltc] get_streams:", data
-        if "::" in data: data = data.split("::")[1]         
+        if "::" in data: data = data.split("::")[1]
         if not self.is_video(data):
             return []
-        
+
         ### Video nomas strīmus pagaidām dabu no mājas lapas TODO
         if data.split("/")[0]=="videonoma" and len(data.split("/"))>1:
             #video_id=data.split("/")[-1]
@@ -412,14 +412,14 @@ Accept-Language: en-US,en;q=0.8
         else:
             if not self.is_logedin():
                 if not self.login():
-                    return []   
+                    return []
             r = self.call(data)
             if not r: return []
             if "errors" in r:
                 return []
             self.refresh_token()
             token = "&auth_token=app_%s"%(self.token)
-            
+
             vid = data.split("/")[2].split("?")[0]
             vtype = data.split("/")[1]
             if vtype == "live-streams":
@@ -444,10 +444,10 @@ Accept-Language: en-US,en;q=0.8
                 date = epg["date"]
                 title = "%s (%s %s-%s)"%(title,date,t1,t2)
                 desc = epg["description"]
-    
+
             streams = []
             for s in r["data"]:
-                stream = stream0.copy()
+                stream = util.item()
                 stream["url"]=(s["attributes"]["stream-url"]+token.encode("utf8")).encode("utf8")
                 stream["name"]=title
                 stream["desc"]=desc
@@ -466,7 +466,7 @@ Accept-Language: en-US,en;q=0.8
             s["order"] = lv+qv
         streams = sorted(streams,key=lambda item: item["order"],reverse=True)
         return streams
-        
+
     def is_video(self,data):
         if "::" in data:
             data = data.split("::")[1]
@@ -481,7 +481,7 @@ Accept-Language: en-US,en;q=0.8
             return True
         else:
             return False
-    
+
     def get_channels(self):
         if self.ch:
             return self.ch
@@ -495,21 +495,21 @@ Accept-Language: en-US,en;q=0.8
             self.ch_id2[item["xprs_id"]]=i
             self.ch_name[item["name"]]=i
         return self.ch
-                
+
     def get_channel_by_id(self,chid):
         if not self.ch:
             self.get_channels()
         if not self.ch:
             return None
         return self.ch[self.ch_id[chid]] if self.ch_id.has_key(chid) else None
-    
+
     def get_channel_by_id2(self,chid):
         if not self.ch:
             self.get_channels()
         if not self.ch:
             return None
         return self.ch[self.ch_id2[chid]] if self.ch_id2.has_key(chid) else None
-    
+
     def get_channels2(self):
         if self.ch2:
             return self.ch2
@@ -522,7 +522,7 @@ Accept-Language: en-US,en;q=0.8
             ch["title"]=item[1]
             self.ch2.append(ch)
         return self.ch2
-    
+
     def get_channel_by_name2(self,name):
         if not self.ch2:
             self.get_channels2()
@@ -530,16 +530,16 @@ Accept-Language: en-US,en;q=0.8
             if c["name"]==name:
                 return c
         return None
-            
+
     def get_channel_by_name(self,name):
         if not self.ch:
             self.get_channels()
         ch2 = self.get_channel_by_name2(name)
         if not ch2:
             return None
-        ch = self.get_channel_by_id2(ch2["id2"]) 
+        ch = self.get_channel_by_id2(ch2["id2"])
         return ch
-        
+
     def get_epg(self,date=None,update=False):
         #https://manstv.lattelecom.tv/api/v1.3/get/tv/epg/?daynight=2016-05-19
         today=datetime.date.today()
@@ -569,10 +569,10 @@ Accept-Language: en-US,en;q=0.8
                 if not item["channel_id"] in self.epg_ch:
                     self.epg_ch[item["channel_id"]]=[]
                 self.epg_ch[item["channel_id"]].append(index)
-                              
+
         if not date in self.epgdates:
             self.epgdates.append(date)
-        
+
 
     def get_epg_id(self,epgid):
         if not self.epg:
@@ -581,7 +581,7 @@ Accept-Language: en-US,en;q=0.8
         if epgid in self.epg_id:
             return self.epg[self.epg_id[epgid]]
         return None
-    
+
     def get_epg_date(self,date,chid):
         if not date in self.epgdates:
             self.get_epg(date)
@@ -590,10 +590,10 @@ Accept-Language: en-US,en;q=0.8
         for it in self.epg_date[date]:
             item = self.epg[it]
             if item["channel_id"]==ch["xprs_id"]:
-                items.append(item)        
+                items.append(item)
         return items
-        
-        
+
+
     def call(self, data,params = None, headers=None):
         if not headers: headers = self.headers
         #if not lang: lang = self.country
@@ -607,7 +607,7 @@ Accept-Language: en-US,en;q=0.8
                 return None
         else:
             return None
-        
+
     def call2(self, data,params = None, headers=None):
         if not headers: headers = self.headers2
         #if not lang: lang = self.country
@@ -628,10 +628,10 @@ Accept-Language: en-US,en;q=0.8
 
     def login(self,user="",password=""):
         """Login in to site, get token"""
-        self.options_read()        
+        self.options_read()
         if not user: user=self.options["user"]
         if not password: password = self.options["password"]
-        
+
         # Dabūjam tokenu
         url = "https://manstv.lattelecom.tv/api/v1.3/post/user/login"
         params = "uid=7f777e938d35e017&password=%s&username=%s&"%(password,user)
@@ -639,7 +639,7 @@ Accept-Language: en-US,en;q=0.8
 Content-Type: application/x-www-form-urlencoded; charset=UTF-8
 User-Agent: Dalvik/1.6.0 (Linux; U; Android 4.4.2; SM-G900FD Build/KOT49H)
 Host: manstv.lattelecom.tv
-""" )    
+""" )
         try:
             r = urllib2.Request(url, data=params, headers=headers)
             u = urllib2.urlopen(r)
@@ -653,7 +653,7 @@ Host: manstv.lattelecom.tv
             return True
         else:
             return False
-        
+
     def refresh_token(self):
         data = "user/refresh-token//%s"%self.token
         r = self.call(data)
@@ -663,7 +663,7 @@ Host: manstv.lattelecom.tv
         else:
             self.token = ""
             return False
-    
+
     def check_logedin(self):
         if not self.token:
             return False
@@ -672,18 +672,18 @@ Host: manstv.lattelecom.tv
                 return True
             else:
                 return False
-        
+
     def is_logedin(self):
         if self.token:
             return True
         else:
             return False
-                 
+
     #----------------------------------------------------------------------
     def get_tv_url(self,video_id):
         """Get m3u8 url for given live tv channel"""
         url = "https://m.lattelecom.tv/tiesraide/%s"%video_id
-        data = self.get_stream_url2("tiesraide/%s"%video_id)        
+        data = self.get_stream_url2("tiesraide/%s"%video_id)
         #headers = self.headers
         #headers["Cookie"] = "%s; %s; _hjIncludedInSample=0; MobBitr=1; MobRentBitr=%s; MobRentLang=%s;"%(self.session_id,self.mobtv_cache,data["quality"],data["language"])
         #response = urllib2.urlopen(urllib2.Request(url, headers=headers))
@@ -702,11 +702,11 @@ Host: manstv.lattelecom.tv
         #response = urllib2.urlopen(urllib2.Request(url, headers=headers))
         #m3u8 = response.read()
         return data["stream"] if data else None
-        
+
     #----------------------------------------------------------------------
     def get_arhivs_url(self,video_id):
         """Get m3u8 url for given archive video"""
-        data = self.get_video_data(video_id)                
+        data = self.get_video_data(video_id)
         #url = "https://m.lattelecom.tv/free_origin?show_origin=1&type=arhivs&event_id=%s&bitrate=mhq"%(video_id) #,data["quality"])
         #headers = self.headers
         #headers["Cookie"] = "%s; %s; MobBitr=1; "%(self.session_id,self.mobtv_cache)
@@ -727,7 +727,7 @@ Host: manstv.lattelecom.tv
             return None
         if not self.is_logedin():
             if not self.login():
-                return None       
+                return None
         r = self.call(data)
         if not r:
             return None
@@ -741,9 +741,9 @@ Host: manstv.lattelecom.tv
                 s["stream"] += token
                 hls["streams"].append(s)
         return hls
-            
+
     def get_stream_url2(self,data):
-        video_id=data[data.find("/")+1:]        
+        video_id=data[data.find("/")+1:]
         if not self.is_logedin2():
             if not self.login2():
                 return []
@@ -753,14 +753,14 @@ Host: manstv.lattelecom.tv
         if m:
             title = m.group(1)
         else:
-            title = ""  
+            title = ""
         desc = title
-          
+
         url = "https://www.lattelecom.tv/xmls/%s.xml"%video_id
         headers = self.headers2
         headers["Cookie"] = self.session_id
         response = urllib2.urlopen(urllib2.Request(url, headers=headers))
-        
+
         r = response.read()
         servers = re.findall("(?s)<origin>([^<]+)</origin>", r)
         streams_xml = re.findall('<stream quality="\w+">(mp4:\w+_(\w\w)_(\w\w).mp4)</stream>',r)
@@ -775,13 +775,13 @@ Host: manstv.lattelecom.tv
             sub["lang"] = s[0]
             sub["name"] = "captions (vtt)"
             sub["type"] = "vtt"
-            sub["order"] = llist.index(sub["lang"])*10 if sub["lang"] in llist else 0            
-            captions.append(sub)       
-        captions = sorted(captions,key=lambda item: item["order"],reverse=True)      
+            sub["order"] = llist.index(sub["lang"])*10 if sub["lang"] in llist else 0
+            captions.append(sub)
+        captions = sorted(captions,key=lambda item: item["order"],reverse=True)
         for s in streams_xml:
-            for server in servers: 
+            for server in servers:
                 server2 = self.load_balancer(server)
-                url = "http://%s/mobile-vod/%s/playlist.m3u8?resource_id=%s&auth_token=%s"%(server2,s[0],resource_id,token) 
+                url = "http://%s/mobile-vod/%s/playlist.m3u8?resource_id=%s&auth_token=%s"%(server2,s[0],resource_id,token)
                 stream = util.item()
                 stream["url"]=url
                 stream["lang"]=s[1]
@@ -792,15 +792,15 @@ Host: manstv.lattelecom.tv
                 stream["subs"] = []
                 for c in captions:
                     c2= c.copy()
-                    #c2["url"] ="http://%s/mobile-vod/%s/%s?resource_id=%s&auth_token=%s"%(server2,s[0],c["url"],resource_id,token) 
-                    c2["url"] ="http://%s/mobile-vod/%s/%s"%(server2,s[0],c["url"]) 
+                    #c2["url"] ="http://%s/mobile-vod/%s/%s?resource_id=%s&auth_token=%s"%(server2,s[0],c["url"],resource_id,token)
+                    c2["url"] ="http://%s/mobile-vod/%s/%s"%(server2,s[0],c["url"])
                     stream["subs"].append(c2)
                     pass
-                streams.append(stream)        
+                streams.append(stream)
                 break # TODO ņem tikai pirmo serveri, varētu pārbaudit, kurš no tiem strādā, kurš ne
 
         return streams
-        
+
         #data = {}
         #data["server"] = re.findall("(?s)<origin>([^<]+)</origin>", r)[1]
         #data["language"]=re.findall('(?s)<language code="([^"]+)">', r)
@@ -809,12 +809,12 @@ Host: manstv.lattelecom.tv
         #data["qs"]=dict(data["qs"])
         #qs = data["qs"].keys()
         #data["quality"] = "hd" if "hd" in qs else "hq" if "hq" in qs else "mhq" if "mhq" in qs else "lq"
-        #data["mp4"] = data["qs"][data["quality"]]        
+        #data["mp4"] = data["qs"][data["quality"]]
         #data["token"] = re.search("(?s)<auth_token>([^<]+)</auth_token>", r).group(1)
         #data["resource_id"]=re.search("(?s)<resource_id>([^<]+)</resource_id>", r).group(1)
         #data["server"]=self.load_balancer(data["server"])
-        #data["hls"] = "http://%s/mobile-vod/%s/playlist.m3u8?resource_id=%s&auth_token=%s"%(data["server"],data["mp4"],data["resource_id"],data["token"]) 
-        ##data["hls"]="http://%s/mobile-vod/mp4:%s/playlist.m3u8?resource_id=%s&auth_token=app_%s"%(data["server"],data["mp4"],data["resource_id"],data["token"])  
+        #data["hls"] = "http://%s/mobile-vod/%s/playlist.m3u8?resource_id=%s&auth_token=%s"%(data["server"],data["mp4"],data["resource_id"],data["token"])
+        ##data["hls"]="http://%s/mobile-vod/mp4:%s/playlist.m3u8?resource_id=%s&auth_token=app_%s"%(data["server"],data["mp4"],data["resource_id"],data["token"])
 
     ### wwww.lattelecom.tv izsaukumi
     def login2(self,user="",password=""):
@@ -905,10 +905,10 @@ Referer: https://www.lattelecom.tv/
             err = re.search('"error":"(.+?)"').group(1) if re.search('"error":"(.+?)"') else ""
             raise Exception(u"Kļūda ielogojoties - %s"%err)
         self.session_id = session_id
-        self.headers2["Cookie"] = "%s; "%(self.session_id)    
+        self.headers2["Cookie"] = "%s; "%(self.session_id)
         self.error = ""
         return True
-    
+
     def check_logedin2(self):
         if not self.session_id:
             return False
@@ -920,13 +920,13 @@ Referer: https://www.lattelecom.tv/
             else:
                 self.session_id = ""
                 return False
-        
+
     def is_logedin2(self):
         if self.session_id:
             return True
         else:
             return False
-    
+
     def load_balancer(self,server,streams=[]):
         headers = headers2dict("""
 Connection: keep-alive
@@ -950,7 +950,7 @@ User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like
         except Exception as ex:
             print "hls failed: %s %s"%(ex.getcode(),url)
             return False
-        
+
         if response.code == 200:
             html = response.read()
             url0 = re.search("(http://[^/]+/)",url).group(1)
@@ -960,7 +960,7 @@ User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like
             try:
                 response2 = urllib2.urlopen(urllib2.Request(url2, headers=headers))
             except Exception as ex:
-                print "hls chunk failed: %s %s"%(ex.getcode(),url2)                
+                print "hls chunk failed: %s %s"%(ex.getcode(),url2)
                 return False
             if response2.code == 200:
                 return True
@@ -968,15 +968,15 @@ User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like
                 return False
         else:
             return False
-    
+
 if __name__ == "__main__":
     c = Source()
     from subprocess import call
-    
+
     if len(sys.argv)>1 and  not "ltc::" in sys.argv[1]:
-        
+
         vid = sys.argv[1]
-        print "login - %s"%c.login("ivars777","xxx")        
+        print "login - %s"%c.login("ivars777","xxx")
         vid = "1069"
         vid = "1462566072086"
         channelid="101"
@@ -984,19 +984,19 @@ if __name__ == "__main__":
         #data = c.get_stream_url(vid,"vod")
         #call([r"c:\Program Files\VideoLAN\VLC\vlc.exe",data["stream"]])
         pass
- 
-        print "login2 - %s"%c.login2("ivars777","xxx")         
+
+        print "login2 - %s"%c.login2("ivars777","xxx")
         #vid2 = "animation/ultimate_avengers_ii"
         #vid2 = "animation/ice_age"
         vid2 = "tiesraide/ltv1"
         #vid2 = "arhivs/1456521417815"
         data = c.get_stream_url2(vid2)
-        print data        
+        print data
         #for s in data:
         call([r"c:\Program Files\VideoLAN\VLC\vlc.exe",data["stream"]])
         pass
 
-        
+
     else:
         if len(sys.argv)>1:
             data= sys.argv[1]

ipkg/data/usr/lib/enigma2/python/Plugins/Extensions/PlayStream/sources/movieplace.py

@@ -23,7 +23,7 @@ h = HTMLParser.HTMLParser()
 
 class Source(SourceBase):
 
-    def __init__(self,country=""):
+    def __init__(self, country=""):
         self.name = "movieplace"
         self.title = "MoviePlace.lv"
         self.img = "http://movieplace.lv/images/logo.png"
@@ -44,8 +44,8 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
     ######### Entry point ########
     def get_content(self, data):
         print "[movieplace] get_content:", data
-        source,data,path,plist,clist,params,qs = self.parse_data(data)
-        content=[]
+        source, data, path, plist, clist, params, qs = self.parse_data(data)
+        content = []
         content.append(("..return", "back","","Return back"))
 
         if clist=="home":
@@ -93,7 +93,7 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
             else:
                 r = self.call(data)
             #r = r.decode("cp1251").encode("utf8")
-            if clist=="load":
+            if clist == "load":
                 result = re.findall(r' <a href="/([^"]+)" alt="([^"]+)"><img src="/([^"]+)" title="([^"]+)">.+?<div class="years">([^<]+)</div>\s+<div class="country">([^<]+)</div>', r, re.DOTALL)
             else:
                 result = re.findall(r' <a href="/([^"]+)" alt="([^"]+)"><img src="/([^"]+)" title="[^"]+">.+?<span>([^<]+)</span>\s*<div class="country">([^<]+)</div>', r, re.IGNORECASE | re.DOTALL)

ipkg/data/usr/lib/enigma2/python/Plugins/Extensions/PlayStream/sources/serialguru.py

@@ -18,9 +18,9 @@ from SourceBase import SourceBase
 headers2dict = lambda  h: dict([l.strip().split(": ") for l in h.strip().splitlines()])
 import HTMLParser
 h = HTMLParser.HTMLParser()
-    
+
 class Source(SourceBase):
-    
+
     def __init__(self,country=""):
         self.name = "serialguru"
         self.title = "SerialGURU.ru"
@@ -29,88 +29,88 @@ class Source(SourceBase):
         self.country=country
         self.headers = headers2dict("""
 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.79 Safari/537.36
-Referer: http://serialguru.ru/        
+Referer: http://serialguru.ru/
 """)
         self.headers2 = headers2dict("""
 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.79 Safari/537.36
 X-Requested-With: XMLHttpRequest
 Content-Type: application/x-www-form-urlencoded; charset=UTF-8
-Referer: http://serialguru.ru/        
+Referer: http://serialguru.ru/
 """)
         self.url = "http://serialguru.ru/"
         #self.login()
-        
+
     def login(self,user="",password=""):
         return True
-            
+
     def get_content(self, data):
         print "[tvdom] get_content:", data
         if "::" in data:
-            data = data.split("::")[1] 
+            data = data.split("::")[1]
         path = data.split("?")[0]
         clist = path.split("/")[0]
         params = data[data.find("?"):] if "?" in data else ""
         qs = dict(map(lambda x:x.split("="),re.findall("[%\w]+=\w+",params)))
         lang = qs["lang"] if "lang" in qs else self.country
-    
+
         content=[]
         content.append(("..return", "back","","Return back"))
-        
+
         if clist=="home":
             content.extend([
-                ("Search", "serialguru::search/{0}","","Search content"),                
-                ("Last", "serialguru::last","","Last series"),                
+                ("Search", "serialguru::search/{0}","","Search content"),
+                ("Last", "serialguru::last","","Last series"),
                 ("Series", "serialguru::serials","","TV Series"),
                 ("Shows", "serialguru::tv","","TV Shows"),
                 ("Animations", "serialguru::mult","","Animation series"),
-                
+
                 #("Archive - all", "tvdom::arhivs_all","","Video archive all"),
             ])
             return content
-    
-        elif data=="last":
+
+        elif data == "last":
             r = self.call("")
             for item in re.findall(r'<li><a href="(http://serialguru\.ru/[^"]+)"><i>([^<]+)</i>  <i>([^<]+)</i> <b>([^<]+)</b></a></li>', r, re.DOTALL):
                 title = item[1] + " - " + item[2]+"/"+item[3]
                 img = ""
-                data2 = item[0].replace(self.url,"")
+                data2 = item[0].replace(self.url, "")
                 desc = title
-                content.append((title,self.name+"::"+data2,img,desc))
+                content.append((title, self.name+"::"+data2, img, desc))
             return content
 
         elif data=="serials":
             content.extend([
-                ("All", "serialguru::serials?o=0&t=S","","All series"),                
-                ("Russian", "serialguru::serials?c%5B%5D=53&c%5B%5D=61&c%5B%5D=33&c%5B%5D=42&c%5B%5D=31&o=0&t=S","","Russian countries series"),                
+                ("All", "serialguru::serials?o=0&t=S","","All series"),
+                ("Russian", "serialguru::serials?c%5B%5D=53&c%5B%5D=61&c%5B%5D=33&c%5B%5D=42&c%5B%5D=31&o=0&t=S","","Russian countries series"),
                 ("English", "serialguru::serials?c%5B%5D=27&c%5B%5D=26&c%5B%5D=43&c%5B%5D=30&c%5B%5D=34&c%5B%5D=25&o=0&t=S","","English countries series"),
                 ("Europe", "serialguru::serials?c%5B%5D=29&c%5B%5D=66&c%5B%5D=44&c%5B%5D=28&c%5B%5D=51&c%5B%5D=65&c%5B%5D=62&c%5B%5D=40&c%5B%5D=45&c%5B%5D=68&c%5B%5D=59&c%5B%5D=39&c%5B%5D=35&c%5B%5D=47&o=0&t=S","","European countries series"),
                 ("Other", "serialguru::serials?c%5B%5D=36&c%5B%5D=32&c%5B%5D=67&c%5B%5D=63&c%5B%5D=60&c%5B%5D=64&c%5B%5D=38&c%5B%5D=52&c%5B%5D=41&c%5B%5D=58&c%5B%5D=57&c%5B%5D=37&c%5B%5D=50&c%5B%5D=46&o=0&t=S","","Other countries series"),
                 #("Archive - all", "tvdom::arhivs_all","","Video archive all"),
             ])
             return content
-        
+
         elif data=="tv":
             content.extend([
-                ("All", "serialguru::tv?o=0&t=S","","All series"),                
-                ("Russian", "serialguru::tv?c%5B%5D=53&c%5B%5D=61&c%5B%5D=33&c%5B%5D=42&c%5B%5D=31&o=0&t=P","","Russian countries TV shows"),                
+                ("All", "serialguru::tv?o=0&t=S","","All series"),
+                ("Russian", "serialguru::tv?c%5B%5D=53&c%5B%5D=61&c%5B%5D=33&c%5B%5D=42&c%5B%5D=31&o=0&t=P","","Russian countries TV shows"),
                 ("English", "serialguru::tv?c%5B%5D=27&c%5B%5D=26&c%5B%5D=43&c%5B%5D=30&c%5B%5D=34&c%5B%5D=25&o=0&t=P","","English countries TV shows"),
                 ("Europe", "serialguru::tv?c%5B%5D=29&c%5B%5D=66&c%5B%5D=44&c%5B%5D=28&c%5B%5D=51&c%5B%5D=65&c%5B%5D=62&c%5B%5D=40&c%5B%5D=45&c%5B%5D=68&c%5B%5D=59&c%5B%5D=39&c%5B%5D=35&c%5B%5D=47&o=0&t=P","","European countries TV shows series"),
                 ("Other", "serialguru::tv?c%5B%5D=36&c%5B%5D=32&c%5B%5D=67&c%5B%5D=63&c%5B%5D=60&c%5B%5D=64&c%5B%5D=38&c%5B%5D=52&c%5B%5D=41&c%5B%5D=58&c%5B%5D=57&c%5B%5D=37&c%5B%5D=50&c%5B%5D=46&o=0&t=P","","Other countries TV shows"),
                 #("Archive - all", "tvdom::arhivs_all","","Video archive all"),
             ])
             return content
-        
+
         elif data=="mult":
             content.extend([
-                ("All", "serialguru::mult?o=0&t=S","","All series"),                
-                ("Russian", "serialguru::mult?c%5B%5D=53&c%5B%5D=61&c%5B%5D=33&c%5B%5D=42&c%5B%5D=31&o=0&t=M","","Russian countries animantions"),                
+                ("All", "serialguru::mult?o=0&t=S","","All series"),
+                ("Russian", "serialguru::mult?c%5B%5D=53&c%5B%5D=61&c%5B%5D=33&c%5B%5D=42&c%5B%5D=31&o=0&t=M","","Russian countries animantions"),
                 ("English", "serialguru::mult?c%5B%5D=27&c%5B%5D=26&c%5B%5D=43&c%5B%5D=30&c%5B%5D=34&c%5B%5D=25&o=0&t=M","","English countries animantions"),
                 ("Europe", "serialguru::mult?c%5B%5D=29&c%5B%5D=66&c%5B%5D=44&c%5B%5D=28&c%5B%5D=51&c%5B%5D=65&c%5B%5D=62&c%5B%5D=40&c%5B%5D=45&c%5B%5D=68&c%5B%5D=59&c%5B%5D=39&c%5B%5D=35&c%5B%5D=47&o=0&t=M","","European countries animantions"),
                 ("Other", "serialguru::mult?c%5B%5D=36&c%5B%5D=32&c%5B%5D=67&c%5B%5D=63&c%5B%5D=60&c%5B%5D=64&c%5B%5D=38&c%5B%5D=52&c%5B%5D=41&c%5B%5D=58&c%5B%5D=57&c%5B%5D=37&c%5B%5D=50&c%5B%5D=46&o=0&t=M","","Other countries animantions"),
                 #("Archive - all", "tvdom::arhivs_all","","Video archive all"),
             ])
             return content
-        
+
         elif clist=="search":
             if data.split("/")>1:
                 term = data.split("/")[1]
@@ -128,7 +128,7 @@ Referer: http://serialguru.ru/
                 desc = title +"\nRating:%s (%s+/%s-)"%(rating,item["plus_cnt"].encode("utf8"),item["minus_cnt"].encode("utf8"))
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
-                        
+
         elif path=="serials" or path=="tv" or path=="mult":
             if path=="serials" and not "cat%5B%5D" in data:
                 #content.append(("All", "serialguru::"+data+"&cat%5B%5D=","","All series"))
@@ -146,11 +146,11 @@ Referer: http://serialguru.ru/
                     content.append((title,self.name+"::"+data2,img,desc))
                 page=int(re.search("o=(\d+)",data).group(1))
                 data2 = re.sub("o=(\d+)","o=%s"%(page+15),data)
-                content.append(("Next page",self.name+"::"+data2,"","Go to next page"))                 
+                content.append(("Next page",self.name+"::"+data2,"","Go to next page"))
                 return content
-        
-        
-        ### Pārraide  
+
+
+        ### Pārraide
         else:
             r = self.call(clist)
             title0=re.search('<h2>(.+?)</h2>',r,re.DOTALL).group(1)
@@ -181,10 +181,10 @@ Referer: http://serialguru.ru/
                     img = img0
                     data2 = item["file"].encode("utf8")
                     desc = desc0
-                    content.append((title,data2,img,desc))               
+                    content.append((title,data2,img,desc))
             return content
- 
-            
+
+
     def is_video(self,data):
         if "::" in data:
             data = data.split("::")[1]
@@ -192,14 +192,14 @@ Referer: http://serialguru.ru/
             return True
         else:
             return False
-    
+
     def get_categories(self,data):
         r = self.call(data)
         r2 = re.search('<td class="category">(.+?)</td>', r, re.DOTALL).group(1)
         items = re.findall(r'<a href="#" data-id="(\d+)">([^<]+)</a>', r2, re.DOTALL)
         return items
 
-        
+
     def call(self, data,params = None, headers=None):
         if not headers: headers = self.headers
         #if not lang: lang = self.country

ipkg/data/usr/lib/enigma2/python/Plugins/Extensions/PlayStream/util.py

@@ -248,7 +248,19 @@ def ttaf2srt(s):
 
 
 def item():
-    stream0 = {'name': '', 'url': '', 'quality': '???', 'surl': '', 'subs': '', 'headers': {},"desc":"","img":"","lang":"","type":"","order":0}
+    stream0 = {
+        'name': '',
+        'url': '',
+        'quality': '?',
+        'surl': '',
+        'subs': [],
+        'headers': {},
+        "desc":"","img":"",
+        "lang":"",
+        "type":"",
+        "resolver":"",
+        "order":0
+        }
     return stream0
 
 class _StringCookieJar(cookielib.LWPCookieJar):

sources/SourceBase.py

@@ -13,7 +13,7 @@ from collections import OrderedDict
 import ConfigParser
 
 headers2dict = lambda  h: dict([l.strip().split(": ") for l in h.strip().splitlines()])
-stream0 = {'name': '', 'url': '', 'quality': '???', 'surl': '', 'subs': '', 'headers': {},"desc":"","img":"","lang":"","type":"","order":0}        
+stream0 = {'name': '', 'url': '', 'quality': '???', 'surl': '', 'subs': '', 'headers': {},"desc":"","img":"","lang":"","type":"","order":0}
 
 
 class SourceBase(object):
@@ -56,28 +56,28 @@ User-Agent: Mozilla/5.0 (Linux; U; Android 4.4.4; Nexus 5 Build/KTU84P) AppleWeb
         stream["url"] = content[1].encode("utf8") if isinstance(content[1],unicode) else content[1]
         stream["img"] = content[2].encode("utf8") if isinstance(content[2],unicode) else content[2]
         stream["desc"] = content[3].encode("utf8") if isinstance(content[3],unicode) else content[3]
-        stream["type"] = stream_type(content[1]).encode("utf8") 
+        stream["type"] = stream_type(content[1]).encode("utf8")
         return[stream]
 
     def options_read(self):
         if not ("options" in dir(self) and self.options): # process options only if self.options defined, self.config_file should be defined too
             return None
-        config = ConfigParser.ConfigParser()        
+        config = ConfigParser.ConfigParser()
         if os.path.exists(self.config_file):
             config.read(self.config_file)
-            self.options = OrderedDict(config.items(self.name))             
+            self.options = OrderedDict(config.items(self.name))
         else:
             self.options_write(self.options)
         return self.options
 
-    def options_write(self,options):        
-        config = ConfigParser.ConfigParser() 
+    def options_write(self,options):
+        config = ConfigParser.ConfigParser()
         config.add_section(self.name)
         for k in options.keys():
             config.set(self.name, k,options[k])
         with open(self.config_file,"w") as f:
             config.write(f)
-        self.options = OrderedDict(config.items(self.name))        
+        self.options = OrderedDict(config.items(self.name))
 
     def call(self, data,params=None,headers=None,lang=""):
         if not headers: headers = self.headers
@@ -94,14 +94,14 @@ User-Agent: Mozilla/5.0 (Linux; U; Android 4.4.4; Nexus 5 Build/KTU84P) AppleWeb
             raise "No data returned"
 
     def _http_request(self, url,params = None, headers=None):
-        if not headers: 
+        if not headers:
             headers = self.headers if "headers" in dir(self) else headers2dict("User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:49.0) Gecko/20100101 Firefox/49.0")
         try:
             if params:
                 r = requests.post(url, data=params, headers=headers)
             else:
                 r = requests.get(url, headers=headers)
-            return r.content 
+            return r.content
         except Exception as ex:
             if "read" in ex:
                 content = ex.read()
@@ -113,10 +113,6 @@ User-Agent: Mozilla/5.0 (Linux; U; Android 4.4.4; Nexus 5 Build/KTU84P) AppleWeb
     def stream_type(data):
         return stream_type(data)
 
-    @staticmethod
-    def get_stream0():
-        return stream0.copy()
-
     @staticmethod
     def parse_data(data):
         if "::" in data:

sources/euronews.py

@@ -14,13 +14,14 @@ import urllib2, urllib
 import datetime, time,re, sys,os
 from collections import OrderedDict
 from SourceBase import SourceBase
+import util
 
 headers2dict = lambda  h: dict([l.strip().split(": ") for l in h.strip().splitlines()])
 import HTMLParser
 h = HTMLParser.HTMLParser()
-    
+
 class Source(SourceBase):
-    
+
     def __init__(self,language="en"):
         self.name = "euronews"
         self.title = "Euronews"
@@ -42,10 +43,10 @@ Connection: keep-alive
             self.get_languages()
         except:
             pass
-        
+
     def login(self,user="",password=""):
         return True
-            
+
     def get_content(self, data):
         print "[%s] get_content:"%self.name, data
         source,data,path,plist,clist,params,qs = self.parse_data(data)
@@ -53,13 +54,13 @@ Connection: keep-alive
         lang = self.options["language"]
         if not lang in self.get_languages():
             raise Exception("Not valid default language - '%s'"%lang)
-    
+
         content=[]
         content.append(("..return", "back","","Return back"))
-        
+
         if clist=="home":
             content.extend([
-                ("Search", "euronews::content/getSearch?lang=%s&byPage=40&page=1&text={0}"%lang,self.img,"Top stories timeline"),                
+                ("Search", "euronews::content/getSearch?lang=%s&byPage=40&page=1&text={0}"%lang,self.img,"Top stories timeline"),
                 ("Live stream", "euronews::live?lang=%s"%lang,self.img,"Euronews live stream"),
                 ("Just in", "euronews::content/getTimeline?lang=%s&byPage=40&page=1"%lang,self.img,"News timeline"),
                 ("Top stories", "euronews::content/getTopStories?lang=%s"%lang,self.img,"Top stories timeline"),
@@ -71,16 +72,16 @@ Connection: keep-alive
                 ("Programs list", "euronews::content/getPrograms?lang=%s"%lang,self.img,"Programs list"),
              ])
             return content
-        
 
-        ### Video arhīvs ###  
+
+        ### Video arhīvs ###
         elif clist=="content":
             if "lang" in qs:
                 del qs["lang"]
             params = json.dumps(qs)
-            
+
             req = '{"methodName":"content.%s","apiKey":"androidPhoneEuronews-1.0","params":%s,"language":"%s"}'%(plist[1],params,lang)
-            r = self.call(req)    
+            r = self.call(req)
             if not r:
                 return content
             lst = r["timeline"] if "timeline" in r else\
@@ -93,7 +94,7 @@ Connection: keep-alive
                 []
             if not lst:
                 return content
-            
+
             for item in lst:
                 if plist[1] in ("getTimeline"):
                     article = item["article"]
@@ -104,7 +105,7 @@ Connection: keep-alive
                     article = item
                     atype = "article"
                 if plist[1]=="getPrograms":
-                    title = article["title"] 
+                    title = article["title"]
                     id = article["pId"]
                     desc = title
                     img = "http://static.euronews.com/articles/programs/533x360_%s"%article["img"]
@@ -115,7 +116,7 @@ Connection: keep-alive
                     if atype <> "article":
                         title = "[%s] %s"%(atype,title)
                     atime = datetime.datetime.fromtimestamp(int(article["uts"]))
-                    #atime = datetime.datetime.fromtimestamp(int(article["uts"])-time.altzone) 
+                    #atime = datetime.datetime.fromtimestamp(int(article["uts"])-time.altzone)
                     atime = atime.strftime("%Y-%m-%d %H:%M")
                     vert = self.vid[article["vId"]] if "vId" in article else ""
                     ptitle = article["pTitle"] if "pTitle" in article else ""
@@ -129,19 +130,19 @@ Connection: keep-alive
                     content.append((title,self.name+"::"+data2,img,desc))
             if "page=" in data:
                 data2 = re.sub("page=\d+","page=%s"%(int(qs["page"])+1),data)
-                content.append(("Next page",self.name+"::"+data2,self.img,"Next page")) 
-            return content            
+                content.append(("Next page",self.name+"::"+data2,self.img,"Next page"))
+            return content
+
 
-    
     def is_video(self,data):
-        source,data,path,plist,clist,params,qs = self.parse_data(data)        
+        source,data,path,plist,clist,params,qs = self.parse_data(data)
         if path == "live":
             return True
         elif clist=="content" and plist[1]=="getArticle":
             return True
         else:
             return False
-        
+
     def get_streams(self, data):
         print "[euronews] get_streams:", data
         if not self.is_video(data):
@@ -150,10 +151,10 @@ Connection: keep-alive
         #lang = qs["lang"] if "lang" in qs else self.language
         lang = self.options["language"]
         if not lang in self.get_languages():
-            raise Exception("Not valid default language - '%s'"%lang)        
-        
+            raise Exception("Not valid default language - '%s'"%lang)
+
         streams = []
-        
+
         if path == "live":
             url = "http://www.euronews.com/api/watchlive.json"
             r = self._http_request(url)
@@ -169,11 +170,11 @@ Connection: keep-alive
                     raise Exception("No live stream found")
             except:
                 raise Exception("No live stream found")
-            
+
             slist = js["primary"]
-            
+
             for l in slist:
-                stream = self.get_stream0()
+                stream = util.item()
                 stream["url"]=slist[l]["hls"]
                 stream["lang"]=l
                 stream["quality"]="variant"
@@ -181,7 +182,7 @@ Connection: keep-alive
                 stream["desc"]=stream["name"]
                 stream["type"]="hls" #stream_type(url)
                 streams.append(stream)
-                
+
         elif clist=="content" and plist[1] == "getArticle":
             if "lang" in qs:
                 del qs["lang"]
@@ -189,14 +190,14 @@ Connection: keep-alive
             for lang in languages:
                 id = qs["id"]
                 req = '{"methodName":"content.getArticle","apiKey":"androidPhoneEuronews-1.0","params":{"id":"%s"},"language":"%s"}'%(id,lang)
-                r = self.call(req)    
+                r = self.call(req)
                 if not r:
-                    raise Exception("No live stream found") 
+                    raise Exception("No live stream found")
                 if not "articlelist" in r:
                     msg = r["label"] if "label" in r else "No article finde"
                     raise Exception(msg)
                 article = r["articlelist"]
-                stream = self.get_stream0()
+                stream = util.item()
                 stream["url"]=article["videoUri"] if "videoUri" in article else ""
                 if not stream["url"]:
                     return []
@@ -206,13 +207,13 @@ Connection: keep-alive
                 stream["desc"]=article["text"] if "text" in article else article["title"]
                 stream["type"]="http" #stream_type(url)
                 streams.append(stream)
-            
+
         else:
             raise Exception("No live stream found")
-           
+
         ### TODO - sakārtot sarakstu, lai pirmais ir labakais video
         qlist = ["???","lq","mq","hq","hd","variant"]
-        llist = ["fr","en","ru","lv"]        
+        llist = ["fr","en","ru","lv"]
         for s in streams:
             if s["lang"]==self.options["language"]:
                 s["order"] = 10000
@@ -238,11 +239,11 @@ Connection: keep-alive
                 raise Exception("Can not get languages list")
         except:
             raise Exception("Can not get languages list")
-        
+
         slist = js["primary"]
         self.languages=slist.keys()
         return self.languages
-        
+
     def call(self, data,params = None, headers=None):
         if not headers: headers = self.headers
         #if not lang: lang = self.country
@@ -269,7 +270,7 @@ content-disposition: form-data; name=request
                 return None
         else:
             return None
-        
+
 
 if __name__ == "__main__":
     language= "en"

sources/iplayer.py

@@ -13,22 +13,23 @@ import datetime
 import HTMLParser
 import json
 import datetime,time
-from SourceBase import SourceBase, stream_type, stream0
+from SourceBase import SourceBase, stream_type
+import util
 from collections import OrderedDict
 
 API_URL = 'https://m.lattelecom.tv/'
 user_agent = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 5_1_1 like Mac OS X; da-dk) AppleWebKit/534.46.0 (KHTML, like Gecko) CriOS/19.0.1084.60 Mobile/9B206 Safari/7534.48.3"
 headers2dict = lambda  h: dict([l.strip().split(": ") for l in h.strip().splitlines()])
 h = HTMLParser.HTMLParser()
-    
+
 class Source(SourceBase):
-    
+
     def __init__(self):
         self.name = "iplayer"
         self.title = "BBC iPlayer"
         self.img = "http://www.userlogos.org/files/logos/inductiveload/BBC_iPlayer_logo.png"
         self.desc = "BBC iPlayer portal content"
-        
+
         self.api_url = "http://ibl.api.bbci.co.uk/ibl/v1/"
         self.headers = headers2dict("""
 User-Agent: BBCiPlayer/4.19.0.3021 (SM-G900FD; Android 4.4.2)
@@ -38,7 +39,7 @@ Connection: Keep-Alive
 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.102 Safari/537.36
 Connection: Keep-Alive
         """)
-        
+
         self.ch = []
         self.ch_id={}
         self.ch_id2={}
@@ -54,26 +55,26 @@ Connection: Keep-Alive
             "bbc_news24":"http://www.lyngsat-logo.com/hires/bb/bbc_news.png",
             "bbc_parliament":"http://www.lyngsat-logo.com/hires/bb/bbc_parliament.png",
             "bbc_alba":"http://www.lyngsat-logo.com/hires/bb/bbc_alba.png",
-            "s4cpbs":"http://www.lyngsat-logo.com/hires/ss/s4c_uk.png"          
+            "s4cpbs":"http://www.lyngsat-logo.com/hires/ss/s4c_uk.png"
         }
         cur_directory = os.path.dirname(os.path.abspath(__file__))
         self.config_file = os.path.join(cur_directory,self.name+".cfg")
         self.options = OrderedDict([("user","lietotajs"),("password","parole")])
         self.options_read()
-                     
+
     def get_content(self, data):
         print "[iplayer] get_content:", data
         if "::" in data:
-            data = data.split("::")[1] 
+            data = data.split("::")[1]
         path = data.split("?")[0]
         clist = path.split("/")[0]
         params = data[data.find("?"):] if "?" in data else ""
         qs = dict(map(lambda x:x.split("="),re.findall("\w+=[\w-]+",params)))
         #lang = qs["lang"] if "lang" in qs else self.country
-    
+
         content=[]
         content.append(("..return", "back","","Return back"))
-        
+
         ### Home ###
         if data=="home":
             content.extend([
@@ -82,11 +83,11 @@ Connection: Keep-Alive
                 ("Channels", "iplayer::channels","","Programmes by channel/date"),
                 ("Categories", "iplayer::categories","","Programmes by categories"),
                 ("A-Z", "iplayer::a-z","","All programmes by name"),
-                ("Highlights", "iplayer::home/highlights","","Current highlights"),             
-                ("Most popular", "iplayer::groups/popular/episodes?per_page=40&page=1","","Most popular programmes")            
+                ("Highlights", "iplayer::home/highlights","","Current highlights"),
+                ("Most popular", "iplayer::groups/popular/episodes?per_page=40&page=1","","Most popular programmes")
             ])
             return content
-        
+
         ### Search ###
         elif clist=="search":
             data_ = "search-suggest/?q=%s&rights=mobile&initial_child_count=1"%data.split("/")[1]
@@ -95,8 +96,8 @@ Connection: Keep-Alive
                 title,data2,img,desc = self.get_data_element(item)
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
-                        
-        
+
+
         ### Live main ###
         elif data=="live":
             for ch in self.get_channels():
@@ -108,7 +109,7 @@ Connection: Keep-Alive
                 desc = ee[2]
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
-        
+
         ### Categories ###
         elif data == "categories":
             r = self.call(data)
@@ -121,7 +122,7 @@ Connection: Keep-Alive
                 img = self.img
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
-        
+
         ### Catetory root ###
         elif clist == "categories" and len(data.split("/"))==2:
             r = self.call(data)
@@ -132,7 +133,7 @@ Connection: Keep-Alive
             title = "%s - a-z (%s programmes, %s episodes)"%(r["category"]["title"],r["category"]["child_programme_count"],r["category"]["child_episode_count"])
             content.append((title,self.name+"::"+data+"/programmes?rights=mobile&page=1&per_page=40&sort=title&sort_direction=asc&initial_child_count=1&availability=available",self.img,title))
             return content
-        
+
         ### Program/episodes list ###
         elif   re.search("categories/([\w\-]+)/(highlights|programmes).+",data) or\
                re.search("programmes/(\w+)/episodes.+",data) or\
@@ -165,12 +166,12 @@ Connection: Keep-Alive
                 else:
                     title,data2,img,desc = self.get_data_element(el)
                 content.append((title,self.name+"::"+data2,img,desc))
-            
+
             if "&page=" in data and lst["page"]*lst["per_page"]<lst["count"]:
                 data2 = re.sub("&page=\d+","&page=%s"%(lst["page"]+1),data)
-                content.append(("Next page",self.name+"::"+data2,self.img,"Next page")) 
+                content.append(("Next page",self.name+"::"+data2,self.img,"Next page"))
             return content
-        
+
         ### A-z root ###
         elif data=="a-z":
             url = "http://www.bbc.co.uk/programmes/a-z/by/x/all.json?page=1"
@@ -185,7 +186,7 @@ Connection: Keep-Alive
                 data2 = "atoz/%s/programmes?rights=mobile&page=1&per_page=40&initial_child_count=1&sort=title&sort_direction=asc&availability=available"%ch
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
-        
+
         ###  Channels home ###
         elif data=="channels":
             for ch in self.get_channels():
@@ -197,26 +198,26 @@ Connection: Keep-Alive
                 desc = title
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
-        
+
         ### Channel higlihts/progrmmes/days ###
         elif clist=="channels" and len(data.split("/"))==2:
             r = self.call(data)
             chid = data.split("/")[1]
             ch = self.get_channel_by_id(chid)
-            
+
             # Highlights
             title = ch["title"] + " - highlights"
             img = "http://static.bbci.co.uk/mobileiplayerappbranding/1.9/android/images/channels/tv-guide-wide-logo/layout_normal/xxhdpi/%s_tv-guide-wide-logo.png"%ch["id"]
             data2 = "channels/%s/highlights?lang=en&rights=mobile&availability=available"%ch["id"]
             desc = title
             content.append((title,self.name+"::"+data2,img,desc))
-            
+
             #AtoZ
             title = ch["title"] + " - programmes AtoZ"
             data2 = "channels/%s/programmes?rights=mobile&page=1&per_page=40&sort=recent&sort_direction=asc&initial_child_count=1&availability=available"%ch["id"]
             desc = title
             content.append((title,self.name+"::"+data2,img,desc))
-            
+
             day0 = datetime.date.today()
             for i in range(10):
                 day = day0-datetime.timedelta(days=i)
@@ -228,11 +229,11 @@ Connection: Keep-Alive
                 desc = title
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
-        
-            
+
+
     def get_streams(self, data):
         print "[iplayer] get_streams:", data
-        if "::" in data: data = data.split("::")[1]         
+        if "::" in data: data = data.split("::")[1]
         if not self.is_video(data):
             return []
         cmd = data.split("/")
@@ -265,7 +266,7 @@ Connection: Keep-Alive
                     sub["name"] = s["service"] if "service" in s else "captions (taff)"
                     sub["lang"] = "en"
                     captions.append(sub)
-                    
+
             if s["kind"] <> "video":
                 continue
             for c in s["connection"]:
@@ -277,9 +278,9 @@ Connection: Keep-Alive
                 if not r2: continue
                 slist = re.findall("#EXT-X-STREAM-INF:([^\n]+)\n([^\n]+)", r2, re.DOTALL)
                 if not slist:
-                    stream = stream0.copy()
+                    stream = util.item()
                     stream["url"]=url
-                    stream["name"]=title 
+                    stream["name"]=title
                     stream["desc"]=desc
                     stream["img"]=img
                     stream["type"]="hls"
@@ -299,9 +300,9 @@ Connection: Keep-Alive
                             uu = url.split("/")[:-1]
                             uu.append(url2)
                             url2 = "/".join(uu)
-                        stream = stream0.copy()
+                        stream = util.item()
                         stream["url"]=url2
-                        stream["name"]=title 
+                        stream["name"]=title
                         stream["desc"]=desc
                         stream["img"]=img
                         stream["type"]="hls"
@@ -315,7 +316,7 @@ Connection: Keep-Alive
                 s["subs"]=captions
         streams = sorted(streams,key=lambda item: item["order"],reverse=True)
         return streams
-        
+
     def is_video(self,data):
         if "::" in data:
             data = data.split("::")[1]
@@ -326,7 +327,7 @@ Connection: Keep-Alive
             return True
         else:
             return False
-        
+
     def get_data_element(self,item):
         if ("programme" in item["type"] or "group" in item["type"]) and item["count"]>1:
             ep = item.copy()
@@ -354,9 +355,9 @@ Connection: Keep-Alive
             title = "%s [%s episodes]"%(title,ep["count"])
         else:
             data2 = "programmes/%s/episodes?per_page=40&page=1"%ep["id"]
-            title = "%s [%s episodes]"%(title,ep["count"])            
+            title = "%s [%s episodes]"%(title,ep["count"])
         return title,data2,img,desc
-    
+
     def get_epg_video(self,vid):
         data = "episodes/%s"%vid
         r = self.call(data)
@@ -378,7 +379,7 @@ Connection: Keep-Alive
             return title.encode("utf8"),img.encode("utf8"),desc.encode("utf8"),vid.encode("utf8")
         else:
             raise Exception("No video info")
-    
+
     def get_epg_live(self,channelid):
         data = "channels/%s/highlights?live=true"%channelid
         r = self.call(data)
@@ -401,9 +402,9 @@ Connection: Keep-Alive
             title = r["channel_highlights"]["channel"]["title"]
             img = ""
             desc = title
-            
+
         return title.encode("utf8"),img.encode("utf8"),desc.encode("utf8")
-        
+
     def get_channels(self):
         if self.ch:
             return self.ch
@@ -415,31 +416,31 @@ Connection: Keep-Alive
             self.ch_id2[item["master_brand_id"]]=i
             self.ch_name[item["title"]]=i
         return self.ch
-                
+
     def get_channel_by_id(self,chid):
         if not self.ch:
             self.get_channels()
         if not self.ch:
             return None
         return self.ch[self.ch_id[chid]] if self.ch_id.has_key(chid) else None
-    
+
     def get_channel_by_id2(self,chid):
         if not self.ch:
             self.get_channels()
         if not self.ch:
             return None
         return self.ch[self.ch_id2[chid]] if self.ch_id2.has_key(chid) else None
-     
+
     def get_channel_by_name(self,name):
         if not self.ch:
             self.get_channels()
         ch2 = self.get_channel_by_name2(name)
         if not ch2:
             return None
-        ch = self.get_channel_by_id2(ch2["id2"]) 
+        ch = self.get_channel_by_id2(ch2["id2"])
         return ch
-                
-        
+
+
     def call(self, data,params = None, headers=None):
         if not headers: headers = self.headers
         #if not lang: lang = self.country
@@ -453,7 +454,7 @@ Connection: Keep-Alive
                 return None
         else:
             return None
-        
+
     def call2(self, data,params = None, headers=None):
         if not headers: headers = self.headers2
         #if not lang: lang = self.country
@@ -467,7 +468,7 @@ Connection: Keep-Alive
         try:
             r = requests.get(url, headers=headers)
             return r.content
-        
+
         except Exception as ex:
             if ex.code==403:
                 return ex.read()
@@ -481,17 +482,17 @@ def gt(dt_str):
     #us= int(us.rstrip("Z"), 10)
     #r = dt + datetime.timedelta(microseconds=us)a
     return dt
-   
+
 if __name__ == "__main__":
     c = Source()
     from subprocess import call
     #ch = c.get_channels()
     #c.get_epg_live("bbc_two_england")
-    
+
     if len(sys.argv)>1 and  not "iplayer::" in sys.argv[1]:
-        
+
         vid = sys.argv[1]
-        print "login - %s"%c.login("ivars777","xxx")        
+        print "login - %s"%c.login("ivars777","xxx")
         vid = "1069"
         vid = "1462566072086"
         channelid="101"
@@ -499,9 +500,9 @@ if __name__ == "__main__":
         #data = c.get_stream_url(vid,"vod")
         #call([r"c:\Program Files\VideoLAN\VLC\vlc.exe",data["stream"]])
         pass
- 
 
-        
+
+
     else:
         if len(sys.argv)>1:
             data= sys.argv[1]

sources/ltc.py

@@ -21,15 +21,15 @@ API_URL = 'https://m.lattelecom.tv/'
 user_agent = "Mozilla/5.0 (iPhone; U; CPU iPhone OS 5_1_1 like Mac OS X; da-dk) AppleWebKit/534.46.0 (KHTML, like Gecko) CriOS/19.0.1084.60 Mobile/9B206 Safari/7534.48.3"
 headers2dict = lambda  h: dict([l.strip().split(": ") for l in h.strip().splitlines()])
 h = HTMLParser.HTMLParser()
-    
+
 class Source(SourceBase):
-    
+
     def __init__(self):
         self.name = "ltc"
         self.title = "Shortcut.lv (lattelecom.tv)"
         self.img = "picons/shortcut.png"
         self.desc = "Shortcut.lv (lattelecom.tv) satura skatīšanās"
-        
+
         self.token = "" # manstv.lattelecom.tv
         self.session_id = ""  # www.lattelecom.tv
         self.api_url = "https://manstv.lattelecom.tv/api/v1.4/get/"
@@ -46,7 +46,7 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0
 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/50.0.2661.102 Safari/537.36
 Accept-Language: en-US,en;q=0.8
         """)
-        
+
         self.channels = None
         ### specific service info ###
         self.ch=[]
@@ -60,38 +60,38 @@ Accept-Language: en-US,en;q=0.8
         self.epg_date={}
         self.epg_ch={}
         self.epgdates = []
-        
+
         self.today = datetime.date.today()
-        self.today2 = self.today.strftime("%d.%m.%Y") 
+        self.today2 = self.today.strftime("%d.%m.%Y")
 
         cur_directory = os.path.dirname(os.path.abspath(__file__))
         self.config_file = os.path.join(cur_directory,self.name+".cfg")
         self.options = OrderedDict([("user","lietotajs"),("password","parole")])
         self.options_read()
-               
+
     def get_content(self, data):
         print "[ltc] get_content:", data
         if "::" in data:
-            data = data.split("::")[1] 
+            data = data.split("::")[1]
         path = data.split("?")[0]
         clist = path.split("/")[0]
         params = data[data.find("?"):] if "?" in data else ""
         qs = dict(map(lambda x:x.split("="),re.findall("\w+=[\w-]+",params)))
         #lang = qs["lang"] if "lang" in qs else self.country
-    
+
         content=[]
         content.append(("..return", "back","","Return back"))
-        
+
         if clist=="home":
             content.extend([
                 ("Search TV", "ltc::search/{0}","","Search in TV archive"),
                 ("Search Video", "ltc::meklet?q={0}","","Search in video"),
                 ("Live streams", "ltc::tiesraide","","TV live streams"),
                 ("Archive", "ltc::arhivs","","TV live archive"),
-                ("Video", "ltc::videonoma","","Video on demand"),             
+                ("Video", "ltc::videonoma","","Video on demand"),
             ])
             return content
-        
+
         ### Meklēt TV (1.4 API)
         elif clist == "search": #TODO vod/search/{q}
             #r = self.call("vod/"+data)
@@ -100,12 +100,12 @@ Accept-Language: en-US,en;q=0.8
         ### Meklēsana video (www )###
         elif clist == "meklet": #TODO vod/search/{q}
             r = self.call2(data)
-            
+
             for res in re.findall('<div class="(program follow|movie forward)-link">(.+?</div></div>.*?)</div>', r, re.DOTALL):
                 r2 = res[1]
                 if "movie" in res[0]:
                     #if not "permalink" in r2:
-                        #continue                    
+                        #continue
                     m = re.search('<a class="title" href="([^"]+)/">([^<]+)</a>', r2, re.DOTALL)
                     if not m: continue
                     title = m.group(2)
@@ -118,7 +118,7 @@ Accept-Language: en-US,en;q=0.8
                     m = re.search('class="genre".+?>([^<]+)<', r2, re.DOTALL)
                     if m:
                         desc = m.group(1)+"\n"+desc
-                    
+
                 else:
                     m = re.search('<a href="/([^"]+)" class="title">([^<]+)</a>', r2, re.DOTALL)
                     if not m: continue
@@ -140,7 +140,7 @@ Accept-Language: en-US,en;q=0.8
                     desc = title
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
-            
+
         ### Tiešraides kanānālu saraksts ###
         elif data=="tiesraide":
             r = self.call2(data)
@@ -159,7 +159,7 @@ Accept-Language: en-US,en;q=0.8
                     desc = title
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
-            
+
         ### TV arhīva sākums ###
         elif data=="archive" or data=="arhivs":
             #self.get_epg()
@@ -169,7 +169,7 @@ Accept-Language: en-US,en;q=0.8
                 #("Archive - dates", "ltc::archive/dates","","TV live archive by dates"),
             ])
             return content
-                
+
         ### Arhīva kategorijas
         elif data=="archive/categories":
             #https://manstv.lattelecom.tv/api/v1.3/get/archive/records/?filter[category]=13&limit=10&until_id=1458681019238
@@ -182,7 +182,7 @@ Accept-Language: en-US,en;q=0.8
                 desc = title
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
-        
+
         ### Arhīva kategoriju video
         elif "archive/records" in data:
             #https://manstv.lattelecom.tv/api/v1.3/get/archive/records/?filter[category]=13&limit=10&until_id=1458681019238
@@ -203,7 +203,7 @@ Accept-Language: en-US,en;q=0.8
                     if not item["channel_id"] in self.epg_ch:
                         self.epg_ch[item["channel_id"]]=[]
                     self.epg_ch[item["channel_id"]].append(index)
-                item = self.get_epg_id(item["id"])                     
+                item = self.get_epg_id(item["id"])
                 ch = self.get_channel_by_id2(item["channel_id"])
                 ch_name = ch["name"] if ch else item["channel_id"]
                 title = u"[%s %s-%s] %s - %s"%(item["date"],item["time_start2"].strftime("%H:%M"),item["time_stop2"].strftime("%H:%M"),ch_name,item["title"])
@@ -217,7 +217,7 @@ Accept-Language: en-US,en;q=0.8
                 data2 = re.sub("until_id=\d+","until_id="+item["id"],data)
             else:
                 data2 = data + "&until_id=%s"%item["id"]
-            content.append(("Next page",self.name+"::"+data2,"","Go to next page"))                 
+            content.append(("Next page",self.name+"::"+data2,"","Go to next page"))
             return content
 
         ### Arhīva kanānālu saraksts
@@ -232,7 +232,7 @@ Accept-Language: en-US,en;q=0.8
             return content
 
         ### Arhīva kanānāla video saraksta
-        elif "archive/channel/" in data: 
+        elif "archive/channel/" in data:
             chid = path.split("/")[2]
             for item in self.get_epg_date(qs["date"],chid):
                 #if item["is_archive"]=='0':continue
@@ -251,18 +251,18 @@ Accept-Language: en-US,en;q=0.8
                 data2 = re.sub("date=[\d-]+","date="+date2,data)
             else:
                 data2 = data + "&date=%s"%date2
-            content.append(("Previous day (%s)"%date2,self.name+"::"+data2,"","Go previous day"))                 
+            content.append(("Previous day (%s)"%date2,self.name+"::"+data2,"","Go previous day"))
             return content
-        
-        ### Arhīva datumi 
+
+        ### Arhīva datumi
         elif clist=="arhivs" and len(data.split("/"))==2: # TODO - pasreiz nestrada
             ch = data.split("/")[1]
-            r= self.call(data)            
+            r= self.call(data)
             m = re.search('class="spac no_select">([^<]+)</span>', r, re.IGNORECASE)
             if m:
                 ch_name = m.group(1)
             else:
-                ch_name = ""            
+                ch_name = ""
             today =  datetime.date.today()
             for i in range(7):
                 date = today-datetime.timedelta(i)
@@ -277,12 +277,12 @@ Accept-Language: en-US,en;q=0.8
         elif clist=="arhivs" and len(data.split("/"))==3: # TODO - nestrādā
             ch = data.split("/")[1]
             date = data.split("/")[2]
-            r= self.call(data) 
+            r= self.call(data)
             m = re.search('class="spac no_select">([^<]+)</span>', r, re.IGNORECASE)
             if m:
                 ch_name = m.group(1)
             else:
-                ch_name = ""                        
+                ch_name = ""
             for item in re.findall('(?i)href="/([^"]+?)" id="" class="archive_programm_a"><div class="archive_programm "><div class="chanel_time"><span>([^<]+)</span></div><div class="archive_programm_one"><span>([^<]+)', r):
                 title = "%s - %s"%(item[1],item[2])
                 data2 = item[0]
@@ -290,8 +290,8 @@ Accept-Language: en-US,en;q=0.8
                 desc = "%s (%s)\n%s"%(ch_name,date,title)
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
-                
-        
+
+
         ### Videonoma galvenā
         elif data=="videonoma":
             content.extend([
@@ -315,7 +315,7 @@ Accept-Language: en-US,en;q=0.8
                 ("Koncerti - pēc nosaukuma", "ltc::videonoma?page=0&genre=19&sorts=title&cnt=40&clear=true&filter={}","https://www.lattelecom.tv/images/redesign/videonoma_dropdown_koncerti.png","Koncerti pēc pēc nosaukuma"),
             ])
             return content
-        
+
         ### Videonomas saraksti
         elif path == "videonoma":
             url = "https://www.lattelecom.tv/movies-snippet.json"+params
@@ -328,19 +328,19 @@ Accept-Language: en-US,en;q=0.8
             for item in js["movies"]:
                 if not item["title"]:
                     continue
-                title = item["title"].encode("utf8") 
+                title = item["title"].encode("utf8")
                 data2 = item["url"][1:].encode("utf8")
                 if data2[-1]=="/": data2=data2[:-1]
                 if "/raidijumi/" in data2:
                     data2 += "?series"
                 img = "https://www.lattelecom.tv"+item["image"].encode("utf8")
                 desc = "%s\n%s"%(title,item["genre"].encode("utf8"))
-                content.append((title,self.name+"::"+data2,img,desc)) 
+                content.append((title,self.name+"::"+data2,img,desc))
             m = re.search("page=(\d+)",data)
             if m:
                 page = int(m.group(1))
                 data2 = re.sub("page=\d+","page=%s"%(page+1),data)
-                content.append(("Next page",self.name+"::"+data2,"","Go to next page"))                 
+                content.append(("Next page",self.name+"::"+data2,"","Go to next page"))
             return content
 
         ### Sērijas
@@ -353,7 +353,7 @@ Accept-Language: en-US,en;q=0.8
             raidijums = m.group(1) + " - " if m else ""
             m = re.search('data-bid="([^"]+)',r)
             if m:
-                url = "https://www.lattelecom.tv/episode-loader.json?bcast_ids=%s"%(m.group(1)) 
+                url = "https://www.lattelecom.tv/episode-loader.json?bcast_ids=%s"%(m.group(1))
                 r = self._http_request(url,headers=self.headers2)
                 i1 = r.find('{"total":')
                 i2 = r.find('}<div class=')
@@ -363,16 +363,16 @@ Accept-Language: en-US,en;q=0.8
                     data2 = item["url"][1:]
                     img = "https://www.lattelecom.tv"+item["img"]
                     desc = title
-                    content.append((title,self.name+"::"+data2,img,desc))                                     
+                    content.append((title,self.name+"::"+data2,img,desc))
             else:
-                for item in re.findall('(?si)<a class="elementxxx forward-link[^"]*" href="([^"]+)">.*?<img src="([^"]+)" class="img"><span class="titlez">([^<]+)</span><span class="epizode_number">([^<]+)</span>', r):                
+                for item in re.findall('(?si)<a class="elementxxx forward-link[^"]*" href="([^"]+)">.*?<img src="([^"]+)" class="img"><span class="titlez">([^<]+)</span><span class="epizode_number">([^<]+)</span>', r):
                     title = "%s%s (%s)"%(raidijums,item[2],item[3])
                     data2 = item[0][1:]
                     img = "https://www.lattelecom.tv"+item[1]
                     desc = title
                     content.append((title,self.name+"::"+data2,img,desc))
-            return content           
-            
+            return content
+
         ### Videonomas video
         elif clist=="videonoma" and len(data.split("/"))>1:
             ch = data.split("/")[1]
@@ -391,20 +391,20 @@ Accept-Language: en-US,en;q=0.8
             if m:
                 title = m.group(1)
             else:
-                title = ""  
+                title = ""
             desc = title
             content = (title,data2,"",desc)
             return content
 
         else:
             return content
-        
+
     def get_streams(self, data):
         print "[ltc] get_streams:", data
-        if "::" in data: data = data.split("::")[1]         
+        if "::" in data: data = data.split("::")[1]
         if not self.is_video(data):
             return []
-        
+
         ### Video nomas strīmus pagaidām dabu no mājas lapas TODO
         if data.split("/")[0]=="videonoma" and len(data.split("/"))>1:
             #video_id=data.split("/")[-1]
@@ -412,14 +412,14 @@ Accept-Language: en-US,en;q=0.8
         else:
             if not self.is_logedin():
                 if not self.login():
-                    return []   
+                    return []
             r = self.call(data)
             if not r: return []
             if "errors" in r:
                 return []
             self.refresh_token()
             token = "&auth_token=app_%s"%(self.token)
-            
+
             vid = data.split("/")[2].split("?")[0]
             vtype = data.split("/")[1]
             if vtype == "live-streams":
@@ -444,10 +444,10 @@ Accept-Language: en-US,en;q=0.8
                 date = epg["date"]
                 title = "%s (%s %s-%s)"%(title,date,t1,t2)
                 desc = epg["description"]
-    
+
             streams = []
             for s in r["data"]:
-                stream = stream0.copy()
+                stream = util.item()
                 stream["url"]=(s["attributes"]["stream-url"]+token.encode("utf8")).encode("utf8")
                 stream["name"]=title
                 stream["desc"]=desc
@@ -466,7 +466,7 @@ Accept-Language: en-US,en;q=0.8
             s["order"] = lv+qv
         streams = sorted(streams,key=lambda item: item["order"],reverse=True)
         return streams
-        
+
     def is_video(self,data):
         if "::" in data:
             data = data.split("::")[1]
@@ -481,7 +481,7 @@ Accept-Language: en-US,en;q=0.8
             return True
         else:
             return False
-    
+
     def get_channels(self):
         if self.ch:
             return self.ch
@@ -495,21 +495,21 @@ Accept-Language: en-US,en;q=0.8
             self.ch_id2[item["xprs_id"]]=i
             self.ch_name[item["name"]]=i
         return self.ch
-                
+
     def get_channel_by_id(self,chid):
         if not self.ch:
             self.get_channels()
         if not self.ch:
             return None
         return self.ch[self.ch_id[chid]] if self.ch_id.has_key(chid) else None
-    
+
     def get_channel_by_id2(self,chid):
         if not self.ch:
             self.get_channels()
         if not self.ch:
             return None
         return self.ch[self.ch_id2[chid]] if self.ch_id2.has_key(chid) else None
-    
+
     def get_channels2(self):
         if self.ch2:
             return self.ch2
@@ -522,7 +522,7 @@ Accept-Language: en-US,en;q=0.8
             ch["title"]=item[1]
             self.ch2.append(ch)
         return self.ch2
-    
+
     def get_channel_by_name2(self,name):
         if not self.ch2:
             self.get_channels2()
@@ -530,16 +530,16 @@ Accept-Language: en-US,en;q=0.8
             if c["name"]==name:
                 return c
         return None
-            
+
     def get_channel_by_name(self,name):
         if not self.ch:
             self.get_channels()
         ch2 = self.get_channel_by_name2(name)
         if not ch2:
             return None
-        ch = self.get_channel_by_id2(ch2["id2"]) 
+        ch = self.get_channel_by_id2(ch2["id2"])
         return ch
-        
+
     def get_epg(self,date=None,update=False):
         #https://manstv.lattelecom.tv/api/v1.3/get/tv/epg/?daynight=2016-05-19
         today=datetime.date.today()
@@ -569,10 +569,10 @@ Accept-Language: en-US,en;q=0.8
                 if not item["channel_id"] in self.epg_ch:
                     self.epg_ch[item["channel_id"]]=[]
                 self.epg_ch[item["channel_id"]].append(index)
-                              
+
         if not date in self.epgdates:
             self.epgdates.append(date)
-        
+
 
     def get_epg_id(self,epgid):
         if not self.epg:
@@ -581,7 +581,7 @@ Accept-Language: en-US,en;q=0.8
         if epgid in self.epg_id:
             return self.epg[self.epg_id[epgid]]
         return None
-    
+
     def get_epg_date(self,date,chid):
         if not date in self.epgdates:
             self.get_epg(date)
@@ -590,10 +590,10 @@ Accept-Language: en-US,en;q=0.8
         for it in self.epg_date[date]:
             item = self.epg[it]
             if item["channel_id"]==ch["xprs_id"]:
-                items.append(item)        
+                items.append(item)
         return items
-        
-        
+
+
     def call(self, data,params = None, headers=None):
         if not headers: headers = self.headers
         #if not lang: lang = self.country
@@ -607,7 +607,7 @@ Accept-Language: en-US,en;q=0.8
                 return None
         else:
             return None
-        
+
     def call2(self, data,params = None, headers=None):
         if not headers: headers = self.headers2
         #if not lang: lang = self.country
@@ -628,10 +628,10 @@ Accept-Language: en-US,en;q=0.8
 
     def login(self,user="",password=""):
         """Login in to site, get token"""
-        self.options_read()        
+        self.options_read()
         if not user: user=self.options["user"]
         if not password: password = self.options["password"]
-        
+
         # Dabūjam tokenu
         url = "https://manstv.lattelecom.tv/api/v1.3/post/user/login"
         params = "uid=7f777e938d35e017&password=%s&username=%s&"%(password,user)
@@ -639,7 +639,7 @@ Accept-Language: en-US,en;q=0.8
 Content-Type: application/x-www-form-urlencoded; charset=UTF-8
 User-Agent: Dalvik/1.6.0 (Linux; U; Android 4.4.2; SM-G900FD Build/KOT49H)
 Host: manstv.lattelecom.tv
-""" )    
+""" )
         try:
             r = urllib2.Request(url, data=params, headers=headers)
             u = urllib2.urlopen(r)
@@ -653,7 +653,7 @@ Host: manstv.lattelecom.tv
             return True
         else:
             return False
-        
+
     def refresh_token(self):
         data = "user/refresh-token//%s"%self.token
         r = self.call(data)
@@ -663,7 +663,7 @@ Host: manstv.lattelecom.tv
         else:
             self.token = ""
             return False
-    
+
     def check_logedin(self):
         if not self.token:
             return False
@@ -672,18 +672,18 @@ Host: manstv.lattelecom.tv
                 return True
             else:
                 return False
-        
+
     def is_logedin(self):
         if self.token:
             return True
         else:
             return False
-                 
+
     #----------------------------------------------------------------------
     def get_tv_url(self,video_id):
         """Get m3u8 url for given live tv channel"""
         url = "https://m.lattelecom.tv/tiesraide/%s"%video_id
-        data = self.get_stream_url2("tiesraide/%s"%video_id)        
+        data = self.get_stream_url2("tiesraide/%s"%video_id)
         #headers = self.headers
         #headers["Cookie"] = "%s; %s; _hjIncludedInSample=0; MobBitr=1; MobRentBitr=%s; MobRentLang=%s;"%(self.session_id,self.mobtv_cache,data["quality"],data["language"])
         #response = urllib2.urlopen(urllib2.Request(url, headers=headers))
@@ -702,11 +702,11 @@ Host: manstv.lattelecom.tv
         #response = urllib2.urlopen(urllib2.Request(url, headers=headers))
         #m3u8 = response.read()
         return data["stream"] if data else None
-        
+
     #----------------------------------------------------------------------
     def get_arhivs_url(self,video_id):
         """Get m3u8 url for given archive video"""
-        data = self.get_video_data(video_id)                
+        data = self.get_video_data(video_id)
         #url = "https://m.lattelecom.tv/free_origin?show_origin=1&type=arhivs&event_id=%s&bitrate=mhq"%(video_id) #,data["quality"])
         #headers = self.headers
         #headers["Cookie"] = "%s; %s; MobBitr=1; "%(self.session_id,self.mobtv_cache)
@@ -727,7 +727,7 @@ Host: manstv.lattelecom.tv
             return None
         if not self.is_logedin():
             if not self.login():
-                return None       
+                return None
         r = self.call(data)
         if not r:
             return None
@@ -741,9 +741,9 @@ Host: manstv.lattelecom.tv
                 s["stream"] += token
                 hls["streams"].append(s)
         return hls
-            
+
     def get_stream_url2(self,data):
-        video_id=data[data.find("/")+1:]        
+        video_id=data[data.find("/")+1:]
         if not self.is_logedin2():
             if not self.login2():
                 return []
@@ -753,14 +753,14 @@ Host: manstv.lattelecom.tv
         if m:
             title = m.group(1)
         else:
-            title = ""  
+            title = ""
         desc = title
-          
+
         url = "https://www.lattelecom.tv/xmls/%s.xml"%video_id
         headers = self.headers2
         headers["Cookie"] = self.session_id
         response = urllib2.urlopen(urllib2.Request(url, headers=headers))
-        
+
         r = response.read()
         servers = re.findall("(?s)<origin>([^<]+)</origin>", r)
         streams_xml = re.findall('<stream quality="\w+">(mp4:\w+_(\w\w)_(\w\w).mp4)</stream>',r)
@@ -775,13 +775,13 @@ Host: manstv.lattelecom.tv
             sub["lang"] = s[0]
             sub["name"] = "captions (vtt)"
             sub["type"] = "vtt"
-            sub["order"] = llist.index(sub["lang"])*10 if sub["lang"] in llist else 0            
-            captions.append(sub)       
-        captions = sorted(captions,key=lambda item: item["order"],reverse=True)      
+            sub["order"] = llist.index(sub["lang"])*10 if sub["lang"] in llist else 0
+            captions.append(sub)
+        captions = sorted(captions,key=lambda item: item["order"],reverse=True)
         for s in streams_xml:
-            for server in servers: 
+            for server in servers:
                 server2 = self.load_balancer(server)
-                url = "http://%s/mobile-vod/%s/playlist.m3u8?resource_id=%s&auth_token=%s"%(server2,s[0],resource_id,token) 
+                url = "http://%s/mobile-vod/%s/playlist.m3u8?resource_id=%s&auth_token=%s"%(server2,s[0],resource_id,token)
                 stream = util.item()
                 stream["url"]=url
                 stream["lang"]=s[1]
@@ -792,15 +792,15 @@ Host: manstv.lattelecom.tv
                 stream["subs"] = []
                 for c in captions:
                     c2= c.copy()
-                    #c2["url"] ="http://%s/mobile-vod/%s/%s?resource_id=%s&auth_token=%s"%(server2,s[0],c["url"],resource_id,token) 
-                    c2["url"] ="http://%s/mobile-vod/%s/%s"%(server2,s[0],c["url"]) 
+                    #c2["url"] ="http://%s/mobile-vod/%s/%s?resource_id=%s&auth_token=%s"%(server2,s[0],c["url"],resource_id,token)
+                    c2["url"] ="http://%s/mobile-vod/%s/%s"%(server2,s[0],c["url"])
                     stream["subs"].append(c2)
                     pass
-                streams.append(stream)        
+                streams.append(stream)
                 break # TODO ņem tikai pirmo serveri, varētu pārbaudit, kurš no tiem strādā, kurš ne
 
         return streams
-        
+
         #data = {}
         #data["server"] = re.findall("(?s)<origin>([^<]+)</origin>", r)[1]
         #data["language"]=re.findall('(?s)<language code="([^"]+)">', r)
@@ -809,12 +809,12 @@ Host: manstv.lattelecom.tv
         #data["qs"]=dict(data["qs"])
         #qs = data["qs"].keys()
         #data["quality"] = "hd" if "hd" in qs else "hq" if "hq" in qs else "mhq" if "mhq" in qs else "lq"
-        #data["mp4"] = data["qs"][data["quality"]]        
+        #data["mp4"] = data["qs"][data["quality"]]
         #data["token"] = re.search("(?s)<auth_token>([^<]+)</auth_token>", r).group(1)
         #data["resource_id"]=re.search("(?s)<resource_id>([^<]+)</resource_id>", r).group(1)
         #data["server"]=self.load_balancer(data["server"])
-        #data["hls"] = "http://%s/mobile-vod/%s/playlist.m3u8?resource_id=%s&auth_token=%s"%(data["server"],data["mp4"],data["resource_id"],data["token"]) 
-        ##data["hls"]="http://%s/mobile-vod/mp4:%s/playlist.m3u8?resource_id=%s&auth_token=app_%s"%(data["server"],data["mp4"],data["resource_id"],data["token"])  
+        #data["hls"] = "http://%s/mobile-vod/%s/playlist.m3u8?resource_id=%s&auth_token=%s"%(data["server"],data["mp4"],data["resource_id"],data["token"])
+        ##data["hls"]="http://%s/mobile-vod/mp4:%s/playlist.m3u8?resource_id=%s&auth_token=app_%s"%(data["server"],data["mp4"],data["resource_id"],data["token"])
 
     ### wwww.lattelecom.tv izsaukumi
     def login2(self,user="",password=""):
@@ -905,10 +905,10 @@ Referer: https://www.lattelecom.tv/
             err = re.search('"error":"(.+?)"').group(1) if re.search('"error":"(.+?)"') else ""
             raise Exception(u"Kļūda ielogojoties - %s"%err)
         self.session_id = session_id
-        self.headers2["Cookie"] = "%s; "%(self.session_id)    
+        self.headers2["Cookie"] = "%s; "%(self.session_id)
         self.error = ""
         return True
-    
+
     def check_logedin2(self):
         if not self.session_id:
             return False
@@ -920,13 +920,13 @@ Referer: https://www.lattelecom.tv/
             else:
                 self.session_id = ""
                 return False
-        
+
     def is_logedin2(self):
         if self.session_id:
             return True
         else:
             return False
-    
+
     def load_balancer(self,server,streams=[]):
         headers = headers2dict("""
 Connection: keep-alive
@@ -950,7 +950,7 @@ User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like
         except Exception as ex:
             print "hls failed: %s %s"%(ex.getcode(),url)
             return False
-        
+
         if response.code == 200:
             html = response.read()
             url0 = re.search("(http://[^/]+/)",url).group(1)
@@ -960,7 +960,7 @@ User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like
             try:
                 response2 = urllib2.urlopen(urllib2.Request(url2, headers=headers))
             except Exception as ex:
-                print "hls chunk failed: %s %s"%(ex.getcode(),url2)                
+                print "hls chunk failed: %s %s"%(ex.getcode(),url2)
                 return False
             if response2.code == 200:
                 return True
@@ -968,15 +968,15 @@ User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like
                 return False
         else:
             return False
-    
+
 if __name__ == "__main__":
     c = Source()
     from subprocess import call
-    
+
     if len(sys.argv)>1 and  not "ltc::" in sys.argv[1]:
-        
+
         vid = sys.argv[1]
-        print "login - %s"%c.login("ivars777","xxx")        
+        print "login - %s"%c.login("ivars777","xxx")
         vid = "1069"
         vid = "1462566072086"
         channelid="101"
@@ -984,19 +984,19 @@ if __name__ == "__main__":
         #data = c.get_stream_url(vid,"vod")
         #call([r"c:\Program Files\VideoLAN\VLC\vlc.exe",data["stream"]])
         pass
- 
-        print "login2 - %s"%c.login2("ivars777","xxx")         
+
+        print "login2 - %s"%c.login2("ivars777","xxx")
         #vid2 = "animation/ultimate_avengers_ii"
         #vid2 = "animation/ice_age"
         vid2 = "tiesraide/ltv1"
         #vid2 = "arhivs/1456521417815"
         data = c.get_stream_url2(vid2)
-        print data        
+        print data
         #for s in data:
         call([r"c:\Program Files\VideoLAN\VLC\vlc.exe",data["stream"]])
         pass
 
-        
+
     else:
         if len(sys.argv)>1:
             data= sys.argv[1]

sources/serialguru.py

@@ -18,9 +18,9 @@ from SourceBase import SourceBase
 headers2dict = lambda  h: dict([l.strip().split(": ") for l in h.strip().splitlines()])
 import HTMLParser
 h = HTMLParser.HTMLParser()
-    
+
 class Source(SourceBase):
-    
+
     def __init__(self,country=""):
         self.name = "serialguru"
         self.title = "SerialGURU.ru"
@@ -29,88 +29,88 @@ class Source(SourceBase):
         self.country=country
         self.headers = headers2dict("""
 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.79 Safari/537.36
-Referer: http://serialguru.ru/        
+Referer: http://serialguru.ru/
 """)
         self.headers2 = headers2dict("""
 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.79 Safari/537.36
 X-Requested-With: XMLHttpRequest
 Content-Type: application/x-www-form-urlencoded; charset=UTF-8
-Referer: http://serialguru.ru/        
+Referer: http://serialguru.ru/
 """)
         self.url = "http://serialguru.ru/"
         #self.login()
-        
+
     def login(self,user="",password=""):
         return True
-            
+
     def get_content(self, data):
         print "[tvdom] get_content:", data
         if "::" in data:
-            data = data.split("::")[1] 
+            data = data.split("::")[1]
         path = data.split("?")[0]
         clist = path.split("/")[0]
         params = data[data.find("?"):] if "?" in data else ""
         qs = dict(map(lambda x:x.split("="),re.findall("[%\w]+=\w+",params)))
         lang = qs["lang"] if "lang" in qs else self.country
-    
+
         content=[]
         content.append(("..return", "back","","Return back"))
-        
+
         if clist=="home":
             content.extend([
-                ("Search", "serialguru::search/{0}","","Search content"),                
-                ("Last", "serialguru::last","","Last series"),                
+                ("Search", "serialguru::search/{0}","","Search content"),
+                ("Last", "serialguru::last","","Last series"),
                 ("Series", "serialguru::serials","","TV Series"),
                 ("Shows", "serialguru::tv","","TV Shows"),
                 ("Animations", "serialguru::mult","","Animation series"),
-                
+
                 #("Archive - all", "tvdom::arhivs_all","","Video archive all"),
             ])
             return content
-    
-        elif data=="last":
+
+        elif data == "last":
             r = self.call("")
             for item in re.findall(r'<li><a href="(http://serialguru\.ru/[^"]+)"><i>([^<]+)</i>  <i>([^<]+)</i> <b>([^<]+)</b></a></li>', r, re.DOTALL):
                 title = item[1] + " - " + item[2]+"/"+item[3]
                 img = ""
-                data2 = item[0].replace(self.url,"")
+                data2 = item[0].replace(self.url, "")
                 desc = title
-                content.append((title,self.name+"::"+data2,img,desc))
+                content.append((title, self.name+"::"+data2, img, desc))
             return content
 
         elif data=="serials":
             content.extend([
-                ("All", "serialguru::serials?o=0&t=S","","All series"),                
-                ("Russian", "serialguru::serials?c%5B%5D=53&c%5B%5D=61&c%5B%5D=33&c%5B%5D=42&c%5B%5D=31&o=0&t=S","","Russian countries series"),                
+                ("All", "serialguru::serials?o=0&t=S","","All series"),
+                ("Russian", "serialguru::serials?c%5B%5D=53&c%5B%5D=61&c%5B%5D=33&c%5B%5D=42&c%5B%5D=31&o=0&t=S","","Russian countries series"),
                 ("English", "serialguru::serials?c%5B%5D=27&c%5B%5D=26&c%5B%5D=43&c%5B%5D=30&c%5B%5D=34&c%5B%5D=25&o=0&t=S","","English countries series"),
                 ("Europe", "serialguru::serials?c%5B%5D=29&c%5B%5D=66&c%5B%5D=44&c%5B%5D=28&c%5B%5D=51&c%5B%5D=65&c%5B%5D=62&c%5B%5D=40&c%5B%5D=45&c%5B%5D=68&c%5B%5D=59&c%5B%5D=39&c%5B%5D=35&c%5B%5D=47&o=0&t=S","","European countries series"),
                 ("Other", "serialguru::serials?c%5B%5D=36&c%5B%5D=32&c%5B%5D=67&c%5B%5D=63&c%5B%5D=60&c%5B%5D=64&c%5B%5D=38&c%5B%5D=52&c%5B%5D=41&c%5B%5D=58&c%5B%5D=57&c%5B%5D=37&c%5B%5D=50&c%5B%5D=46&o=0&t=S","","Other countries series"),
                 #("Archive - all", "tvdom::arhivs_all","","Video archive all"),
             ])
             return content
-        
+
         elif data=="tv":
             content.extend([
-                ("All", "serialguru::tv?o=0&t=S","","All series"),                
-                ("Russian", "serialguru::tv?c%5B%5D=53&c%5B%5D=61&c%5B%5D=33&c%5B%5D=42&c%5B%5D=31&o=0&t=P","","Russian countries TV shows"),                
+                ("All", "serialguru::tv?o=0&t=S","","All series"),
+                ("Russian", "serialguru::tv?c%5B%5D=53&c%5B%5D=61&c%5B%5D=33&c%5B%5D=42&c%5B%5D=31&o=0&t=P","","Russian countries TV shows"),
                 ("English", "serialguru::tv?c%5B%5D=27&c%5B%5D=26&c%5B%5D=43&c%5B%5D=30&c%5B%5D=34&c%5B%5D=25&o=0&t=P","","English countries TV shows"),
                 ("Europe", "serialguru::tv?c%5B%5D=29&c%5B%5D=66&c%5B%5D=44&c%5B%5D=28&c%5B%5D=51&c%5B%5D=65&c%5B%5D=62&c%5B%5D=40&c%5B%5D=45&c%5B%5D=68&c%5B%5D=59&c%5B%5D=39&c%5B%5D=35&c%5B%5D=47&o=0&t=P","","European countries TV shows series"),
                 ("Other", "serialguru::tv?c%5B%5D=36&c%5B%5D=32&c%5B%5D=67&c%5B%5D=63&c%5B%5D=60&c%5B%5D=64&c%5B%5D=38&c%5B%5D=52&c%5B%5D=41&c%5B%5D=58&c%5B%5D=57&c%5B%5D=37&c%5B%5D=50&c%5B%5D=46&o=0&t=P","","Other countries TV shows"),
                 #("Archive - all", "tvdom::arhivs_all","","Video archive all"),
             ])
             return content
-        
+
         elif data=="mult":
             content.extend([
-                ("All", "serialguru::mult?o=0&t=S","","All series"),                
-                ("Russian", "serialguru::mult?c%5B%5D=53&c%5B%5D=61&c%5B%5D=33&c%5B%5D=42&c%5B%5D=31&o=0&t=M","","Russian countries animantions"),                
+                ("All", "serialguru::mult?o=0&t=S","","All series"),
+                ("Russian", "serialguru::mult?c%5B%5D=53&c%5B%5D=61&c%5B%5D=33&c%5B%5D=42&c%5B%5D=31&o=0&t=M","","Russian countries animantions"),
                 ("English", "serialguru::mult?c%5B%5D=27&c%5B%5D=26&c%5B%5D=43&c%5B%5D=30&c%5B%5D=34&c%5B%5D=25&o=0&t=M","","English countries animantions"),
                 ("Europe", "serialguru::mult?c%5B%5D=29&c%5B%5D=66&c%5B%5D=44&c%5B%5D=28&c%5B%5D=51&c%5B%5D=65&c%5B%5D=62&c%5B%5D=40&c%5B%5D=45&c%5B%5D=68&c%5B%5D=59&c%5B%5D=39&c%5B%5D=35&c%5B%5D=47&o=0&t=M","","European countries animantions"),
                 ("Other", "serialguru::mult?c%5B%5D=36&c%5B%5D=32&c%5B%5D=67&c%5B%5D=63&c%5B%5D=60&c%5B%5D=64&c%5B%5D=38&c%5B%5D=52&c%5B%5D=41&c%5B%5D=58&c%5B%5D=57&c%5B%5D=37&c%5B%5D=50&c%5B%5D=46&o=0&t=M","","Other countries animantions"),
                 #("Archive - all", "tvdom::arhivs_all","","Video archive all"),
             ])
             return content
-        
+
         elif clist=="search":
             if data.split("/")>1:
                 term = data.split("/")[1]
@@ -128,7 +128,7 @@ Referer: http://serialguru.ru/
                 desc = title +"\nRating:%s (%s+/%s-)"%(rating,item["plus_cnt"].encode("utf8"),item["minus_cnt"].encode("utf8"))
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
-                        
+
         elif path=="serials" or path=="tv" or path=="mult":
             if path=="serials" and not "cat%5B%5D" in data:
                 #content.append(("All", "serialguru::"+data+"&cat%5B%5D=","","All series"))
@@ -146,11 +146,11 @@ Referer: http://serialguru.ru/
                     content.append((title,self.name+"::"+data2,img,desc))
                 page=int(re.search("o=(\d+)",data).group(1))
                 data2 = re.sub("o=(\d+)","o=%s"%(page+15),data)
-                content.append(("Next page",self.name+"::"+data2,"","Go to next page"))                 
+                content.append(("Next page",self.name+"::"+data2,"","Go to next page"))
                 return content
-        
-        
-        ### Pārraide  
+
+
+        ### Pārraide
         else:
             r = self.call(clist)
             title0=re.search('<h2>(.+?)</h2>',r,re.DOTALL).group(1)
@@ -181,10 +181,10 @@ Referer: http://serialguru.ru/
                     img = img0
                     data2 = item["file"].encode("utf8")
                     desc = desc0
-                    content.append((title,data2,img,desc))               
+                    content.append((title,data2,img,desc))
             return content
- 
-            
+
+
     def is_video(self,data):
         if "::" in data:
             data = data.split("::")[1]
@@ -192,14 +192,14 @@ Referer: http://serialguru.ru/
             return True
         else:
             return False
-    
+
     def get_categories(self,data):
         r = self.call(data)
         r2 = re.search('<td class="category">(.+?)</td>', r, re.DOTALL).group(1)
         items = re.findall(r'<a href="#" data-id="(\d+)">([^<]+)</a>', r2, re.DOTALL)
         return items
 
-        
+
     def call(self, data,params = None, headers=None):
         if not headers: headers = self.headers
         #if not lang: lang = self.country