darba versija

project.wpr

@@ -39,7 +39,11 @@ proj.launch-config = {loc('ContentSources.py'): ('project',
         (u'home',
          ''))}
 [user attributes]
-debug.breakpoints = {loc('Downloader.py'): {94: (0,
+debug.breakpoints = {loc('../../../../../../../../../../Data/Programming/Kodi/plugin.video.playstream/resources/lib/content/sources/enigma2.py'): {122L: (0,
+        None,
+        1,
+        0)},
+                     loc('Downloader.py'): {94: (0,
         None,
         1,
         0),
@@ -333,7 +337,48 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                               ('browser',
                                'tall',
                                0,
-                               {'all_tree_states': {loc('../../../$Setup/Python/Libs/pyglet-1.0-docs/examples/programming_guide/hello_world.py'): {'c'\
+                               {'all_tree_states': {loc('../../../../../../../Python27/lib/lib-tk/Tkinter.py'): {'e'\
+        'xpanded-nodes': [],
+        'selected-nodes': [],
+        'top-node': [('function def',
+                      loc('../../../../../../../Python27/lib/lib-tk/Tkinter.py'),
+                      'At')]},
+        loc('../../../../../Python27/lib/lib-tk/Tkinter.py'): {'expanded-nod'\
+        'es': [],
+        'selected-nodes': [],
+        'top-node': [('function def',
+                      loc('../../../../../Python27/lib/lib-tk/Tkinter.py'),
+                      'At')]},
+        loc('../../../../../Python27/lib/lib-tk/tkCommonDialog.py'): {'expan'\
+        'ded-nodes': [],
+        'selected-nodes': [],
+        'top-node': [('class def',
+                      loc('../../../../../Python27/lib/lib-tk/tkCommonDialog.py'),
+                      'Dialog')]},
+        loc('../../../../../Python27/lib/lib-tk/tkMessageBox.py'): {'expande'\
+        'd-nodes': [],
+        'selected-nodes': [],
+        'top-node': [('generic attribute',
+                      loc('../../../../../Python27/lib/lib-tk/tkMessageBox.py'),
+                      'ABORT')]},
+        loc('../../../../../Python27/lib/lib-tk/tkSimpleDialog.py'): {'expan'\
+        'ded-nodes': [],
+        'selected-nodes': [],
+        'top-node': [('function def',
+                      loc('../../../../../Python27/lib/lib-tk/tkSimpleDialog.py'),
+                      'askfloat')]},
+        loc('../../../../../Python27/lib/lib-tk/ttk.py'): {'expanded-nodes': [],
+        'selected-nodes': [],
+        'top-node': [('class def',
+                      loc('../../../../../Python27/lib/lib-tk/ttk.py'),
+                      'Button')]},
+        loc('../../../../../Python27/lib/site-packages/PIL/Image.py'): {'exp'\
+        'anded-nodes': [],
+        'selected-nodes': [],
+        'top-node': [('generic attribute',
+                      loc('../../../../../Python27/lib/site-packages/PIL/Image.py'),
+                      'ADAPTIVE')]},
+        loc('../../../$Setup/Python/Libs/pyglet-1.0-docs/examples/programming_guide/hello_world.py'): {'c'\
         'olumn-widths': [1.0],
         'expanded-nodes': [],
         'selected-nodes': [],
@@ -815,59 +860,18 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                       'top-node': [('generic attribute',
         loc('../vietas/vietas2.py'),
         'd_lat')]},
-        loc('../../../../../Python27/lib/lib-tk/Tkinter.py'): {'expanded-nod'\
-        'es': [],
-        'selected-nodes': [],
-        'top-node': [('function def',
-                      loc('../../../../../Python27/lib/lib-tk/Tkinter.py'),
-                      'At')]},
-        loc('../../../../../Python27/lib/lib-tk/tkCommonDialog.py'): {'expan'\
-        'ded-nodes': [],
-        'selected-nodes': [],
-        'top-node': [('class def',
-                      loc('../../../../../Python27/lib/lib-tk/tkCommonDialog.py'),
-                      'Dialog')]},
-        loc('../../../../../Python27/lib/lib-tk/tkMessageBox.py'): {'expande'\
-        'd-nodes': [],
-        'selected-nodes': [],
-        'top-node': [('generic attribute',
-                      loc('../../../../../Python27/lib/lib-tk/tkMessageBox.py'),
-                      'ABORT')]},
-        loc('../../../../../Python27/lib/lib-tk/tkSimpleDialog.py'): {'expan'\
-        'ded-nodes': [],
-        'selected-nodes': [],
-        'top-node': [('function def',
-                      loc('../../../../../Python27/lib/lib-tk/tkSimpleDialog.py'),
-                      'askfloat')]},
-        loc('../../../../../Python27/lib/lib-tk/ttk.py'): {'expanded-nodes': [],
-        'selected-nodes': [],
-        'top-node': [('class def',
-                      loc('../../../../../Python27/lib/lib-tk/ttk.py'),
-                      'Button')]},
-        loc('../../../../../Python27/lib/site-packages/PIL/Image.py'): {'exp'\
-        'anded-nodes': [],
-        'selected-nodes': [],
-        'top-node': [('generic attribute',
-                      loc('../../../../../Python27/lib/site-packages/PIL/Image.py'),
-                      'ADAPTIVE')]},
-        loc('../../../../../../../Python27/lib/lib-tk/Tkinter.py'): {'expand'\
-        'ed-nodes': [],
-        'selected-nodes': [],
-        'top-node': [('function def',
-                      loc('../../../../../../../Python27/lib/lib-tk/Tkinter.py'),
-                      'At')]},
-        loc('unknown:<untitled> #5'): {'expanded-nodes': [],
+        loc('unknown:<untitled> #4'): {'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #6'): {'expanded-nodes': [],
+        loc('unknown:<untitled> #6'): {'column-widths': [1.0],
+                                       'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        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'): {'column-widths': [1.0],
-                                       'expanded-nodes': [],
+        loc('unknown:<untitled> #3'): {'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None}},
                                 'browse_mode': u'Current Module',
@@ -1061,42 +1065,19 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                        'selection_end': 174L,
                        'selection_start': 174L,
                        'zoom': 0L})],
-        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('run.py'),
-        {'attrib-starts': [],
-         'first-line': 717L,
+        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('sources/enigma2.py'),
+        {'attrib-starts': [('Source',
+                            31),
+                           ('Source.get_content',
+                            56)],
+         'first-line': 49L,
          'folded-linenos': [],
-         'sel-line': 733L,
-         'sel-line-start': 29517L,
-         'selection_end': 29528L,
-         'selection_start': 29521L,
+         'sel-line': 58L,
+         'sel-line-start': 2053L,
+         'selection_end': 2053L,
+         'selection_start': 2053L,
          'zoom': 0L},
-        1536008661.996],
-        [loc('sources/enigma2.py'),
-         {'attrib-starts': [('Source',
-                             31),
-                            ('Source.get_content',
-                             56)],
-          'first-line': 45L,
-          'folded-linenos': [],
-          'sel-line': 58L,
-          'sel-line-start': 2053L,
-          'selection_end': 2112L,
-          'selection_start': 2112L,
-          'zoom': 0L},
-         1536008669.221],
-        [loc('sources/enigma2.py'),
-         {'attrib-starts': [('Source',
-                             31),
-                            ('Source.get_content',
-                             56)],
-          'first-line': 49L,
-          'folded-linenos': [],
-          'sel-line': 58L,
-          'sel-line-start': 2053L,
-          'selection_end': 2053L,
-          'selection_start': 2053L,
-          'zoom': 0L},
-         1536008716.399],
+        1536008716.399],
         [loc('sources/enigma2.py'),
          {'attrib-starts': [('Source',
                              31),
@@ -1308,9 +1289,35 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
           'selection_end': 3554L,
           'selection_start': 3540L,
           'zoom': 0L},
-         1536009988.528]],
+         1536009988.528],
+        [loc('sources/enigma2.py'),
+         {'attrib-starts': [('Source',
+                             31),
+                            ('Source.__init__',
+                             33)],
+          'first-line': 21L,
+          'folded-linenos': [],
+          'sel-line': 47L,
+          'sel-line-start': 1575L,
+          'selection_end': 1630L,
+          'selection_start': 1630L,
+          'zoom': 0L},
+         1536016931.751],
+        [loc('../../../../../../../../../../Data/Programming/Kodi/plugin.video.playstream/resources/lib/content/sources/enigma2.py'),
+         {'attrib-starts': [('Source',
+                             31),
+                            ('Source.__init__',
+                             33)],
+          'first-line': 31L,
+          'folded-linenos': [],
+          'sel-line': 48L,
+          'sel-line-start': 1665L,
+          'selection_end': 1684L,
+          'selection_start': 1684L,
+          'zoom': 0L},
+         1536016982.591]],
         20),
-        'current-loc': loc('sources/enigma2.py'),
+        'current-loc': loc('../../../../../../../../../../Data/Programming/Kodi/plugin.video.playstream/resources/lib/content/sources/enigma2.py'),
         'editor-state-list': [(loc('run.py'),
                                {'attrib-starts': [],
                                 'first-line': 717L,
@@ -1450,6 +1457,18 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 'sel-line-start': 1575L,
                                 'selection_end': 1630L,
                                 'selection_start': 1630L,
+                                'zoom': 0L}),
+                              (loc('../../../../../../../../../../Data/Programming/Kodi/plugin.video.playstream/resources/lib/content/sources/enigma2.py'),
+                               {'attrib-starts': [('Source',
+        31),
+        ('Source.get_streams',
+         125)],
+                                'first-line': 115L,
+                                'folded-linenos': [],
+                                'sel-line': 140L,
+                                'sel-line-start': 5399L,
+                                'selection_end': 5439L,
+                                'selection_start': 5439L,
                                 'zoom': 0L})],
         'has-focus': True,
         'locked': False},
@@ -1463,7 +1482,8 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
          loc('changelog.md'),
          loc('sources/filmix.py'),
          loc('sources/filmas.py'),
-         loc('sources/enigma2.py')]),
+         loc('sources/enigma2.py'),
+         loc('../../../../../../../../../../Data/Programming/Kodi/plugin.video.playstream/resources/lib/content/sources/enigma2.py')]),
                                'open_files': [u'changelog.md',
         u'run.py',
         u'sources/config.py',
@@ -1474,7 +1494,8 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         u'sources/replay.py',
         u'sources/tvplay.py',
         u'util.py',
-        u'sources/enigma2.py']},
+        u'sources/enigma2.py',
+        u'../../../../../../../../../../Data/Programming/Kodi/plugin.video.playstream/resources/lib/content/sources/enigma2.py']},
         'saved_notebook_display': None,
         'split_percents': {0: 0.587782340862423},
         'splits': 2,
@@ -1489,7 +1510,8 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                          0,
                          2393,
                          1440)}]}
-guimgr.recent-documents = [loc('sources/enigma2.py'),
+guimgr.recent-documents = [loc('../../../../../../../../../../Data/Programming/Kodi/plugin.video.playstream/resources/lib/content/sources/enigma2.py'),
+                           loc('sources/enigma2.py'),
                            loc('util.py'),
                            loc('run.py'),
                            loc('sources/ltc.py'),
@@ -1500,7 +1522,83 @@ guimgr.recent-documents = [loc('sources/enigma2.py'),
                            loc('sources/filmas.py'),
                            loc('changelog.md'),
                            loc('sources/config.py')]
-guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
+guimgr.visual-state = {loc('../../../../../../../Python27/lib/lib-tk/Tkinter.py'): {'a'\
+        'ttrib-starts': [],
+        'first-line': 0L,
+        'folded-linenos': [],
+        'sel-line': 0L,
+        'sel-line-start': 0L,
+        'selection_end': 0L,
+        'selection_start': 0L,
+        'zoom': 0L},
+                       loc('../../../../../Python27/lib/ftplib.py'): {'attri'\
+        'b-starts': [],
+        'first-line': 0L,
+        'folded-linenos': [],
+        'sel-line': 0L,
+        'sel-line-start': 0L,
+        'selection_end': 0L,
+        'selection_start': 0L,
+        'zoom': 0L},
+                       loc('../../../../../Python27/lib/lib-tk/Tkinter.py'): {'a'\
+        'ttrib-starts': [('CallWrapper',
+                          1528),
+                         ('CallWrapper.__call__',
+                          1536)],
+        'first-line': 1537L,
+        'folded-linenos': [],
+        'sel-line': 1542L,
+        'sel-line-start': 60799L,
+        'selection_end': 60799L,
+        'selection_start': 60799L,
+        'zoom': 0L},
+                       loc('../../../../../Python27/lib/lib-tk/tkCommonDialog.py'): {'a'\
+        'ttrib-starts': [('Dialog',
+                          12)],
+        'first-line': 12L,
+        'folded-linenos': [],
+        'sel-line': 12L,
+        'sel-line-start': 298L,
+        'selection_end': 298L,
+        'selection_start': 298L,
+        'zoom': 0L},
+                       loc('../../../../../Python27/lib/lib-tk/tkSimpleDialog.py'): {'a'\
+        'ttrib-starts': [('Dialog',
+                          29),
+                         ('Dialog.__init__',
+                          36)],
+        'first-line': 61L,
+        'folded-linenos': [],
+        'sel-line': 76L,
+        'sel-line-start': 1627L,
+        'selection_end': 1686L,
+        'selection_start': 1686L,
+        'zoom': 0L},
+                       loc('../../../../../Python27/lib/site-packages/requests/adapters.py'): {'a'\
+        'ttrib-starts': [('HTTPAdapter',
+                          80),
+                         ('HTTPAdapter.send',
+                          387)],
+        'first-line': 493L,
+        'folded-linenos': [],
+        'sel-line': 505L,
+        'sel-line-start': 20166L,
+        'selection_end': 20166L,
+        'selection_start': 20166L,
+        'zoom': 0L},
+                       loc('../../../../../Python27/lib/site-packages/requests/models.py'): {'a'\
+        'ttrib-starts': [('Response',
+                          577),
+                         ('Response.content',
+                          810)],
+        'first-line': 819L,
+        'folded-linenos': [],
+        'sel-line': 827L,
+        'sel-line-start': 29594L,
+        'selection_end': 29594L,
+        'selection_start': 29594L,
+        'zoom': 0L},
+                       loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
         'ib-starts': [('NavigableString',
                        354),
                       ('NavigableString.__getattr__',
@@ -1993,82 +2091,6 @@ guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
         'sel-line-start': 0,
         'selection_end': 1,
         'selection_start': 1},
-                       loc('../../../../../Python27/lib/ftplib.py'): {'attri'\
-        'b-starts': [],
-        'first-line': 0L,
-        'folded-linenos': [],
-        'sel-line': 0L,
-        'sel-line-start': 0L,
-        'selection_end': 0L,
-        'selection_start': 0L,
-        'zoom': 0L},
-                       loc('../../../../../Python27/lib/lib-tk/Tkinter.py'): {'a'\
-        'ttrib-starts': [('CallWrapper',
-                          1528),
-                         ('CallWrapper.__call__',
-                          1536)],
-        'first-line': 1537L,
-        'folded-linenos': [],
-        'sel-line': 1542L,
-        'sel-line-start': 60799L,
-        'selection_end': 60799L,
-        'selection_start': 60799L,
-        'zoom': 0L},
-                       loc('../../../../../Python27/lib/lib-tk/tkCommonDialog.py'): {'a'\
-        'ttrib-starts': [('Dialog',
-                          12)],
-        'first-line': 12L,
-        'folded-linenos': [],
-        'sel-line': 12L,
-        'sel-line-start': 298L,
-        'selection_end': 298L,
-        'selection_start': 298L,
-        'zoom': 0L},
-                       loc('../../../../../Python27/lib/lib-tk/tkSimpleDialog.py'): {'a'\
-        'ttrib-starts': [('Dialog',
-                          29),
-                         ('Dialog.__init__',
-                          36)],
-        'first-line': 61L,
-        'folded-linenos': [],
-        'sel-line': 76L,
-        'sel-line-start': 1627L,
-        'selection_end': 1686L,
-        'selection_start': 1686L,
-        'zoom': 0L},
-                       loc('../../../../../Python27/lib/site-packages/requests/adapters.py'): {'a'\
-        'ttrib-starts': [('HTTPAdapter',
-                          80),
-                         ('HTTPAdapter.send',
-                          387)],
-        'first-line': 493L,
-        'folded-linenos': [],
-        'sel-line': 505L,
-        'sel-line-start': 20166L,
-        'selection_end': 20166L,
-        'selection_start': 20166L,
-        'zoom': 0L},
-                       loc('../../../../../Python27/lib/site-packages/requests/models.py'): {'a'\
-        'ttrib-starts': [('Response',
-                          577),
-                         ('Response.content',
-                          810)],
-        'first-line': 819L,
-        'folded-linenos': [],
-        'sel-line': 827L,
-        'sel-line-start': 29594L,
-        'selection_end': 29594L,
-        'selection_start': 29594L,
-        'zoom': 0L},
-                       loc('../../../../../../../Python27/lib/lib-tk/Tkinter.py'): {'a'\
-        'ttrib-starts': [],
-        'first-line': 0L,
-        'folded-linenos': [],
-        'sel-line': 0L,
-        'sel-line-start': 0L,
-        'selection_end': 0L,
-        'selection_start': 0L,
-        'zoom': 0L},
                        loc('x-wingide-zip://C:/Python25/Lib/site-packages/argparse-1.1-py2.5.egg//argparse.py'): {'a'\
         'ttrib-starts': [('_ActionsContainer',
                           1187),

sources/enigma2.py

@@ -138,7 +138,7 @@ Accept-Language: en-US,en;q=0.5
             event = r2["now"]
         title, img, desc = self.get_title_desc(event)
 
-        r = self.call(data)
+        r = self._http_request(self.url+data)
         m =  re.search("(http(s)*:.+)", r)
         if not m:
             raise Exception("No streams found!")