salabots filmix u.x.

changelog.md

@@ -0,0 +1,3 @@
+**10.03.2018**:
+- filmix turlkojumi/srīmi salaboti (nerādīja visas sērijas u.c.)
+

project.wpr

@@ -117,6 +117,10 @@ debug.breakpoints = {loc('Downloader.py'): {182L: (0,
                      loc('sources/euronews.py'): {161L: (0,
         None,
         1,
+        0)},
+                     loc('sources/filmix.py'): {121L: (0,
+        None,
+        1,
         0)},
                      loc('sources/filmon.py'): {49L: (0,
         None,
@@ -150,11 +154,11 @@ debug.breakpoints = {loc('Downloader.py'): {182L: (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)}}
@@ -249,7 +253,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                  'current_pages': [0,
                                    0],
                  'full-screen': False,
-                 'notebook_display': 'tabs only',
+                 'notebook_display': 'normal',
                  'notebook_percent': 0.17992831541218635,
                  'override_title': None,
                  'pagelist': [('project',
@@ -257,8 +261,8 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                0,
                                {'tree-state': {'file-sort-method': 'by name',
         'list-files-first': 0,
-        'tree-states': {'deep': {'expanded-nodes': [(1,)],
-                                 'selected-nodes': [(16,)],
+        'tree-states': {'deep': {'expanded-nodes': [(2,)],
+                                 'selected-nodes': [(17,)],
                                  'top-node': (0,)}},
         'tree-style': 'deep'}}),
                               ('snippets',
@@ -777,18 +781,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'): {'column-widths': [1.0],
+        loc('unknown:<untitled> #3'): {'column-widths': [1.0],
                                        'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #5'): {'column-widths': [1.0],
-                                       'expanded-nodes': [],
+        loc('unknown:<untitled> #6'): {'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #4'): {'expanded-nodes': [],
+        loc('unknown:<untitled> #5'): {'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #3'): {'expanded-nodes': [],
+        loc('unknown:<untitled> #4'): {'column-widths': [1.0],
+                                       'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None}},
                                 'browse_mode': u'Current Module',
@@ -925,35 +929,31 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         -1,
         -1),
                        'attrib-starts': [],
-                       'first-line': 56L,
+                       'first-line': 76L,
                        'folded-linenos': [],
-                       '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',
+                       'history': {u'file:C:/Data/Programming/enigma2/PlayStream2/content/sources/filmix.py': ['p'\
+        'ath\n',
+        'print translations\n',
+        'print translations[0]\n',
+        'translations.keys()[0]\n',
+        'print translations.keys()[0]\n',
+        'print translations.keys()[1]\n',
+        'translations[pl]\n',
+        'len(translations)\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']},
+        'translations[0]\n',
+        'translations.keys()\n',
+        'translations\n',
+        'playlist =js["playlist"]\n',
+        'playlist\n',
+        'len(playlist)\n',
+        's\n',
+        'e\n']},
                        'launch-id': None,
-                       'sel-line': 67L,
-                       'sel-line-start': 2424L,
-                       'selection_end': 2424L,
-                       'selection_start': 2424L,
+                       'sel-line': 87L,
+                       'sel-line-start': 8336L,
+                       'selection_end': 8336L,
+                       'selection_start': 8336L,
                        'zoom': 0L}),
                      ('debug-watch',
                       'wide',
@@ -966,8 +966,8 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         u'theme'),
                                        ('eval',
         u'item')],
-                       'tree-state': {'expanded-nodes': [],
-                                      'selected-nodes': [(2,)],
+                       'tree-state': {'expanded-nodes': [(0,)],
+                                      'selected-nodes': [],
                                       'top-node': (0,)}}),
                      ('messages',
                       'wide',
@@ -999,269 +999,273 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                        'selection_end': 174L,
                        'selection_start': 174L,
                        'zoom': 0L})],
-        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('ContentSources.py'),
-        {'attrib-starts': [('ContentSources',
-                            16),
-                           ('ContentSources.__init__',
-                            20)],
-         'first-line': 54L,
+        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('sources/ltc.py'),
+        {'attrib-starts': [('Source',
+                            26),
+                           ('Source.get_content',
+                            73)],
+         'first-line': 116L,
          'folded-linenos': [],
-         'sel-line': 61L,
-         'sel-line-start': 2639L,
-         'selection_end': 2704L,
-         'selection_start': 2700L,
+         'sel-line': 124L,
+         'sel-line-start': 5213L,
+         'selection_end': 5232L,
+         'selection_start': 5232L,
          'zoom': 0L},
-        1518896761.573],
-        [loc('ContentSources.py'),
-         {'attrib-starts': [('ContentSources',
-                             16),
-                            ('ContentSources.get_streams',
-                             96)],
-          'first-line': 97L,
-          'folded-linenos': [],
-          'sel-line': 106L,
-          'sel-line-start': 4586L,
-          'selection_end': 4611L,
-          'selection_start': 4607L,
-          'zoom': 0L},
-         1518896762.565],
-        [loc('ContentSources.py'),
-         {'attrib-starts': [('ContentSources',
-                             16),
-                            ('ContentSources.get_streams',
-                             96)],
-          'first-line': 114L,
+        1520677422.318],
+        [loc('sources/config.py'),
+         {'attrib-starts': [('Source',
+                             12),
+                            ('Source.get_content',
+                             24)],
+          'first-line': 18L,
           'folded-linenos': [],
-          'sel-line': 123L,
-          'sel-line-start': 5221L,
-          'selection_end': 5309L,
-          'selection_start': 5305L,
+          'sel-line': 26L,
+          'sel-line-start': 938L,
+          'selection_end': 963L,
+          'selection_start': 951L,
           'zoom': 0L},
-         1518896764.162],
-        [loc('ContentSources.py'),
-         {'attrib-starts': [('ContentSources',
-                             16),
-                            ('ContentSources.__init__',
-                             20)],
-          'first-line': 49L,
+         1520677584.944],
+        [loc('sources/config.py'),
+         {'attrib-starts': [('Source',
+                             12),
+                            ('Source.read_streams',
+                             36)],
+          'first-line': 28L,
           'folded-linenos': [],
-          'sel-line': 49L,
-          'sel-line-start': 2031L,
-          'selection_end': 2056L,
-          'selection_start': 2056L,
+          'sel-line': 36L,
+          'sel-line-start': 1181L,
+          'selection_end': 1201L,
+          'selection_start': 1189L,
           'zoom': 0L},
-         1518896775.095],
-        [loc('ContentSources.py'),
-         {'attrib-starts': [('ContentSources',
-                             16),
-                            ('ContentSources.get_content',
-                             64)],
-          'first-line': 71L,
+         1520677589.925],
+        [loc('sources/config.py'),
+         {'attrib-starts': [('Source',
+                             12),
+                            ('Source.read_streams',
+                             36)],
+          'first-line': 44L,
           'folded-linenos': [],
-          'sel-line': 80L,
-          'sel-line-start': 3634L,
-          'selection_end': 3676L,
-          'selection_start': 3672L,
+          'sel-line': 50L,
+          'sel-line-start': 1707L,
+          'selection_end': 1772L,
+          'selection_start': 1723L,
           'zoom': 0L},
-         1518896776.269],
-        [loc('ContentSources.py'),
-         {'attrib-starts': [('ContentSources',
-                             16),
-                            ('ContentSources.get_content',
-                             64)],
-          'first-line': 77L,
+         1520677822.726],
+        [loc('run.py'),
+         {'attrib-starts': [('Main',
+                             22),
+                            ('Main.play_video',
+                             242)],
+          'first-line': 255L,
           'folded-linenos': [],
-          'sel-line': 80L,
-          'sel-line-start': 3634L,
-          'selection_end': 3662L,
-          'selection_start': 3662L,
+          'sel-line': 267L,
+          'sel-line-start': 10485L,
+          'selection_end': 10511L,
+          'selection_start': 10511L,
           'zoom': 0L},
-         1518896830.949],
-        [loc('sources/replay.py'),
+         1520677824.052],
+        [loc('sources/cinemalive.py'),
          {'attrib-starts': [('Source',
-                             30),
-                            ('Source.get_content',
-                             41)],
-          'first-line': 84L,
+                             29),
+                            ('Source.get_streams',
+                             166)],
+          'first-line': 176L,
           'folded-linenos': [],
-          'sel-line': 85L,
-          'sel-line-start': 3948L,
-          'selection_end': 3948L,
-          'selection_start': 3948L,
+          'sel-line': 184L,
+          'sel-line-start': 9047L,
+          'selection_end': 9087L,
+          'selection_start': 9074L,
           'zoom': 0L},
-         1518896951.611],
-        [loc('sources/replay.py'),
-         {'attrib-starts': [('Source',
-                             30),
-                            ('Source.__init__',
-                             32)],
-          'first-line': 27L,
+         1520679273.911],
+        [loc('run.py'),
+         {'attrib-starts': [('Main',
+                             22),
+                            ('Main.play_video',
+                             242)],
+          'first-line': 255L,
           'folded-linenos': [],
-          'sel-line': 35L,
-          'sel-line-start': 1150L,
-          'selection_end': 1165L,
-          'selection_start': 1165L,
+          'sel-line': 267L,
+          'sel-line-start': 10485L,
+          'selection_end': 10511L,
+          'selection_start': 10511L,
           'zoom': 0L},
-         1518902208.605],
-        [loc('sources/replay.py'),
-         {'attrib-starts': [('Source',
-                             30),
-                            ('Source.__init__',
-                             32)],
-          'first-line': 32L,
+         1520679278.088],
+        [loc('kivy_test.py'),
+         {'attrib-starts': [],
+          'first-line': 0L,
+          'folded-linenos': [24L],
+          'sel-line': 0L,
+          'sel-line-start': 0L,
+          'selection_end': 3L,
+          'selection_start': 3L,
+          'zoom': 0L},
+         1520679279.16],
+        [loc('run.py'),
+         {'attrib-starts': [('Main',
+                             22),
+                            ('Main.play_video',
+                             242)],
+          'first-line': 255L,
           'folded-linenos': [],
-          'sel-line': 39L,
-          'sel-line-start': 1273L,
-          'selection_end': 1288L,
-          'selection_start': 1287L,
+          'sel-line': 267L,
+          'sel-line-start': 10485L,
+          'selection_end': 10511L,
+          'selection_start': 10511L,
           'zoom': 0L},
-         1518902209.757],
-        [loc('sources/replay.py'),
+         1520679328.293],
+        [loc('sources/filmix.py'),
          {'attrib-starts': [('Source',
-                             30),
+                             31),
                             ('Source.get_content',
-                             41)],
-          'first-line': 76L,
+                             56)],
+          'first-line': 79L,
           'folded-linenos': [],
-          'sel-line': 83L,
-          'sel-line-start': 3857L,
-          'selection_end': 3881L,
-          'selection_start': 3881L,
+          'sel-line': 89L,
+          'sel-line-start': 3266L,
+          'selection_end': 3324L,
+          'selection_start': 3324L,
           'zoom': 0L},
-         1518902233.149],
-        [loc('sources/replay.py'),
+         1520679335.223],
+        [loc('sources/filmix.py'),
          {'attrib-starts': [('Source',
-                             30),
-                            ('Source.get_content',
-                             41)],
-          'first-line': 76L,
+                             31)],
+          'first-line': 283L,
           'folded-linenos': [],
-          'sel-line': 78L,
-          'sel-line-start': 3572L,
-          'selection_end': 3593L,
-          'selection_start': 3593L,
+          'sel-line': 292L,
+          'sel-line-start': 12893L,
+          'selection_end': 12893L,
+          'selection_start': 12893L,
           'zoom': 0L},
-         1518902241.094],
-        [loc('sources/replay.py'),
-         {'attrib-starts': [('Source',
-                             30),
-                            ('Source.get_content',
-                             41)],
-          'first-line': 79L,
+         1520682303.573],
+        [loc('run.py'),
+         {'attrib-starts': [('Main',
+                             22),
+                            ('Main.list_action',
+                             106)],
+          'first-line': 105L,
           'folded-linenos': [],
-          'sel-line': 86L,
-          'sel-line-start': 3989L,
-          'selection_end': 4008L,
-          'selection_start': 4005L,
+          'sel-line': 110L,
+          'sel-line-start': 4505L,
+          'selection_end': 4505L,
+          'selection_start': 4505L,
           'zoom': 0L},
-         1518902242.177],
-        [loc('sources/replay.py'),
+         1520682335.838],
+        [loc('sources/filmix.py'),
          {'attrib-starts': [('Source',
-                             30),
-                            ('Source.get_content',
-                             41)],
-          'first-line': 79L,
+                             31),
+                            ('Source.get_streams',
+                             264)],
+          'first-line': 306L,
           'folded-linenos': [],
-          'sel-line': 86L,
-          'sel-line-start': 3989L,
-          'selection_end': 4019L,
-          'selection_start': 4016L,
+          'sel-line': 316L,
+          'sel-line-start': 13856L,
+          'selection_end': 13882L,
+          'selection_start': 13882L,
           'zoom': 0L},
-         1518902242.716],
-        [loc('sources/replay.py'),
+         1520683280.721],
+        [loc('sources/filmix.py'),
          {'attrib-starts': [('Source',
-                             30),
-                            ('Source.get_content',
-                             41)],
-          'first-line': 79L,
+                             31),
+                            ('Source.get_streams',
+                             262)],
+          'first-line': 318L,
           'folded-linenos': [],
-          'sel-line': 88L,
-          'sel-line-start': 4069L,
-          'selection_end': 4131L,
-          'selection_start': 4128L,
+          'sel-line': 327L,
+          'sel-line-start': 14325L,
+          'selection_end': 14325L,
+          'selection_start': 14325L,
           'zoom': 0L},
-         1518902243.216],
-        [loc('sources/replay.py'),
-         {'attrib-starts': [('Source',
-                             30),
-                            ('Source.get_content',
-                             41)],
-          'first-line': 89L,
+         1520685621.8],
+        [loc('run.py'),
+         {'attrib-starts': [('Main',
+                             22),
+                            ('Main.play_video',
+                             242)],
+          'first-line': 247L,
           'folded-linenos': [],
-          'sel-line': 98L,
-          'sel-line-start': 4629L,
-          'selection_end': 4659L,
-          'selection_start': 4659L,
+          'sel-line': 256L,
+          'sel-line-start': 10058L,
+          'selection_end': 10058L,
+          'selection_start': 10058L,
           'zoom': 0L},
-         1518902252.631],
-        [loc('sources/replay.py'),
-         {'attrib-starts': [('Source',
-                             30),
-                            ('Source.get_content',
-                             41)],
-          'first-line': 93L,
+         1520685647.025],
+        [loc('sources/filmix.py'),
+         {'attrib-starts': [],
+          'first-line': 431L,
           'folded-linenos': [],
-          'sel-line': 100L,
-          'sel-line-start': 4691L,
-          'selection_end': 4753L,
-          'selection_start': 4750L,
+          'sel-line': 440L,
+          'sel-line-start': 19309L,
+          'selection_end': 19309L,
+          'selection_start': 19309L,
           'zoom': 0L},
-         1518902253.454],
-        [loc('sources/replay.py'),
-         {'attrib-starts': [('Source',
-                             30),
-                            ('Source.get_content',
-                             41)],
-          'first-line': 108L,
+         1520685650.21],
+        [loc('run.py'),
+         {'attrib-starts': [('Main',
+                             22),
+                            ('Main.play_video',
+                             242)],
+          'first-line': 247L,
           'folded-linenos': [],
-          'sel-line': 117L,
-          'sel-line-start': 5571L,
-          'selection_end': 5590L,
-          'selection_start': 5587L,
+          'sel-line': 256L,
+          'sel-line-start': 10058L,
+          'selection_end': 10058L,
+          'selection_start': 10058L,
           'zoom': 0L},
-         1518902255.89],
-        [loc('sources/replay.py'),
+         1520685674.597],
+        [loc('sources/filmix.py'),
          {'attrib-starts': [('Source',
-                             30),
-                            ('Source.get_content',
-                             41)],
-          'first-line': 115L,
+                             31),
+                            ('Source.get_streams',
+                             262)],
+          'first-line': 285L,
           'folded-linenos': [],
-          'sel-line': 122L,
-          'sel-line-start': 5820L,
-          'selection_end': 5882L,
-          'selection_start': 5879L,
+          'sel-line': 290L,
+          'sel-line-start': 12861L,
+          'selection_end': 12861L,
+          'selection_start': 12861L,
           'zoom': 0L},
-         1518902256.998],
-        [loc('sources/replay.py'),
-         {'attrib-starts': [('Source',
-                             30),
-                            ('Source.get_content',
-                             41)],
-          'first-line': 149L,
+         1520686791.424],
+        [loc('run.py'),
+         {'attrib-starts': [('Main',
+                             22),
+                            ('Main.initUI',
+                             47)],
+          'first-line': 90L,
           'folded-linenos': [],
-          'sel-line': 158L,
-          'sel-line-start': 7698L,
-          'selection_end': 7717L,
-          'selection_start': 7714L,
+          'sel-line': 96L,
+          'sel-line-start': 3996L,
+          'selection_end': 3996L,
+          'selection_start': 3996L,
           'zoom': 0L},
-         1518902258.525],
-        [loc('sources/replay.py'),
+         1520686861.295],
+        [loc('sources/filmix.py'),
          {'attrib-starts': [('Source',
-                             30),
-                            ('Source.get_content',
-                             41)],
-          'first-line': 86L,
+                             31),
+                            ('Source.get_streams',
+                             262)],
+          'first-line': 285L,
           'folded-linenos': [],
-          'sel-line': 93L,
-          'sel-line-start': 4254L,
-          'selection_end': 4254L,
-          'selection_start': 4254L,
+          'sel-line': 290L,
+          'sel-line-start': 12861L,
+          'selection_end': 12861L,
+          'selection_start': 12861L,
           'zoom': 0L},
-         1518902786.933]],
+         1520686867.682]],
         20),
-        'current-loc': loc('sources/ltc.py'),
-        'editor-state-list': [(loc('ContentSources.py'),
+        'current-loc': loc('sources/filmix.py'),
+        'editor-state-list': [(loc('run.py'),
+                               {'attrib-starts': [('Main',
+        22),
+        ('Main.initUI',
+         47)],
+                                'first-line': 90L,
+                                'folded-linenos': [],
+                                'sel-line': 96L,
+                                'sel-line-start': 3996L,
+                                'selection_end': 3996L,
+                                'selection_start': 3996L,
+                                'zoom': 0L}),
+                              (loc('ContentSources.py'),
                                {'attrib-starts': [('ContentSources',
         16),
         ('ContentSources.get_content',
@@ -1275,15 +1279,15 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 'zoom': 0L}),
                               (loc('sources/ltc.py'),
                                {'attrib-starts': [('Source',
-        27),
+        26),
         ('Source.get_content',
-         74)],
-                                'first-line': 117L,
+         73)],
+                                'first-line': 116L,
                                 'folded-linenos': [],
-                                'sel-line': 122L,
-                                'sel-line-start': 5124L,
-                                'selection_end': 5124L,
-                                'selection_start': 5124L,
+                                'sel-line': 124L,
+                                'sel-line-start': 5213L,
+                                'selection_end': 5232L,
+                                'selection_start': 5232L,
                                 'zoom': 0L}),
                               (loc('util.py'),
                                {'attrib-starts': [('unescape',
@@ -1307,18 +1311,6 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 'selection_end': 4254L,
                                 'selection_start': 4254L,
                                 'zoom': 0L}),
-                              (loc('sources/cinemalive.py'),
-                               {'attrib-starts': [('Source',
-        29),
-        ('Source.get_streams',
-         166)],
-                                'first-line': 176L,
-                                'folded-linenos': [],
-                                'sel-line': 184L,
-                                'sel-line-start': 9045L,
-                                'selection_end': 9087L,
-                                'selection_start': 9074L,
-                                'zoom': 0L}),
                               (loc('sources/lmt.py'),
                                {'attrib-starts': [],
                                 'first-line': 199L,
@@ -1340,26 +1332,17 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 'selection_end': 1369L,
                                 'selection_start': 1369L,
                                 'zoom': 0L}),
-                              (loc('kivy_test.py'),
-                               {'attrib-starts': [],
-                                'first-line': 0L,
-                                'folded-linenos': [24L],
-                                'sel-line': 0L,
-                                'sel-line-start': 0L,
-                                'selection_end': 3L,
-                                'selection_start': 3L,
-                                'zoom': 0L}),
                               (loc('sources/filmix.py'),
                                {'attrib-starts': [('Source',
         31),
         ('Source.get_content',
          56)],
-                                'first-line': 79L,
+                                'first-line': 144L,
                                 'folded-linenos': [],
-                                'sel-line': 88L,
-                                'sel-line-start': 3207L,
-                                'selection_end': 3207L,
-                                'selection_start': 3207L,
+                                'sel-line': 146L,
+                                'sel-line-start': 5981L,
+                                'selection_end': 6012L,
+                                'selection_start': 6012L,
                                 'zoom': 0L}),
                               (loc('Downloader.py'),
                                {'attrib-starts': [('get_header',
@@ -1371,18 +1354,6 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 'selection_end': 8012L,
                                 'selection_start': 8012L,
                                 'zoom': 0L}),
-                              (loc('run.py'),
-                               {'attrib-starts': [('Main',
-        22),
-        ('Main.play_video',
-         242)],
-                                'first-line': 255L,
-                                'folded-linenos': [],
-                                'sel-line': 267L,
-                                'sel-line-start': 10485L,
-                                'selection_end': 10511L,
-                                'selection_start': 10511L,
-                                'zoom': 0L}),
                               (loc('sources/euronews.py'),
                                {'attrib-starts': [],
                                 'first-line': 302L,
@@ -1410,37 +1381,47 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 'sel-line-start': 1587L,
                                 'selection_end': 1599L,
                                 'selection_start': 1599L,
+                                'zoom': 0L}),
+                              (loc('sources/config.py'),
+                               {'attrib-starts': [('Source',
+        12),
+        ('Source.read_streams',
+         36)],
+                                'first-line': 44L,
+                                'folded-linenos': [],
+                                'sel-line': 50L,
+                                'sel-line-start': 1707L,
+                                'selection_end': 1772L,
+                                'selection_start': 1723L,
                                 'zoom': 0L})],
         'has-focus': True,
         'locked': False},
-        [loc('ContentSources.py'),
+        [loc('run.py'),
+         loc('ContentSources.py'),
          loc('sources/ltc.py'),
          loc('util.py'),
          loc('sources/replay.py'),
-         loc('sources/cinemalive.py'),
          loc('sources/lmt.py'),
          loc('sources/filmas.py'),
-         loc('kivy_test.py'),
          loc('sources/filmix.py'),
          loc('Downloader.py'),
-         loc('run.py'),
          loc('sources/euronews.py'),
          loc('resolver.py'),
-         loc('resolvers/cloudsany.py')]),
-                               'open_files': [u'Downloader.py',
-        u'kivy_test.py',
+         loc('resolvers/cloudsany.py'),
+         loc('sources/config.py')]),
+                               'open_files': [u'ContentSources.py',
+        u'Downloader.py',
         u'resolver.py',
         u'resolvers/cloudsany.py',
-        u'sources/cinemalive.py',
         u'sources/euronews.py',
         u'sources/filmas.py',
         u'sources/lmt.py',
-        u'sources/filmix.py',
-        u'run.py',
-        u'util.py',
-        u'ContentSources.py',
         u'sources/replay.py',
-        u'sources/ltc.py']},
+        u'util.py',
+        u'sources/ltc.py',
+        u'sources/config.py',
+        u'run.py',
+        u'sources/filmix.py']},
         'saved_notebook_display': None,
         'split_percents': {0: 0.42670046472327844},
         'splits': 2,
@@ -1455,19 +1436,18 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                          -1080,
                          1858,
                          1080)}]}
-guimgr.recent-documents = [loc('sources/ltc.py'),
+guimgr.recent-documents = [loc('sources/filmix.py'),
+                           loc('run.py'),
+                           loc('sources/config.py'),
+                           loc('sources/ltc.py'),
+                           loc('util.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('Downloader.py'),
                            loc('sources/filmas.py'),
-                           loc('kivy_test.py'),
                            loc('sources/lmt.py')]
 guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
         'ib-starts': [('NavigableString',
@@ -1638,12 +1618,12 @@ guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
         'selection_end': 3450,
         'selection_start': 3449},
                        loc('kivy_test.py'): {'attrib-starts': [],
-        'first-line': 72L,
-        'folded-linenos': [],
-        'sel-line': 27L,
-        'sel-line-start': 691L,
-        'selection_end': 705L,
-        'selection_start': 702L,
+        'first-line': 0L,
+        'folded-linenos': [24L],
+        'sel-line': 0L,
+        'sel-line-start': 0L,
+        'selection_end': 3L,
+        'selection_start': 3L,
         'zoom': 0L},
                        loc('kivy_test2.py'): {'attrib-starts': [],
         'first-line': 0L,
@@ -1706,13 +1686,17 @@ guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
         'selection_end': 4550L,
         'selection_start': 4550L,
         'zoom': 0L},
-                       loc('sources/cinemalive.py'): {'attrib-starts': [],
-        'first-line': 197L,
+                       loc('sources/cinemalive.py'): {'attrib-starts': [('So'\
+        'urce',
+        29),
+        ('Source.get_streams',
+         166)],
+        'first-line': 176L,
         'folded-linenos': [],
-        'sel-line': 202L,
-        'sel-line-start': 9589L,
-        'selection_end': 9603L,
-        'selection_start': 9603L,
+        'sel-line': 184L,
+        'sel-line-start': 9047L,
+        'selection_end': 9087L,
+        'selection_start': 9074L,
         'zoom': 0L},
                        loc('sources/config.py'): {'attrib-starts': [('Source',
         12),

sources/filmix.py

@@ -132,40 +132,39 @@ Cookie: FILMIXNET=%s;
             key = m.group(3) if m else ""
             js = self.get_movie_info(vid,key)
             translations = js["message"]["translations"]["html5"]
+            items = []
             for pl  in translations:
                 if translations[pl].startswith("http"):
                     continue
                 pl_link = translations[pl]
                 lang = pl.encode("utf8")
-                break
-            else:
-                raise Exception("No episodes list found!")
-            #pl_link = js["message"]["translations"]["flash"].values()[0]
-            #  TODO process several players, currently taking the first
-            #TODO - kļuda, vairs nesradā
-            if not pl_link.startswith("http"):
                 pl_link = self.decode_direct_media_url(pl_link)
-            js = self._http_request(pl_link)
-            js = self.decode_direct_media_url(js)
-            js = json.loads(js)
-            if "s" in qs:
-                s = int(qs["s"])
-                for i,ep in enumerate(js["playlist"][s-1]["playlist"]):
-                    title = title0+" - "+js["playlist"][s-1]["playlist"][i]["comment"].encode("utf8")
-                    serie = js["playlist"][s-1]["playlist"][i]["comment"].encode("utf8")
-                    data2 = data+"&e=%s"%(i+1)
-                    desc = serie +"\n"+desc0
-                    content.append((title,self.name+"::"+data2,img,desc))
-            else:
-                for i,ep in enumerate(js["playlist"]):
-                    title = title0 +" - "+js["playlist"][i]["comment"].encode("utf8")
-                    serie = js["playlist"][i]["comment"].encode("utf8")
-                    if "file" in ep and ep["file"]:
-                        data2 = data+"?e=%s"%(i+1)
-                    else:
-                        data2 = data+"?s=%s"%(i+1)
-                    desc = serie +"\n"+desc0
-                    content.append((title,self.name+"::"+data2,img,desc))
+                js = self._http_request(pl_link)
+                js = self.decode_direct_media_url(js)
+                js = json.loads(js)
+                if "s" in qs:
+                    s = int(qs["s"])
+                    if s > len(js["playlist"]): continue
+                    for i,ep in enumerate(js["playlist"][s-1]["playlist"]):
+                        title = title0+" - "+js["playlist"][s-1]["playlist"][i]["comment"].encode("utf8")
+                        serie = js["playlist"][s-1]["playlist"][i]["comment"].encode("utf8")
+                        data2 = data+"&e=%s"%(i+1)
+                        desc = serie +"\n"+desc0
+                        if data2 not in items:
+                            items.append(data2)
+                            content.append((title,self.name+"::"+data2,img,desc))
+                else:
+                    for i,ep in enumerate(js["playlist"]):
+                        title = title0 +" - "+js["playlist"][i]["comment"].encode("utf8")
+                        serie = js["playlist"][i]["comment"].encode("utf8")
+                        if "file" in ep and ep["file"]:
+                            data2 = data+"?e=%s"%(i+1)
+                        else:
+                            data2 = data+"?s=%s"%(i+1)
+                        desc = serie +"\n"+desc0
+                        if data2 not in items:
+                            items.append(data2)
+                            content.append((title,self.name+"::"+data2,img,desc))
             return content
             #r = self._http_request(url)
 
@@ -289,50 +288,15 @@ Cookie: FILMIXNET=%s;
         key = m.group(3) if m else ""
         js = self.get_movie_info(vid,key)
         translations = js["message"]["translations"]["html5"]
-        for pl in translations:
-            if translations[pl].startswith("http"):
-                continue
-            pl_link = translations[pl]
-            lang = pl.encode("utf8")
-            break
-        else:
-            raise Exception("No episodes list found!")
-        if not pl_link.startswith("http"):
-            pl_link = self.decode_direct_media_url(pl_link)
 
         if not series : # Filma
-            url0 = pl_link
-            streams2 = self.get_streams2(url0)
-            for st in streams2:
-                stream = util.item()
-                stream["url"]=st[1]
-                stream["lang"]=lang
-                stream["quality"]=st[0]
-                stream["name"]= title
-                stream["desc"]=desc
-                streams.append(stream)
-            return streams
-
-        else: # Seriāls
-            #pl_link = video_link
-            js = self._http_request(pl_link)
-            js = self.decode_direct_media_url(js)
-            js = json.loads(js)
-            if "e" in qs:
-                if "s" in qs:
-                    s = int(qs["s"])
-                else:
-                    s = None
-                e = int(qs["e"])
-                if s: # sezona + epizode
-                    serie = js["playlist"][s-1]["playlist"][e-1]["comment"].encode("utf8")
-                    title = title0+" - "+ serie
-                    url0 = js["playlist"][s-1]["playlist"][e-1]["file"].encode("utf8")
-                else: # tikai epizode, nav sezonas
-                    title = title0 +" - "+js["playlist"][e-1]["comment"].encode("utf8")
-                    serie = js["playlist"][e-1]["comment"].encode("utf8")
-                    url0 = js["playlist"][e-1]["file"].encode("utf8")
-                streams2 = self.get_streams2(url0)
+            for pl in translations:
+                if translations[pl].startswith("http"):
+                    continue
+                pl_link = translations[pl]
+                lang = pl.encode("utf8")
+                pl_link = self.decode_direct_media_url(pl_link)
+                streams2 = self.get_streams2(pl_link)
                 for st in streams2:
                     stream = util.item()
                     stream["url"]=st[1]
@@ -341,7 +305,47 @@ Cookie: FILMIXNET=%s;
                     stream["name"]= title
                     stream["desc"]=desc
                     streams.append(stream)
-                return streams
+            return streams
+
+        else: # Seriāls
+            for pl in translations:
+                if translations[pl].startswith("http"):
+                    continue
+                pl_link = translations[pl]
+                lang = pl.encode("utf8")
+                pl_link = self.decode_direct_media_url(pl_link)
+
+                #pl_link = video_link
+                js = self._http_request(pl_link)
+                js = self.decode_direct_media_url(js)
+                js = json.loads(js)
+                playlist =  js["playlist"]
+                if "e" in qs:
+                    if "s" in qs:
+                        s = int(qs["s"])
+                    else:
+                        s = None
+                    e = int(qs["e"])
+                    if s: # sezona + epizode
+                        if s > len(js["playlist"]) or e > len(js["playlist"][s-1]["playlist"]): continue
+                        serie = js["playlist"][s-1]["playlist"][e-1]["comment"].encode("utf8")
+                        title = title0+" - "+ serie
+                        url0 = js["playlist"][s-1]["playlist"][e-1]["file"].encode("utf8")
+                    else: # tikai epizode, nav sezonas
+                        if e > len(js["playlist"]): continue
+                        title = title0 +" - "+js["playlist"][e-1]["comment"].encode("utf8")
+                        serie = js["playlist"][e-1]["comment"].encode("utf8")
+                        url0 = js["playlist"][e-1]["file"].encode("utf8")
+                    streams2 = self.get_streams2(url0)
+                    for st in streams2:
+                        stream = util.item()
+                        stream["url"]=st[1]
+                        stream["lang"]=lang
+                        stream["quality"]=st[0]
+                        stream["name"]= title
+                        stream["desc"]=desc
+                        streams.append(stream)
+            return streams
 
     def call(self, data,params=None,headers=None,lang=""):
         if not headers: headers = self.headers