Selaa lähdekoodia

salabots replay

Ivars 6 vuotta sitten
vanhempi
commit
d15f972c1a
2 muutettua tiedostoa jossa 360 lisäystä ja 332 poistoa
  1. 359
    331
      project.wpr
  2. 1
    1
      sources/replay.py

+ 359
- 331
project.wpr Näytä tiedosto

@@ -95,11 +95,7 @@ debug.breakpoints = {loc('Downloader.py'): {94: (0,
95 95
                None,
96 96
                1,
97 97
                0)},
98
-                     loc('run.py'): {111L: (0,
99
-        None,
100
-        1,
101
-        0),
102
-                                     277L: (0,
98
+                     loc('run.py'): {277L: (0,
103 99
         None,
104 100
         1,
105 101
         0),
@@ -159,11 +155,15 @@ debug.breakpoints = {loc('Downloader.py'): {94: (0,
159 155
                None,
160 156
                1,
161 157
                0)},
162
-                     loc('sources/replay.py'): {13L: (0,
158
+                     loc('sources/replay.py'): {145L: (0,
163 159
         None,
164 160
         1,
165 161
         0),
166
-        145L: (0,
162
+        222L: (0,
163
+               None,
164
+               1,
165
+               0),
166
+        275L: (0,
167 167
                None,
168 168
                1,
169 169
                0),
@@ -199,11 +199,11 @@ debug.breakpoints = {loc('Downloader.py'): {94: (0,
199 199
             None,
200 200
             1,
201 201
             0)},
202
-                     loc('unknown:<untitled> #1'): {10: (0,
202
+                     loc('unknown:<untitled> #2'): {2: (0,
203 203
         None,
204 204
         1,
205 205
         0)},
206
-                     loc('unknown:<untitled> #2'): {2: (0,
206
+                     loc('unknown:<untitled> #1'): {10: (0,
207 207
         None,
208 208
         1,
209 209
         0)}}
@@ -305,9 +305,9 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
305 305
         'view': {'area': 'tall',
306 306
                  'constraint': None,
307 307
                  'current_pages': [2,
308
-                                   2],
308
+                                   0],
309 309
                  'full-screen': False,
310
-                 'notebook_display': 'tabs only',
310
+                 'notebook_display': 'normal',
311 311
                  'notebook_percent': 0.17992831541218635,
312 312
                  'override_title': None,
313 313
                  'pagelist': [('project',
@@ -816,52 +816,52 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
816 816
         'top-node': [('generic attribute',
817 817
                       loc('../../SplashData/remdup.py'),
818 818
                       'f')]},
819
-        loc('../../../../../Python27/lib/lib-tk/Tkinter.py'): {'expanded-nod'\
819
+        loc('../../../../../Python27/Lib/lib-tk/Tkinter.py'): {'expanded-nod'\
820 820
         'es': [],
821 821
         'selected-nodes': [],
822 822
         'top-node': [('function def',
823
-                      loc('../../../../../Python27/lib/lib-tk/Tkinter.py'),
823
+                      loc('../../../../../Python27/Lib/lib-tk/Tkinter.py'),
824 824
                       'At')]},
825
-        loc('../../../../../Python27/lib/lib-tk/tkCommonDialog.py'): {'expan'\
825
+        loc('../../../../../Python27/Lib/lib-tk/tkCommonDialog.py'): {'expan'\
826 826
         'ded-nodes': [],
827 827
         'selected-nodes': [],
828 828
         'top-node': [('class def',
829
-                      loc('../../../../../Python27/lib/lib-tk/tkCommonDialog.py'),
829
+                      loc('../../../../../Python27/Lib/lib-tk/tkCommonDialog.py'),
830 830
                       'Dialog')]},
831
-        loc('../../../../../Python27/lib/lib-tk/tkMessageBox.py'): {'expande'\
831
+        loc('../../../../../Python27/Lib/lib-tk/tkMessageBox.py'): {'expande'\
832 832
         'd-nodes': [],
833 833
         'selected-nodes': [],
834 834
         'top-node': [('generic attribute',
835
-                      loc('../../../../../Python27/lib/lib-tk/tkMessageBox.py'),
835
+                      loc('../../../../../Python27/Lib/lib-tk/tkMessageBox.py'),
836 836
                       'ABORT')]},
837
-        loc('../../../../../Python27/lib/lib-tk/tkSimpleDialog.py'): {'expan'\
837
+        loc('../../../../../Python27/Lib/lib-tk/tkSimpleDialog.py'): {'expan'\
838 838
         'ded-nodes': [],
839 839
         'selected-nodes': [],
840 840
         'top-node': [('function def',
841
-                      loc('../../../../../Python27/lib/lib-tk/tkSimpleDialog.py'),
841
+                      loc('../../../../../Python27/Lib/lib-tk/tkSimpleDialog.py'),
842 842
                       'askfloat')]},
843
-        loc('../../../../../Python27/lib/lib-tk/ttk.py'): {'expanded-nodes': [],
843
+        loc('../../../../../Python27/Lib/lib-tk/ttk.py'): {'expanded-nodes': [],
844 844
         'selected-nodes': [],
845 845
         'top-node': [('class def',
846
-                      loc('../../../../../Python27/lib/lib-tk/ttk.py'),
846
+                      loc('../../../../../Python27/Lib/lib-tk/ttk.py'),
847 847
                       'Button')]},
848
-        loc('../../../../../Python27/lib/site-packages/PIL/Image.py'): {'exp'\
848
+        loc('../../../../../Python27/Lib/site-packages/PIL/Image.py'): {'exp'\
849 849
         'anded-nodes': [],
850 850
         'selected-nodes': [],
851 851
         'top-node': [('generic attribute',
852
-                      loc('../../../../../Python27/lib/site-packages/PIL/Image.py'),
852
+                      loc('../../../../../Python27/Lib/site-packages/PIL/Image.py'),
853 853
                       'ADAPTIVE')]},
854
-        loc('unknown:<untitled> #5'): {'column-widths': [1.0],
855
-                                       'expanded-nodes': [],
854
+        loc('unknown:<untitled> #4'): {'expanded-nodes': [],
856 855
                                        'selected-nodes': [],
857 856
                                        'top-node': None},
858
-        loc('unknown:<untitled> #6'): {'expanded-nodes': [],
857
+        loc('unknown:<untitled> #5'): {'expanded-nodes': [],
859 858
                                        'selected-nodes': [],
860 859
                                        'top-node': None},
861
-        loc('unknown:<untitled> #4'): {'expanded-nodes': [],
860
+        loc('unknown:<untitled> #3'): {'column-widths': [1.0],
861
+                                       'expanded-nodes': [],
862 862
                                        'selected-nodes': [],
863 863
                                        'top-node': None},
864
-        loc('unknown:<untitled> #3'): {'column-widths': [1.0],
864
+        loc('unknown:<untitled> #6'): {'column-widths': [1.0],
865 865
                                        'expanded-nodes': [],
866 866
                                        'selected-nodes': [],
867 867
                                        'top-node': None}},
@@ -892,7 +892,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
892 892
         'current_pages': [2,
893 893
                           0],
894 894
         'notebook_display': 'normal',
895
-        'notebook_percent': 0.5084067253803042,
895
+        'notebook_percent': 0.32746196957566054,
896 896
         'override_title': None,
897 897
         'pagelist': [('debug-breakpoints',
898 898
                       'wide',
@@ -999,24 +999,20 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
999 999
         -1,
1000 1000
         -1),
1001 1001
                        'attrib-starts': [],
1002
-                       'first-line': 28L,
1002
+                       'first-line': 4L,
1003 1003
                        'folded-linenos': [],
1004
-                       'history': {u'file:C:/Data/Programming/enigma2/PlayStream2/content/sources/ltc.py': ['s'\
1005
-        'treams\n',
1006
-        'response\n',
1007
-        'r\n',
1008
-        'print r\n',
1009
-        'not streams_xml\n'],
1010
-                                   u'file:C:/Data/Programming/enigma2/PlayStream2/content/sources/tvplay.py': ['d'\
1011
-        'ata\n',
1012
-        'r\n',
1013
-        'url\n',
1014
-        'print url\n']},
1004
+                       'history': {u'file:C:/Data/Programming/enigma2/PlayStream2/content/sources/replay.py': ['u'\
1005
+        'rl2\n',
1006
+        'print r3\n',
1007
+        "re.search(r\"src: '([^']+)',\\s+?type: 'application/x-mpegurl'\", r"\
1008
+        "3, re.DOTALL|re.IGNORECASE)\n",
1009
+        'print data2\n',
1010
+        'print url2\n']},
1015 1011
                        'launch-id': None,
1016
-                       'sel-line': 39L,
1017
-                       'sel-line-start': 1962L,
1018
-                       'selection_end': 1962L,
1019
-                       'selection_start': 1962L,
1012
+                       'sel-line': 7L,
1013
+                       'sel-line-start': 449L,
1014
+                       'selection_end': 581L,
1015
+                       'selection_start': 449L,
1020 1016
                        'zoom': 0L}),
1021 1017
                      ('debug-watch',
1022 1018
                       'wide',
@@ -1060,307 +1056,315 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1060 1056
                        'history': {},
1061 1057
                        'launch-id': None,
1062 1058
                        'sel-line': 2L,
1063
-                       'sel-line-start': 174L,
1064
-                       'selection_end': 174L,
1065
-                       'selection_start': 174L,
1059
+                       'sel-line-start': 163L,
1060
+                       'selection_end': 163L,
1061
+                       'selection_start': 163L,
1066 1062
                        'zoom': 0L})],
1067
-        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('sources/tvplay.py'),
1063
+        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('sources/ltc.py'),
1068 1064
         {'attrib-starts': [('Source',
1069
-                            32),
1070
-                           ('Source.get_content',
1071
-                            62)],
1072
-         'first-line': 124L,
1073
-         'folded-linenos': [159L],
1074
-         'sel-line': 129L,
1075
-         'sel-line-start': 5841L,
1076
-         'selection_end': 5878L,
1077
-         'selection_start': 5852L,
1065
+                            26),
1066
+                           ('Source.get_stream_url2',
1067
+                            978)],
1068
+         'first-line': 989L,
1069
+         'folded-linenos': [132L,
1070
+                            161L,
1071
+                            221L,
1072
+                            232L,
1073
+                            258L,
1074
+                            277L,
1075
+                            296L,
1076
+                            320L,
1077
+                            350L,
1078
+                            351L,
1079
+                            399L,
1080
+                            412L,
1081
+                            532L],
1082
+         'sel-line': 998L,
1083
+         'sel-line-start': 51732L,
1084
+         'selection_end': 51782L,
1085
+         'selection_start': 51782L,
1078 1086
          'zoom': 0L},
1079
-        1538212838.81],
1080
-        [loc('sources/tvplay.py'),
1081
-         {'attrib-starts': [('Source',
1082
-                             32),
1083
-                            ('Source.get_content',
1084
-                             62)],
1085
-          'first-line': 134L,
1086
-          'folded-linenos': [159L],
1087
-          'sel-line': 144L,
1088
-          'sel-line-start': 6564L,
1089
-          'selection_end': 6601L,
1090
-          'selection_start': 6575L,
1087
+        1539297256.427],
1088
+        [loc('sources/replay.py'),
1089
+         {'attrib-starts': [],
1090
+          'first-line': 4L,
1091
+          'folded-linenos': [70L,
1092
+                             89L,
1093
+                             143L,
1094
+                             166L,
1095
+                             284L],
1096
+          'sel-line': 12L,
1097
+          'sel-line-start': 356L,
1098
+          'selection_end': 356L,
1099
+          'selection_start': 356L,
1091 1100
           'zoom': 0L},
1092
-         1538212839.721],
1093
-        [loc('sources/tvplay.py'),
1094
-         {'attrib-starts': [('Source',
1095
-                             32),
1096
-                            ('Source.get_content',
1097
-                             62)],
1098
-          'first-line': 124L,
1099
-          'folded-linenos': [159L],
1100
-          'sel-line': 129L,
1101
-          'sel-line-start': 5841L,
1102
-          'selection_end': 5878L,
1103
-          'selection_start': 5852L,
1101
+         1539297285.235],
1102
+        [loc('../../../../../Python27/Lib/site-packages/PIL/Image.py'),
1103
+         {'attrib-starts': [],
1104
+          'first-line': 40L,
1105
+          'folded-linenos': [],
1106
+          'sel-line': 54L,
1107
+          'sel-line-start': 1389L,
1108
+          'selection_end': 1434L,
1109
+          'selection_start': 1434L,
1104 1110
           'zoom': 0L},
1105
-         1538212848.303],
1106
-        [loc('sources/tvplay.py'),
1107
-         {'attrib-starts': [('Source',
1108
-                             32),
1109
-                            ('Source.get_content',
1110
-                             62)],
1111
-          'first-line': 134L,
1112
-          'folded-linenos': [159L],
1113
-          'sel-line': 144L,
1114
-          'sel-line-start': 6564L,
1115
-          'selection_end': 6601L,
1116
-          'selection_start': 6575L,
1111
+         1539297508.406],
1112
+        [loc('sources/replay.py'),
1113
+         {'attrib-starts': [],
1114
+          'first-line': 4L,
1115
+          'folded-linenos': [70L,
1116
+                             89L,
1117
+                             143L,
1118
+                             166L,
1119
+                             284L],
1120
+          'sel-line': 12L,
1121
+          'sel-line-start': 356L,
1122
+          'selection_end': 356L,
1123
+          'selection_start': 356L,
1117 1124
           'zoom': 0L},
1118
-         1538212852.612],
1119
-        [loc('sources/tvplay.py'),
1120
-         {'attrib-starts': [('Source',
1121
-                             32),
1122
-                            ('Source.get_content',
1123
-                             62)],
1124
-          'first-line': 124L,
1125
-          'folded-linenos': [159L],
1126
-          'sel-line': 129L,
1127
-          'sel-line-start': 5841L,
1128
-          'selection_end': 5878L,
1129
-          'selection_start': 5852L,
1125
+         1539297655.692],
1126
+        [loc('../../../../../Python27/Lib/site-packages/PIL/Image.py'),
1127
+         {'attrib-starts': [],
1128
+          'first-line': 40L,
1129
+          'folded-linenos': [],
1130
+          'sel-line': 57L,
1131
+          'sel-line-start': 1583L,
1132
+          'selection_end': 1583L,
1133
+          'selection_start': 1583L,
1130 1134
           'zoom': 0L},
1131
-         1538212858.88],
1132
-        [loc('sources/tvplay.py'),
1133
-         {'attrib-starts': [('Source',
1134
-                             32),
1135
-                            ('Source.get_content',
1136
-                             62)],
1137
-          'first-line': 134L,
1138
-          'folded-linenos': [159L],
1139
-          'sel-line': 144L,
1140
-          'sel-line-start': 6564L,
1141
-          'selection_end': 6601L,
1142
-          'selection_start': 6575L,
1135
+         1539297662.222],
1136
+        [loc('run.py'),
1137
+         {'attrib-starts': [],
1138
+          'first-line': 7L,
1139
+          'folded-linenos': [],
1140
+          'sel-line': 12L,
1141
+          'sel-line-start': 232L,
1142
+          'selection_end': 232L,
1143
+          'selection_start': 232L,
1143 1144
           'zoom': 0L},
1144
-         1538212861.467],
1145
-        [loc('sources/tvplay.py'),
1146
-         {'attrib-starts': [('Source',
1147
-                             32),
1148
-                            ('Source.get_content',
1149
-                             62)],
1150
-          'first-line': 124L,
1151
-          'folded-linenos': [159L],
1152
-          'sel-line': 129L,
1153
-          'sel-line-start': 5841L,
1154
-          'selection_end': 5878L,
1155
-          'selection_start': 5852L,
1145
+         1539297770.425],
1146
+        [loc('sources/replay.py'),
1147
+         {'attrib-starts': [],
1148
+          'first-line': 104L,
1149
+          'folded-linenos': [70L,
1150
+                             89L,
1151
+                             143L,
1152
+                             166L,
1153
+                             284L],
1154
+          'sel-line': 12L,
1155
+          'sel-line-start': 356L,
1156
+          'selection_end': 356L,
1157
+          'selection_start': 356L,
1156 1158
           'zoom': 0L},
1157
-         1538212862.657],
1158
-        [loc('sources/tvplay.py'),
1159
+         1539297799.369],
1160
+        [loc('sources/replay.py'),
1159 1161
          {'attrib-starts': [('Source',
1160
-                             32),
1161
-                            ('Source.get_content',
1162
-                             62)],
1163
-          'first-line': 134L,
1164
-          'folded-linenos': [159L],
1165
-          'sel-line': 144L,
1166
-          'sel-line-start': 6564L,
1167
-          'selection_end': 6601L,
1168
-          'selection_start': 6575L,
1162
+                             31)],
1163
+          'first-line': 21L,
1164
+          'folded-linenos': [70L,
1165
+                             89L,
1166
+                             143L,
1167
+                             166L,
1168
+                             284L],
1169
+          'sel-line': 31L,
1170
+          'sel-line-start': 1008L,
1171
+          'selection_end': 1020L,
1172
+          'selection_start': 1014L,
1169 1173
           'zoom': 0L},
1170
-         1538212864.032],
1171
-        [loc('sources/tvplay.py'),
1174
+         1539297803.694],
1175
+        [loc('sources/replay.py'),
1172 1176
          {'attrib-starts': [('Source',
1173
-                             32),
1174
-                            ('Source.get_content',
1175
-                             62)],
1176
-          'first-line': 124L,
1177
-          'folded-linenos': [159L],
1178
-          'sel-line': 129L,
1179
-          'sel-line-start': 5841L,
1180
-          'selection_end': 5878L,
1181
-          'selection_start': 5852L,
1177
+                             31),
1178
+                            ('Source.get_streams',
1179
+                             220)],
1180
+          'first-line': 165L,
1181
+          'folded-linenos': [70L,
1182
+                             89L,
1183
+                             143L,
1184
+                             166L,
1185
+                             284L],
1186
+          'sel-line': 221L,
1187
+          'sel-line-start': 11331L,
1188
+          'selection_end': 11331L,
1189
+          'selection_start': 11331L,
1182 1190
           'zoom': 0L},
1183
-         1538212865.618],
1184
-        [loc('sources/tvplay.py'),
1191
+         1539298415.885],
1192
+        [loc('run.py'),
1193
+         {'attrib-starts': [('Main',
1194
+                             22),
1195
+                            ('Main.list_action',
1196
+                             106)],
1197
+          'first-line': 94L,
1198
+          'folded-linenos': [],
1199
+          'sel-line': 110L,
1200
+          'sel-line-start': 4515L,
1201
+          'selection_end': 4515L,
1202
+          'selection_start': 4515L,
1203
+          'zoom': 0L},
1204
+         1539298436.081],
1205
+        [loc('sources/replay.py'),
1185 1206
          {'attrib-starts': [('Source',
1186
-                             32),
1187
-                            ('Source.get_content',
1188
-                             62)],
1189
-          'first-line': 134L,
1190
-          'folded-linenos': [159L],
1191
-          'sel-line': 144L,
1192
-          'sel-line-start': 6564L,
1193
-          'selection_end': 6601L,
1194
-          'selection_start': 6575L,
1207
+                             31),
1208
+                            ('Source.get_streams',
1209
+                             220)],
1210
+          'first-line': 165L,
1211
+          'folded-linenos': [70L,
1212
+                             89L,
1213
+                             143L,
1214
+                             166L,
1215
+                             284L],
1216
+          'sel-line': 221L,
1217
+          'sel-line-start': 11331L,
1218
+          'selection_end': 11331L,
1219
+          'selection_start': 11331L,
1195 1220
           'zoom': 0L},
1196
-         1538212867.204],
1197
-        [loc('sources/tvplay.py'),
1198
-         {'attrib-starts': [],
1221
+         1539298448.838],
1222
+        [loc('run.py'),
1223
+         {'attrib-starts': [('Main',
1224
+                             22),
1225
+                            ('Main.list_action',
1226
+                             106)],
1199 1227
           'first-line': 0L,
1200
-          'folded-linenos': [159L],
1201
-          'sel-line': 14L,
1202
-          'sel-line-start': 421L,
1203
-          'selection_end': 431L,
1204
-          'selection_start': 431L,
1205
-          'zoom': 0L},
1206
-         1538242100.48],
1207
-        [loc('sources/tmp/ltc.py'),
1208
-         {'attrib-starts': [('Source',
1209
-                             26),
1210
-                            ('Source.get_content',
1211
-                             78)],
1212
-          'first-line': 117L,
1213 1228
           'folded-linenos': [],
1214
-          'sel-line': 123L,
1215
-          'sel-line-start': 5880L,
1216
-          'selection_end': 5911L,
1217
-          'selection_start': 5911L,
1229
+          'sel-line': 118L,
1230
+          'sel-line-start': 4754L,
1231
+          'selection_end': 4754L,
1232
+          'selection_start': 4754L,
1218 1233
           'zoom': 0L},
1219
-         1538242117.32],
1220
-        [loc('sources/tmp/ltc.py'),
1234
+         1539298521.416],
1235
+        [loc('sources/replay.py'),
1221 1236
          {'attrib-starts': [('Source',
1222
-                             26),
1237
+                             31),
1223 1238
                             ('Source.get_streams',
1224
-                             572)],
1225
-          'first-line': 574L,
1226
-          'folded-linenos': [],
1227
-          'sel-line': 572L,
1228
-          'sel-line-start': 33932L,
1229
-          'selection_end': 33951L,
1230
-          'selection_start': 33940L,
1239
+                             220)],
1240
+          'first-line': 165L,
1241
+          'folded-linenos': [70L,
1242
+                             89L,
1243
+                             143L,
1244
+                             166L,
1245
+                             284L],
1246
+          'sel-line': 221L,
1247
+          'sel-line-start': 11331L,
1248
+          'selection_end': 11331L,
1249
+          'selection_start': 11331L,
1231 1250
           'zoom': 0L},
1232
-         1538242153.844],
1233
-        [loc('sources/tmp/SourceBase.py'),
1234
-         {'attrib-starts': [],
1235
-          'first-line': 11L,
1251
+         1539298544.426],
1252
+        [loc('run.py'),
1253
+         {'attrib-starts': [('Main',
1254
+                             22),
1255
+                            ('Main.list_action',
1256
+                             106)],
1257
+          'first-line': 94L,
1236 1258
           'folded-linenos': [],
1237
-          'sel-line': 28L,
1238
-          'sel-line-start': 906L,
1239
-          'selection_end': 906L,
1240
-          'selection_start': 906L,
1259
+          'sel-line': 110L,
1260
+          'sel-line-start': 4515L,
1261
+          'selection_end': 4515L,
1262
+          'selection_start': 4515L,
1241 1263
           'zoom': 0L},
1242
-         1538242175.463],
1243
-        [loc('sources/tvplay.py'),
1244
-         {'attrib-starts': [],
1245
-          'first-line': 0L,
1246
-          'folded-linenos': [159L],
1247
-          'sel-line': 14L,
1248
-          'sel-line-start': 421L,
1249
-          'selection_end': 431L,
1250
-          'selection_start': 431L,
1251
-          'zoom': 0L},
1252
-         1538242185.735],
1253
-        [loc('sources/ltc.py'),
1264
+         1539298552.821],
1265
+        [loc('sources/replay.py'),
1254 1266
          {'attrib-starts': [('Source',
1255
-                             26),
1256
-                            ('Source.get_info2',
1257
-                             930)],
1258
-          'first-line': 925L,
1259
-          'folded-linenos': [132L,
1260
-                             161L,
1261
-                             221L,
1262
-                             232L,
1263
-                             258L,
1264
-                             277L,
1265
-                             296L,
1266
-                             320L,
1267
-                             350L,
1268
-                             351L,
1269
-                             399L,
1270
-                             412L,
1271
-                             532L],
1272
-          'sel-line': 944L,
1273
-          'sel-line-start': 48949L,
1274
-          'selection_end': 48949L,
1275
-          'selection_start': 48949L,
1267
+                             31),
1268
+                            ('Source.get_streams',
1269
+                             220)],
1270
+          'first-line': 402L,
1271
+          'folded-linenos': [70L,
1272
+                             89L,
1273
+                             143L,
1274
+                             166L,
1275
+                             284L],
1276
+          'sel-line': 412L,
1277
+          'sel-line-start': 20394L,
1278
+          'selection_end': 20394L,
1279
+          'selection_start': 20394L,
1276 1280
           'zoom': 0L},
1277
-         1538242192.809],
1278
-        [loc('sources/tmp/SourceBase.py'),
1279
-         {'attrib-starts': [],
1280
-          'first-line': 11L,
1281
+         1539298751.21],
1282
+        [loc('run.py'),
1283
+         {'attrib-starts': [('Main',
1284
+                             22),
1285
+                            ('Main.initUI',
1286
+                             47)],
1287
+          'first-line': 62L,
1281 1288
           'folded-linenos': [],
1282
-          'sel-line': 28L,
1283
-          'sel-line-start': 906L,
1284
-          'selection_end': 906L,
1285
-          'selection_start': 906L,
1289
+          'sel-line': 67L,
1290
+          'sel-line-start': 2534L,
1291
+          'selection_end': 2534L,
1292
+          'selection_start': 2534L,
1286 1293
           'zoom': 0L},
1287
-         1538242194.523],
1288
-        [loc('sources/ltc.py'),
1289
-         {'attrib-starts': [('Source',
1290
-                             26),
1291
-                            ('Source.get_info2',
1292
-                             930)],
1293
-          'first-line': 925L,
1294
-          'folded-linenos': [132L,
1295
-                             161L,
1296
-                             221L,
1297
-                             232L,
1298
-                             258L,
1299
-                             277L,
1300
-                             296L,
1301
-                             320L,
1302
-                             350L,
1303
-                             351L,
1304
-                             399L,
1305
-                             412L,
1306
-                             532L],
1307
-          'sel-line': 944L,
1308
-          'sel-line-start': 48949L,
1309
-          'selection_end': 48949L,
1310
-          'selection_start': 48949L,
1294
+         1539298794.934],
1295
+        [loc('run.py'),
1296
+         {'attrib-starts': [('Main',
1297
+                             22),
1298
+                            ('Main.show_desc',
1299
+                             196)],
1300
+          'first-line': 186L,
1301
+          'folded-linenos': [],
1302
+          'sel-line': 197L,
1303
+          'sel-line-start': 7793L,
1304
+          'selection_end': 7838L,
1305
+          'selection_start': 7793L,
1311 1306
           'zoom': 0L},
1312
-         1538242196.177],
1313
-        [loc('sources/tmp/ltc.py'),
1307
+         1539298803.499],
1308
+        [loc('sources/replay.py'),
1314 1309
          {'attrib-starts': [('Source',
1315
-                             26),
1310
+                             31),
1316 1311
                             ('Source.get_streams',
1317
-                             572)],
1318
-          'first-line': 574L,
1312
+                             220)],
1313
+          'first-line': 402L,
1314
+          'folded-linenos': [70L,
1315
+                             89L,
1316
+                             143L,
1317
+                             166L,
1318
+                             284L],
1319
+          'sel-line': 412L,
1320
+          'sel-line-start': 20394L,
1321
+          'selection_end': 20394L,
1322
+          'selection_start': 20394L,
1323
+          'zoom': 0L},
1324
+         1539298809.481],
1325
+        [loc('run.py'),
1326
+         {'attrib-starts': [('Main',
1327
+                             22),
1328
+                            ('Main.show_desc',
1329
+                             196)],
1330
+          'first-line': 186L,
1319 1331
           'folded-linenos': [],
1320
-          'sel-line': 572L,
1321
-          'sel-line-start': 33932L,
1322
-          'selection_end': 33951L,
1323
-          'selection_start': 33940L,
1332
+          'sel-line': 198L,
1333
+          'sel-line-start': 7838L,
1334
+          'selection_end': 7846L,
1335
+          'selection_start': 7846L,
1324 1336
           'zoom': 0L},
1325
-         1538242196.984],
1326
-        [loc('sources/ltc.py'),
1337
+         1539298830.092],
1338
+        [loc('sources/replay.py'),
1327 1339
          {'attrib-starts': [('Source',
1328
-                             26),
1329
-                            ('Source.get_info2',
1330
-                             930)],
1331
-          'first-line': 925L,
1332
-          'folded-linenos': [132L,
1333
-                             161L,
1334
-                             221L,
1335
-                             232L,
1336
-                             258L,
1337
-                             277L,
1338
-                             296L,
1339
-                             320L,
1340
-                             350L,
1341
-                             351L,
1342
-                             399L,
1343
-                             412L,
1344
-                             532L],
1345
-          'sel-line': 932L,
1346
-          'sel-line-start': 48309L,
1347
-          'selection_end': 48345L,
1348
-          'selection_start': 48325L,
1340
+                             31),
1341
+                            ('Source.get_streams',
1342
+                             220)],
1343
+          'first-line': 165L,
1344
+          'folded-linenos': [70L,
1345
+                             89L,
1346
+                             143L,
1347
+                             166L,
1348
+                             284L],
1349
+          'sel-line': 221L,
1350
+          'sel-line-start': 11331L,
1351
+          'selection_end': 11331L,
1352
+          'selection_start': 11331L,
1349 1353
           'zoom': 0L},
1350
-         1538242212.028]],
1354
+         1539298837.49]],
1351 1355
         20),
1352
-        'current-loc': loc('sources/ltc.py'),
1356
+        'current-loc': loc('run.py'),
1353 1357
         'editor-state-list': [(loc('run.py'),
1354
-                               {'attrib-starts': [('VideoInfo',
1355
-        343),
1356
-        ('VideoInfo.body',
1357
-         370)],
1358
-                                'first-line': 401L,
1358
+                               {'attrib-starts': [('Main',
1359
+        22),
1360
+        ('Main.list_action',
1361
+         106)],
1362
+                                'first-line': 105L,
1359 1363
                                 'folded-linenos': [],
1360
-                                'sel-line': 412L,
1361
-                                'sel-line-start': 16393L,
1362
-                                'selection_end': 16393L,
1363
-                                'selection_start': 16393L,
1364
+                                'sel-line': 110L,
1365
+                                'sel-line-start': 4515L,
1366
+                                'selection_end': 4527L,
1367
+                                'selection_start': 4527L,
1364 1368
                                 'zoom': 0L}),
1365 1369
                               (loc('util.py'),
1366 1370
                                {'attrib-starts': [('unescape',
@@ -1400,17 +1404,20 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1400 1404
                                 'selection_start': 51782L,
1401 1405
                                 'zoom': 0L}),
1402 1406
                               (loc('sources/replay.py'),
1403
-                               {'attrib-starts': [],
1404
-                                'first-line': 4L,
1407
+                               {'attrib-starts': [('Source',
1408
+        31),
1409
+        ('Source.get_streams',
1410
+         220)],
1411
+                                'first-line': 165L,
1405 1412
                                 'folded-linenos': [70L,
1406 1413
         89L,
1407 1414
         143L,
1408 1415
         166L,
1409 1416
         284L],
1410
-                                'sel-line': 12L,
1411
-                                'sel-line-start': 356L,
1412
-                                'selection_end': 356L,
1413
-                                'selection_start': 356L,
1417
+                                'sel-line': 221L,
1418
+                                'sel-line-start': 11331L,
1419
+                                'selection_end': 11331L,
1420
+                                'selection_start': 11331L,
1414 1421
                                 'zoom': 0L}),
1415 1422
                               (loc('sources/tvplay.py'),
1416 1423
                                {'attrib-starts': [],
@@ -1477,6 +1484,15 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1477 1484
                                 'sel-line-start': 7404L,
1478 1485
                                 'selection_end': 7404L,
1479 1486
                                 'selection_start': 7404L,
1487
+                                'zoom': 0L}),
1488
+                              (loc('../../../../../Python27/Lib/site-packages/PIL/Image.py'),
1489
+                               {'attrib-starts': [],
1490
+                                'first-line': 40L,
1491
+                                'folded-linenos': [],
1492
+                                'sel-line': 60L,
1493
+                                'sel-line-start': 1578L,
1494
+                                'selection_end': 1583L,
1495
+                                'selection_start': 1583L,
1480 1496
                                 'zoom': 0L})],
1481 1497
         'has-focus': True,
1482 1498
         'locked': False},
@@ -1489,19 +1505,21 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1489 1505
          loc('sources/config.py'),
1490 1506
          loc('changelog.md'),
1491 1507
          loc('sources/filmix.py'),
1492
-         loc('sources/filmas.py')]),
1508
+         loc('sources/filmas.py'),
1509
+         loc('../../../../../Python27/Lib/site-packages/PIL/Image.py')]),
1493 1510
                                'open_files': [u'changelog.md',
1494
-        u'run.py',
1495 1511
         u'sources/config.py',
1496 1512
         u'sources/euronews.py',
1497 1513
         u'sources/filmas.py',
1498 1514
         u'sources/filmix.py',
1499
-        u'sources/replay.py',
1500
-        u'util.py',
1501 1515
         u'sources/tvplay.py',
1502
-        u'sources/ltc.py']},
1516
+        u'util.py',
1517
+        u'sources/ltc.py',
1518
+        u'../../../../../Python27/Lib/site-packages/PIL/Image.py',
1519
+        u'sources/replay.py',
1520
+        u'run.py']},
1503 1521
         'saved_notebook_display': None,
1504
-        'split_percents': {0: 0.43178920526986825},
1522
+        'split_percents': {0: 0.5388225255972696},
1505 1523
         'splits': 2,
1506 1524
         'tab_location': 'top',
1507 1525
         'user_data': {}},
@@ -1514,12 +1532,13 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1514 1532
                          0,
1515 1533
                          2393,
1516 1534
                          1440)}]}
1517
-guimgr.recent-documents = [loc('sources/ltc.py'),
1518
-                           loc('sources/tvplay.py'),
1535
+guimgr.recent-documents = [loc('run.py'),
1536
+                           loc('sources/replay.py'),
1537
+                           loc('../../../../../Python27/Lib/site-packages/PIL/Image.py'),
1538
+                           loc('sources/ltc.py'),
1519 1539
                            loc('util.py'),
1520
-                           loc('run.py'),
1540
+                           loc('sources/tvplay.py'),
1521 1541
                            loc('sources/euronews.py'),
1522
-                           loc('sources/replay.py'),
1523 1542
                            loc('sources/filmix.py'),
1524 1543
                            loc('sources/filmas.py'),
1525 1544
                            loc('changelog.md'),
@@ -2025,7 +2044,7 @@ guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
2025 2044
         'sel-line-start': 0,
2026 2045
         'selection_end': 1,
2027 2046
         'selection_start': 1},
2028
-                       loc('../../../../../Python27/lib/ftplib.py'): {'attri'\
2047
+                       loc('../../../../../Python27/Lib/ftplib.py'): {'attri'\
2029 2048
         'b-starts': [],
2030 2049
         'first-line': 0L,
2031 2050
         'folded-linenos': [],
@@ -2034,7 +2053,7 @@ guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
2034 2053
         'selection_end': 0L,
2035 2054
         'selection_start': 0L,
2036 2055
         'zoom': 0L},
2037
-                       loc('../../../../../Python27/lib/lib-tk/Tkinter.py'): {'a'\
2056
+                       loc('../../../../../Python27/Lib/lib-tk/Tkinter.py'): {'a'\
2038 2057
         'ttrib-starts': [('CallWrapper',
2039 2058
                           1528),
2040 2059
                          ('CallWrapper.__call__',
@@ -2046,7 +2065,7 @@ guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
2046 2065
         'selection_end': 60799L,
2047 2066
         'selection_start': 60799L,
2048 2067
         'zoom': 0L},
2049
-                       loc('../../../../../Python27/lib/lib-tk/tkCommonDialog.py'): {'a'\
2068
+                       loc('../../../../../Python27/Lib/lib-tk/tkCommonDialog.py'): {'a'\
2050 2069
         'ttrib-starts': [('Dialog',
2051 2070
                           12)],
2052 2071
         'first-line': 12L,
@@ -2056,7 +2075,7 @@ guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
2056 2075
         'selection_end': 298L,
2057 2076
         'selection_start': 298L,
2058 2077
         'zoom': 0L},
2059
-                       loc('../../../../../Python27/lib/lib-tk/tkSimpleDialog.py'): {'a'\
2078
+                       loc('../../../../../Python27/Lib/lib-tk/tkSimpleDialog.py'): {'a'\
2060 2079
         'ttrib-starts': [('Dialog',
2061 2080
                           29),
2062 2081
                          ('Dialog.__init__',
@@ -2068,7 +2087,16 @@ guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
2068 2087
         'selection_end': 1686L,
2069 2088
         'selection_start': 1686L,
2070 2089
         'zoom': 0L},
2071
-                       loc('../../../../../Python27/lib/site-packages/requests/adapters.py'): {'a'\
2090
+                       loc('../../../../../Python27/Lib/site-packages/PIL/Image.py'): {'a'\
2091
+        'ttrib-starts': [],
2092
+        'first-line': 40L,
2093
+        'folded-linenos': [],
2094
+        'sel-line': 54L,
2095
+        'sel-line-start': 1389L,
2096
+        'selection_end': 1434L,
2097
+        'selection_start': 1434L,
2098
+        'zoom': 0L},
2099
+                       loc('../../../../../Python27/Lib/site-packages/requests/adapters.py'): {'a'\
2072 2100
         'ttrib-starts': [('HTTPAdapter',
2073 2101
                           80),
2074 2102
                          ('HTTPAdapter.send',
@@ -2080,7 +2108,7 @@ guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
2080 2108
         'selection_end': 20166L,
2081 2109
         'selection_start': 20166L,
2082 2110
         'zoom': 0L},
2083
-                       loc('../../../../../Python27/lib/site-packages/requests/models.py'): {'a'\
2111
+                       loc('../../../../../Python27/Lib/site-packages/requests/models.py'): {'a'\
2084 2112
         'ttrib-starts': [('Response',
2085 2113
                           577),
2086 2114
                          ('Response.content',

+ 1
- 1
sources/replay.py Näytä tiedosto

@@ -374,7 +374,7 @@ Referer: https://replay.lsm.lv/%s/%s
374 374
                 r3 = self._http_request(url3, headers=headers)
375 375
                 if not r3:
376 376
                     raise Exception("No stream found")
377
-                m = re.search(r"src: '([^']+)',\s+?type: 'application/x-mpegurl'", r3, re.DOTALL)
377
+                m = re.search(r"src: '([^']+)',\s+?type: 'application/x-mpegurl'", r3, re.DOTALL|re.IGNORECASE)
378 378
                 if not m:
379 379
                     raise Exception("No stream found")
380 380
                 data2 = "https:" + m.group(1)