Izlabots USTVnow

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'ltc::home',
+        (u'config::home',
          '')),
                       loc('filmix_decode2.py'): ('project',
         (u'XRHzQZe3yvH32Z5ly1b3XakY7RUw7LYl7L60yM2n2ZQLOZtlfZUT2mUW2jkw2xtv2W20fxEMOZcLfW50yM=Va02lynHeDSYPDWDwQWwgDLsL2ZEMyVnmizlgkzkCHEGSXabNmLlzOZA4205laSYIQZch',
@@ -128,7 +128,7 @@ debug.breakpoints = {loc('gstreamer/player-minimal.py'): {12: (0,
               None,
               1,
               0),
-        284: (0,
+        283: (0,
               None,
               1,
               0)},
@@ -136,10 +136,14 @@ debug.breakpoints = {loc('gstreamer/player-minimal.py'): {12: (0,
         None,
         1,
         0)},
-                     loc('sources/kinofilmnet.py'): {172: (0,
+                     loc('sources/kinofilmnet.py'): {151: (0,
         None,
         1,
-        0)},
+        0),
+        172: (0,
+              None,
+              1,
+              0)},
                      loc('sources/ltc.py'): {73: (0,
         None,
         1,
@@ -288,7 +292,7 @@ debug.breakpoints = {loc('gstreamer/player-minimal.py'): {12: (0,
               None,
               1,
               0)},
-                     loc('sources/ustvnow.py'): {58: (0,
+                     loc('sources/ustvnow.py'): {59: (0,
         None,
         1,
         0)},
@@ -339,6 +343,10 @@ debug.breakpoints = {loc('gstreamer/player-minimal.py'): {12: (0,
                      loc('util.py'): {51: (0,
         None,
         1,
+        0),
+                                      85: (0,
+        None,
+        1,
         0)},
                      loc('viaplay/vialib.py'): {84: (0,
         None,
@@ -4949,9 +4957,10 @@ debug.err-values = {None: {},
                                     0)},
                     loc('test_sources.py'): {},
                     loc('viaplay/vialib.py'): {}}
-debug.recent-run-args = {loc('ContentSources.py'): [u'ltc::home',
+debug.recent-run-args = {loc('ContentSources.py'): [u'config::home',
+        u'filmix::home',
+        u'ltc::home',
         u'ltc::videonoma/raidijumi/littlest_pet_shop_s1e26?series',
-        u'config::home',
         u'viaplay::home',
         u'kinofilmnet::home',
         u'viaplay::kids',
@@ -4962,7 +4971,6 @@ debug.recent-run-args = {loc('ContentSources.py'): [u'ltc::home',
         u'filmix::series',
         u'filmix::films',
         u'filmix::play/109175',
-        u'filmix::home',
         u'replay::home',
         u'tvdom::home',
         u'replay::search/?term=rondo\n',
@@ -5056,23 +5064,24 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         'type': 'dock',
         'view': {'area': 'tall',
                  'constraint': None,
-                 'current_pages': [1,
+                 'current_pages': [0,
                                    0],
                  'full-screen': False,
                  'notebook_display': 'normal',
-                 'notebook_percent': 0.18907736863880842,
+                 'notebook_percent': 0.23133716160787532,
                  'override_title': None,
                  'pagelist': [('project',
                                'tall',
                                0,
                                {'tree-state': {'file-sort-method': 'by name',
         'list-files-first': False,
-        'tree-states': {'deep': {'expanded-nodes': [(9,),
-        (17,),
-        (75,),
-        (110,)],
-                                 'selected-nodes': [(27,)],
-                                 'top-node': (0,)}},
+        'tree-states': {'deep': {'expanded-nodes': [(17,),
+        (74,),
+        (108,)],
+                                 'selected-nodes': [(17,
+        8)],
+                                 'top-node': (17,
+        1)}},
         'tree-style': 'deep'}}),
                               ('snippets',
                                'tall',
@@ -5108,7 +5117,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                {'tree-state': []})],
                  'primary_view_state': {'area': 'wide',
         'constraint': None,
-        'current_pages': [7,
+        'current_pages': [1,
                           1],
         'notebook_display': 'normal',
         'notebook_percent': 0.40625,
@@ -5159,7 +5168,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                        'fRegexFlags': 46,
                                        'fReplaceText': u'self.',
                                        'fReverse': False,
-                                       'fSearchText': u'timer',
+                                       'fSearchText': u'gst-',
                                        'fStartPos': 0,
                                        'fStyle': 'text',
                                        'fWholeWords': False,
@@ -5216,20 +5225,17 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         -1,
         -1),
                        'attrib-starts': [],
-                       'first-line': 82,
+                       'first-line': 1215,
                        'folded-linenos': [],
                        'history': {u'file:C:/Data/Programming/enigma2/PlayStream2/ContentSources.py': ['u'\
         'rl\n',
-        'print url\n',
-        'self\n',
-        'self.api_url\n',
-        'dir(self)\n',
-        '"api_url" in dir(self)\n']},
+        'print r\n',
+        'print url\n']},
                        'launch-id': None,
-                       'sel-line': 93,
-                       'sel-line-start': 1439,
-                       'selection_end': 1439,
-                       'selection_start': 1439}),
+                       'sel-line': 1225,
+                       'sel-line-start': 82159,
+                       'selection_end': 82269,
+                       'selection_start': 82159}),
                      ('debug-watch',
                       'wide',
                       1,
@@ -5245,7 +5251,9 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         u'tracks'),
                                        ('eval',
         u't')],
-                       'tree-state': {'expanded-nodes': [],
+                       'tree-state': {'expanded-nodes': [(3,),
+        (3,
+         0)],
                                       'selected-nodes': [(0,)],
                                       'top-node': (0,)}}),
                      ('debug-modules',
@@ -5281,216 +5289,240 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                       {})],
         'primary_view_state': {'editor_states': ('vertical',
         1.0,
-        ({'bookmarks': ([[loc('PlayStream.py'),
-                          {'attrib-starts': [('PSPlayer',
-        91),
-        ('PSPlayer.service_info',
-         225)],
-                           'first-line': 215,
-                           'folded-linenos': [],
-                           'sel-line': 232,
-                           'sel-line-start': 9024,
-                           'selection_end': 9077,
-                           'selection_start': 9072},
-                          1480756796.863],
-                         [loc('PlayStream.py'),
-                          {'attrib-starts': [('MainScreen',
-        318)],
-                           'first-line': 311,
+        ({'bookmarks': ([[loc('util.py'),
+                          {'attrib-starts': [('play_video',
+        49)],
+                           'first-line': 0,
                            'folded-linenos': [],
-                           'sel-line': 328,
-                           'sel-line-start': 12826,
-                           'selection_end': 12897,
-                           'selection_start': 12892},
-                          1480756797.782],
-                         [loc('PlayStream.py'),
-                          {'attrib-starts': [('MainScreen',
-        318),
-        ('MainScreen.Ok',
-         491)],
-                           'first-line': 526,
+                           'sel-line': 70,
+                           'sel-line-start': 1928,
+                           'selection_end': 1928,
+                           'selection_start': 1928},
+                          1481149538.99],
+                         [loc('util.py'),
+                          {'attrib-starts': [('play_video',
+        49)],
+                           'first-line': 66,
                            'folded-linenos': [],
-                           'sel-line': 532,
-                           'sel-line-start': 22660,
-                           'selection_end': 22728,
-                           'selection_start': 22728},
-                          1480756800.912],
-                         [loc('PlayStream.py'),
-                          {'attrib-starts': [('MainScreen',
-        318),
-        ('MainScreen.Ok',
-         491)],
-                           'first-line': 526,
+                           'sel-line': 83,
+                           'sel-line-start': 2447,
+                           'selection_end': 2486,
+                           'selection_start': 2485},
+                          1481149540.094],
+                         [loc('util.py'),
+                          {'attrib-starts': [('player',
+        86)],
+                           'first-line': 76,
                            'folded-linenos': [],
-                           'sel-line': 534,
-                           'sel-line-start': 22746,
-                           'selection_end': 22766,
-                           'selection_start': 22765},
-                          1480756802.509],
-                         [loc('PlayStream.py'),
-                          {'attrib-starts': [],
-                           'first-line': 9,
+                           'sel-line': 97,
+                           'sel-line-start': 3194,
+                           'selection_end': 3215,
+                           'selection_start': 3204},
+                          1481371034.176],
+                         [loc('ContentSources.py'),
+                          {'attrib-starts': [('ContentSources',
+        15),
+        ('ContentSources.get_streams',
+         74)],
+                           'first-line': 87,
                            'folded-linenos': [],
-                           'sel-line': 14,
-                           'sel-line-start': 466,
-                           'selection_end': 513,
-                           'selection_start': 513},
-                          1480756808.806],
-                         [loc('PlayStream.py'),
-                          {'attrib-starts': [],
-                           'first-line': 9,
+                           'sel-line': 94,
+                           'sel-line-start': 3796,
+                           'selection_end': 3829,
+                           'selection_start': 3829},
+                          1481371054.748],
+                         [loc('sources/replay.py'),
+                          {'attrib-starts': [('Source',
+        25),
+        ('Source.get_content',
+         36)],
+                           'first-line': 233,
                            'folded-linenos': [],
-                           'sel-line': 14,
-                           'sel-line-start': 466,
-                           'selection_end': 520,
-                           'selection_start': 514},
-                          1480756809.501],
-                         [loc('PlayStream.py'),
-                          {'attrib-starts': [('PSPlayer',
-        91),
-        ('PSPlayer.__init__',
-         92)],
-                           'first-line': 104,
+                           'sel-line': 245,
+                           'sel-line-start': 13416,
+                           'selection_end': 13416,
+                           'selection_start': 13416},
+                          1481371071.983],
+                         [loc('sources/SourceBase.py'),
+                          {'attrib-starts': [('SourceBase',
+        18),
+        ('SourceBase.get_streams',
+         47)],
+                           'first-line': 42,
                            'folded-linenos': [],
-                           'sel-line': 121,
-                           'sel-line-start': 4996,
-                           'selection_end': 5024,
-                           'selection_start': 5018},
-                          1480758158.263],
-                         [loc('sniplets.py'),
-                          {'attrib-starts': [],
-                           'first-line': 0,
+                           'sel-line': 59,
+                           'sel-line-start': 2232,
+                           'selection_end': 2232,
+                           'selection_start': 2232},
+                          1481371086.367],
+                         [loc('ContentSources.py'),
+                          {'attrib-starts': [('ContentSources',
+        15),
+        ('ContentSources.get_streams',
+         74)],
+                           'first-line': 87,
                            'folded-linenos': [],
-                           'sel-line': 0,
-                           'sel-line-start': 0,
-                           'selection_end': 0,
-                           'selection_start': 0},
-                          1480758171.285],
-                         [loc('sniplets.py'),
-                          {'attrib-starts': [],
-                           'first-line': 0,
+                           'sel-line': 94,
+                           'sel-line-start': 3796,
+                           'selection_end': 3796,
+                           'selection_start': 3796},
+                          1481371095.354],
+                         [loc('util.py'),
+                          {'attrib-starts': [('play_video',
+        49)],
+                           'first-line': 67,
                            'folded-linenos': [],
-                           'sel-line': 4,
-                           'sel-line-start': 124,
-                           'selection_end': 143,
-                           'selection_start': 135},
-                          1480758572.581],
+                           'sel-line': 84,
+                           'sel-line-start': 2507,
+                           'selection_end': 2507,
+                           'selection_start': 2507},
+                          1481414443.715],
                          [loc('ContentSources.py'),
-                          {'attrib-starts': [],
-                           'first-line': 173,
+                          {'attrib-starts': [('ContentSources',
+        15),
+        ('ContentSources.get_streams',
+         74)],
+                           'first-line': 87,
                            'folded-linenos': [],
-                           'sel-line': 192,
-                           'sel-line-start': 6829,
-                           'selection_end': 6829,
-                           'selection_start': 6829},
-                          1480758581.095],
-                         [loc('sources/ltc.py'),
+                           'sel-line': 94,
+                           'sel-line-start': 3796,
+                           'selection_end': 3796,
+                           'selection_start': 3796},
+                          1481414529.33],
+                         [loc('sources/kinofilmnet.py'),
                           {'attrib-starts': [('Source',
-        24),
-        ('Source.get_content',
-         71)],
-                           'first-line': 67,
+        23),
+        ('Source.get_streams',
+         149)],
+                           'first-line': 154,
                            'folded-linenos': [],
-                           'sel-line': 72,
-                           'sel-line-start': 2705,
-                           'selection_end': 2705,
-                           'selection_start': 2705},
-                          1480758647.62],
-                         [loc('PlayStream.py'),
-                          {'attrib-starts': [('PSPlayer',
-        91),
-        ('PSPlayer.__init__',
-         92)],
-                           'first-line': 109,
+                           'sel-line': 166,
+                           'sel-line-start': 7521,
+                           'selection_end': 7521,
+                           'selection_start': 7521},
+                          1481415143.712],
+                         [loc('ContentSources.py'),
+                          {'attrib-starts': [('ContentSources',
+        15),
+        ('ContentSources.get_streams',
+         74)],
+                           'first-line': 87,
                            'folded-linenos': [],
-                           'sel-line': 124,
-                           'sel-line-start': 5133,
-                           'selection_end': 5147,
-                           'selection_start': 5147},
-                          1480758789.926],
-                         [loc('sniplets.py'),
-                          {'attrib-starts': [],
-                           'first-line': 0,
+                           'sel-line': 94,
+                           'sel-line-start': 3796,
+                           'selection_end': 3796,
+                           'selection_start': 3796},
+                          1481415159.443],
+                         [loc('sources/ustvnow.py'),
+                          {'attrib-starts': [('Source',
+        28),
+        ('Source.login',
+         44)],
+                           'first-line': 55,
                            'folded-linenos': [],
-                           'sel-line': 1,
-                           'sel-line-start': 28,
-                           'selection_end': 74,
-                           'selection_start': 67},
-                          1480758809.125],
-                         [loc('PlayStream.py'),
-                          {'attrib-starts': [('PSPlayer',
-        91),
-        ('PSPlayer.__init__',
-         92)],
-                           'first-line': 109,
+                           'sel-line': 57,
+                           'sel-line-start': 2180,
+                           'selection_end': 2223,
+                           'selection_start': 2223},
+                          1481416133.375],
+                         [loc('ContentSources.py'),
+                          {'attrib-starts': [('ContentSources',
+        15),
+        ('ContentSources.get_streams',
+         74)],
+                           'first-line': 87,
                            'folded-linenos': [],
-                           'sel-line': 125,
-                           'sel-line-start': 5157,
-                           'selection_end': 5219,
-                           'selection_start': 5219},
-                          1480758825.135],
-                         [loc('sniplets.py'),
-                          {'attrib-starts': [],
-                           'first-line': 0,
+                           'sel-line': 94,
+                           'sel-line-start': 3796,
+                           'selection_end': 3796,
+                           'selection_start': 3796},
+                          1481416147.512],
+                         [loc('sources/ustvnow.py'),
+                          {'attrib-starts': [('Source',
+        28),
+        ('Source.login',
+         44)],
+                           'first-line': 47,
                            'folded-linenos': [],
-                           'sel-line': 1,
-                           'sel-line-start': 28,
-                           'selection_end': 82,
-                           'selection_start': 51},
-                          1480758835.647],
-                         [loc('PlayStream.py'),
-                          {'attrib-starts': [('PSPlayer',
-        91),
-        ('PSPlayer.__init__',
-         92)],
-                           'first-line': 131,
+                           'sel-line': 63,
+                           'sel-line-start': 2478,
+                           'selection_end': 2478,
+                           'selection_start': 2478},
+                          1481416278.649],
+                         [loc('ContentSources.py'),
+                          {'attrib-starts': [('ContentSources',
+        15),
+        ('ContentSources.get_streams',
+         74)],
+                           'first-line': 87,
+                           'folded-linenos': [],
+                           'sel-line': 94,
+                           'sel-line-start': 3796,
+                           'selection_end': 3796,
+                           'selection_start': 3796},
+                          1481416290.17],
+                         [loc('sources/ustvnow.py'),
+                          {'attrib-starts': [('Source',
+        28),
+        ('Source.login',
+         44)],
+                           'first-line': 41,
                            'folded-linenos': [],
-                           'sel-line': 138,
-                           'sel-line-start': 5629,
-                           'selection_end': 5663,
-                           'selection_start': 5663},
-                          1480759343.704],
-                         [loc('PlayStream.py'),
-                          {'attrib-starts': [('MainScreen',
-        324)],
-                           'first-line': 327,
+                           'sel-line': 53,
+                           'sel-line-start': 2010,
+                           'selection_end': 2040,
+                           'selection_start': 2040},
+                          1481416344.922],
+                         [loc('ContentSources.py'),
+                          {'attrib-starts': [('ContentSources',
+        15),
+        ('ContentSources.get_streams',
+         74)],
+                           'first-line': 87,
                            'folded-linenos': [],
-                           'sel-line': 331,
-                           'sel-line-start': 12889,
-                           'selection_end': 12909,
-                           'selection_start': 12909},
-                          1480761919.893],
-                         [loc('PlayStream.py'),
-                          {'attrib-starts': [('MainScreen',
-        324)],
-                           'first-line': 320,
+                           'sel-line': 94,
+                           'sel-line-start': 3796,
+                           'selection_end': 3796,
+                           'selection_start': 3796},
+                          1481416358.672],
+                         [loc('sources/ustvnow.py'),
+                          {'attrib-starts': [('Source',
+        28),
+        ('Source.login',
+         44)],
+                           'first-line': 48,
                            'folded-linenos': [],
-                           'sel-line': 331,
-                           'sel-line-start': 12889,
-                           'selection_end': 12911,
-                           'selection_start': 12910},
-                          1480761920.764],
-                         [loc('PlayStream.py'),
-                          {'attrib-starts': [('MainScreen',
-        324)],
-                           'first-line': 320,
+                           'sel-line': 56,
+                           'sel-line-start': 2058,
+                           'selection_end': 2066,
+                           'selection_start': 2066},
+                          1481416411.631],
+                         [loc('ContentSources.py'),
+                          {'attrib-starts': [('ContentSources',
+        15),
+        ('ContentSources.get_streams',
+         74)],
+                           'first-line': 87,
                            'folded-linenos': [],
-                           'sel-line': 331,
-                           'sel-line-start': 12889,
-                           'selection_end': 12930,
-                           'selection_start': 12928},
-                          1480761921.605],
-                         [loc('PlayStream.py'),
-                          {'attrib-starts': [],
-                           'first-line': 9,
+                           'sel-line': 94,
+                           'sel-line-start': 3796,
+                           'selection_end': 3796,
+                           'selection_start': 3796},
+                          1481416424.704],
+                         [loc('sources/ustvnow.py'),
+                          {'attrib-starts': [('Source',
+        28),
+        ('Source.login',
+         44)],
+                           'first-line': 48,
                            'folded-linenos': [],
-                           'sel-line': 14,
-                           'sel-line-start': 466,
-                           'selection_end': 520,
-                           'selection_start': 515},
-                          1480761922.368]],
+                           'sel-line': 59,
+                           'sel-line-start': 2351,
+                           'selection_end': 2351,
+                           'selection_start': 2351},
+                          1481416464.308]],
                         20),
-          'current-loc': loc('PlayStream.py'),
+          'current-loc': loc('ContentSources.py'),
           'editor-state-list': [(loc('plugin.py'),
                                  {'attrib-starts': [('main',
         4)],
@@ -5505,29 +5537,32 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         91),
         ('PSPlayer.__init__',
          92)],
-                                  'first-line': 104,
+                                  'first-line': 94,
                                   'folded-linenos': [],
-                                  'sel-line': 125,
-                                  'sel-line-start': 5157,
-                                  'selection_end': 5188,
-                                  'selection_start': 5188}),
+                                  'sel-line': 100,
+                                  'sel-line-start': 4102,
+                                  'selection_end': 4110,
+                                  'selection_start': 4110}),
                                 (loc('util.py'),
                                  {'attrib-starts': [('play_video',
         49)],
-                                  'first-line': 45,
+                                  'first-line': 67,
                                   'folded-linenos': [],
-                                  'sel-line': 50,
-                                  'sel-line-start': 1408,
-                                  'selection_end': 1408,
-                                  'selection_start': 1408}),
+                                  'sel-line': 84,
+                                  'sel-line-start': 2507,
+                                  'selection_end': 2507,
+                                  'selection_start': 2507}),
                                 (loc('ContentSources.py'),
-                                 {'attrib-starts': [],
-                                  'first-line': 173,
+                                 {'attrib-starts': [('ContentSources',
+        15),
+        ('ContentSources.get_streams',
+         74)],
+                                  'first-line': 87,
                                   'folded-linenos': [],
-                                  'sel-line': 192,
-                                  'sel-line-start': 6829,
-                                  'selection_end': 6829,
-                                  'selection_start': 6829}),
+                                  'sel-line': 94,
+                                  'sel-line-start': 3796,
+                                  'selection_end': 3796,
+                                  'selection_start': 3796}),
                                 (loc('sources/viaplay.py'),
                                  {'attrib-starts': [('Source',
         26),
@@ -5566,12 +5601,12 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         23),
         ('Source.get_streams',
          149)],
-                                  'first-line': 162,
+                                  'first-line': 154,
                                   'folded-linenos': [],
-                                  'sel-line': 172,
-                                  'sel-line-start': 7708,
-                                  'selection_end': 7732,
-                                  'selection_start': 7724}),
+                                  'sel-line': 166,
+                                  'sel-line-start': 7521,
+                                  'selection_end': 7521,
+                                  'selection_start': 7521}),
                                 (loc('sources/ltc.py'),
                                  {'attrib-starts': [('Source',
         24),
@@ -5621,8 +5656,41 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                   'sel-line': 1,
                                   'sel-line-start': 28,
                                   'selection_end': 82,
-                                  'selection_start': 51})],
-          'has-focus': False,
+                                  'selection_start': 51}),
+                                (loc('sources/filmix.py'),
+                                 {'attrib-starts': [('Source',
+        24),
+        ('Source.get_content',
+         49)],
+                                  'first-line': 106,
+                                  'folded-linenos': [],
+                                  'sel-line': 117,
+                                  'sel-line-start': 4649,
+                                  'selection_end': 4649,
+                                  'selection_start': 4649}),
+                                (loc('sources/replay.py'),
+                                 {'attrib-starts': [('Source',
+        25),
+        ('Source.get_content',
+         36)],
+                                  'first-line': 233,
+                                  'folded-linenos': [],
+                                  'sel-line': 245,
+                                  'sel-line-start': 13416,
+                                  'selection_end': 13416,
+                                  'selection_start': 13416}),
+                                (loc('sources/ustvnow.py'),
+                                 {'attrib-starts': [('Source',
+        28),
+        ('Source.login',
+         44)],
+                                  'first-line': 48,
+                                  'folded-linenos': [],
+                                  'sel-line': 59,
+                                  'sel-line-start': 2351,
+                                  'selection_end': 2351,
+                                  'selection_start': 2351})],
+          'has-focus': True,
           'locked': False},
          [loc('plugin.py'),
           loc('PlayStream.py'),
@@ -5636,7 +5704,10 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
           loc('resolvers/hdgo.py'),
           loc('ChoiceBox.py'),
           loc('../python/Components/GUISkin.py'),
-          loc('sniplets.py')]),
+          loc('sniplets.py'),
+          loc('sources/filmix.py'),
+          loc('sources/replay.py'),
+          loc('sources/ustvnow.py')]),
         ({'bookmarks': ([[loc('sources/viaplay.py'),
                           {'attrib-starts': [('Source',
         19),
@@ -5878,6 +5949,17 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                   'selection_start': 2626}),
                                 (loc('sources/euronews.py'),
                                  {}),
+                                (loc('sources/filmix.py'),
+                                 {'attrib-starts': [('Source',
+        24),
+        ('Source.get_content',
+         49)],
+                                  'first-line': 97,
+                                  'folded-linenos': [],
+                                  'sel-line': 102,
+                                  'sel-line-start': 3784,
+                                  'selection_end': 3784,
+                                  'selection_start': 3784}),
                                 (loc('resolvers/hdgo.py'),
                                  {'attrib-starts': [],
                                   'first-line': 74,
@@ -5928,6 +6010,17 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                   'selection_start': 112}),
                                 (loc('sniplets.py'),
                                  {}),
+                                (loc('sources/ustvnow.py'),
+                                 {'attrib-starts': [('Source',
+        28),
+        ('Source.login',
+         44)],
+                                  'first-line': 18,
+                                  'folded-linenos': [],
+                                  'sel-line': 47,
+                                  'sel-line-start': 1703,
+                                  'selection_end': 1730,
+                                  'selection_start': 1730}),
                                 (loc('util.py'),
                                  {'attrib-starts': [('player',
         86)],
@@ -5949,12 +6042,30 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                   'selection_end': 5488,
                                   'selection_start': 5476}),
                                 (loc('../python/Components/GUISkin.py'),
-                                 {})],
+                                 {'attrib-starts': [],
+                                  'first-line': 0,
+                                  'folded-linenos': [],
+                                  'sel-line': 0,
+                                  'sel-line-start': 0,
+                                  'selection_end': 0,
+                                  'selection_start': 0}),
+                                (loc('sources/replay.py'),
+                                 {'attrib-starts': [('Source',
+        25),
+        ('Source.get_content',
+         36)],
+                                  'first-line': 224,
+                                  'folded-linenos': [],
+                                  'sel-line': 234,
+                                  'sel-line-start': 12780,
+                                  'selection_end': 12780,
+                                  'selection_start': 12780})],
           'has-focus': False,
           'locked': False},
          [loc('ChoiceBox.py'),
           loc('ContentSources.py'),
           loc('sources/euronews.py'),
+          loc('sources/filmix.py'),
           loc('resolvers/hdgo.py'),
           loc('sources/iplayer.py'),
           loc('sources/kinofilmnet.py'),
@@ -5962,24 +6073,29 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
           loc('PlayStream.py'),
           loc('plugin.py'),
           loc('sniplets.py'),
+          loc('sources/ustvnow.py'),
           loc('util.py'),
           loc('sources/viaplay.py'),
-          loc('../python/Components/GUISkin.py')])),
+          loc('../python/Components/GUISkin.py'),
+          loc('sources/replay.py')])),
                                'open_files': [u'ChoiceBox.py',
+        u'PlayStream.py',
         u'plugin.py',
         u'resolvers/hdgo.py',
+        u'sniplets.py',
         u'sources/euronews.py',
+        u'sources/filmix.py',
         u'sources/iplayer.py',
-        u'sources/kinofilmnet.py',
+        u'sources/ltc.py',
         u'sources/viaplay.py',
         u'../python/Components/GUISkin.py',
+        u'sources/replay.py',
         u'util.py',
-        u'ContentSources.py',
-        u'sources/ltc.py',
-        u'sniplets.py',
-        u'PlayStream.py']},
+        u'sources/kinofilmnet.py',
+        u'sources/ustvnow.py',
+        u'ContentSources.py']},
         'saved_notebook_display': None,
-        'split_percents': {0: 0.2603027754415475},
+        'split_percents': {0: 0.33756345177664976},
         'splits': 2,
         'tab_location': 'top',
         'user_data': {}},
@@ -5992,18 +6108,22 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                          0,
                          2405,
                          1376)}]}
-guimgr.recent-documents = [loc('PlayStream.py'),
-                           loc('sniplets.py'),
-                           loc('sources/ltc.py'),
-                           loc('ContentSources.py'),
+guimgr.recent-documents = [loc('ContentSources.py'),
+                           loc('sources/ustvnow.py'),
+                           loc('sources/kinofilmnet.py'),
                            loc('util.py'),
+                           loc('sources/replay.py'),
+                           loc('PlayStream.py'),
+                           loc('../python/Components/GUISkin.py'),
+                           loc('sources/filmix.py'),
+                           loc('sources/ltc.py'),
+                           loc('sniplets.py'),
                            loc('ChoiceBox.py'),
                            loc('resolvers/hdgo.py'),
                            loc('sources/viaplay.py'),
                            loc('sources/iplayer.py'),
                            loc('plugin.py'),
-                           loc('sources/euronews.py'),
-                           loc('sources/kinofilmnet.py')]
+                           loc('sources/euronews.py')]
 guimgr.visual-state = {loc('../../Kodi/test2/plugin.video.aaa/addon.py'): {'a'\
         'ttrib-starts': [],
         'first-line': 0,
@@ -6664,15 +6784,6 @@ guimgr.visual-state = {loc('../../Kodi/test2/plugin.video.aaa/addon.py'): {'a'\
         'sel-line-start': 0,
         'selection_end': 0,
         'selection_start': 0},
-                       loc('../../../../Python27/Lib/re.py'): {'attrib-start'\
-        's': [('findall',
-               172)],
-        'first-line': 162,
-        'folded-linenos': [],
-        'sel-line': 180,
-        'sel-line-start': 8708,
-        'selection_end': 8708,
-        'selection_start': 8708},
                        loc('../../../../Python27/Lib/site-packages/requests/adapters.py'): {'a'\
         'ttrib-starts': [('HTTPAdapter',
                           77),
@@ -6713,6 +6824,15 @@ guimgr.visual-state = {loc('../../Kodi/test2/plugin.video.aaa/addon.py'): {'a'\
         'sel-line-start': 2478,
         'selection_end': 2478,
         'selection_start': 2478},
+                       loc('../../../../Python27/lib/re.py'): {'attrib-start'\
+        's': [('findall',
+               172)],
+        'first-line': 162,
+        'folded-linenos': [],
+        'sel-line': 180,
+        'sel-line-start': 8708,
+        'selection_end': 8708,
+        'selection_start': 8708},
                        loc('../../../../Python27/lib/site-packages/gi/__init__.py'): {'a'\
         'ttrib-starts': [],
         'first-line': 24,
@@ -6756,7 +6876,8 @@ proj.pypath = {None: ('custom',
                       u'c:\\Data\\Programming\\enigma2\\python;')}
 search.replace-history = [u'self',
                           u'current']
-search.search-history = [u'timer',
+search.search-history = [u'gst',
+                         u'timer',
                          u'etimer',
                          u'text=',
                          u'OptionsScreen',
@@ -6774,8 +6895,7 @@ search.search-history = [u'timer',
                          u'ChoiceEntryComponent',
                          u'list',
                          u'content',
-                         u'autoResize',
-                         u'font']
+                         u'autoResize']
 testing.stored-results = (1,
                           [],
                           {})

imake.bat

@@ -1,6 +1,15 @@
 @echo off
 :=== Parameters ===
-set ver=0.5j
+
+if ()==(%1%) (
+    set ver=0.5k
+	rem echo Please provide version
+	rem pause
+	rem GOTO:EOF
+) else (
+    set ver=%1
+)
+
 set prog=PlayStream
 set pack_name=enigma2-plugin-extensions-playstream
 set desc=Play online streams from various sources, mostly Latvian
@@ -18,7 +27,8 @@ set TAR=\MinGW\msys\1.0\bin\tar.exe
 if exist %ipk_dir% rm -r -f %ipk_dir% 
 mkdir %ipk_dir%
 for %%f in (
-readme.txt
+readme.md
+changelog.md
 __init__.py
 plugin.py
 plugin.png

readme.md

@@ -10,7 +10,11 @@ Currently implemented:
 - **lattelecom.tv(shortcut.lv)** media portal content
 - **play24.lv** media portal content
 - **viaplay.lv**
+- **cinemalive.tv**
+- **kinofilmnet.lv**
 - **dom.tv**
+- **BBC iPlayer**
+- **Euronews**
 - **filmon.tv** media portal content
 - **ustvnow.tv**
 - **serialguru.ru**
@@ -19,8 +23,10 @@ Currently implemented:
 ---
 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)  
-Contains files from enigma2-plugin-youtube by Taapat (https://github.com/Taapat/enigma2-plugin-youtube), originally from https://github.com/rg3/youtube-dl/blob/master/youtube_dl  
+Used fragments of code from 
+- enigma2-plugin-tv3play by Taapat (https://github.com/Taapat/enigma2-plugin-tv3play)
+- Kodi plugin script.module.stream.resolver (https://github.com/kodi-czsk/script.module.stream.resolver)  
+- enigma2-plugin-youtube by Taapat (https://github.com/Taapat/enigma2-plugin-youtube), originally from https://github.com/rg3/youtube-dl/blob/master/youtube_dl  
 
 
 

sources/filmix.py

@@ -236,8 +236,7 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
         result = self._http_request(url,params,headers=headers)
         return result
 
-
-        
+    
     def decode_uppod_text(self, text): 
         Client_codec_a = ["l", "u", "T", "D", "Q", "H", "0", "3", "G", "1", "f", "M", "p", "U", "a", "I", "6", "k", "d", "s", "b", "W", "5", "e", "y", "="]
         Client_codec_b = ["w", "g", "i", "Z", "c", "R", "z", "v", "x", "n", "N", "2", "8", "J", "X", "t", "9", "V", "7", "4", "B", "m", "Y", "o", "L", "h"]    

sources/ustvnow.py

@@ -55,7 +55,8 @@ class Source(SourceBase):
         """)
 
         url = "http://m-api.ustvnow.com/iphone/1/live/login?username=%s&password=%s&device=gtv&redir=0"%(user,password)
-        r = self._http_request(url,headers)
+        #url = "http://m-api.ustvnow.com/gtv/1/live/login?username=%s&password=%s&device=gtv&redir=0"%(user,password)
+        r = self._http_request(url,headers=headers)
         if 'success' in r:
             self.token = re.search('"token":"([^"]+)',r).group(1)
             return True