Ivars 6 лет назад
Родитель
Сommit
752e7320a6
5 измененных файлов: 183 добавлений и 144 удалений
  1. 1
    1
      PlayStream.py
  2. 114
    117
      PlayStream.wpr
  3. 26
    0
      changelog.md
  4. 12
    8
      imake.bat
  5. 30
    18
      locale/plugin.pot

+ 1
- 1
PlayStream.py Просмотреть файл

@@ -6,7 +6,7 @@
6 6
 # Used fragments of code from enigma2-plugin-tv3play by Taapat (https://github.com/Taapat/enigma2-plugin-tv3play)
7 7
 #
8 8
 
9
-__version__ = "0.7u"
9
+__version__ = "0.8r"
10 10
 __id__ = "playstream"
11 11
 __title__ = "PlayStream"
12 12
 __author__ = "ivars777@gmail.com"

+ 114
- 117
PlayStream.wpr Просмотреть файл

@@ -428,7 +428,7 @@ debug.breakpoints = {loc('content/sources/config.py'): {171L: (0,
428 428
         None,
429 429
         1,
430 430
         0)},
431
-                     loc('../../../../Python27/Lib/site-packages/twisted/internet/_sslverify.py'): {1106L: (0,
431
+                     loc('../../../../Python27/lib/site-packages/twisted/internet/_sslverify.py'): {1106L: (0,
432 432
         None,
433 433
         1,
434 434
         0)}}
@@ -5155,7 +5155,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
5155 5155
                                {'tree-state': {'file-sort-method': 'by name',
5156 5156
         'list-files-first': False,
5157 5157
         'tree-states': {'deep': {'expanded-nodes': [],
5158
-                                 'selected-nodes': [(96,)],
5158
+                                 'selected-nodes': [(0,)],
5159 5159
                                  'top-node': (0,)}},
5160 5160
         'tree-style': 'deep'}}),
5161 5161
                               ('browser',
@@ -5692,40 +5692,40 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
5692 5692
         'top-node': [('function def',
5693 5693
                       loc('../../../../Python25/Lib/struct.py'),
5694 5694
                       'calcsize')]},
5695
-        loc('../../../../Python27/Lib/BaseHTTPServer.py'): {'expanded-nodes': [],
5695
+        loc('../../../../Python27/lib/BaseHTTPServer.py'): {'expanded-nodes': [],
5696 5696
         'selected-nodes': [],
5697 5697
         'top-node': [('class def',
5698
-                      loc('../../../../Python27/Lib/BaseHTTPServer.py'),
5698
+                      loc('../../../../Python27/lib/BaseHTTPServer.py'),
5699 5699
                       'BaseHTTPRequestHandler')]},
5700
-        loc('../../../../Python27/Lib/ConfigParser.py'): {'expanded-nodes': [],
5700
+        loc('../../../../Python27/lib/ConfigParser.py'): {'expanded-nodes': [],
5701 5701
         'selected-nodes': [],
5702 5702
         'top-node': [('class def',
5703
-                      loc('../../../../Python27/Lib/ConfigParser.py'),
5703
+                      loc('../../../../Python27/lib/ConfigParser.py'),
5704 5704
                       'ConfigParser')]},
5705
-        loc('../../../../Python27/Lib/site-packages/psycopg2/extras.py'): {'e'\
5705
+        loc('../../../../Python27/lib/site-packages/psycopg2/extras.py'): {'e'\
5706 5706
         'xpanded-nodes': [],
5707 5707
         'selected-nodes': [],
5708 5708
         'top-node': [('class def',
5709
-                      loc('../../../../Python27/Lib/site-packages/psycopg2/extras.py'),
5709
+                      loc('../../../../Python27/lib/site-packages/psycopg2/extras.py'),
5710 5710
                       'CompositeCaster')]},
5711
-        loc('../../../../Python27/Lib/site-packages/win32com/client/dynamic.py'): {'e'\
5711
+        loc('../../../../Python27/lib/site-packages/win32com/client/dynamic.py'): {'e'\
5712 5712
         'xpanded-nodes': [],
5713 5713
         'selected-nodes': [],
5714 5714
         'top-node': [('generic attribute',
5715
-                      loc('../../../../Python27/Lib/site-packages/win32com/client/dynamic.py'),
5715
+                      loc('../../../../Python27/lib/site-packages/win32com/client/dynamic.py'),
5716 5716
                       'ALL_INVOKE_TYPES')]},
5717
-        loc('unknown:<untitled> #4'): {'column-widths': [1.0],
5717
+        loc('unknown:<untitled> #3'): {'column-widths': [1.0],
5718 5718
                                        'expanded-nodes': [],
5719 5719
                                        'selected-nodes': [],
5720 5720
                                        'top-node': None},
5721
-        loc('unknown:<untitled> #2'): {'expanded-nodes': [],
5721
+        loc('unknown:<untitled> #1'): {'column-widths': [1.0],
5722
+                                       'expanded-nodes': [],
5722 5723
                                        'selected-nodes': [],
5723 5724
                                        'top-node': None},
5724
-        loc('unknown:<untitled> #3'): {'column-widths': [1.0],
5725
-                                       'expanded-nodes': [],
5725
+        loc('unknown:<untitled> #2'): {'expanded-nodes': [],
5726 5726
                                        'selected-nodes': [],
5727 5727
                                        'top-node': None},
5728
-        loc('unknown:<untitled> #1'): {'expanded-nodes': [],
5728
+        loc('unknown:<untitled> #4'): {'expanded-nodes': [],
5729 5729
                                        'selected-nodes': [],
5730 5730
                                        'top-node': None}},
5731 5731
                                 'browse_mode': u'Current Module',
@@ -5916,42 +5916,16 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
5916 5916
                        'toolbox-percent': 1.0,
5917 5917
                        'toolbox-tree-sel': ''})],
5918 5918
         'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('PlayStream.py'),
5919
-        {'attrib-starts': [('MainScreen',
5920
-                            93),
5921
-                           ('MainScreen.layout_finished',
5922
-                            133)],
5923
-         'first-line': 149L,
5919
+        {'attrib-starts': [('ConfigScreen',
5920
+                            1053)],
5921
+         'first-line': 1044L,
5924 5922
          'folded-linenos': [303L],
5925
-         'sel-line': 159L,
5926
-         'sel-line-start': 7486L,
5927
-         'selection_end': 7506L,
5928
-         'selection_start': 7506L,
5923
+         'sel-line': 1053L,
5924
+         'sel-line-start': 44495L,
5925
+         'selection_end': 44513L,
5926
+         'selection_start': 44501L,
5929 5927
          'zoom': 0L},
5930
-        1520765029.276],
5931
-        [loc('PlayStream.py'),
5932
-         {'attrib-starts': [('ConfigScreen',
5933
-                             1053),
5934
-                            ('ConfigScreen.select_tmp_dir',
5935
-                             1115)],
5936
-          'first-line': 1094L,
5937
-          'folded-linenos': [303L],
5938
-          'sel-line': 1120L,
5939
-          'sel-line-start': 48248L,
5940
-          'selection_end': 48279L,
5941
-          'selection_start': 48279L,
5942
-          'zoom': 0L},
5943
-         1520765145.141],
5944
-        [loc('PlayStream.py'),
5945
-         {'attrib-starts': [('ConfigScreen',
5946
-                             1053)],
5947
-          'first-line': 1044L,
5948
-          'folded-linenos': [303L],
5949
-          'sel-line': 1053L,
5950
-          'sel-line-start': 44495L,
5951
-          'selection_end': 44513L,
5952
-          'selection_start': 44501L,
5953
-          'zoom': 0L},
5954
-         1520765193.281],
5928
+        1520765193.281],
5955 5929
         [loc('PlayStream.py'),
5956 5930
          {'attrib-starts': [('MainScreen',
5957 5931
                              93),
@@ -6169,17 +6143,37 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
6169 6143
           'selection_end': 420L,
6170 6144
           'selection_start': 420L,
6171 6145
           'zoom': 0L},
6172
-         1520767034.408]],
6146
+         1520767034.408],
6147
+        [loc('changelog.md'),
6148
+         {'attrib-starts': [],
6149
+          'first-line': 6L,
6150
+          'folded-linenos': [],
6151
+          'sel-line': 18L,
6152
+          'sel-line-start': 489L,
6153
+          'selection_end': 529L,
6154
+          'selection_start': 529L,
6155
+          'zoom': 0L},
6156
+         1528028015.673],
6157
+        [loc('PlayStream.py'),
6158
+         {'attrib-starts': [],
6159
+          'first-line': 0L,
6160
+          'folded-linenos': [303L],
6161
+          'sel-line': 8L,
6162
+          'sel-line-start': 401L,
6163
+          'selection_end': 420L,
6164
+          'selection_start': 420L,
6165
+          'zoom': 0L},
6166
+         1528028021.646]],
6173 6167
         20),
6174
-        'current-loc': loc('changelog.md'),
6168
+        'current-loc': loc('PlayStream.py'),
6175 6169
         'editor-state-list': [(loc('changelog.md'),
6176 6170
                                {'attrib-starts': [],
6177
-                                'first-line': 0L,
6171
+                                'first-line': 6L,
6178 6172
                                 'folded-linenos': [],
6179
-                                'sel-line': 4L,
6180
-                                'sel-line-start': 197L,
6181
-                                'selection_end': 197L,
6182
-                                'selection_start': 197L,
6173
+                                'sel-line': 18L,
6174
+                                'sel-line-start': 489L,
6175
+                                'selection_end': 529L,
6176
+                                'selection_start': 529L,
6183 6177
                                 'zoom': 0L}),
6184 6178
                               (loc('plugin.py'),
6185 6179
                                {'attrib-starts': [],
@@ -6191,13 +6185,16 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
6191 6185
                                 'selection_start': 203L,
6192 6186
                                 'zoom': 0L}),
6193 6187
                               (loc('PlayStream.py'),
6194
-                               {'attrib-starts': [],
6195
-                                'first-line': 0L,
6188
+                               {'attrib-starts': [('MainScreen',
6189
+        93),
6190
+        ('MainScreen.download_stream',
6191
+         593)],
6192
+                                'first-line': 598L,
6196 6193
                                 'folded-linenos': [303L],
6197
-                                'sel-line': 8L,
6198
-                                'sel-line-start': 401L,
6199
-                                'selection_end': 420L,
6200
-                                'selection_start': 420L,
6194
+                                'sel-line': 607L,
6195
+                                'sel-line-start': 27166L,
6196
+                                'selection_end': 27207L,
6197
+                                'selection_start': 27207L,
6201 6198
                                 'zoom': 0L}),
6202 6199
                               (loc('VideoDownload.py'),
6203 6200
                                {'attrib-starts': [('VideoDownloadList',
@@ -6260,13 +6257,13 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
6260 6257
          loc('content/sources/config.py'),
6261 6258
          loc('content/ContentSources.py')]),
6262 6259
                                'open_files': [u'VideoDownload.py',
6263
-        u'imake.bat',
6264
-        u'../python/enigma.py',
6265
-        u'plugin.py',
6266 6260
         u'content/ContentSources.py',
6267 6261
         u'content/sources/config.py',
6268
-        u'PlayStream.py',
6269
-        u'changelog.md']},
6262
+        u'imake.bat',
6263
+        u'plugin.py',
6264
+        u'../python/enigma.py',
6265
+        u'changelog.md',
6266
+        u'PlayStream.py']},
6270 6267
         'saved_notebook_display': None,
6271 6268
         'split_percents': {0: 0.4733405875952122},
6272 6269
         'splits': 2,
@@ -6281,14 +6278,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
6281 6278
                          0,
6282 6279
                          1880,
6283 6280
                          1100)}]}
6284
-guimgr.recent-documents = [loc('changelog.md'),
6285
-                           loc('PlayStream.py'),
6281
+guimgr.recent-documents = [loc('PlayStream.py'),
6282
+                           loc('changelog.md'),
6283
+                           loc('../python/enigma.py'),
6286 6284
                            loc('content/sources/config.py'),
6287 6285
                            loc('content/ContentSources.py'),
6288 6286
                            loc('plugin.py'),
6289 6287
                            loc('VideoDownload.py'),
6290
-                           loc('imake.bat'),
6291
-                           loc('../python/enigma.py')]
6288
+                           loc('imake.bat')]
6292 6289
 guimgr.visual-state = {loc('../../$pylib/main6.py'): {'attrib-starts': [('pa'\
6293 6290
         'rse_arguments',
6294 6291
         9)],
@@ -7301,7 +7298,34 @@ guimgr.visual-state = {loc('../../$pylib/main6.py'): {'attrib-starts': [('pa'\
7301 7298
         'selection_end': 7951L,
7302 7299
         'selection_start': 7944L,
7303 7300
         'zoom': 0L},
7304
-                       loc('../../../../Python27/Lib/BaseHTTPServer.py'): {'a'\
7301
+                       loc('../../../../Python27/Lib/site-packages/gi/overrides/Gst.py'): {'a'\
7302
+        'ttrib-starts': [],
7303
+        'first-line': 0,
7304
+        'folded-linenos': [],
7305
+        'sel-line': 0,
7306
+        'sel-line-start': 0,
7307
+        'selection_end': 0,
7308
+        'selection_start': 0},
7309
+                       loc('../../../../Python27/lib/site-packages/gi/__init__.py'): {'a'\
7310
+        'ttrib-starts': [],
7311
+        'first-line': 24,
7312
+        'folded-linenos': [],
7313
+        'sel-line': 41,
7314
+        'sel-line-start': 1595,
7315
+        'selection_end': 1595,
7316
+        'selection_start': 1595},
7317
+                       loc('../../../../Python27/lib/site-packages/gi/module.py'): {'a'\
7318
+        'ttrib-starts': [('IntrospectionModule',
7319
+                          110),
7320
+                         ('IntrospectionModule.__getattr__',
7321
+                          132)],
7322
+        'first-line': 121,
7323
+        'folded-linenos': [],
7324
+        'sel-line': 136,
7325
+        'sel-line-start': 4187,
7326
+        'selection_end': 4187,
7327
+        'selection_start': 4187},
7328
+                       loc('../../../../Python27/lib/BaseHTTPServer.py'): {'a'\
7305 7329
         'ttrib-starts': [('BaseHTTPRequestHandler',
7306 7330
                           113),
7307 7331
                          ('BaseHTTPRequestHandler.handle_one_request',
@@ -7312,7 +7336,7 @@ guimgr.visual-state = {loc('../../$pylib/main6.py'): {'attrib-starts': [('pa'\
7312 7336
         'sel-line-start': 12434,
7313 7337
         'selection_end': 12434,
7314 7338
         'selection_start': 12434},
7315
-                       loc('../../../../Python27/Lib/argparse.py'): {'attrib'\
7339
+                       loc('../../../../Python27/lib/argparse.py'): {'attrib'\
7316 7340
         '-starts': [('_VersionAction',
7317 7341
                      999),
7318 7342
                     ('_VersionAction.__call__',
@@ -7323,7 +7347,7 @@ guimgr.visual-state = {loc('../../$pylib/main6.py'): {'attrib-starts': [('pa'\
7323 7347
         'sel-line-start': 35713L,
7324 7348
         'selection_end': 35713L,
7325 7349
         'selection_start': 35713L},
7326
-                       loc('../../../../Python27/Lib/base64.py'): {'attrib-s'\
7350
+                       loc('../../../../Python27/lib/base64.py'): {'attrib-s'\
7327 7351
         'tarts': [('b64decode',
7328 7352
                    58)],
7329 7353
         'first-line': 54,
@@ -7332,7 +7356,7 @@ guimgr.visual-state = {loc('../../$pylib/main6.py'): {'attrib-starts': [('pa'\
7332 7356
         'sel-line-start': 2478,
7333 7357
         'selection_end': 2478,
7334 7358
         'selection_start': 2478},
7335
-                       loc('../../../../Python27/Lib/json/__init__.py'): {'a'\
7359
+                       loc('../../../../Python27/lib/json/__init__.py'): {'a'\
7336 7360
         'ttrib-starts': [('loads',
7337 7361
                           293)],
7338 7362
         'first-line': 316L,
@@ -7341,7 +7365,7 @@ guimgr.visual-state = {loc('../../$pylib/main6.py'): {'attrib-starts': [('pa'\
7341 7365
         'sel-line-start': 13995L,
7342 7366
         'selection_end': 13995L,
7343 7367
         'selection_start': 13995L},
7344
-                       loc('../../../../Python27/Lib/json/decoder.py'): {'at'\
7368
+                       loc('../../../../Python27/lib/json/decoder.py'): {'at'\
7345 7369
         'trib-starts': [('JSONDecoder',
7346 7370
                          271),
7347 7371
                         ('JSONDecoder.decode',
@@ -7353,7 +7377,7 @@ guimgr.visual-state = {loc('../../$pylib/main6.py'): {'attrib-starts': [('pa'\
7353 7377
         'selection_end': 13117L,
7354 7378
         'selection_start': 13117L,
7355 7379
         'zoom': 0L},
7356
-                       loc('../../../../Python27/Lib/re.py'): {'attrib-start'\
7380
+                       loc('../../../../Python27/lib/re.py'): {'attrib-start'\
7357 7381
         's': [('_compile',
7358 7382
                229)],
7359 7383
         'first-line': 236L,
@@ -7363,15 +7387,7 @@ guimgr.visual-state = {loc('../../$pylib/main6.py'): {'attrib-starts': [('pa'\
7363 7387
         'selection_end': 10653L,
7364 7388
         'selection_start': 10653L,
7365 7389
         'zoom': 0L},
7366
-                       loc('../../../../Python27/Lib/site-packages/gi/overrides/Gst.py'): {'a'\
7367
-        'ttrib-starts': [],
7368
-        'first-line': 0,
7369
-        'folded-linenos': [],
7370
-        'sel-line': 0,
7371
-        'sel-line-start': 0,
7372
-        'selection_end': 0,
7373
-        'selection_start': 0},
7374
-                       loc('../../../../Python27/Lib/site-packages/requests/adapters.py'): {'a'\
7390
+                       loc('../../../../Python27/lib/site-packages/requests/adapters.py'): {'a'\
7375 7391
         'ttrib-starts': [('HTTPAdapter',
7376 7392
                           77),
7377 7393
                          ('HTTPAdapter.send',
@@ -7382,7 +7398,7 @@ guimgr.visual-state = {loc('../../$pylib/main6.py'): {'attrib-starts': [('pa'\
7382 7398
         'sel-line-start': 19494L,
7383 7399
         'selection_end': 19494L,
7384 7400
         'selection_start': 19494L},
7385
-                       loc('../../../../Python27/Lib/site-packages/requests/api.py'): {'a'\
7401
+                       loc('../../../../Python27/lib/site-packages/requests/api.py'): {'a'\
7386 7402
         'ttrib-starts': [('request',
7387 7403
                           15)],
7388 7404
         'first-line': 37,
@@ -7391,7 +7407,7 @@ guimgr.visual-state = {loc('../../$pylib/main6.py'): {'attrib-starts': [('pa'\
7391 7407
         'sel-line-start': 2762,
7392 7408
         'selection_end': 2762,
7393 7409
         'selection_start': 2762},
7394
-                       loc('../../../../Python27/Lib/site-packages/twisted/internet/_sslverify.py'): {'a'\
7410
+                       loc('../../../../Python27/lib/site-packages/twisted/internet/_sslverify.py'): {'a'\
7395 7411
         'ttrib-starts': [('_tolerateErrors',
7396 7412
                           1079),
7397 7413
                          ('_tolerateErrors.infoCallback',
@@ -7403,7 +7419,7 @@ guimgr.visual-state = {loc('../../$pylib/main6.py'): {'attrib-starts': [('pa'\
7403 7419
         'selection_end': 35250L,
7404 7420
         'selection_start': 35238L,
7405 7421
         'zoom': 0L},
7406
-                       loc('../../../../Python27/Lib/site-packages/twisted/internet/base.py'): {'a'\
7422
+                       loc('../../../../Python27/lib/site-packages/twisted/internet/base.py'): {'a'\
7407 7423
         'ttrib-starts': [('_SignalReactorMixin',
7408 7424
                           1171),
7409 7425
                          ('_SignalReactorMixin.mainLoop',
@@ -7415,7 +7431,7 @@ guimgr.visual-state = {loc('../../$pylib/main6.py'): {'attrib-starts': [('pa'\
7415 7431
         'selection_end': 43358L,
7416 7432
         'selection_start': 43358L,
7417 7433
         'zoom': 0L},
7418
-                       loc('../../../../Python27/Lib/site-packages/twisted/internet/posixbase.py'): {'a'\
7434
+                       loc('../../../../Python27/lib/site-packages/twisted/internet/posixbase.py'): {'a'\
7419 7435
         'ttrib-starts': [('_FDWaker',
7420 7436
                           109),
7421 7437
                          ('_FDWaker.doRead',
@@ -7427,7 +7443,7 @@ guimgr.visual-state = {loc('../../$pylib/main6.py'): {'attrib-starts': [('pa'\
7427 7443
         'selection_end': 4129L,
7428 7444
         'selection_start': 4129L,
7429 7445
         'zoom': 0L},
7430
-                       loc('../../../../Python27/Lib/site-packages/twisted/internet/selectreactor.py'): {'a'\
7446
+                       loc('../../../../Python27/lib/site-packages/twisted/internet/selectreactor.py'): {'a'\
7431 7447
         'ttrib-starts': [('SelectReactor',
7432 7448
                           54),
7433 7449
                          ('SelectReactor.doSelect',
@@ -7439,7 +7455,7 @@ guimgr.visual-state = {loc('../../$pylib/main6.py'): {'attrib-starts': [('pa'\
7439 7455
         'selection_end': 4737L,
7440 7456
         'selection_start': 4737L,
7441 7457
         'zoom': 0L},
7442
-                       loc('../../../../Python27/Lib/site-packages/twisted/internet/tcp.py'): {'a'\
7458
+                       loc('../../../../Python27/lib/site-packages/twisted/internet/tcp.py'): {'a'\
7443 7459
         'ttrib-starts': [('_BaseBaseClient',
7444 7460
                           317),
7445 7461
                          ('_BaseBaseClient.connectionLost',
@@ -7451,7 +7467,7 @@ guimgr.visual-state = {loc('../../$pylib/main6.py'): {'attrib-starts': [('pa'\
7451 7467
         'selection_end': 16452L,
7452 7468
         'selection_start': 16452L,
7453 7469
         'zoom': 0L},
7454
-                       loc('../../../../Python27/Lib/site-packages/twisted/python/filepath.py'): {'a'\
7470
+                       loc('../../../../Python27/lib/site-packages/twisted/python/filepath.py'): {'a'\
7455 7471
         'ttrib-starts': [('FilePath',
7456 7472
                           671),
7457 7473
                          ('FilePath.open',
@@ -7463,7 +7479,7 @@ guimgr.visual-state = {loc('../../$pylib/main6.py'): {'attrib-starts': [('pa'\
7463 7479
         'selection_end': 33502L,
7464 7480
         'selection_start': 33502L,
7465 7481
         'zoom': 0L},
7466
-                       loc('../../../../Python27/Lib/site-packages/twisted/python/log.py'): {'a'\
7482
+                       loc('../../../../Python27/lib/site-packages/twisted/python/log.py'): {'a'\
7467 7483
         'ttrib-starts': [('callWithLogger',
7468 7484
                           89)],
7469 7485
         'first-line': 89L,
@@ -7473,7 +7489,7 @@ guimgr.visual-state = {loc('../../$pylib/main6.py'): {'attrib-starts': [('pa'\
7473 7489
         'selection_end': 3060L,
7474 7490
         'selection_start': 3060L,
7475 7491
         'zoom': 0L},
7476
-                       loc('../../../../Python27/Lib/site-packages/twisted/web/resource.py'): {'a'\
7492
+                       loc('../../../../Python27/lib/site-packages/twisted/web/resource.py'): {'a'\
7477 7493
         'ttrib-starts': [('Resource',
7478 7494
                           103),
7479 7495
                          ('Resource.putChild',
@@ -7485,7 +7501,7 @@ guimgr.visual-state = {loc('../../$pylib/main6.py'): {'attrib-starts': [('pa'\
7485 7501
         'selection_end': 6970L,
7486 7502
         'selection_start': 6970L,
7487 7503
         'zoom': 0L},
7488
-                       loc('../../../../Python27/Lib/site-packages/twisted/web/static.py'): {'a'\
7504
+                       loc('../../../../Python27/lib/site-packages/twisted/web/static.py'): {'a'\
7489 7505
         'ttrib-starts': [('File',
7490 7506
                           169)],
7491 7507
         'first-line': 160L,
@@ -7500,7 +7516,7 @@ guimgr.visual-state = {loc('../../$pylib/main6.py'): {'attrib-starts': [('pa'\
7500 7516
         'selection_end': 4935L,
7501 7517
         'selection_start': 4927L,
7502 7518
         'zoom': 0L},
7503
-                       loc('../../../../Python27/Lib/site.py'): {'attrib-sta'\
7519
+                       loc('../../../../Python27/lib/site.py'): {'attrib-sta'\
7504 7520
         'rts': [('setquit',
7505 7521
                  333),
7506 7522
                 ('setquit.Quitter',
@@ -7512,26 +7528,7 @@ guimgr.visual-state = {loc('../../$pylib/main6.py'): {'attrib-starts': [('pa'\
7512 7528
         'sel-line': 359,
7513 7529
         'sel-line-start': 12399,
7514 7530
         'selection_end': 12399,
7515
-        'selection_start': 12399},
7516
-                       loc('../../../../Python27/lib/site-packages/gi/__init__.py'): {'a'\
7517
-        'ttrib-starts': [],
7518
-        'first-line': 24,
7519
-        'folded-linenos': [],
7520
-        'sel-line': 41,
7521
-        'sel-line-start': 1595,
7522
-        'selection_end': 1595,
7523
-        'selection_start': 1595},
7524
-                       loc('../../../../Python27/lib/site-packages/gi/module.py'): {'a'\
7525
-        'ttrib-starts': [('IntrospectionModule',
7526
-                          110),
7527
-                         ('IntrospectionModule.__getattr__',
7528
-                          132)],
7529
-        'first-line': 121,
7530
-        'folded-linenos': [],
7531
-        'sel-line': 136,
7532
-        'sel-line-start': 4187,
7533
-        'selection_end': 4187,
7534
-        'selection_start': 4187}}
7531
+        'selection_start': 12399}}
7535 7532
 proj.build-cmd = {None: ('default',
7536 7533
                          None)}
7537 7534
 proj.default-encoding = 'utf_8'

+ 26
- 0
changelog.md Просмотреть файл

@@ -1,3 +1,29 @@
1
+**0.8p** (21.08.2018):
2
+**0.8r** (29.09.2018):
3
+- salabots TVPlay (raidījumi pa kategorijām)
4
+
5
+**0.8p** (21.08.2018):
6
+- pievienots jaunais TVPlay
7
+
8
+**0.8j** (24.06.2018):
9
+- vēlreiz salabots replay
10
+- reanimētas filmas.lv
11
+
12
+**0.8h** (15.06.2018):
13
+- salabots replay
14
+
15
+**0.8c** (18.05.2018):
16
+- salabots filmix domeins (tagad filmix.co)
17
+
18
+**0.8b** (27.04.2018)
19
+- [change] Salabotas shortcut tiešraides un arhīvs
20
+
21
+**0.8a** (10.04.2018)
22
+- [change] Salaboti shortcut saraksti
23
+
24
+**0.7v** (15.03.2018)
25
+- [bugfix] Salabots shortcut tiešraides
26
+
1 27
 **0.7u** (11.03.2018)
2 28
 - [bugfix] Salabots filmix
3 29
 

+ 12
- 8
imake.bat Просмотреть файл

@@ -1,10 +1,11 @@
1 1
 @echo off
2 2
 
3 3
 :--- Pull content submodule ---
4
-rem cd content
5
-rem git checkout .
6
-rem git pull
7
-rem cd ..
4
+cd content
5
+git commit -a -m a
6
+git checkout .
7
+git pull
8
+cd ..
8 9
 
9 10
 :=== Parameters ===
10 11
 
@@ -54,6 +55,7 @@ content\ContentSources.py
54 55
 content\Downloader.py
55 56
 content\resolver.py
56 57
 content\util.py
58
+content\file.py
57 59
 content\icon.gif
58 60
 content\run.py
59 61
 content\playstreamproxy.py
@@ -78,6 +80,8 @@ content\sources\serialguru.py
78 80
 content\sources\tvdom.py
79 81
 content\sources\ustvnow.py
80 82
 content\sources\viaplay.py
83
+content\sources\filmas.py
84
+content\sources\tvplay.py
81 85
 content\sources\YouTubeVideoUrl.py
82 86
 content\sources\jsinterp.py
83 87
 content\sources\swfinterp.py
@@ -169,10 +173,10 @@ echo exit 0
169 173
 dos2unix %ipk_dir%CONTROL\postrm
170 174
 
171 175
 :=== conffiles file ===
172
-(
173
-echo %ext_dir2%%prog%/content/sources/streams.cfg
174
-) >%ipk_dir%CONTROL\conffiles
175
-dos2unix %ipk_dir%CONTROL\conffiles
176
+rem (
177
+rem echo %ext_dir2%%prog%/content/sources/streams.cfg
178
+rem ) >%ipk_dir%CONTROL\conffiles
179
+rem dos2unix %ipk_dir%CONTROL\conffiles
176 180
 
177 181
 :=== create ipk file ===
178 182
 if not exist %release_dir% mkdir %release_dir%

+ 30
- 18
locale/plugin.pot Просмотреть файл

@@ -5,7 +5,7 @@
5 5
 msgid ""
6 6
 msgstr ""
7 7
 "Project-Id-Version: PACKAGE VERSION\n"
8
-"POT-Creation-Date: 2017-03-18 15:28+FLE Standard Time\n"
8
+"POT-Creation-Date: 2018-04-07 15:14+FLE Daylight Time\n"
9 9
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
10 10
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
11 11
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -15,61 +15,73 @@ msgstr ""
15 15
 "Generated-By: pygettext.py 1.5\n"
16 16
 
17 17
 
18
-#: PlayStream.py:104 PlayStream.py:1126
18
+#: PlayStream.py:100 PlayStream.py:1238
19 19
 msgid "Exit"
20 20
 msgstr ""
21 21
 
22
-#: PlayStream.py:105 PlayStream.py:1127
22
+#: PlayStream.py:101
23 23
 msgid "Select"
24 24
 msgstr ""
25 25
 
26
-#: PlayStream.py:106 PlayStream.py:1128
26
+#: PlayStream.py:102
27 27
 msgid "Options"
28 28
 msgstr ""
29 29
 
30
-#: PlayStream.py:107 PlayStream.py:1129
30
+#: PlayStream.py:103
31 31
 msgid "Config"
32 32
 msgstr ""
33 33
 
34
-#: PlayStream.py:555
34
+#: PlayStream.py:667
35 35
 msgid ""
36 36
 "Sorry, this file already exists:\n"
37 37
 "%s"
38 38
 msgstr ""
39 39
 
40
-#: PlayStream.py:933
40
+#: PlayStream.py:1064
41 41
 msgid "Download folder"
42 42
 msgstr ""
43 43
 
44
-#: PlayStream.py:934
44
+#: PlayStream.py:1065
45 45
 msgid "Overwrite download video"
46 46
 msgstr ""
47 47
 
48
-#: PlayStream.py:935
48
+#: PlayStream.py:1066
49 49
 msgid "TMP folder"
50 50
 msgstr ""
51 51
 
52
-#: PlayStream.py:936
52
+#: PlayStream.py:1067
53 53
 msgid "Clear tmp folder on exit"
54 54
 msgstr ""
55 55
 
56
-#: PlayStream.py:937
56
+#: PlayStream.py:1068
57 57
 msgid "Start playstreamproxy"
58 58
 msgstr ""
59 59
 
60
-#: PlayStream.py:941 PlayStream.py:1057
60
+#: PlayStream.py:1069
61
+msgid "Check new plugin version in feed"
62
+msgstr ""
63
+
64
+#: PlayStream.py:1070
65
+msgid "Content config file"
66
+msgstr ""
67
+
68
+#: PlayStream.py:1071
69
+msgid "Remote content config file"
70
+msgstr ""
71
+
72
+#: PlayStream.py:1072
73
+msgid "User remote content config file"
74
+msgstr ""
75
+
76
+#: PlayStream.py:1076 PlayStream.py:1183
61 77
 msgid "Cancel"
62 78
 msgstr ""
63 79
 
64
-#: PlayStream.py:942
80
+#: PlayStream.py:1077
65 81
 msgid "Save"
66 82
 msgstr ""
67 83
 
68
-#: PlayStream.py:1016
84
+#: PlayStream.py:1154
69 85
 msgid "Restart Enigma2?"
70 86
 msgstr ""
71 87
 
72
-#: plugin.py:27 plugin.py:28
73
-msgid "Play online streams from various sources"
74
-msgstr ""
75
-