ltc,replay live epg u.c.

ContentSources.py

@@ -78,6 +78,7 @@ class ContentSources(object):
                         for el in item:
                             if isinstance(el,unicode):
                                 el = el.encode("utf8")
+                            el = util.unescape(el)
                             item2.append(el)
                         content.append(tuple(item2))
                 else:

project.wpr

@@ -122,18 +122,10 @@ debug.breakpoints = {loc('Downloader.py'): {182L: (0,
         None,
         1,
         0)},
-                     loc('sources/ltc.py'): {79L: (0,
+                     loc('sources/replay.py'): {255L: (0,
         None,
         1,
         0)},
-                     loc('sources/replay.py'): {77L: (0,
-        None,
-        1,
-        0),
-        249L: (0,
-               None,
-               1,
-               0)},
                      loc('sources/tvdom.py'): {292L: (0,
         None,
         1,
@@ -158,11 +150,11 @@ debug.breakpoints = {loc('Downloader.py'): {182L: (0,
             None,
             1,
             0)},
-                     loc('unknown:<untitled> #1'): {2: (0,
+                     loc('unknown:<untitled> #2'): {10: (0,
         None,
         1,
         0)},
-                     loc('unknown:<untitled> #2'): {10: (0,
+                     loc('unknown:<untitled> #1'): {2: (0,
         None,
         1,
         0)}}
@@ -177,6 +169,7 @@ debug.err-values = {None: {},
                     loc('sources/euronews.py'): {},
                     loc('sources/filmix.py'): {},
                     loc('sources/ltc.py'): {},
+                    loc('sources/replay.py'): {},
                     loc('test_sources2.py'): {}}
 debug.recent-run-args = {loc('ContentSources.py'): [u'config::home streams_bernu.cfg',
         u'ltc::home',
@@ -265,7 +258,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                {'tree-state': {'file-sort-method': 'by name',
         'list-files-first': 0,
         'tree-states': {'deep': {'expanded-nodes': [(1,)],
-                                 'selected-nodes': [(15,)],
+                                 'selected-nodes': [(16,)],
                                  'top-node': (0,)}},
         'tree-style': 'deep'}}),
                               ('snippets',
@@ -784,18 +777,18 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         'top-node': [('generic attribute',
                       loc('../../../../../Python27/lib/site-packages/PIL/Image.py'),
                       'ADAPTIVE')]},
-        loc('unknown:<untitled> #6'): {'expanded-nodes': [],
-                                       'selected-nodes': [],
-                                       'top-node': None},
-        loc('unknown:<untitled> #4'): {'expanded-nodes': [],
+        loc('unknown:<untitled> #6'): {'column-widths': [1.0],
+                                       'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
         loc('unknown:<untitled> #5'): {'column-widths': [1.0],
                                        'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #3'): {'column-widths': [1.0],
-                                       'expanded-nodes': [],
+        loc('unknown:<untitled> #4'): {'expanded-nodes': [],
+                                       'selected-nodes': [],
+                                       'top-node': None},
+        loc('unknown:<untitled> #3'): {'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None}},
                                 'browse_mode': u'Current Module',
@@ -858,7 +851,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                        'fRegexFlags': 46,
                                        'fReplaceText': u'www.shortcut.lv',
                                        'fReverse': False,
-                                       'fSearchText': u'raise',
+                                       'fSearchText': u'img',
                                        'fStartPos': 0,
                                        'fStyle': 'text',
                                        'fWholeWords': False,
@@ -932,14 +925,35 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         -1,
         -1),
                        'attrib-starts': [],
-                       'first-line': 0L,
+                       'first-line': 56L,
                        'folded-linenos': [],
-                       'history': {},
+                       'history': {u'file:C:/Data/Programming/enigma2/PlayStream2/content/run.py': ['r'\
+        '\n',
+        'self.url+data\n',
+        'r.content\n',
+        'r.cookies\n',
+        'r.cookies.keys()\n',
+        'cookie\n',
+        'data\n',
+        'headers\n',
+        'print data\n'],
+                                   u'file:C:/Data/Programming/enigma2/PlayStream2/content/sources/ltc.py': ['e'\
+        'pg\n',
+        'desc\n',
+        'title\n'],
+                                   u'file:C:/Data/Programming/enigma2/PlayStream2/content/sources/replay.py': ['d'\
+        'esc\n',
+        'print desc\n',
+        'title\n',
+        'item\n',
+        'item[0]\n',
+        'item[0].split("theme=")\n',
+        'item[0].split("theme=")[1]\n']},
                        'launch-id': None,
-                       'sel-line': 0L,
-                       'sel-line-start': 0L,
-                       'selection_end': 0L,
-                       'selection_start': 0L,
+                       'sel-line': 67L,
+                       'sel-line-start': 2424L,
+                       'selection_end': 2424L,
+                       'selection_start': 2424L,
                        'zoom': 0L}),
                      ('debug-watch',
                       'wide',
@@ -947,13 +961,13 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                       {'node-states': [('eval',
         u'js'),
                                        ('eval',
-        u'cur'),
+        u'title'),
                                        ('eval',
-        u'article'),
+        u'theme'),
                                        ('eval',
         u'item')],
                        'tree-state': {'expanded-nodes': [],
-                                      'selected-nodes': [(1,)],
+                                      'selected-nodes': [(2,)],
                                       'top-node': (0,)}}),
                      ('messages',
                       'wide',
@@ -985,286 +999,313 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                        'selection_end': 174L,
                        'selection_start': 174L,
                        'zoom': 0L})],
-        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('resolvers/cloudsany.py'),
-        {'attrib-starts': [('resolve',
-                            30)],
-         'first-line': 47L,
+        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('ContentSources.py'),
+        {'attrib-starts': [('ContentSources',
+                            16),
+                           ('ContentSources.__init__',
+                            20)],
+         'first-line': 54L,
          'folded-linenos': [],
-         'sel-line': 52L,
-         'sel-line-start': 1489L,
-         'selection_end': 1527L,
-         'selection_start': 1514L,
+         'sel-line': 61L,
+         'sel-line-start': 2639L,
+         'selection_end': 2704L,
+         'selection_start': 2700L,
          'zoom': 0L},
-        1513039026.067],
-        [loc('resolvers/cloudsany.py'),
-         {'attrib-starts': [('resolve',
-                             30)],
-          'first-line': 63L,
+        1518896761.573],
+        [loc('ContentSources.py'),
+         {'attrib-starts': [('ContentSources',
+                             16),
+                            ('ContentSources.get_streams',
+                             96)],
+          'first-line': 97L,
           'folded-linenos': [],
-          'sel-line': 85L,
-          'sel-line-start': 2581L,
-          'selection_end': 2619L,
-          'selection_start': 2606L,
+          'sel-line': 106L,
+          'sel-line-start': 4586L,
+          'selection_end': 4611L,
+          'selection_start': 4607L,
           'zoom': 0L},
-         1513039049.916],
-        [loc('resolvers/cloudsany.py'),
-         {'attrib-starts': [('resolve',
-                             30)],
-          'first-line': 75L,
+         1518896762.565],
+        [loc('ContentSources.py'),
+         {'attrib-starts': [('ContentSources',
+                             16),
+                            ('ContentSources.get_streams',
+                             96)],
+          'first-line': 114L,
           'folded-linenos': [],
-          'sel-line': 85L,
-          'sel-line-start': 2581L,
-          'selection_end': 2619L,
-          'selection_start': 2606L,
+          'sel-line': 123L,
+          'sel-line-start': 5221L,
+          'selection_end': 5309L,
+          'selection_start': 5305L,
           'zoom': 0L},
-         1513039051.812],
-        [loc('resolvers/cloudsany.py'),
-         {'attrib-starts': [('resolve',
-                             30)],
-          'first-line': 42L,
+         1518896764.162],
+        [loc('ContentSources.py'),
+         {'attrib-starts': [('ContentSources',
+                             16),
+                            ('ContentSources.__init__',
+                             20)],
+          'first-line': 49L,
           'folded-linenos': [],
-          'sel-line': 47L,
-          'sel-line-start': 1343L,
-          'selection_end': 1356L,
-          'selection_start': 1351L,
+          'sel-line': 49L,
+          'sel-line-start': 2031L,
+          'selection_end': 2056L,
+          'selection_start': 2056L,
           'zoom': 0L},
-         1513039058.41],
-        [loc('resolvers/cloudsany.py'),
-         {'attrib-starts': [('resolve',
-                             30)],
-          'first-line': 42L,
+         1518896775.095],
+        [loc('ContentSources.py'),
+         {'attrib-starts': [('ContentSources',
+                             16),
+                            ('ContentSources.get_content',
+                             64)],
+          'first-line': 71L,
           'folded-linenos': [],
-          'sel-line': 52L,
-          'sel-line-start': 1489L,
-          'selection_end': 1502L,
-          'selection_start': 1497L,
+          'sel-line': 80L,
+          'sel-line-start': 3634L,
+          'selection_end': 3676L,
+          'selection_start': 3672L,
           'zoom': 0L},
-         1513039058.793],
-        [loc('resolvers/cloudsany.py'),
-         {'attrib-starts': [('resolve',
-                             30)],
-          'first-line': 75L,
+         1518896776.269],
+        [loc('ContentSources.py'),
+         {'attrib-starts': [('ContentSources',
+                             16),
+                            ('ContentSources.get_content',
+                             64)],
+          'first-line': 77L,
           'folded-linenos': [],
-          'sel-line': 85L,
-          'sel-line-start': 2581L,
-          'selection_end': 2594L,
-          'selection_start': 2589L,
+          'sel-line': 80L,
+          'sel-line-start': 3634L,
+          'selection_end': 3662L,
+          'selection_start': 3662L,
           'zoom': 0L},
-         1513039059.535],
-        [loc('resolvers/cloudsany.py'),
-         {'attrib-starts': [('resolve',
-                             30)],
-          'first-line': 78L,
+         1518896830.949],
+        [loc('sources/replay.py'),
+         {'attrib-starts': [('Source',
+                             30),
+                            ('Source.get_content',
+                             41)],
+          'first-line': 84L,
           'folded-linenos': [],
-          'sel-line': 90L,
-          'sel-line-start': 2795L,
-          'selection_end': 2819L,
-          'selection_start': 2819L,
+          'sel-line': 85L,
+          'sel-line-start': 3948L,
+          'selection_end': 3948L,
+          'selection_start': 3948L,
           'zoom': 0L},
-         1513039704.266],
-        [loc('sources/cinemalive.py'),
+         1518896951.611],
+        [loc('sources/replay.py'),
          {'attrib-starts': [('Source',
-                             29),
-                            ('Source.get_streams',
-                             166)],
-          'first-line': 176L,
+                             30),
+                            ('Source.__init__',
+                             32)],
+          'first-line': 27L,
           'folded-linenos': [],
-          'sel-line': 184L,
-          'sel-line-start': 9045L,
-          'selection_end': 9087L,
-          'selection_start': 9074L,
+          'sel-line': 35L,
+          'sel-line-start': 1150L,
+          'selection_end': 1165L,
+          'selection_start': 1165L,
           'zoom': 0L},
-         1513039740.396],
-        [loc('resolvers/cloudsany.py'),
-         {'attrib-starts': [('resolve',
-                             30)],
-          'first-line': 78L,
+         1518902208.605],
+        [loc('sources/replay.py'),
+         {'attrib-starts': [('Source',
+                             30),
+                            ('Source.__init__',
+                             32)],
+          'first-line': 32L,
           'folded-linenos': [],
-          'sel-line': 88L,
-          'sel-line-start': 2726L,
-          'selection_end': 2743L,
-          'selection_start': 2743L,
+          'sel-line': 39L,
+          'sel-line-start': 1273L,
+          'selection_end': 1288L,
+          'selection_start': 1287L,
           'zoom': 0L},
-         1513039768.169],
-        [loc('sources/cinemalive.py'),
+         1518902209.757],
+        [loc('sources/replay.py'),
          {'attrib-starts': [('Source',
-                             29),
-                            ('Source.get_streams',
-                             166)],
-          'first-line': 176L,
+                             30),
+                            ('Source.get_content',
+                             41)],
+          'first-line': 76L,
           'folded-linenos': [],
-          'sel-line': 184L,
-          'sel-line-start': 9045L,
-          'selection_end': 9087L,
-          'selection_start': 9074L,
+          'sel-line': 83L,
+          'sel-line-start': 3857L,
+          'selection_end': 3881L,
+          'selection_start': 3881L,
           'zoom': 0L},
-         1513039803.617],
-        [loc('resolvers/cloudsany.py'),
-         {'attrib-starts': [('resolve',
-                             30)],
-          'first-line': 81L,
+         1518902233.149],
+        [loc('sources/replay.py'),
+         {'attrib-starts': [('Source',
+                             30),
+                            ('Source.get_content',
+                             41)],
+          'first-line': 76L,
           'folded-linenos': [],
-          'sel-line': 88L,
-          'sel-line-start': 2726L,
-          'selection_end': 2726L,
-          'selection_start': 2726L,
+          'sel-line': 78L,
+          'sel-line-start': 3572L,
+          'selection_end': 3593L,
+          'selection_start': 3593L,
           'zoom': 0L},
-         1513039835.015],
-        [loc('sources/cinemalive.py'),
+         1518902241.094],
+        [loc('sources/replay.py'),
          {'attrib-starts': [('Source',
-                             29),
-                            ('Source.get_streams',
-                             166)],
-          'first-line': 176L,
+                             30),
+                            ('Source.get_content',
+                             41)],
+          'first-line': 79L,
           'folded-linenos': [],
-          'sel-line': 184L,
-          'sel-line-start': 9045L,
-          'selection_end': 9087L,
-          'selection_start': 9074L,
+          'sel-line': 86L,
+          'sel-line-start': 3989L,
+          'selection_end': 4008L,
+          'selection_start': 4005L,
           'zoom': 0L},
-         1513039853.364],
-        [loc('resolvers/cloudsany.py'),
-         {'attrib-starts': [('resolve',
-                             30)],
-          'first-line': 81L,
+         1518902242.177],
+        [loc('sources/replay.py'),
+         {'attrib-starts': [('Source',
+                             30),
+                            ('Source.get_content',
+                             41)],
+          'first-line': 79L,
           'folded-linenos': [],
-          'sel-line': 90L,
-          'sel-line-start': 2808L,
-          'selection_end': 2834L,
-          'selection_start': 2834L,
+          'sel-line': 86L,
+          'sel-line-start': 3989L,
+          'selection_end': 4019L,
+          'selection_start': 4016L,
           'zoom': 0L},
-         1513039884.569],
-        [loc('sources/cinemalive.py'),
+         1518902242.716],
+        [loc('sources/replay.py'),
          {'attrib-starts': [('Source',
-                             29),
-                            ('Source.get_streams',
-                             166)],
-          'first-line': 176L,
+                             30),
+                            ('Source.get_content',
+                             41)],
+          'first-line': 79L,
           'folded-linenos': [],
-          'sel-line': 184L,
-          'sel-line-start': 9045L,
-          'selection_end': 9087L,
-          'selection_start': 9074L,
+          'sel-line': 88L,
+          'sel-line-start': 4069L,
+          'selection_end': 4131L,
+          'selection_start': 4128L,
           'zoom': 0L},
-         1513039905.096],
-        [loc('resolvers/cloudsany.py'),
-         {'attrib-starts': [('resolve',
-                             30)],
-          'first-line': 81L,
+         1518902243.216],
+        [loc('sources/replay.py'),
+         {'attrib-starts': [('Source',
+                             30),
+                            ('Source.get_content',
+                             41)],
+          'first-line': 89L,
           'folded-linenos': [],
-          'sel-line': 87L,
-          'sel-line-start': 2699L,
-          'selection_end': 2719L,
-          'selection_start': 2719L,
+          'sel-line': 98L,
+          'sel-line-start': 4629L,
+          'selection_end': 4659L,
+          'selection_start': 4659L,
           'zoom': 0L},
-         1513041023.607],
-        [loc('sources/euronews.py'),
+         1518902252.631],
+        [loc('sources/replay.py'),
          {'attrib-starts': [('Source',
-                             26),
-                            ('Source.get_streams',
-                             150)],
-          'first-line': 168L,
+                             30),
+                            ('Source.get_content',
+                             41)],
+          'first-line': 93L,
           'folded-linenos': [],
-          'sel-line': 176L,
-          'sel-line-start': 7974L,
-          'selection_end': 7974L,
-          'selection_start': 7974L,
+          'sel-line': 100L,
+          'sel-line-start': 4691L,
+          'selection_end': 4753L,
+          'selection_start': 4750L,
           'zoom': 0L},
-         1513041028.021],
-        [loc('sources/euronews.py'),
-         {'attrib-starts': [],
-          'first-line': 302L,
+         1518902253.454],
+        [loc('sources/replay.py'),
+         {'attrib-starts': [('Source',
+                             30),
+                            ('Source.get_content',
+                             41)],
+          'first-line': 108L,
           'folded-linenos': [],
-          'sel-line': 309L,
-          'sel-line-start': 12837L,
-          'selection_end': 12837L,
-          'selection_start': 12837L,
+          'sel-line': 117L,
+          'sel-line-start': 5571L,
+          'selection_end': 5590L,
+          'selection_start': 5587L,
           'zoom': 0L},
-         1516202716.441],
-        [loc('ContentSources.py'),
-         {'attrib-starts': [('ContentSources',
-                             16),
-                            ('ContentSources.get_content',
-                             64)],
-          'first-line': 80L,
+         1518902255.89],
+        [loc('sources/replay.py'),
+         {'attrib-starts': [('Source',
+                             30),
+                            ('Source.get_content',
+                             41)],
+          'first-line': 115L,
           'folded-linenos': [],
-          'sel-line': 89L,
-          'sel-line-start': 4016L,
-          'selection_end': 4016L,
-          'selection_start': 4016L,
+          'sel-line': 122L,
+          'sel-line-start': 5820L,
+          'selection_end': 5882L,
+          'selection_start': 5879L,
           'zoom': 0L},
-         1516202720.157],
-        [loc('run.py'),
-         {'attrib-starts': [('Main',
-                             22),
-                            ('Main.play_video',
-                             242)],
-          'first-line': 255L,
+         1518902256.998],
+        [loc('sources/replay.py'),
+         {'attrib-starts': [('Source',
+                             30),
+                            ('Source.get_content',
+                             41)],
+          'first-line': 149L,
           'folded-linenos': [],
-          'sel-line': 264L,
-          'sel-line-start': 10415L,
-          'selection_end': 10415L,
-          'selection_start': 10415L,
+          'sel-line': 158L,
+          'sel-line-start': 7698L,
+          'selection_end': 7717L,
+          'selection_start': 7714L,
           'zoom': 0L},
-         1516203350.279],
-        [loc('resolvers/cloudsany.py'),
-         {'attrib-starts': [('resolve',
-                             30)],
-          'first-line': 41L,
+         1518902258.525],
+        [loc('sources/replay.py'),
+         {'attrib-starts': [('Source',
+                             30),
+                            ('Source.get_content',
+                             41)],
+          'first-line': 86L,
           'folded-linenos': [],
-          'sel-line': 55L,
-          'sel-line-start': 1587L,
-          'selection_end': 1599L,
-          'selection_start': 1599L,
+          'sel-line': 93L,
+          'sel-line-start': 4254L,
+          'selection_end': 4254L,
+          'selection_start': 4254L,
           'zoom': 0L},
-         1516226196.772]],
+         1518902786.933]],
         20),
-        'current-loc': loc('ContentSources.py'),
+        'current-loc': loc('sources/ltc.py'),
         'editor-state-list': [(loc('ContentSources.py'),
                                {'attrib-starts': [('ContentSources',
         16),
         ('ContentSources.get_content',
          64)],
-                                'first-line': 80L,
+                                'first-line': 77L,
                                 'folded-linenos': [],
-                                'sel-line': 89L,
-                                'sel-line-start': 4016L,
-                                'selection_end': 4016L,
-                                'selection_start': 4016L,
+                                'sel-line': 80L,
+                                'sel-line-start': 3634L,
+                                'selection_end': 3662L,
+                                'selection_start': 3662L,
                                 'zoom': 0L}),
                               (loc('sources/ltc.py'),
                                {'attrib-starts': [('Source',
         27),
         ('Source.get_content',
          74)],
-                                'first-line': 78L,
+                                'first-line': 117L,
                                 'folded-linenos': [],
-                                'sel-line': 83L,
-                                'sel-line-start': 3077L,
-                                'selection_end': 3168L,
-                                'selection_start': 3168L,
+                                'sel-line': 122L,
+                                'sel-line-start': 5124L,
+                                'selection_end': 5124L,
+                                'selection_start': 5124L,
                                 'zoom': 0L}),
                               (loc('util.py'),
                                {'attrib-starts': [('unescape',
         538)],
-                                'first-line': 539L,
+                                'first-line': 537L,
                                 'folded-linenos': [],
-                                'sel-line': 547L,
-                                'sel-line-start': 16779L,
-                                'selection_end': 16779L,
-                                'selection_start': 16779L,
+                                'sel-line': 540L,
+                                'sel-line-start': 16550L,
+                                'selection_end': 16598L,
+                                'selection_start': 16598L,
                                 'zoom': 0L}),
                               (loc('sources/replay.py'),
                                {'attrib-starts': [('Source',
         30),
         ('Source.get_content',
          41)],
-                                'first-line': 236L,
+                                'first-line': 86L,
                                 'folded-linenos': [],
-                                'sel-line': 248L,
-                                'sel-line-start': 13008L,
-                                'selection_end': 13008L,
-                                'selection_start': 13008L,
+                                'sel-line': 93L,
+                                'sel-line-start': 4254L,
+                                'selection_end': 4254L,
+                                'selection_start': 4254L,
                                 'zoom': 0L}),
                               (loc('sources/cinemalive.py'),
                                {'attrib-starts': [('Source',
@@ -1313,12 +1354,12 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         31),
         ('Source.get_content',
          56)],
-                                'first-line': 81L,
+                                'first-line': 79L,
                                 'folded-linenos': [],
-                                'sel-line': 90L,
-                                'sel-line-start': 3299L,
-                                'selection_end': 3299L,
-                                'selection_start': 3299L,
+                                'sel-line': 88L,
+                                'sel-line-start': 3207L,
+                                'selection_end': 3207L,
+                                'selection_start': 3207L,
                                 'zoom': 0L}),
                               (loc('Downloader.py'),
                                {'attrib-starts': [('get_header',
@@ -1337,10 +1378,10 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
          242)],
                                 'first-line': 255L,
                                 'folded-linenos': [],
-                                'sel-line': 264L,
-                                'sel-line-start': 10415L,
-                                'selection_end': 10415L,
-                                'selection_start': 10415L,
+                                'sel-line': 267L,
+                                'sel-line-start': 10485L,
+                                'selection_end': 10511L,
+                                'selection_start': 10511L,
                                 'zoom': 0L}),
                               (loc('sources/euronews.py'),
                                {'attrib-starts': [],
@@ -1351,18 +1392,6 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 'selection_end': 12837L,
                                 'selection_start': 12837L,
                                 'zoom': 0L}),
-                              (loc('sources/filmon.py'),
-                               {'attrib-starts': [('Source',
-        32),
-        ('Source.get_content',
-         47)],
-                                'first-line': 113L,
-                                'folded-linenos': [],
-                                'sel-line': 122L,
-                                'sel-line-start': 4665L,
-                                'selection_end': 4665L,
-                                'selection_start': 4665L,
-                                'zoom': 0L}),
                               (loc('resolver.py'),
                                {'attrib-starts': [],
                                 'first-line': 0L,
@@ -1396,24 +1425,22 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
          loc('Downloader.py'),
          loc('run.py'),
          loc('sources/euronews.py'),
-         loc('sources/filmon.py'),
          loc('resolver.py'),
          loc('resolvers/cloudsany.py')]),
                                'open_files': [u'Downloader.py',
         u'kivy_test.py',
         u'resolver.py',
-        u'run.py',
+        u'resolvers/cloudsany.py',
         u'sources/cinemalive.py',
         u'sources/euronews.py',
         u'sources/filmas.py',
-        u'sources/filmix.py',
-        u'sources/filmon.py',
         u'sources/lmt.py',
-        u'sources/ltc.py',
-        u'sources/replay.py',
+        u'sources/filmix.py',
+        u'run.py',
         u'util.py',
-        u'resolvers/cloudsany.py',
-        u'ContentSources.py']},
+        u'ContentSources.py',
+        u'sources/replay.py',
+        u'sources/ltc.py']},
         'saved_notebook_display': None,
         'split_percents': {0: 0.42670046472327844},
         'splits': 2,
@@ -1428,21 +1455,20 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                          -1080,
                          1858,
                          1080)}]}
-guimgr.recent-documents = [loc('ContentSources.py'),
-                           loc('resolvers/cloudsany.py'),
+guimgr.recent-documents = [loc('sources/ltc.py'),
+                           loc('sources/replay.py'),
+                           loc('ContentSources.py'),
                            loc('util.py'),
                            loc('run.py'),
+                           loc('sources/filmix.py'),
+                           loc('resolvers/cloudsany.py'),
                            loc('sources/euronews.py'),
                            loc('sources/cinemalive.py'),
                            loc('resolver.py'),
-                           loc('sources/filmon.py'),
                            loc('Downloader.py'),
                            loc('sources/filmas.py'),
                            loc('kivy_test.py'),
-                           loc('sources/ltc.py'),
-                           loc('sources/filmix.py'),
-                           loc('sources/lmt.py'),
-                           loc('sources/replay.py')]
+                           loc('sources/lmt.py')]
 guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
         'ib-starts': [('NavigableString',
                        354),
@@ -1732,14 +1758,14 @@ guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
         'zoom': 0L},
                        loc('sources/filmon.py'): {'attrib-starts': [('Source',
         32),
-        ('Source.__init__',
-         34)],
-        'first-line': 26L,
+        ('Source.get_content',
+         47)],
+        'first-line': 113L,
         'folded-linenos': [],
-        'sel-line': 38L,
-        'sel-line-start': 1351L,
-        'selection_end': 1381L,
-        'selection_start': 1381L,
+        'sel-line': 122L,
+        'sel-line-start': 4665L,
+        'selection_end': 4665L,
+        'selection_start': 4665L,
         'zoom': 0L},
                        loc('sources/iplayer.py'): {'attrib-starts': [('Sourc'\
         'e',
@@ -1959,9 +1985,11 @@ proj.env-vars = {None: ('default',
                         [u''])}
 search.replace-history = [u'www.shortcut.lv',
                           u'shortcut.lv']
-search.search-history = [u'raise',
+search.search-history = [u'img',
+                         u'desc',
+                         u'unqute',
+                         u'raise',
                          u'can not find ',
-                         u'img',
                          u'get_head',
                          u'base_url',
                          u'download',
@@ -1976,9 +2004,7 @@ search.search-history = [u'raise',
                          u'host',
                          u'url_stream',
                          u'url_sub',
-                         u'.pack',
-                         u'Text',
-                         u'VideoInfo']
+                         u'.pack']
 testing.stored-results = (1,
                           [],
                           {})

sources/filmix.py

@@ -78,13 +78,14 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
             cookie = r.cookies["FILMIXNET"]
             url = "https://filmix.me/engine/ajax/sphinx_search.php"
             headers = headers2dict("""
-User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:58.0) Gecko/20100101 Firefox/58.0
-X-Requested-With: XMLHttpRequest
+User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:59.0) Gecko/20100101 Firefox/59.0
 Content-Type: application/x-www-form-urlencoded; charset=UTF-8
-Cookie: FILMIXNET=%s
+X-Requested-With: XMLHttpRequest
+Cookie: FILMIXNET=%s;
 """% cookie)
             #data = "scf=fx&story=%s&search_start=0&do=search&subaction=search" % (plist[1].replace(" ", "+"))
-            data = "sdc=fx&story=%s&do=search&subaction=search"% (plist[1].replace(" ", "+"))
+            #data = "sdc=fx&story=%s&do=search&subaction=search"% (plist[1].replace(" ", "+"))
+            data = "scf=fx&story=%s&subaction=search" % (plist[1].replace(" ", "+"))
             r = requests.post(url, data, headers=headers)
             #r = r.content.decode("cp1251").encode("utf8")
             content = self.process_list(r.content, content)

sources/ltc.py

@@ -132,8 +132,9 @@ Accept-Language: en-US,en;q=0.8
                 if item["xprs_id"] in js:
                     epg = js[item["xprs_id"]]
                     desc = "%s - %s (%s-%s)"%(title,epg[0]["t"],epg[0]["hs"],epg[0]["he"])
-                    #img = "https://www.shortcut.lv" + epg[0]["p"]
-                    img = "https://manstv.shortcut.lv/"+ item['broadcast_default_picture']
+                    title = desc
+                    img = "https://www.shortcut.lv" + epg[0]["p"]
+                    #img = "https://manstv.shortcut.lv/"+ item['broadcast_default_picture']
                 else:
                     img = "https://manstv.shortcut.lv/"+ item['broadcast_default_picture']
                     desc = title

sources/replay.py

@@ -75,11 +75,16 @@ class Source(SourceBase):
         elif clist=="categories":
             url = "http://replay.lsm.lv/lv/raidijumi/?lang=lv&type=video" if lang =="lv" else "http://replay.lsm.lv/ru/peredachi/?lang=ru&type=video"
             r = self._http_request(url)
+            icons = {
+                #TODO
+                "1": "https://www.iconfinder.com/icons/314161/download/png/256",
+            }
             for item in re.findall(r'<a .+href="(\?lang=\w+&type=video&theme=\d+)">([^<]+)</a>\t', r):
                 title = item[1]
                 data2 = url.split("?")[0]+item[0]
                 data2 = data2.replace(API_URL%lang,"")
-                img = ""
+                theme =  item[0].split("theme=")[1]
+                img = self.img # TODO icons["1"]
                 desc = title
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
@@ -91,7 +96,7 @@ class Source(SourceBase):
             for item in re.findall(r'<a href="/(lv|ru)/kategorija/(\w+)/">.+?<i class="[^"]+"></i>.+?<span>([^<]+)</span>', r, re.DOTALL):
                 title = item[2]
                 data2 = "kategorija/%s/?lang=%s"%(item[1],item[0])
-                img = ""
+                img = self.img
                 desc = title
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
@@ -114,6 +119,7 @@ class Source(SourceBase):
                 desc = item[1]
                 # 00:10 &ndash; 00:45
                 desc = desc + " (%s)" % item[2].replace("&ndash;", "-")
+                title = title + " - " + desc
                 content.append((title,self.name+"::"+data2,img,desc))
             return content
 
@@ -167,7 +173,7 @@ class Source(SourceBase):
                 if not m:
                     raise Exception("No stream found")
                 data2 = m.group(1).replace("\\","")
-                img = ""
+                img = self.img
                 desc = ""
 
             desc = title

util.py

@@ -538,7 +538,7 @@ def decode_html(data):
 
 def unescape(s0):
     #s2 = re.sub("&#\w+;",HTMLParser.HTMLParser().unescape("\1"),s)
-    s0 = s0.replace("&","&")
+    s0 = s0.replace("&","&").replace(""", '"')
     for s in re.findall("&#\w+;",s0):
         s2 = HTMLParser.HTMLParser().unescape(s)
         if isinstance(s0,str):