papildināts ar xtv.lv

project.wpr

@@ -200,11 +200,11 @@ debug.breakpoints = {loc('Downloader.py'): {94: (0,
             None,
             1,
             0)},
-                     loc('unknown:<untitled> #2'): {10: (0,
+                     loc('unknown:<untitled> #1'): {10: (0,
         None,
         1,
         0)},
-                     loc('unknown:<untitled> #1'): {2: (0,
+                     loc('unknown:<untitled> #2'): {2: (0,
         None,
         1,
         0)}}
@@ -305,10 +305,10 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         'type': 'dock',
         'view': {'area': 'tall',
                  'constraint': None,
-                 'current_pages': [2,
+                 'current_pages': [0,
                                    0],
                  'full-screen': False,
-                 'notebook_display': 'normal',
+                 'notebook_display': 'tabs only',
                  'notebook_percent': 0.17992831541218635,
                  'override_title': None,
                  'pagelist': [('project',
@@ -318,8 +318,9 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         'list-files-first': 0,
         'tree-states': {'deep': {'expanded-nodes': [(6,)],
                                  'selected-nodes': [(6,
-        15)],
-                                 'top-node': (0,)}},
+        22)],
+                                 'top-node': (6,
+        12)}},
         'tree-style': 'deep'}}),
                               ('snippets',
                                'tall',
@@ -681,7 +682,9 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         loc('sources/filmas.py'),
         'data')]},
         loc('sources/filmix.py'): {'expanded-nodes': [],
-                                   'selected-nodes': [],
+                                   'selected-nodes': [[('generic attribute',
+        loc('sources/filmix.py'),
+        'data')]],
                                    'top-node': [('generic attribute',
         loc('sources/filmix.py'),
         'data')]},
@@ -738,6 +741,11 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                    'top-node': [('generic attribute',
         loc('sources/tvplay.py'),
         'data')]},
+        loc('sources/xtv.py'): {'expanded-nodes': [],
+                                'selected-nodes': [],
+                                'top-node': [('generic attribute',
+        loc('sources/xtv.py'),
+        'data')]},
         loc('test1.py'): {'expanded-nodes': [],
                           'selected-nodes': [],
                           'top-node': [('generic attribute',
@@ -865,7 +873,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         loc('unknown:<untitled> #4'): {'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #6'): {'column-widths': [1.0],
+        loc('unknown:<untitled> #3'): {'column-widths': [1.0],
                                        'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
@@ -873,7 +881,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                        'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #3'): {'expanded-nodes': [],
+        loc('unknown:<untitled> #6'): {'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None}},
                                 'browse_mode': u'Current Module',
@@ -900,7 +908,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                None)],
                  'primary_view_state': {'area': 'wide',
         'constraint': None,
-        'current_pages': [2,
+        'current_pages': [4,
                           0],
         'notebook_display': 'normal',
         'notebook_percent': 0.32265812650120096,
@@ -934,12 +942,12 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                        'fMatchCase': False,
                                        'fOmitBinary': True,
                                        'fRegexFlags': 42,
-                                       'fReplaceText': u'filmix.co',
+                                       'fReplaceText': u'xtv::',
                                        'fReverse': False,
-                                       'fSearchText': u'sorted',
+                                       'fSearchText': u'meklet',
                                        'fStartPos': 0,
                                        'fStyle': 'text',
-                                       'fWholeWords': True,
+                                       'fWholeWords': False,
                                        'fWrap': True},
                        'fUIOptions': {'fAutoBackground': True,
                                       'fFilePrefix': 'short-file',
@@ -1010,32 +1018,27 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         -1,
         -1),
                        'attrib-starts': [],
-                       'first-line': 128L,
+                       'first-line': 64L,
                        'folded-linenos': [],
-                       'history': {u'file:C:/Data/Programming/enigma2/PlayStream2/content/sources/filmix.py': ['p'\
-        'rint js[1]\n',
-        'print js[1]["folder"]\n',
-        'print js[1]["folder"][1]\n',
-        'print js[1]["folder"][1]["title"]\n',
-        'items\n',
-        'js[s-1]\n',
-        'len(js[s-1])\n',
-        'js\n',
+                       'history': {u'file:C:/Data/Programming/enigma2/PlayStream2/content/sources/xtv.py': ['i'\
+        'tem\n',
+        'item[0]\n',
         'print title\n',
-        'js[s-1]["folder"][i - 1]["title"]\n',
-        'js[s-1]["folder"][i - 1]["title"].print\n',
-        'print js[s-1]["folder"][i - 1]["title"]\n',
-        'len(js)\n',
-        'len(translations)\n',
-        'img\n',
-        'st\n',
-        'm.group(0)\n',
-        'data\n']},
+        'title\n',
+        'wheb\n',
+        'when\n',
+        'qs\n',
+        'plist\n',
+        'clist\n',
+        'r2\n',
+        'r2[0]\n',
+        'r2[1]\n',
+        'print r2\n']},
                        'launch-id': None,
-                       'sel-line': 132L,
-                       'sel-line-start': 12260L,
-                       'selection_end': 12272L,
-                       'selection_start': 12261L,
+                       'sel-line': 65L,
+                       'sel-line-start': 10947L,
+                       'selection_end': 10947L,
+                       'selection_start': 10947L,
                        'zoom': 0L}),
                      ('debug-watch',
                       'wide',
@@ -1074,314 +1077,339 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         -1,
         -1),
                        'attrib-starts': [],
-                       'first-line': 0L,
+                       'first-line': 4L,
                        'folded-linenos': [],
-                       'history': {},
+                       'history': {None: ['r2\n']},
                        'launch-id': None,
-                       'sel-line': 2L,
-                       'sel-line-start': 163L,
-                       'selection_end': 163L,
-                       'selection_start': 163L,
+                       'sel-line': 10L,
+                       'sel-line-start': 379L,
+                       'selection_end': 379L,
+                       'selection_start': 379L,
                        'zoom': 0L})],
-        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('sources/tvplay.py'),
+        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('sources/replay.py'),
         {'attrib-starts': [('Source',
-                            32),
+                            31),
                            ('Source.get_content',
-                            62)],
-         'first-line': 84L,
-         'folded-linenos': [159L],
-         'sel-line': 99L,
-         'sel-line-start': 4495L,
-         'selection_end': 4545L,
-         'selection_start': 4534L,
+                            42)],
+         'first-line': 41L,
+         'folded-linenos': [70L,
+                            89L,
+                            143L,
+                            166L,
+                            284L],
+         'sel-line': 52L,
+         'sel-line-start': 1776L,
+         'selection_end': 1835L,
+         'selection_start': 1831L,
          'zoom': 0L},
-        1545558002.612],
-        [loc('sources/tvplay.py'),
+        1548541029.557],
+        [loc('sources/replay.py'),
          {'attrib-starts': [('Source',
-                             32),
+                             31),
                             ('Source.get_content',
-                             62)],
-          'first-line': 84L,
-          'folded-linenos': [159L],
-          'sel-line': 100L,
-          'sel-line-start': 4552L,
-          'selection_end': 4593L,
-          'selection_start': 4582L,
+                             42)],
+          'first-line': 41L,
+          'folded-linenos': [70L,
+                             89L,
+                             143L,
+                             166L,
+                             284L],
+          'sel-line': 53L,
+          'sel-line-start': 1866L,
+          'selection_end': 1947L,
+          'selection_start': 1943L,
           'zoom': 0L},
-         1545558003.204],
-        [loc('sources/tvplay.py'),
+         1548541029.854],
+        [loc('sources/replay.py'),
          {'attrib-starts': [('Source',
-                             32),
+                             31),
                             ('Source.get_content',
-                             62)],
-          'first-line': 0L,
-          'folded-linenos': [159L],
-          'sel-line': 111L,
-          'sel-line-start': 5003L,
-          'selection_end': 5046L,
-          'selection_start': 5035L,
+                             42)],
+          'first-line': 41L,
+          'folded-linenos': [70L,
+                             89L,
+                             143L,
+                             166L,
+                             284L],
+          'sel-line': 54L,
+          'sel-line-start': 1981L,
+          'selection_end': 2055L,
+          'selection_start': 2051L,
           'zoom': 0L},
-         1545558778.089],
-        [loc('sources/tvplay.py'),
+         1548541030.064],
+        [loc('sources/replay.py'),
          {'attrib-starts': [('Source',
-                             32),
+                             31),
                             ('Source.get_content',
-                             62)],
-          'first-line': 100L,
-          'folded-linenos': [159L],
-          'sel-line': 112L,
-          'sel-line-start': 5049L,
-          'selection_end': 5103L,
-          'selection_start': 5100L,
+                             42)],
+          'first-line': 41L,
+          'folded-linenos': [70L,
+                             89L,
+                             143L,
+                             166L,
+                             284L],
+          'sel-line': 55L,
+          'sel-line-start': 2097L,
+          'selection_end': 2165L,
+          'selection_start': 2161L,
           'zoom': 0L},
-         1545558778.193],
-        [loc('sources/tvplay.py'),
+         1548541030.285],
+        [loc('sources/replay.py'),
          {'attrib-starts': [('Source',
-                             32),
+                             31),
                             ('Source.get_content',
-                             62)],
-          'first-line': 107L,
-          'folded-linenos': [159L],
-          'sel-line': 116L,
-          'sel-line-start': 5360L,
-          'selection_end': 5401L,
-          'selection_start': 5385L,
+                             42)],
+          'first-line': 41L,
+          'folded-linenos': [70L,
+                             89L,
+                             143L,
+                             166L,
+                             284L],
+          'sel-line': 56L,
+          'sel-line-start': 2207L,
+          'selection_end': 2291L,
+          'selection_start': 2287L,
           'zoom': 0L},
-         1545558783.365],
-        [loc('sources/tvplay.py'),
+         1548541030.467],
+        [loc('sources/replay.py'),
          {'attrib-starts': [('Source',
-                             32),
-                            ('Source.__init__',
-                             34)],
-          'first-line': 45L,
-          'folded-linenos': [159L],
-          'sel-line': 50L,
-          'sel-line-start': 1642L,
-          'selection_end': 1666L,
-          'selection_start': 1650L,
+                             31),
+                            ('Source.get_content',
+                             42)],
+          'first-line': 41L,
+          'folded-linenos': [70L,
+                             89L,
+                             143L,
+                             166L,
+                             284L],
+          'sel-line': 57L,
+          'sel-line-start': 2327L,
+          'selection_end': 2398L,
+          'selection_start': 2394L,
           'zoom': 0L},
-         1545558791.827],
-        [loc('sources/tvplay.py'),
+         1548541030.645],
+        [loc('sources/replay.py'),
          {'attrib-starts': [('Source',
-                             32),
+                             31),
                             ('Source.get_content',
-                             62)],
-          'first-line': 104L,
-          'folded-linenos': [159L],
-          'sel-line': 106L,
-          'sel-line-start': 4768L,
-          'selection_end': 4862L,
-          'selection_start': 4850L,
+                             42)],
+          'first-line': 47L,
+          'folded-linenos': [70L,
+                             89L,
+                             143L,
+                             166L,
+                             284L],
+          'sel-line': 58L,
+          'sel-line-start': 2435L,
+          'selection_end': 2505L,
+          'selection_start': 2501L,
           'zoom': 0L},
-         1545607476.957],
-        [loc('../../../../../Python27/Lib/site-packages/PIL/ImageTk.py'),
-         {'attrib-starts': [('PhotoImage',
-                             69),
-                            ('PhotoImage.paste',
-                             155)],
-          'first-line': 167L,
-          'folded-linenos': [],
-          'sel-line': 184L,
-          'sel-line-start': 5644L,
-          'selection_end': 5668L,
-          'selection_start': 5665L,
-          'zoom': 0L},
-         1545607477.945],
-        [loc('sources/tvplay.py'),
+         1548541030.862],
+        [loc('sources/replay.py'),
          {'attrib-starts': [('Source',
-                             32),
+                             31),
                             ('Source.get_content',
-                             62)],
-          'first-line': 104L,
-          'folded-linenos': [159L],
-          'sel-line': 106L,
-          'sel-line-start': 4768L,
-          'selection_end': 4862L,
-          'selection_start': 4850L,
+                             42)],
+          'first-line': 47L,
+          'folded-linenos': [70L,
+                             89L,
+                             143L,
+                             166L,
+                             284L],
+          'sel-line': 59L,
+          'sel-line-start': 2548L,
+          'selection_end': 2600L,
+          'selection_start': 2596L,
           'zoom': 0L},
-         1545607481.611],
-        [loc('sources/filmas.py'),
+         1548541031.096],
+        [loc('sources/replay.py'),
          {'attrib-starts': [('Source',
-                             36),
-                            ('Source.get_streams',
-                             108)],
-          'first-line': 159L,
-          'folded-linenos': [],
-          'sel-line': 168L,
-          'sel-line-start': 7362L,
-          'selection_end': 7404L,
-          'selection_start': 7404L,
+                             31),
+                            ('Source.get_content',
+                             42)],
+          'first-line': 47L,
+          'folded-linenos': [70L,
+                             89L,
+                             143L,
+                             166L,
+                             284L],
+          'sel-line': 61L,
+          'sel-line-start': 2644L,
+          'selection_end': 2702L,
+          'selection_start': 2698L,
           'zoom': 0L},
-         1545607482.317],
-        [loc('sources/tvplay.py'),
+         1548541031.32],
+        [loc('sources/replay.py'),
          {'attrib-starts': [('Source',
-                             32),
+                             31),
                             ('Source.get_content',
-                             62)],
-          'first-line': 104L,
-          'folded-linenos': [159L],
-          'sel-line': 106L,
-          'sel-line-start': 4768L,
-          'selection_end': 4862L,
-          'selection_start': 4850L,
+                             42)],
+          'first-line': 47L,
+          'folded-linenos': [70L,
+                             89L,
+                             143L,
+                             166L,
+                             284L],
+          'sel-line': 62L,
+          'sel-line-start': 2733L,
+          'selection_end': 2803L,
+          'selection_start': 2799L,
           'zoom': 0L},
-         1545607483.324],
-        [loc('sources/filmix.py'),
+         1548541031.52],
+        [loc('sources/replay.py'),
          {'attrib-starts': [('Source',
                              31),
                             ('Source.get_content',
-                             56)],
-          'first-line': 142L,
-          'folded-linenos': [179L,
-                             270L],
-          'sel-line': 149L,
-          'sel-line-start': 6166L,
-          'selection_end': 6203L,
-          'selection_start': 6203L,
+                             42)],
+          'first-line': 47L,
+          'folded-linenos': [70L,
+                             89L,
+                             143L,
+                             166L,
+                             284L],
+          'sel-line': 63L,
+          'sel-line-start': 2837L,
+          'selection_end': 2911L,
+          'selection_start': 2907L,
           'zoom': 0L},
-         1545609588.231],
-        [loc('sources/filmix.py'),
+         1548541031.754],
+        [loc('sources/replay.py'),
          {'attrib-starts': [('Source',
                              31),
-                            ('Source.get_streams',
-                             270)],
-          'first-line': 343L,
-          'folded-linenos': [179L],
-          'sel-line': 359L,
-          'sel-line-start': 15961L,
-          'selection_end': 15961L,
-          'selection_start': 15961L,
-          'zoom': 0L},
-         1545611652.114],
-        [loc('run.py'),
-         {'attrib-starts': [('Main',
-                             22),
-                            ('Main.play_video',
-                             242)],
-          'first-line': 251L,
-          'folded-linenos': [],
-          'sel-line': 264L,
-          'sel-line-start': 10425L,
-          'selection_end': 10425L,
-          'selection_start': 10425L,
+                            ('Source.get_content',
+                             42)],
+          'first-line': 53L,
+          'folded-linenos': [70L,
+                             89L,
+                             143L,
+                             166L,
+                             284L],
+          'sel-line': 64L,
+          'sel-line-start': 2953L,
+          'selection_end': 3012L,
+          'selection_start': 3008L,
           'zoom': 0L},
-         1545611733.467],
-        [loc('sources/filmix.py'),
+         1548541031.98],
+        [loc('sources/replay.py'),
          {'attrib-starts': [('Source',
                              31),
                             ('Source.get_content',
-                             56)],
-          'first-line': 99L,
-          'folded-linenos': [179L],
-          'sel-line': 76L,
-          'sel-line-start': 2487L,
-          'selection_end': 2487L,
-          'selection_start': 2487L,
+                             42)],
+          'first-line': 53L,
+          'folded-linenos': [70L,
+                             89L,
+                             143L,
+                             166L,
+                             284L],
+          'sel-line': 65L,
+          'sel-line-start': 3058L,
+          'selection_end': 3128L,
+          'selection_start': 3124L,
           'zoom': 0L},
-         1545611946.253],
-        [loc('sources/filmix.py'),
+         1548541032.449],
+        [loc('sources/replay.py'),
          {'attrib-starts': [('Source',
                              31),
-                            ('Source.get_streams',
-                             270)],
-          'first-line': 298L,
-          'folded-linenos': [321L],
-          'sel-line': 318L,
-          'sel-line-start': 14037L,
-          'selection_end': 14037L,
-          'selection_start': 14037L,
+                            ('Source.get_content',
+                             42)],
+          'first-line': 60L,
+          'folded-linenos': [89L,
+                             143L,
+                             166L,
+                             284L],
+          'sel-line': 71L,
+          'sel-line-start': 3286L,
+          'selection_end': 3348L,
+          'selection_start': 3344L,
           'zoom': 0L},
-         1545613448.203],
-        [loc('sources/ltc.py'),
+         1548541032.682],
+        [loc('sources/replay.py'),
          {'attrib-starts': [('Source',
-                             26),
-                            ('Source.get_stream_url2',
-                             984)],
-          'first-line': 66L,
-          'folded-linenos': [132L,
-                             161L,
-                             221L,
-                             232L,
-                             258L,
-                             277L,
-                             296L,
-                             320L,
-                             350L,
-                             351L,
-                             399L,
-                             412L,
-                             532L],
-          'sel-line': 1004L,
-          'sel-line-start': 52035L,
-          'selection_end': 52085L,
-          'selection_start': 52085L,
+                             31),
+                            ('Source.get_content',
+                             42)],
+          'first-line': 76L,
+          'folded-linenos': [89L,
+                             143L,
+                             166L,
+                             284L],
+          'sel-line': 81L,
+          'sel-line-start': 3799L,
+          'selection_end': 3861L,
+          'selection_start': 3857L,
           'zoom': 0L},
-         1545613550.475],
-        [loc('sources/ltc.py'),
+         1548541036.191],
+        [loc('sources/replay.py'),
          {'attrib-starts': [('Source',
-                             26),
-                            ('Source.get_stream_url2',
-                             984)],
-          'first-line': 1008L,
-          'folded-linenos': [132L,
-                             161L,
-                             221L,
-                             232L,
-                             258L,
-                             277L,
-                             296L,
-                             320L,
-                             350L,
-                             351L,
-                             399L,
-                             412L,
-                             532L],
-          'sel-line': 1018L,
-          'sel-line-start': 52714L,
-          'selection_end': 52739L,
-          'selection_start': 52733L,
+                             31),
+                            ('Source.get_content',
+                             42)],
+          'first-line': 47L,
+          'folded-linenos': [143L,
+                             166L,
+                             284L],
+          'sel-line': 52L,
+          'sel-line-start': 1776L,
+          'selection_end': 1821L,
+          'selection_start': 1815L,
           'zoom': 0L},
-         1545613552.544],
-        [loc('sources/ltc.py'),
+         1548541039.005],
+        [loc('sources/replay.py'),
          {'attrib-starts': [('Source',
-                             26),
-                            ('Source.get_streams',
-                             572)],
-          'first-line': 637L,
-          'folded-linenos': [132L,
-                             161L,
-                             221L,
-                             232L,
-                             258L,
-                             277L,
-                             296L,
-                             320L,
-                             350L,
-                             351L,
-                             399L,
-                             412L,
-                             532L],
-          'sel-line': 646L,
-          'sel-line-start': 37498L,
-          'selection_end': 37506L,
-          'selection_start': 37506L,
+                             31),
+                            ('Source.get_content',
+                             42)],
+          'first-line': 0L,
+          'folded-linenos': [143L,
+                             166L,
+                             284L],
+          'sel-line': 52L,
+          'sel-line-start': 1776L,
+          'selection_end': 1821L,
+          'selection_start': 1815L,
           'zoom': 0L},
-         1545613598.407],
-        [loc('sources/filmix.py'),
+         1548541069.483],
+        [loc('sources/xtv.py'),
          {'attrib-starts': [('Source',
-                             31),
+                             32),
                             ('Source.get_streams',
-                             270)],
-          'first-line': 349L,
+                             105)],
+          'first-line': 33L,
           'folded-linenos': [],
-          'sel-line': 351L,
-          'sel-line-start': 15581L,
-          'selection_end': 15640L,
-          'selection_start': 15640L,
+          'sel-line': 127L,
+          'sel-line-start': 5366L,
+          'selection_end': 5366L,
+          'selection_start': 5366L,
+          'zoom': 0L},
+         1548541075.895],
+        [loc('sources/tvplay.py'),
+         {'attrib-starts': [('Source',
+                             32),
+                            ('Source.__init__',
+                             34)],
+          'first-line': 37L,
+          'folded-linenos': [159L],
+          'sel-line': 42L,
+          'sel-line-start': 1296L,
+          'selection_end': 1307L,
+          'selection_start': 1303L,
           'zoom': 0L},
-         1545613904.974]],
+         1548541077.854],
+        [loc('sources/tvplay.py'),
+         {'attrib-starts': [('Source',
+                             32),
+                            ('Source.get_content',
+                             62)],
+          'first-line': 65L,
+          'folded-linenos': [159L],
+          'sel-line': 70L,
+          'sel-line-start': 2616L,
+          'selection_end': 2659L,
+          'selection_start': 2653L,
+          'zoom': 0L},
+         1548541115.158]],
         20),
-        'current-loc': loc('sources/filmix.py'),
+        'current-loc': loc('sources/xtv.py'),
         'editor-state-list': [(loc('run.py'),
                                {'attrib-starts': [('Main',
         22),
@@ -1395,24 +1423,24 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 'selection_start': 10425L,
                                 'zoom': 0L}),
                               (loc('util.py'),
-                               {'attrib-starts': [('unescape',
-        561)],
-                                'first-line': 556L,
+                               {'attrib-starts': [('item',
+        362)],
+                                'first-line': 357L,
                                 'folded-linenos': [573L,
         576L,
         609L,
         631L],
-                                'sel-line': 563L,
-                                'sel-line-start': 17864L,
-                                'selection_end': 17864L,
-                                'selection_start': 17864L,
+                                'sel-line': 373L,
+                                'sel-line-start': 12877L,
+                                'selection_end': 12890L,
+                                'selection_start': 12886L,
                                 'zoom': 0L}),
                               (loc('sources/ltc.py'),
                                {'attrib-starts': [('Source',
         26),
-        ('Source.get_streams',
-         572)],
-                                'first-line': 637L,
+        ('Source.get_content',
+         78)],
+                                'first-line': 392L,
                                 'folded-linenos': [132L,
         161L,
         221L,
@@ -1426,38 +1454,48 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         399L,
         412L,
         532L],
-                                'sel-line': 646L,
-                                'sel-line-start': 37498L,
-                                'selection_end': 37506L,
-                                'selection_start': 37506L,
+                                'sel-line': 427L,
+                                'sel-line-start': 26265L,
+                                'selection_end': 26282L,
+                                'selection_start': 26282L,
                                 'zoom': 0L}),
                               (loc('sources/replay.py'),
                                {'attrib-starts': [('Source',
         31),
-        ('Source.get_streams',
-         220)],
-                                'first-line': 165L,
-                                'folded-linenos': [70L,
-        89L,
-        143L,
+        ('Source.get_content',
+         42)],
+                                'first-line': 0L,
+                                'folded-linenos': [143L,
         166L,
         284L],
-                                'sel-line': 221L,
-                                'sel-line-start': 11331L,
-                                'selection_end': 11331L,
-                                'selection_start': 11331L,
+                                'sel-line': 52L,
+                                'sel-line-start': 1776L,
+                                'selection_end': 1821L,
+                                'selection_start': 1815L,
                                 'zoom': 0L}),
                               (loc('sources/tvplay.py'),
                                {'attrib-starts': [('Source',
         32),
         ('Source.get_content',
          62)],
-                                'first-line': 104L,
+                                'first-line': 65L,
                                 'folded-linenos': [159L],
-                                'sel-line': 106L,
-                                'sel-line-start': 4768L,
-                                'selection_end': 4862L,
-                                'selection_start': 4850L,
+                                'sel-line': 70L,
+                                'sel-line-start': 2616L,
+                                'selection_end': 2659L,
+                                'selection_start': 2653L,
+                                'zoom': 0L}),
+                              (loc('sources/xtv.py'),
+                               {'attrib-starts': [('Source',
+        32),
+        ('Source.get_content',
+         41)],
+                                'first-line': 48L,
+                                'folded-linenos': [],
+                                'sel-line': 61L,
+                                'sel-line-start': 2525L,
+                                'selection_end': 2600L,
+                                'selection_start': 2600L,
                                 'zoom': 0L}),
                               (loc('sources/euronews.py'),
                                {'attrib-starts': [('Source',
@@ -1505,11 +1543,12 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 'selection_start': 12065L,
                                 'zoom': 0L}),
                               (loc('../../../../../Python27/Lib/site-packages/PIL/Image.py'),
-                               {'attrib-starts': [],
+                               {'attrib-starts': [('DecompressionBombError',
+        73)],
                                 'first-line': 40L,
                                 'folded-linenos': [],
-                                'sel-line': 60L,
-                                'sel-line-start': 1578L,
+                                'sel-line': 73L,
+                                'sel-line-start': 1583L,
                                 'selection_end': 1583L,
                                 'selection_start': 1583L,
                                 'zoom': 0L}),
@@ -1528,14 +1567,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                               (loc('ContentSources.py'),
                                {'attrib-starts': [('ContentSources',
         16),
-        ('ContentSources.get_streams',
-         96)],
-                                'first-line': 104L,
+        ('ContentSources.get_content',
+         64)],
+                                'first-line': 75L,
                                 'folded-linenos': [],
-                                'sel-line': 115L,
-                                'sel-line-start': 4877L,
-                                'selection_end': 4877L,
-                                'selection_start': 4877L,
+                                'sel-line': 77L,
+                                'sel-line-start': 3497L,
+                                'selection_end': 3536L,
+                                'selection_start': 3536L,
                                 'zoom': 0L})],
         'has-focus': True,
         'locked': False},
@@ -1544,6 +1583,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
          loc('sources/ltc.py'),
          loc('sources/replay.py'),
          loc('sources/tvplay.py'),
+         loc('sources/xtv.py'),
          loc('sources/euronews.py'),
          loc('sources/config.py'),
          loc('changelog.md'),
@@ -1551,20 +1591,21 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
          loc('../../../../../Python27/Lib/site-packages/PIL/Image.py'),
          loc('sources/lmt.py'),
          loc('ContentSources.py')]),
-                               'open_files': [u'ContentSources.py',
-        u'changelog.md',
+                               'open_files': [u'changelog.md',
+        u'run.py',
         u'sources/config.py',
         u'sources/euronews.py',
+        u'sources/filmix.py',
         u'sources/lmt.py',
-        u'sources/replay.py',
-        u'util.py',
         u'../../../../../Python27/Lib/site-packages/PIL/Image.py',
-        u'sources/tvplay.py',
-        u'run.py',
         u'sources/ltc.py',
-        u'sources/filmix.py']},
+        u'ContentSources.py',
+        u'util.py',
+        u'sources/replay.py',
+        u'sources/tvplay.py',
+        u'sources/xtv.py']},
         'saved_notebook_display': None,
-        'split_percents': {0: 0.5388225255972696},
+        'split_percents': {0: 0.44890202702702703},
         'splits': 2,
         'tab_location': 'top',
         'user_data': {}},
@@ -1577,14 +1618,16 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                          0,
                          2432,
                          1440)}]}
-guimgr.recent-documents = [loc('sources/filmix.py'),
-                           loc('sources/ltc.py'),
-                           loc('run.py'),
+guimgr.recent-documents = [loc('sources/xtv.py'),
                            loc('sources/tvplay.py'),
-                           loc('../../../../../Python27/Lib/site-packages/PIL/Image.py'),
-                           loc('sources/lmt.py'),
                            loc('sources/replay.py'),
                            loc('util.py'),
+                           loc('ContentSources.py'),
+                           loc('sources/ltc.py'),
+                           loc('../../../../../Python27/Lib/site-packages/PIL/Image.py'),
+                           loc('sources/filmix.py'),
+                           loc('run.py'),
+                           loc('sources/lmt.py'),
                            loc('sources/euronews.py'),
                            loc('changelog.md'),
                            loc('sources/config.py')]
@@ -2238,7 +2281,14 @@ search.replace-history = [u'filmix.co',
                           u'https://replay.lsm.lv',
                           u'www.shortcut.lv',
                           u'shortcut.lv']
-search.search-history = [u'sorted',
+search.search-history = [u'meklet',
+                         u'lang',
+                         u'page=',
+                         u'util',
+                         u'unesa',
+                         u'play24::',
+                         u'categori',
+                         u'sorted',
                          u'self.kategorijas',
                          u'kategorijas',
                          u'"playlist"',
@@ -2250,14 +2300,7 @@ search.search-history = [u'sorted',
                          u'raidijumi/kategorijas',
                          u'tvSeries/category/id/33?type=tvseries&',
                          u'size=',
-                         u'set/search?f_metadata.tvSeri',
-                         u'g149',
-                         u'content.app',
-                         u'~',
-                         u'title =',
-                         u'title',
-                         u'nfo',
-                         u'"nfo"']
+                         u'set/search?f_metadata.tvSeri']
 testing.stored-results = (1,
                           [],
                           {})

sources/play24.py

@@ -29,6 +29,7 @@ h = HTMLParser.HTMLParser()
 class Source(SourceBase):
 
     def __init__(self,country="lv",cfg_path=None):
+        self.hidden = True # nerāda menu nestrādājošos avotus
         self.name = "play24"
         self.title = "Play24.lv"
         self.img = "riga24.png"

sources/streams.cfg

@@ -7,7 +7,7 @@ My Kids|config::my_kids|my_kids.png|Mani bērnu video
 Replay.lv (LTV)|replay::home|replay.png|Latvijas TV tiešraides un arhīvs
 TVPlay|tvplay::home|tvplay.png|tvplay.skaties.lv saturs
 Shortcut (lattelecom.tv)|ltc::home|shortcut.png|lattelecom TV, arhīves un video
-Play24.lv (Riga24TV)|play24::home|riga24.png|play24.lv (Riga24TV)tiešraide un arhīvs
+XTV.lv|xtv::home|xtv.png|xtv.lv satura skatīšanās (TVRiga24,360TV,STV)
 LMT straume|lmt::home|lmt.png|LMT straume - dažādi video latviesu valodā
 Filmas.lv|filmas::home|filmas.png|Filmas.lv - Latvijas filmas
 viaplay.lv|viaplay::home|viaplay.png|Viaplay.lv - filmas latviešu, krievu u.c. valodās

sources/xtv.py

@@ -0,0 +1,142 @@
+#!/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
+#
+try:
+    import json
+except:
+    import simplejson as json
+
+import urllib2, urllib
+import datetime, re, sys, os
+import ssl
+if "_create_unverified_context" in dir(ssl):
+    ssl._create_default_https_context = ssl._create_unverified_context
+try:
+    import util
+except:
+    sys.path.insert(0,'..')
+    import util
+from SourceBase import SourceBase
+
+headers2dict = lambda  h: dict([l.strip().split(": ") for l in h.strip().splitlines()])
+re_search = lambda p, s: re.search( p, s, re.DOTALL).group(1).strip() if re.search( p, s, re.DOTALL) else ""
+headers0 = headers2dict("""
+User-Agent: Mozilla/5.0 (Linux; U; Android 4.4.4; Nexus 5 Build/KTU84P) AppleWebkit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30
+""")
+import HTMLParser
+h = HTMLParser.HTMLParser()
+
+class Source(SourceBase):
+
+    def __init__(self,country="lv",cfg_path=None):
+        self.name = "xtv"
+        self.title = "XTV.lv"
+        self.img = "xtv.png"
+        self.desc = "xtv.lv satura skatīšanās (TVRiga24,360TV,STV)"
+        self.country=country
+
+    def get_content(self, data):
+        print "[xtv] get_content:", data
+        source, data, path, plist, clist, params, qs = self.parse_data(data)
+        content = []
+        content.append(("..return", "back","back.png","Return back"))
+
+        if clist=="home":
+            content.extend([
+                ("Jaunākie", "xtv::latest", self.img,"Jaunākie video"),
+                ("Populārajie", "xtv::popular",self.img,"Populāraie video"),
+                ("Visi raidijumi", "xtv::programs",self.img,"Visi raidījumi"),
+                ("Izklaide", "xtv::category/gnPBGaJp8or-izklaide?page=2",self.img,"Izklaides raidījumi un sižeti"),
+                ("Ziņas", "xtv::category/6blmNmLpOPR-zinas?page=2",self.img,"Ziņu raidījumi un sižeti"),
+                ("Diskusijas", "category/AZoQGEwNX89-diskusijas?page=2",self.img,"Diskusiju raidījumi un sižeti"),
+                ("Sports", "xtv::category/Lymz7BwGXEk-sports?page=2",self.img,"Sporta raidījumi un sižeti"),
+                ("Meklēt", "xtv::search?q={0}",self.img,"Meklēt raidījumus un sižetus"),
+             ])
+            return content
+
+        ### Saraksti ###
+        elif clist in ("latest", "popular", "category", "programs", "search") or plist[1] == "program":
+            r = self.call(data)
+            for r0 in re.findall(r'<div class="(tvplot|broadcast)">(.+?)</a>\s+</div>\s+</div>', r, re.DOTALL):
+                r2 = r0[1]
+                title = util.unescape(re_search("<h5>([^<]+)<", r2))
+                data2 = re_search('href="/(.+?)"', r2)
+                if "/program/" in data2:
+                    data2 += "?page=1"
+                img = re_search('src="(.+?)"', r2)
+                duration = re_search('<span class="duration">(.+?)</span>', r2)
+                when = re_search('<span>([^<]+)</span>', r2)
+                category =  re_search('<p>([^<]+)</p>', r2)
+                chan = re_search('<img alt="(.+?) logo"', r2) # <img alt="RigaTV24 logo"
+                desc = util.unescape(re_search('title="(.*?)"', r2))
+                if when or duration:
+                    desc += "\n%s %s" % (when, duration)
+                if category:
+                    desc += "\n%s" % (category)
+                if "/video/" in data2:
+                    chan = data2.split("/")[0].upper()
+                if chan:
+                    title = "%s [%s] " % (title, chan)
+                content.append((title,self.name+"::"+data2,img,desc))
+            if "page" in qs:
+                page = int(qs["page"]) + 1
+                data2 = re.sub("page=\d+", "page=%s" % page, data)
+                content.append(("Next page",self.name+"::"+data2,"next.png","Next page"))
+            return content
+
+        ### Meklēt ###
+        elif data == "search":
+            return content
+
+        else:
+            return content
+
+
+    def is_video(self,data):
+        source,data,path,plist,clist,params,qs = self.parse_data(data)
+        if len(plist) > 1 and plist[1] == "video":
+            return True
+        else:
+            return False
+
+    def get_streams(self,data):
+        print "[xtv] get_streams:", data
+        if not self.is_video(data):
+            return []
+        source,data,path,plist,clist,params,qs = self.parse_data(data)
+        r = self.call(data)
+        # src: "https://video.xtv.lv/files/cc/e5/cce5a0e95dea4404280dabb2a8470f0b/original.mp4", type: "video
+        data2 = re_search('src: "([^"]+)", type: "video', r)
+        if not data2:
+            return []
+        title = util.unescape(re_search('"og:title" content="([^"]+)"', r))
+        desc = util.unescape(re_search('"description" content="([^"]+)"', r))
+        img = re_search('"thumbnailUrl": "([^"]+)"', r) # "thumbnailUrl": "
+
+        stream = util.item()
+        stream["name"] = title
+        stream["url"] = data2
+        stream["img"] = img
+        stream["desc"] = desc
+        stream["lang"] = "lv"
+        stream["resolver"] = "xtv"
+        return [stream]
+
+    def call(self, data,headers=headers0,lang=""):
+        API_URL = "https://xtv.lv/"
+        #if not lang: lang = self.country
+        url = API_URL + data
+        content = self._http_request(url)
+        return content
+
+if __name__ == "__main__":
+    sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
+    import run
+    source = Source()
+    data= sys.argv[1] if len(sys.argv)>1 else source.name+"::home"
+    run.run(source, data)
+    sys.exit()