浏览代码

salabots replay

Ivars 6 年前
父节点
当前提交
049fe794eb
共有 2 个文件被更改,包括 112 次插入90 次删除
  1. 110
    90
      project.wpr
  2. 2
    0
      sources/replay.py

+ 110
- 90
project.wpr 查看文件

@@ -162,7 +162,19 @@ debug.breakpoints = {loc('Downloader.py'): {94: (0,
162 162
                      loc('sources/replay.py'): {145L: (0,
163 163
         None,
164 164
         1,
165
-        0)},
165
+        0),
166
+        222L: (0,
167
+               None,
168
+               1,
169
+               0),
170
+        340L: (0,
171
+               None,
172
+               1,
173
+               0),
174
+        366L: (0,
175
+               None,
176
+               1,
177
+               0)},
166 178
                      loc('sources/tvdom.py'): {292L: (0,
167 179
         None,
168 180
         1,
@@ -826,14 +838,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
826 838
                                        'expanded-nodes': [],
827 839
                                        'selected-nodes': [],
828 840
                                        'top-node': None},
829
-        loc('unknown:<untitled> #6'): {'expanded-nodes': [],
841
+        loc('unknown:<untitled> #6'): {'column-widths': [1.0],
842
+                                       'expanded-nodes': [],
830 843
                                        'selected-nodes': [],
831 844
                                        'top-node': None},
832
-        loc('unknown:<untitled> #4'): {'expanded-nodes': [],
845
+        loc('unknown:<untitled> #5'): {'expanded-nodes': [],
833 846
                                        'selected-nodes': [],
834 847
                                        'top-node': None},
835
-        loc('unknown:<untitled> #5'): {'column-widths': [1.0],
836
-                                       'expanded-nodes': [],
848
+        loc('unknown:<untitled> #4'): {'expanded-nodes': [],
837 849
                                        'selected-nodes': [],
838 850
                                        'top-node': None}},
839 851
                                 'browse_mode': u'Current Module',
@@ -970,20 +982,19 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
970 982
         -1,
971 983
         -1),
972 984
                        'attrib-starts': [],
973
-                       'first-line': 21L,
985
+                       'first-line': 19L,
974 986
                        'folded-linenos': [],
975
-                       'history': {u'file:C:/Data/Programming/Kodi/plugin.video.playstream/resources/lib/content/sources/replay.py': ['d'\
976
-        'ata\n',
977
-        'url3\n',
978
-        'headers\n',
987
+                       'history': {u'file:C:/Data/Programming/Kodi/plugin.video.playstream/resources/lib/content/sources/replay.py': ['p'\
988
+        'rint url2\n',
989
+        'print headers\n',
979 990
         'raise \n',
980
-        'ex\n',
981
-        'm.group(1)\n']},
991
+        'url3\n',
992
+        'url\n']},
982 993
                        'launch-id': None,
983
-                       'sel-line': 26L,
984
-                       'sel-line-start': 1810L,
985
-                       'selection_end': 1810L,
986
-                       'selection_start': 1810L,
994
+                       'sel-line': 27L,
995
+                       'sel-line-start': 1774L,
996
+                       'selection_end': 1774L,
997
+                       'selection_start': 1774L,
987 998
                        'zoom': 0L}),
988 999
                      ('debug-watch',
989 1000
                       'wide',
@@ -1031,70 +1042,31 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1031 1042
                        'selection_end': 174L,
1032 1043
                        'selection_start': 174L,
1033 1044
                        'zoom': 0L})],
1034
-        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('sources/filmix.py'),
1045
+        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('sources/ltc.py'),
1035 1046
         {'attrib-starts': [('Source',
1036
-                            31),
1037
-                           ('Source.get_content',
1038
-                            56)],
1039
-         'first-line': 146L,
1040
-         'folded-linenos': [],
1041
-         'sel-line': 154L,
1042
-         'sel-line-start': 6516L,
1043
-         'selection_end': 6565L,
1044
-         'selection_start': 6560L,
1047
+                            26)],
1048
+         'first-line': 16L,
1049
+         'folded-linenos': [108L,
1050
+                            131L,
1051
+                            160L,
1052
+                            220L,
1053
+                            231L,
1054
+                            257L,
1055
+                            276L,
1056
+                            295L,
1057
+                            319L,
1058
+                            349L,
1059
+                            350L,
1060
+                            367L,
1061
+                            398L,
1062
+                            411L,
1063
+                            525L],
1064
+         'sel-line': 27L,
1065
+         'sel-line-start': 1064L,
1066
+         'selection_end': 1064L,
1067
+         'selection_start': 1064L,
1045 1068
          'zoom': 0L},
1046
-        1530209535.89],
1047
-        [loc('sources/filmix.py'),
1048
-         {'attrib-starts': [('Source',
1049
-                             31),
1050
-                            ('Source.get_content',
1051
-                             56)],
1052
-          'first-line': 146L,
1053
-          'folded-linenos': [],
1054
-          'sel-line': 157L,
1055
-          'sel-line-start': 6682L,
1056
-          'selection_end': 6713L,
1057
-          'selection_start': 6706L,
1058
-          'zoom': 0L},
1059
-         1530209538.483],
1060
-        [loc('sources/filmix.py'),
1061
-         {'attrib-starts': [('Source',
1062
-                             31),
1063
-                            ('Source.process_list',
1064
-                             191)],
1065
-          'first-line': 189L,
1066
-          'folded-linenos': [],
1067
-          'sel-line': 204L,
1068
-          'sel-line-start': 9180L,
1069
-          'selection_end': 9216L,
1070
-          'selection_start': 9216L,
1071
-          'zoom': 0L},
1072
-         1530209624.698],
1073
-        [loc('sources/ltc.py'),
1074
-         {'attrib-starts': [('Source',
1075
-                             26)],
1076
-          'first-line': 16L,
1077
-          'folded-linenos': [108L,
1078
-                             131L,
1079
-                             160L,
1080
-                             220L,
1081
-                             231L,
1082
-                             257L,
1083
-                             276L,
1084
-                             295L,
1085
-                             319L,
1086
-                             349L,
1087
-                             350L,
1088
-                             367L,
1089
-                             398L,
1090
-                             411L,
1091
-                             525L],
1092
-          'sel-line': 27L,
1093
-          'sel-line-start': 1064L,
1094
-          'selection_end': 1064L,
1095
-          'selection_start': 1064L,
1096
-          'zoom': 0L},
1097
-         1530209630.762],
1069
+        1530209630.762],
1098 1070
         [loc('sources/ltc.py'),
1099 1071
          {'attrib-starts': [('Source',
1100 1072
                              26),
@@ -1470,7 +1442,54 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1470 1442
           'selection_end': 4807L,
1471 1443
           'selection_start': 4807L,
1472 1444
           'zoom': 0L},
1473
-         1530475063.84]],
1445
+         1530475063.84],
1446
+        [loc('sources/replay.py'),
1447
+         {'attrib-starts': [('Source',
1448
+                             31),
1449
+                            ('Source.get_streams',
1450
+                             220)],
1451
+          'first-line': 356L,
1452
+          'folded-linenos': [70L,
1453
+                             89L,
1454
+                             143L,
1455
+                             166L,
1456
+                             284L],
1457
+          'sel-line': 361L,
1458
+          'sel-line-start': 18363L,
1459
+          'selection_end': 18393L,
1460
+          'selection_start': 18393L,
1461
+          'zoom': 0L},
1462
+         1530566332.511],
1463
+        [loc('sources/replay.py'),
1464
+         {'attrib-starts': [('Source',
1465
+                             31),
1466
+                            ('Source.get_streams',
1467
+                             220)],
1468
+          'first-line': 354L,
1469
+          'folded-linenos': [70L,
1470
+                             89L,
1471
+                             143L,
1472
+                             166L,
1473
+                             284L],
1474
+          'sel-line': 363L,
1475
+          'sel-line-start': 18441L,
1476
+          'selection_end': 18441L,
1477
+          'selection_start': 18441L,
1478
+          'zoom': 0L},
1479
+         1530566479.33],
1480
+        [loc('sources/SourceBase.py'),
1481
+         {'attrib-starts': [('SourceBase',
1482
+                             32),
1483
+                            ('SourceBase._http_request',
1484
+                             118)],
1485
+          'first-line': 117L,
1486
+          'folded-linenos': [],
1487
+          'sel-line': 127L,
1488
+          'sel-line-start': 4774L,
1489
+          'selection_end': 4774L,
1490
+          'selection_start': 4774L,
1491
+          'zoom': 0L},
1492
+         1530566541.211]],
1474 1493
         20),
1475 1494
         'current-loc': loc('sources/replay.py'),
1476 1495
         'editor-state-list': [(loc('run.py'),
@@ -1527,7 +1546,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1527 1546
         31),
1528 1547
         ('Source.get_streams',
1529 1548
          220)],
1530
-                                'first-line': 356L,
1549
+                                'first-line': 354L,
1531 1550
                                 'folded-linenos': [70L,
1532 1551
         89L,
1533 1552
         143L,
@@ -1535,8 +1554,8 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1535 1554
         284L],
1536 1555
                                 'sel-line': 363L,
1537 1556
                                 'sel-line-start': 18441L,
1538
-                                'selection_end': 18441L,
1539
-                                'selection_start': 18441L,
1557
+                                'selection_end': 18483L,
1558
+                                'selection_start': 18483L,
1540 1559
                                 'zoom': 0L}),
1541 1560
                               (loc('sources/lmt.py'),
1542 1561
                                {'attrib-starts': [('Source',
@@ -1609,14 +1628,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1609 1628
         32),
1610 1629
         ('SourceBase._http_request',
1611 1630
          118)],
1612
-                                'first-line': 120L,
1631
+                                'first-line': 117L,
1613 1632
                                 'folded-linenos': [],
1614
-                                'sel-line': 128L,
1615
-                                'sel-line-start': 4807L,
1616
-                                'selection_end': 4807L,
1617
-                                'selection_start': 4807L,
1633
+                                'sel-line': 127L,
1634
+                                'sel-line-start': 4774L,
1635
+                                'selection_end': 4774L,
1636
+                                'selection_start': 4774L,
1618 1637
                                 'zoom': 0L})],
1619
-        'has-focus': False,
1638
+        'has-focus': True,
1620 1639
         'locked': False},
1621 1640
         [loc('run.py'),
1622 1641
          loc('util.py'),
@@ -1636,8 +1655,9 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1636 1655
         u'sources/filmas.py',
1637 1656
         u'sources/filmix.py',
1638 1657
         u'sources/lmt.py',
1639
-        u'util.py',
1640 1658
         u'sources/ltc.py',
1659
+        u'util.py',
1660
+        u'sources/SourceBase.py',
1641 1661
         u'sources/replay.py']},
1642 1662
         'saved_notebook_display': None,
1643 1663
         'split_percents': {0: 0.47474747474747475},
@@ -1655,8 +1675,8 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1655 1675
                          1462)}]}
1656 1676
 guimgr.recent-documents = [loc('sources/replay.py'),
1657 1677
                            loc('sources/SourceBase.py'),
1658
-                           loc('sources/ltc.py'),
1659 1678
                            loc('util.py'),
1679
+                           loc('sources/ltc.py'),
1660 1680
                            loc('sources/filmix.py'),
1661 1681
                            loc('sources/filmas.py'),
1662 1682
                            loc('run.py'),

+ 2
- 0
sources/replay.py 查看文件

@@ -360,6 +360,8 @@ Referer: https://replay.lsm.lv/%s/%s
360 360
                 if not m:
361 361
                     raise Exception("No stream found")
362 362
                 url3 = m.group(1)
363
+                if url3.startswith("//"):
364
+                    url3 = "https:" + url3
363 365
                 headers["Referer"] = url2
364 366
                 r3 = self._http_request(url3, headers=headers)
365 367
                 if not r3: