Labota kļūda filmix (strādā ar video, kur nav dažādu rezolūciju)

PlayStream.wpr

@@ -120,7 +120,7 @@ debug.breakpoints = {loc('gstreamer/player-minimal.py'): {12: (0,
         None,
         1,
         0),
-        118: (0,
+        119: (0,
               None,
               1,
               0),
@@ -128,7 +128,7 @@ debug.breakpoints = {loc('gstreamer/player-minimal.py'): {12: (0,
               None,
               1,
               0),
-        283: (0,
+        286: (0,
               None,
               1,
               0)},
@@ -5117,8 +5117,8 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                {'tree-state': []})],
                  'primary_view_state': {'area': 'wide',
         'constraint': None,
-        'current_pages': [1,
-                          1],
+        'current_pages': [3,
+                          0],
         'notebook_display': 'normal',
         'notebook_percent': 0.40625,
         'override_title': None,
@@ -5168,7 +5168,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                        'fRegexFlags': 46,
                                        'fReplaceText': u'self.',
                                        'fReverse': False,
-                                       'fSearchText': u'gst-',
+                                       'fSearchText': u'eServiceReference',
                                        'fStartPos': 0,
                                        'fStyle': 'text',
                                        'fWholeWords': False,
@@ -5225,17 +5225,16 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         -1,
         -1),
                        'attrib-starts': [],
-                       'first-line': 1215,
+                       'first-line': 0,
                        'folded-linenos': [],
                        'history': {u'file:C:/Data/Programming/enigma2/PlayStream2/ContentSources.py': ['u'\
-        'rl\n',
-        'print r\n',
-        'print url\n']},
+        'rl0\n',
+        'print url0\n']},
                        'launch-id': None,
-                       'sel-line': 1225,
-                       'sel-line-start': 82159,
-                       'selection_end': 82269,
-                       'selection_start': 82159}),
+                       'sel-line': 3,
+                       'sel-line-start': 114,
+                       'selection_end': 208,
+                       'selection_start': 114}),
                      ('debug-watch',
                       'wide',
                       1,
@@ -5289,166 +5288,181 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                       {})],
         'primary_view_state': {'editor_states': ('vertical',
         1.0,
-        ({'bookmarks': ([[loc('util.py'),
-                          {'attrib-starts': [('play_video',
-        49)],
-                           'first-line': 0,
+        ({'bookmarks': ([[loc('PlayStream.py'),
+                          {'attrib-starts': [('PSPlayer',
+        91),
+        ('PSPlayer.__init__',
+         92)],
+                           'first-line': 107,
                            'folded-linenos': [],
-                           'sel-line': 70,
-                           'sel-line-start': 1928,
-                           'selection_end': 1928,
-                           'selection_start': 1928},
-                          1481149538.99],
-                         [loc('util.py'),
-                          {'attrib-starts': [('play_video',
-        49)],
-                           'first-line': 66,
+                           'sel-line': 119,
+                           'sel-line-start': 4948,
+                           'selection_end': 4979,
+                           'selection_start': 4972},
+                          1481480932.314],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [('PSPlayer',
+        91),
+        ('PSPlayer.play_service',
+         220)],
+                           'first-line': 203,
                            'folded-linenos': [],
-                           'sel-line': 83,
-                           'sel-line-start': 2447,
-                           'selection_end': 2486,
-                           'selection_start': 2485},
-                          1481149540.094],
-                         [loc('util.py'),
-                          {'attrib-starts': [('player',
-        86)],
-                           'first-line': 76,
+                           'sel-line': 220,
+                           'sel-line-start': 8608,
+                           'selection_end': 8628,
+                           'selection_start': 8621},
+                          1481480936.264],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [('PSPlayer',
+        91),
+        ('PSPlayer.play_service',
+         220)],
+                           'first-line': 203,
                            'folded-linenos': [],
-                           'sel-line': 97,
-                           'sel-line-start': 3194,
-                           'selection_end': 3215,
-                           'selection_start': 3204},
-                          1481371034.176],
-                         [loc('ContentSources.py'),
-                          {'attrib-starts': [('ContentSources',
-        15),
-        ('ContentSources.get_streams',
-         74)],
-                           'first-line': 87,
+                           'sel-line': 220,
+                           'sel-line-start': 8608,
+                           'selection_end': 8641,
+                           'selection_start': 8634},
+                          1481480936.679],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [('PSPlayer',
+        91),
+        ('PSPlayer.play_service',
+         220)],
+                           'first-line': 210,
                            'folded-linenos': [],
-                           'sel-line': 94,
-                           'sel-line-start': 3796,
-                           'selection_end': 3829,
-                           'selection_start': 3829},
-                          1481371054.748],
-                         [loc('sources/replay.py'),
-                          {'attrib-starts': [('Source',
-        25),
-        ('Source.get_content',
-         36)],
-                           'first-line': 233,
+                           'sel-line': 221,
+                           'sel-line-start': 8644,
+                           'selection_end': 8678,
+                           'selection_start': 8671},
+                          1481480938.579],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [('PSPlayer',
+        91),
+        ('PSPlayer.service_info',
+         231)],
+                           'first-line': 220,
                            'folded-linenos': [],
-                           'sel-line': 245,
-                           'sel-line-start': 13416,
-                           'selection_end': 13416,
-                           'selection_start': 13416},
-                          1481371071.983],
-                         [loc('sources/SourceBase.py'),
-                          {'attrib-starts': [('SourceBase',
-        18),
-        ('SourceBase.get_streams',
-         47)],
-                           'first-line': 42,
+                           'sel-line': 231,
+                           'sel-line-start': 8885,
+                           'selection_end': 8900,
+                           'selection_start': 8893},
+                          1481480940.845],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [('PSPlayer',
+        91),
+        ('PSPlayer.service_info',
+         231)],
+                           'first-line': 220,
                            'folded-linenos': [],
-                           'sel-line': 59,
-                           'sel-line-start': 2232,
-                           'selection_end': 2232,
-                           'selection_start': 2232},
-                          1481371086.367],
-                         [loc('ContentSources.py'),
-                          {'attrib-starts': [('ContentSources',
-        15),
-        ('ContentSources.get_streams',
-         74)],
-                           'first-line': 87,
+                           'sel-line': 232,
+                           'sel-line-start': 8913,
+                           'selection_end': 8957,
+                           'selection_start': 8950},
+                          1481480941.345],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [('PSPlayer',
+        91),
+        ('PSPlayer.cb_select_stream',
+         259)],
+                           'first-line': 247,
                            'folded-linenos': [],
-                           'sel-line': 94,
-                           'sel-line-start': 3796,
-                           'selection_end': 3796,
-                           'selection_start': 3796},
-                          1481371095.354],
-                         [loc('util.py'),
-                          {'attrib-starts': [('play_video',
-        49)],
-                           'first-line': 67,
+                           'sel-line': 264,
+                           'sel-line-start': 10414,
+                           'selection_end': 10429,
+                           'selection_start': 10422},
+                          1481480944.288],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [('PSPlayer',
+        91),
+        ('PSPlayer.cb_select_stream',
+         259)],
+                           'first-line': 247,
                            'folded-linenos': [],
-                           'sel-line': 84,
-                           'sel-line-start': 2507,
-                           'selection_end': 2507,
-                           'selection_start': 2507},
-                          1481414443.715],
-                         [loc('ContentSources.py'),
-                          {'attrib-starts': [('ContentSources',
-        15),
-        ('ContentSources.get_streams',
-         74)],
-                           'first-line': 87,
+                           'sel-line': 264,
+                           'sel-line-start': 10414,
+                           'selection_end': 10444,
+                           'selection_start': 10437},
+                          1481480944.786],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [('PSPlayer',
+        91),
+        ('PSPlayer.cb_select_stream',
+         259)],
+                           'first-line': 255,
                            'folded-linenos': [],
-                           'sel-line': 94,
-                           'sel-line-start': 3796,
-                           'selection_end': 3796,
-                           'selection_start': 3796},
-                          1481414529.33],
-                         [loc('sources/kinofilmnet.py'),
-                          {'attrib-starts': [('Source',
-        23),
-        ('Source.get_streams',
-         149)],
-                           'first-line': 154,
+                           'sel-line': 266,
+                           'sel-line-start': 10544,
+                           'selection_end': 10569,
+                           'selection_start': 10562},
+                          1481480950.986],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [('PSPlayer',
+        91),
+        ('PSPlayer.cb_select_stream',
+         259)],
+                           'first-line': 255,
                            'folded-linenos': [],
-                           'sel-line': 166,
-                           'sel-line-start': 7521,
-                           'selection_end': 7521,
-                           'selection_start': 7521},
-                          1481415143.712],
-                         [loc('ContentSources.py'),
-                          {'attrib-starts': [('ContentSources',
-        15),
-        ('ContentSources.get_streams',
-         74)],
-                           'first-line': 87,
+                           'sel-line': 266,
+                           'sel-line-start': 10544,
+                           'selection_end': 10577,
+                           'selection_start': 10570},
+                          1481480951.379],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [('PSPlayer',
+        91),
+        ('PSPlayer.serviceStarted',
+         268)],
+                           'first-line': 255,
                            'folded-linenos': [],
-                           'sel-line': 94,
-                           'sel-line-start': 3796,
-                           'selection_end': 3796,
-                           'selection_start': 3796},
-                          1481415159.443],
-                         [loc('sources/ustvnow.py'),
-                          {'attrib-starts': [('Source',
-        28),
-        ('Source.login',
-         44)],
-                           'first-line': 55,
+                           'sel-line': 268,
+                           'sel-line-start': 10580,
+                           'selection_end': 10595,
+                           'selection_start': 10588},
+                          1481480951.763],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [('PSPlayer',
+        91),
+        ('PSPlayer.serviceStarted',
+         268)],
+                           'first-line': 255,
                            'folded-linenos': [],
-                           'sel-line': 57,
-                           'sel-line-start': 2180,
-                           'selection_end': 2223,
-                           'selection_start': 2223},
-                          1481416133.375],
-                         [loc('ContentSources.py'),
-                          {'attrib-starts': [('ContentSources',
-        15),
-        ('ContentSources.get_streams',
-         74)],
-                           'first-line': 87,
+                           'sel-line': 269,
+                           'sel-line-start': 10610,
+                           'selection_end': 10632,
+                           'selection_start': 10625},
+                          1481480952.102],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [('MainScreen',
+        324),
+        ('MainScreen.cb_item_menu',
+         626)],
+                           'first-line': 620,
                            'folded-linenos': [],
-                           'sel-line': 94,
-                           'sel-line-start': 3796,
-                           'selection_end': 3796,
-                           'selection_start': 3796},
-                          1481416147.512],
-                         [loc('sources/ustvnow.py'),
-                          {'attrib-starts': [('Source',
-        28),
-        ('Source.login',
-         44)],
-                           'first-line': 47,
+                           'sel-line': 637,
+                           'sel-line-start': 26848,
+                           'selection_end': 26891,
+                           'selection_start': 26884},
+                          1481480953.804],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [],
+                           'first-line': 9,
+                           'folded-linenos': [],
+                           'sel-line': 14,
+                           'sel-line-start': 466,
+                           'selection_end': 512,
+                           'selection_start': 495},
+                          1481480965.376],
+                         [loc('PlayStream.py'),
+                          {'attrib-starts': [('make_service',
+        54)],
+                           'first-line': 53,
                            'folded-linenos': [],
-                           'sel-line': 63,
-                           'sel-line-start': 2478,
-                           'selection_end': 2478,
-                           'selection_start': 2478},
-                          1481416278.649],
+                           'sel-line': 69,
+                           'sel-line-start': 2647,
+                           'selection_end': 2658,
+                           'selection_start': 2651},
+                          1481917205.656],
                          [loc('ContentSources.py'),
                           {'attrib-starts': [('ContentSources',
         15),
@@ -5460,19 +5474,19 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                            'sel-line-start': 3796,
                            'selection_end': 3796,
                            'selection_start': 3796},
-                          1481416290.17],
-                         [loc('sources/ustvnow.py'),
+                          1481918254.999],
+                         [loc('sources/filmix.py'),
                           {'attrib-starts': [('Source',
-        28),
-        ('Source.login',
-         44)],
-                           'first-line': 41,
+        24),
+        ('Source.get_streams2',
+         253)],
+                           'first-line': 247,
                            'folded-linenos': [],
-                           'sel-line': 53,
-                           'sel-line-start': 2010,
-                           'selection_end': 2040,
-                           'selection_start': 2040},
-                          1481416344.922],
+                           'sel-line': 255,
+                           'sel-line-start': 11626,
+                           'selection_end': 11643,
+                           'selection_start': 11643},
+                          1481918487.272],
                          [loc('ContentSources.py'),
                           {'attrib-starts': [('ContentSources',
         15),
@@ -5484,43 +5498,31 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                            'sel-line-start': 3796,
                            'selection_end': 3796,
                            'selection_start': 3796},
-                          1481416358.672],
-                         [loc('sources/ustvnow.py'),
+                          1481918504.366],
+                         [loc('sources/filmix.py'),
                           {'attrib-starts': [('Source',
-        28),
-        ('Source.login',
-         44)],
-                           'first-line': 48,
-                           'folded-linenos': [],
-                           'sel-line': 56,
-                           'sel-line-start': 2058,
-                           'selection_end': 2066,
-                           'selection_start': 2066},
-                          1481416411.631],
-                         [loc('ContentSources.py'),
-                          {'attrib-starts': [('ContentSources',
-        15),
-        ('ContentSources.get_streams',
-         74)],
-                           'first-line': 87,
+        24),
+        ('Source.get_content',
+         49)],
+                           'first-line': 107,
                            'folded-linenos': [],
-                           'sel-line': 94,
-                           'sel-line-start': 3796,
-                           'selection_end': 3796,
-                           'selection_start': 3796},
-                          1481416424.704],
-                         [loc('sources/ustvnow.py'),
+                           'sel-line': 120,
+                           'sel-line-start': 4810,
+                           'selection_end': 4810,
+                           'selection_start': 4810},
+                          1481918537.137],
+                         [loc('sources/filmix.py'),
                           {'attrib-starts': [('Source',
-        28),
-        ('Source.login',
-         44)],
-                           'first-line': 48,
+        24),
+        ('Source.get_streams2',
+         253)],
+                           'first-line': 245,
                            'folded-linenos': [],
-                           'sel-line': 59,
-                           'sel-line-start': 2351,
-                           'selection_end': 2351,
-                           'selection_start': 2351},
-                          1481416464.308]],
+                           'sel-line': 253,
+                           'sel-line-start': 11549,
+                           'selection_end': 11573,
+                           'selection_start': 11573},
+                          1481918585.247]],
                         20),
           'current-loc': loc('ContentSources.py'),
           'editor-state-list': [(loc('plugin.py'),
@@ -5533,16 +5535,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                   'selection_end': 208,
                                   'selection_start': 199}),
                                 (loc('PlayStream.py'),
-                                 {'attrib-starts': [('PSPlayer',
-        91),
-        ('PSPlayer.__init__',
-         92)],
-                                  'first-line': 94,
+                                 {'attrib-starts': [('make_service',
+        54)],
+                                  'first-line': 53,
                                   'folded-linenos': [],
-                                  'sel-line': 100,
-                                  'sel-line-start': 4102,
-                                  'selection_end': 4110,
-                                  'selection_start': 4110}),
+                                  'sel-line': 69,
+                                  'sel-line-start': 2647,
+                                  'selection_end': 2658,
+                                  'selection_start': 2651}),
                                 (loc('util.py'),
                                  {'attrib-starts': [('play_video',
         49)],
@@ -5660,14 +5660,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                 (loc('sources/filmix.py'),
                                  {'attrib-starts': [('Source',
         24),
-        ('Source.get_content',
-         49)],
-                                  'first-line': 106,
+        ('Source.get_streams2',
+         253)],
+                                  'first-line': 245,
                                   'folded-linenos': [],
-                                  'sel-line': 117,
-                                  'sel-line-start': 4649,
-                                  'selection_end': 4649,
-                                  'selection_start': 4649}),
+                                  'sel-line': 253,
+                                  'sel-line-start': 11549,
+                                  'selection_end': 11573,
+                                  'selection_start': 11573}),
                                 (loc('sources/replay.py'),
                                  {'attrib-starts': [('Source',
         25),
@@ -6079,20 +6079,20 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
           loc('../python/Components/GUISkin.py'),
           loc('sources/replay.py')])),
                                'open_files': [u'ChoiceBox.py',
-        u'PlayStream.py',
         u'plugin.py',
         u'resolvers/hdgo.py',
         u'sniplets.py',
         u'sources/euronews.py',
-        u'sources/filmix.py',
         u'sources/iplayer.py',
+        u'sources/kinofilmnet.py',
         u'sources/ltc.py',
-        u'sources/viaplay.py',
-        u'../python/Components/GUISkin.py',
         u'sources/replay.py',
-        u'util.py',
-        u'sources/kinofilmnet.py',
         u'sources/ustvnow.py',
+        u'sources/viaplay.py',
+        u'util.py',
+        u'../python/Components/GUISkin.py',
+        u'PlayStream.py',
+        u'sources/filmix.py',
         u'ContentSources.py']},
         'saved_notebook_display': None,
         'split_percents': {0: 0.33756345177664976},
@@ -6109,13 +6109,13 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                          2405,
                          1376)}]}
 guimgr.recent-documents = [loc('ContentSources.py'),
+                           loc('sources/filmix.py'),
+                           loc('PlayStream.py'),
+                           loc('../python/Components/GUISkin.py'),
+                           loc('util.py'),
                            loc('sources/ustvnow.py'),
                            loc('sources/kinofilmnet.py'),
-                           loc('util.py'),
                            loc('sources/replay.py'),
-                           loc('PlayStream.py'),
-                           loc('../python/Components/GUISkin.py'),
-                           loc('sources/filmix.py'),
                            loc('sources/ltc.py'),
                            loc('sniplets.py'),
                            loc('ChoiceBox.py'),
@@ -6776,6 +6776,25 @@ guimgr.visual-state = {loc('../../Kodi/test2/plugin.video.aaa/addon.py'): {'a'\
         'sel-line-start': 4043,
         'selection_end': 4043,
         'selection_start': 4043},
+                       loc('../../../../Python27/Lib/site-packages/gi/__init__.py'): {'a'\
+        'ttrib-starts': [],
+        'first-line': 24,
+        'folded-linenos': [],
+        'sel-line': 41,
+        'sel-line-start': 1595,
+        'selection_end': 1595,
+        'selection_start': 1595},
+                       loc('../../../../Python27/Lib/site-packages/gi/module.py'): {'a'\
+        'ttrib-starts': [('IntrospectionModule',
+                          110),
+                         ('IntrospectionModule.__getattr__',
+                          132)],
+        'first-line': 121,
+        'folded-linenos': [],
+        'sel-line': 136,
+        'sel-line-start': 4187,
+        'selection_end': 4187,
+        'selection_start': 4187},
                        loc('../../../../Python27/Lib/site-packages/gi/overrides/Gst.py'): {'a'\
         'ttrib-starts': [],
         'first-line': 0,
@@ -6784,6 +6803,15 @@ guimgr.visual-state = {loc('../../Kodi/test2/plugin.video.aaa/addon.py'): {'a'\
         'sel-line-start': 0,
         'selection_end': 0,
         'selection_start': 0},
+                       loc('../../../../Python27/Lib/re.py'): {'attrib-start'\
+        's': [('findall',
+               172)],
+        'first-line': 162,
+        'folded-linenos': [],
+        'sel-line': 180,
+        'sel-line-start': 8708,
+        'selection_end': 8708,
+        'selection_start': 8708},
                        loc('../../../../Python27/Lib/site-packages/requests/adapters.py'): {'a'\
         'ttrib-starts': [('HTTPAdapter',
                           77),
@@ -6824,34 +6852,6 @@ guimgr.visual-state = {loc('../../Kodi/test2/plugin.video.aaa/addon.py'): {'a'\
         'sel-line-start': 2478,
         'selection_end': 2478,
         'selection_start': 2478},
-                       loc('../../../../Python27/lib/re.py'): {'attrib-start'\
-        's': [('findall',
-               172)],
-        'first-line': 162,
-        'folded-linenos': [],
-        'sel-line': 180,
-        'sel-line-start': 8708,
-        'selection_end': 8708,
-        'selection_start': 8708},
-                       loc('../../../../Python27/lib/site-packages/gi/__init__.py'): {'a'\
-        'ttrib-starts': [],
-        'first-line': 24,
-        'folded-linenos': [],
-        'sel-line': 41,
-        'sel-line-start': 1595,
-        'selection_end': 1595,
-        'selection_start': 1595},
-                       loc('../../../../Python27/lib/site-packages/gi/module.py'): {'a'\
-        'ttrib-starts': [('IntrospectionModule',
-                          110),
-                         ('IntrospectionModule.__getattr__',
-                          132)],
-        'first-line': 121,
-        'folded-linenos': [],
-        'sel-line': 136,
-        'sel-line-start': 4187,
-        'selection_end': 4187,
-        'selection_start': 4187},
                        loc('../../../../Python27/lib/site.py'): {'attrib-sta'\
         'rts': [('setquit',
                  333),
@@ -6876,7 +6876,9 @@ proj.pypath = {None: ('custom',
                       u'c:\\Data\\Programming\\enigma2\\python;')}
 search.replace-history = [u'self',
                           u'current']
-search.search-history = [u'gst',
+search.search-history = [u'eServiceReference',
+                         u'service',
+                         u'gst',
                          u'timer',
                          u'etimer',
                          u'text=',
@@ -6893,9 +6895,7 @@ search.search-history = [u'gst',
                          u'ChoiceList',
                          u'choiceli',
                          u'ChoiceEntryComponent',
-                         u'list',
-                         u'content',
-                         u'autoResize']
+                         u'list']
 testing.stored-results = (1,
                           [],
                           {})

sources/filmix.py

@@ -252,7 +252,10 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
         return result
     
     def get_streams2(self,url0):
-        res = re.search("\[([\d,]+)]",url0).group(1)
+        m = re.search("\[([\d,]+)]",url0)
+        if not m:
+            return [("?",url0)]
+        res = m.group(1)
         streams=[]
         for res in res.split(","):
             if not res: continue