Salabots tvplay (nerādīja kategorijas)

project.wpr

@@ -191,11 +191,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)}}
@@ -833,18 +833,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> #3'): {'column-widths': [1.0],
+        loc('unknown:<untitled> #5'): {'column-widths': [1.0],
                                        'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #4'): {'expanded-nodes': [],
+        loc('unknown:<untitled> #6'): {'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #5'): {'column-widths': [1.0],
-                                       'expanded-nodes': [],
+        loc('unknown:<untitled> #4'): {'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #6'): {'expanded-nodes': [],
+        loc('unknown:<untitled> #3'): {'column-widths': [1.0],
+                                       'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None}},
                                 'browse_mode': u'Current Module',
@@ -871,7 +871,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.33947157726180943,
@@ -904,10 +904,10 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                        'fInterpretBackslashes': False,
                                        'fMatchCase': False,
                                        'fOmitBinary': True,
-                                       'fRegexFlags': 46,
+                                       'fRegexFlags': 42,
                                        'fReplaceText': u'filmix.co',
                                        'fReverse': False,
-                                       'fSearchText': u'title,',
+                                       'fSearchText': u' for item in r["content"]:',
                                        'fStartPos': 0,
                                        'fStyle': 'text',
                                        'fWholeWords': False,
@@ -933,7 +933,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                        'fInterpretBackslashes': False,
                                        'fMatchCase': False,
                                        'fOmitBinary': True,
-                                       'fRegexFlags': 46,
+                                       'fRegexFlags': 42,
                                        'fReplaceText': u'',
                                        'fReverse': False,
                                        'fSearchText': u'command',
@@ -981,24 +981,18 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         -1,
         -1),
                        'attrib-starts': [],
-                       'first-line': 20L,
+                       'first-line': 11L,
                        'folded-linenos': [],
-                       'history': {u'file:C:/Data/Programming/enigma2/PlayStream2/content/sources/tvplay.py': ['z'\
-        'ip(*self.kategorijas)[0]\n',
-        'k\n',
-        'k[0]\n',
-        'qs\n',
-        'len(r["content"])\n',
-        'item["metadata"]["airDate"]\n',
-        'item["metadata"]["airDate"].split["T"][0]\n',
-        'item["metadata"]["airDate"].split("T")[0]\n',
-        'dd =  item["metadata"]["airDate"].split("T")[0].split("-")\n',
-        'dd\n']},
+                       'history': {u'file:C:/Data/Programming/enigma2/PlayStream2/content/sources/tvplay.py': ['d'\
+        'ata\n',
+        'r\n',
+        'url\n',
+        'print url\n']},
                        'launch-id': None,
-                       'sel-line': 26L,
-                       'sel-line-start': 670L,
-                       'selection_end': 670L,
-                       'selection_start': 670L,
+                       'sel-line': 13L,
+                       'sel-line-start': 503L,
+                       'selection_end': 624L,
+                       'selection_start': 503L,
                        'zoom': 0L}),
                      ('debug-watch',
                       'wide',
@@ -1039,277 +1033,267 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                        'attrib-starts': [],
                        'first-line': 0L,
                        'folded-linenos': [],
-                       'history': {None: ['a = [("a", 1), ("b", 2)]\n',
-        'a\n',
-        'zip(a)\n',
-        'zip(*a)\n',
-        'zip(*a)[0]\n']},
+                       'history': {},
                        'launch-id': None,
-                       'sel-line': 11L,
-                       'sel-line-start': 312L,
-                       'selection_end': 312L,
-                       'selection_start': 312L,
+                       'sel-line': 2L,
+                       'sel-line-start': 174L,
+                       'selection_end': 174L,
+                       'selection_start': 174L,
                        'zoom': 0L})],
         'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('sources/tvplay.py'),
         {'attrib-starts': [('Source',
                             32),
                            ('Source.get_content',
-                            52)],
-         'first-line': 106L,
+                            62)],
+         'first-line': 117L,
          'folded-linenos': [],
-         'sel-line': 113L,
-         'sel-line-start': 5583L,
-         'selection_end': 5583L,
-         'selection_start': 5583L,
+         'sel-line': 127L,
+         'sel-line-start': 5744L,
+         'selection_end': 5781L,
+         'selection_start': 5755L,
          'zoom': 0L},
-        1534770326.346],
+        1538212621.538],
         [loc('sources/tvplay.py'),
          {'attrib-starts': [('Source',
                              32),
                             ('Source.get_content',
-                             52)],
-          'first-line': 90L,
-          'folded-linenos': [120L],
-          'sel-line': 100L,
-          'sel-line-start': 4759L,
-          'selection_end': 4808L,
-          'selection_start': 4808L,
+                             62)],
+          'first-line': 125L,
+          'folded-linenos': [],
+          'sel-line': 140L,
+          'sel-line-start': 6359L,
+          'selection_end': 6396L,
+          'selection_start': 6370L,
           'zoom': 0L},
-         1534771988.638],
+         1538212622.826],
         [loc('sources/tvplay.py'),
          {'attrib-starts': [('Source',
                              32),
                             ('Source.get_content',
-                             52)],
-          'first-line': 109L,
-          'folded-linenos': [120L],
-          'sel-line': 131L,
-          'sel-line-start': 6361L,
-          'selection_end': 6383L,
-          'selection_start': 6383L,
+                             62)],
+          'first-line': 117L,
+          'folded-linenos': [],
+          'sel-line': 127L,
+          'sel-line-start': 5744L,
+          'selection_end': 5781L,
+          'selection_start': 5755L,
+          'zoom': 0L},
+         1538212626.538],
+        [loc('sources/tvplay.py'),
+         {'attrib-starts': [],
+          'first-line': 0L,
+          'folded-linenos': [155L],
+          'sel-line': 4L,
+          'sel-line-start': 136L,
+          'selection_end': 174L,
+          'selection_start': 174L,
           'zoom': 0L},
-         1534772103.433],
+         1538212649.721],
         [loc('sources/tvplay.py'),
          {'attrib-starts': [('Source',
                              32),
                             ('Source.get_content',
-                             52)],
-          'first-line': 57L,
-          'folded-linenos': [],
-          'sel-line': 63L,
-          'sel-line-start': 2330L,
-          'selection_end': 2352L,
-          'selection_start': 2352L,
+                             62)],
+          'first-line': 112L,
+          'folded-linenos': [155L],
+          'sel-line': 127L,
+          'sel-line-start': 5744L,
+          'selection_end': 5781L,
+          'selection_start': 5755L,
+          'zoom': 0L},
+         1538212673.477],
+        [loc('sources/tvplay.py'),
+         {'attrib-starts': [],
+          'first-line': 0L,
+          'folded-linenos': [155L],
+          'sel-line': 5L,
+          'sel-line-start': 188L,
+          'selection_end': 214L,
+          'selection_start': 214L,
           'zoom': 0L},
-         1534774794.02],
+         1538212677.553],
         [loc('sources/tvplay.py'),
          {'attrib-starts': [('Source',
                              32),
                             ('Source.get_content',
                              62)],
-          'first-line': 107L,
-          'folded-linenos': [],
-          'sel-line': 112L,
-          'sel-line-start': 5016L,
-          'selection_end': 5016L,
-          'selection_start': 5016L,
+          'first-line': 112L,
+          'folded-linenos': [157L],
+          'sel-line': 127L,
+          'sel-line-start': 5744L,
+          'selection_end': 5841L,
+          'selection_start': 5744L,
           'zoom': 0L},
-         1534866469.787],
+         1538212820.898],
         [loc('sources/tvplay.py'),
          {'attrib-starts': [('Source',
                              32),
                             ('Source.get_content',
                              62)],
-          'first-line': 153L,
-          'folded-linenos': [],
-          'sel-line': 161L,
-          'sel-line-start': 7444L,
-          'selection_end': 7500L,
-          'selection_start': 7471L,
+          'first-line': 119L,
+          'folded-linenos': [157L],
+          'sel-line': 129L,
+          'sel-line-start': 5841L,
+          'selection_end': 5878L,
+          'selection_start': 5852L,
           'zoom': 0L},
-         1534866470.415],
+         1538212825.218],
         [loc('sources/tvplay.py'),
          {'attrib-starts': [('Source',
                              32),
                             ('Source.get_content',
                              62)],
-          'first-line': 153L,
-          'folded-linenos': [],
-          'sel-line': 161L,
-          'sel-line-start': 7444L,
-          'selection_end': 7499L,
-          'selection_start': 7471L,
+          'first-line': 127L,
+          'folded-linenos': [159L],
+          'sel-line': 143L,
+          'sel-line-start': 6492L,
+          'selection_end': 6551L,
+          'selection_start': 6551L,
           'zoom': 0L},
-         1534866471.652],
+         1538212833.955],
         [loc('sources/tvplay.py'),
          {'attrib-starts': [('Source',
                              32),
                             ('Source.get_content',
                              62)],
-          'first-line': 126L,
-          'folded-linenos': [],
-          'sel-line': 161L,
-          'sel-line-start': 7444L,
-          'selection_end': 7521L,
-          'selection_start': 7521L,
+          'first-line': 134L,
+          'folded-linenos': [159L],
+          'sel-line': 144L,
+          'sel-line-start': 6564L,
+          'selection_end': 6601L,
+          'selection_start': 6575L,
           'zoom': 0L},
-         1534866508.975],
+         1538212835.157],
         [loc('sources/tvplay.py'),
          {'attrib-starts': [('Source',
                              32),
                             ('Source.get_content',
                              62)],
-          'first-line': 175L,
-          'folded-linenos': [],
-          'sel-line': 185L,
-          'sel-line-start': 8867L,
-          'selection_end': 8899L,
-          'selection_start': 8894L,
+          'first-line': 124L,
+          'folded-linenos': [159L],
+          'sel-line': 129L,
+          'sel-line-start': 5841L,
+          'selection_end': 5878L,
+          'selection_start': 5852L,
           'zoom': 0L},
-         1534866510.627],
+         1538212838.81],
         [loc('sources/tvplay.py'),
          {'attrib-starts': [('Source',
                              32),
                             ('Source.get_content',
                              62)],
-          'first-line': 111L,
-          'folded-linenos': [],
-          'sel-line': 97L,
-          'sel-line-start': 4300L,
-          'selection_end': 4352L,
-          'selection_start': 4352L,
+          'first-line': 134L,
+          'folded-linenos': [159L],
+          'sel-line': 144L,
+          'sel-line-start': 6564L,
+          'selection_end': 6601L,
+          'selection_start': 6575L,
           'zoom': 0L},
-         1534867304.635],
-        [loc('run.py'),
-         {'attrib-starts': [('Main',
-                             22),
-                            ('Main.show_pic',
-                             206)],
-          'first-line': 232L,
-          'folded-linenos': [],
-          'sel-line': 237L,
-          'sel-line-start': 9356L,
-          'selection_end': 9356L,
-          'selection_start': 9356L,
+         1538212839.721],
+        [loc('sources/tvplay.py'),
+         {'attrib-starts': [('Source',
+                             32),
+                            ('Source.get_content',
+                             62)],
+          'first-line': 124L,
+          'folded-linenos': [159L],
+          'sel-line': 129L,
+          'sel-line-start': 5841L,
+          'selection_end': 5878L,
+          'selection_start': 5852L,
           'zoom': 0L},
-         1534867343.078],
+         1538212848.303],
         [loc('sources/tvplay.py'),
          {'attrib-starts': [('Source',
                              32),
                             ('Source.get_content',
                              62)],
-          'first-line': 120L,
-          'folded-linenos': [],
-          'sel-line': 97L,
-          'sel-line-start': 4300L,
-          'selection_end': 4352L,
-          'selection_start': 4352L,
+          'first-line': 134L,
+          'folded-linenos': [159L],
+          'sel-line': 144L,
+          'sel-line-start': 6564L,
+          'selection_end': 6601L,
+          'selection_start': 6575L,
           'zoom': 0L},
-         1534867353.742],
+         1538212852.612],
         [loc('sources/tvplay.py'),
          {'attrib-starts': [('Source',
                              32),
-                            ('Source.is_video',
-                             222)],
-          'first-line': 214L,
-          'folded-linenos': [],
-          'sel-line': 222L,
-          'sel-line-start': 10645L,
-          'selection_end': 10661L,
-          'selection_start': 10653L,
+                            ('Source.get_content',
+                             62)],
+          'first-line': 124L,
+          'folded-linenos': [159L],
+          'sel-line': 129L,
+          'sel-line-start': 5841L,
+          'selection_end': 5878L,
+          'selection_start': 5852L,
           'zoom': 0L},
-         1534867365.534],
+         1538212858.88],
         [loc('sources/tvplay.py'),
          {'attrib-starts': [('Source',
                              32),
-                            ('Source.get_streams',
-                             237)],
-          'first-line': 243L,
-          'folded-linenos': [],
-          'sel-line': 246L,
-          'sel-line-start': 11558L,
-          'selection_end': 11573L,
-          'selection_start': 11573L,
+                            ('Source.get_content',
+                             62)],
+          'first-line': 134L,
+          'folded-linenos': [159L],
+          'sel-line': 144L,
+          'sel-line-start': 6564L,
+          'selection_end': 6601L,
+          'selection_start': 6575L,
           'zoom': 0L},
-         1534867772.439],
+         1538212861.467],
         [loc('sources/tvplay.py'),
          {'attrib-starts': [('Source',
                              32),
                             ('Source.get_content',
                              62)],
-          'first-line': 145L,
-          'folded-linenos': [],
+          'first-line': 124L,
+          'folded-linenos': [159L],
           'sel-line': 129L,
-          'sel-line-start': 5854L,
-          'selection_end': 5914L,
-          'selection_start': 5870L,
+          'sel-line-start': 5841L,
+          'selection_end': 5878L,
+          'selection_start': 5852L,
           'zoom': 0L},
-         1534867781.697],
+         1538212862.657],
         [loc('sources/tvplay.py'),
          {'attrib-starts': [('Source',
                              32),
-                            ('Source.get_streams',
-                             237)],
-          'first-line': 240L,
-          'folded-linenos': [],
-          'sel-line': 249L,
-          'sel-line-start': 11673L,
-          'selection_end': 11673L,
-          'selection_start': 11673L,
-          'zoom': 0L},
-         1534868014.439],
-        [loc('run.py'),
-         {'attrib-starts': [('Main',
-                             22),
-                            ('Main.show_pic',
-                             206)],
-          'first-line': 232L,
-          'folded-linenos': [],
-          'sel-line': 237L,
-          'sel-line-start': 9356L,
-          'selection_end': 9356L,
-          'selection_start': 9356L,
+                            ('Source.get_content',
+                             62)],
+          'first-line': 134L,
+          'folded-linenos': [159L],
+          'sel-line': 144L,
+          'sel-line-start': 6564L,
+          'selection_end': 6601L,
+          'selection_start': 6575L,
           'zoom': 0L},
-         1534871787.894],
+         1538212864.032],
         [loc('sources/tvplay.py'),
          {'attrib-starts': [('Source',
                              32),
-                            ('Source.get_streams',
-                             237)],
-          'first-line': 233L,
-          'folded-linenos': [],
-          'sel-line': 238L,
-          'sel-line-start': 11226L,
-          'selection_end': 11226L,
-          'selection_start': 11226L,
-          'zoom': 0L},
-         1534871794.684],
-        [loc('run.py'),
-         {'attrib-starts': [('VideoInfo',
-                             343),
-                            ('VideoInfo.body',
-                             370)],
-          'first-line': 401L,
-          'folded-linenos': [],
-          'sel-line': 412L,
-          'sel-line-start': 16393L,
-          'selection_end': 16393L,
-          'selection_start': 16393L,
+                            ('Source.get_content',
+                             62)],
+          'first-line': 124L,
+          'folded-linenos': [159L],
+          'sel-line': 129L,
+          'sel-line-start': 5841L,
+          'selection_end': 5878L,
+          'selection_start': 5852L,
           'zoom': 0L},
-         1534871894.169],
+         1538212865.618],
         [loc('sources/tvplay.py'),
          {'attrib-starts': [('Source',
                              32),
-                            ('Source.get_streams',
-                             237)],
-          'first-line': 233L,
-          'folded-linenos': [],
-          'sel-line': 238L,
-          'sel-line-start': 11226L,
-          'selection_end': 11226L,
-          'selection_start': 11226L,
+                            ('Source.get_content',
+                             62)],
+          'first-line': 134L,
+          'folded-linenos': [159L],
+          'sel-line': 144L,
+          'sel-line-start': 6564L,
+          'selection_end': 6601L,
+          'selection_start': 6575L,
           'zoom': 0L},
-         1534871898.081]],
+         1538212867.204]],
         20),
         'current-loc': loc('sources/tvplay.py'),
         'editor-state-list': [(loc('run.py'),
@@ -1377,14 +1361,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                               (loc('sources/tvplay.py'),
                                {'attrib-starts': [('Source',
         32),
-        ('Source.get_title_desc',
-         196)],
-                                'first-line': 199L,
-                                'folded-linenos': [],
-                                'sel-line': 209L,
-                                'sel-line-start': 10046L,
-                                'selection_end': 10084L,
-                                'selection_start': 10084L,
+        ('Source.get_content',
+         62)],
+                                'first-line': 124L,
+                                'folded-linenos': [159L],
+                                'sel-line': 129L,
+                                'sel-line-start': 5841L,
+                                'selection_end': 5878L,
+                                'selection_start': 5852L,
                                 'zoom': 0L}),
                               (loc('sources/euronews.py'),
                                {'attrib-starts': [('Source',
@@ -1456,6 +1440,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
          loc('sources/filmix.py'),
          loc('sources/filmas.py')]),
                                'open_files': [u'changelog.md',
+        u'run.py',
         u'sources/config.py',
         u'sources/euronews.py',
         u'sources/filmas.py',
@@ -1463,7 +1448,6 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         u'sources/ltc.py',
         u'sources/replay.py',
         u'util.py',
-        u'run.py',
         u'sources/tvplay.py']},
         'saved_notebook_display': None,
         'split_percents': {0: 0.587782340862423},
@@ -1480,8 +1464,8 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                          2393,
                          1440)}]}
 guimgr.recent-documents = [loc('sources/tvplay.py'),
-                           loc('run.py'),
                            loc('util.py'),
+                           loc('run.py'),
                            loc('sources/euronews.py'),
                            loc('sources/replay.py'),
                            loc('sources/ltc.py'),
@@ -2098,7 +2082,11 @@ search.replace-history = [u'filmix.co',
                           u'https://replay.lsm.lv',
                           u'www.shortcut.lv',
                           u'shortcut.lv']
-search.search-history = [u'size=',
+search.search-history = [u' for item in r["content"]:',
+                         u'sort=',
+                         u'raidijumi/kategorijas',
+                         u'tvSeries/category/id/33?type=tvseries&',
+                         u'size=',
                          u'set/search?f_metadata.tvSeri',
                          u'g149',
                          u'content.app',
@@ -2113,11 +2101,7 @@ search.search-history = [u'size=',
                          u'filmix.me',
                          u'1.4',
                          u'1.3',
-                         u'img =',
-                         u'http:',
-                         u'http://replay.lsm.lv',
-                         u'img0',
-                         u'get_movie_info']
+                         u'img =']
 testing.stored-results = (1,
                           [],
                           {})

sources/tvplay.py

@@ -111,7 +111,7 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
             if plist[1] == "kategorijas":
                 for kat in self.kategorijas:
                     content.append(("Raidijumi - "+kat[1], "tvplay::raidijumi/%s" % kat[0], kat[3], kat[4]))
-                    #content.append(kat[1], "tvplay::tvSeries/category/id/%s?type=tvseries&size=500&sort=title.title&descending=true" % kat[2], kat[3], kat[4])
+                    #content.append(kat[1], "tvplay::tvSeries/category/id/%s?type=tvseries&size=500&sort=&descending=true" % kat[2], kat[3], kat[4])
                 return content
             else:
                 for k in self.kategorijas:
@@ -120,11 +120,13 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
                         break
                 else:
                     return content
-                data = "tvplay::tvSeries/category/id/%s?type=tvseries&size=500&sort=title.title&descending=true" % kat_num
+                data = "tvplay::tvSeries/category/id/%s?type=tvseries&size=500&sort=&descending=true" % kat_num
                 return self.get_content(data)
 
         elif path == "asset/search":
             r = self.call(data)
+            if not "content" in r:
+                raise Exception("Error reading items list")
             for item in r["content"]:
                 data2 = "asset/%s" % item["id"]
                 title, img, desc = self.get_title_desc(item)
@@ -138,6 +140,8 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
 
         elif plist[0] == "tvSeries" and plist[1] == "category":
             r = self.call(data)
+            if not "content" in r:
+                raise Exception("Error reading items list")
             for item in r["content"]:
                 tvseries = True if "type" in qs and qs["type"] == "tvseries" else False
                 if tvseries and not "seasonNumber" in item:  # tvseries (programma)