Ivars před 6 roky
rodič
revize
6d277fc326
3 změnil soubory, kde provedl 328 přidání a 480 odebrání
  1. 325
    478
      project.wpr
  2. 1
    1
      run.py
  3. 2
    1
      sources/play24.py

+ 325
- 478
project.wpr Zobrazit soubor

@@ -159,10 +159,18 @@ debug.breakpoints = {loc('Downloader.py'): {94: (0,
159 159
                None,
160 160
                1,
161 161
                0)},
162
-                     loc('sources/replay.py'): {145L: (0,
162
+                     loc('sources/play24.py'): {39L: (0,
163
+        None,
164
+        1,
165
+        0)},
166
+                     loc('sources/replay.py'): {13L: (0,
163 167
         None,
164 168
         1,
165 169
         0),
170
+        145L: (0,
171
+               None,
172
+               1,
173
+               0),
166 174
         366L: (0,
167 175
                None,
168 176
                1,
@@ -307,7 +315,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
307 315
                                {'tree-state': {'file-sort-method': 'by name',
308 316
         'list-files-first': 0,
309 317
         'tree-states': {'deep': {'expanded-nodes': [],
310
-                                 'selected-nodes': [(13,)],
318
+                                 'selected-nodes': [(36,)],
311 319
                                  'top-node': (0,)}},
312 320
         'tree-style': 'deep'}}),
313 321
                               ('snippets',
@@ -457,12 +465,6 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
457 465
         'top-node': [('generic attribute',
458 466
                       loc('../../../Python27/Lib/site-packages/win32com/client/dynamic.py'),
459 467
                       'ALL_INVOKE_TYPES')]},
460
-        loc('../../SplashData/remdup.py'): {'column-widths': [1.0],
461
-        'expanded-nodes': [],
462
-        'selected-nodes': [],
463
-        'top-node': [('generic attribute',
464
-                      loc('../../SplashData/remdup.py'),
465
-                      'f')]},
466 468
         loc('../$test/test2.py'): {'column-widths': [1.0],
467 469
                                    'expanded-nodes': [],
468 470
                                    'selected-nodes': [],
@@ -791,6 +793,12 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
791 793
                                       'top-node': [('generic attribute',
792 794
         loc('../vietas/vietas2.py'),
793 795
         'd_lat')]},
796
+        loc('../../SplashData/remdup.py'): {'column-widths': [1.0],
797
+        'expanded-nodes': [],
798
+        'selected-nodes': [],
799
+        'top-node': [('generic attribute',
800
+                      loc('../../SplashData/remdup.py'),
801
+                      'f')]},
794 802
         loc('../../../../../Python27/lib/lib-tk/Tkinter.py'): {'expanded-nod'\
795 803
         'es': [],
796 804
         'selected-nodes': [],
@@ -826,18 +834,18 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
826 834
         'top-node': [('generic attribute',
827 835
                       loc('../../../../../Python27/lib/site-packages/PIL/Image.py'),
828 836
                       'ADAPTIVE')]},
829
-        loc('unknown:<untitled> #3'): {'column-widths': [1.0],
837
+        loc('unknown:<untitled> #4'): {'column-widths': [1.0],
830 838
                                        'expanded-nodes': [],
831 839
                                        'selected-nodes': [],
832 840
                                        'top-node': None},
833
-        loc('unknown:<untitled> #6'): {'column-widths': [1.0],
834
-                                       'expanded-nodes': [],
841
+        loc('unknown:<untitled> #5'): {'expanded-nodes': [],
835 842
                                        'selected-nodes': [],
836 843
                                        'top-node': None},
837
-        loc('unknown:<untitled> #5'): {'expanded-nodes': [],
844
+        loc('unknown:<untitled> #6'): {'expanded-nodes': [],
838 845
                                        'selected-nodes': [],
839 846
                                        'top-node': None},
840
-        loc('unknown:<untitled> #4'): {'expanded-nodes': [],
847
+        loc('unknown:<untitled> #3'): {'column-widths': [1.0],
848
+                                       'expanded-nodes': [],
841 849
                                        'selected-nodes': [],
842 850
                                        'top-node': None}},
843 851
                                 'browse_mode': u'Current Module',
@@ -864,7 +872,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
864 872
                                None)],
865 873
                  'primary_view_state': {'area': 'wide',
866 874
         'constraint': None,
867
-        'current_pages': [2,
875
+        'current_pages': [4,
868 876
                           0],
869 877
         'notebook_display': 'normal',
870 878
         'notebook_percent': 0.4595676541232986,
@@ -900,7 +908,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
900 908
                                        'fRegexFlags': 46,
901 909
                                        'fReplaceText': u'filmix.co',
902 910
                                        'fReverse': False,
903
-                                       'fSearchText': u'~',
911
+                                       'fSearchText': u'riga24',
904 912
                                        'fStartPos': 0,
905 913
                                        'fStyle': 'text',
906 914
                                        'fWholeWords': False,
@@ -974,20 +982,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
974 982
         -1,
975 983
         -1),
976 984
                        'attrib-starts': [],
977
-                       'first-line': 21L,
985
+                       'first-line': 0L,
978 986
                        'folded-linenos': [],
979
-                       'history': {u'file:C:/Data/Programming/Kodi/plugin.video.playstream/resources/lib/content/sources/replay.py': ['p'\
980
-        'rint url2\n',
981
-        'print headers\n',
982
-        'raise \n',
983
-        'url3\n',
984
-        'url\n',
985
-        'data2\n']},
987
+                       'history': {},
986 988
                        'launch-id': None,
987
-                       'sel-line': 29L,
988
-                       'sel-line-start': 2068L,
989
-                       'selection_end': 2068L,
990
-                       'selection_start': 2068L,
989
+                       'sel-line': 0L,
990
+                       'sel-line-start': 0L,
991
+                       'selection_end': 0L,
992
+                       'selection_start': 0L,
991 993
                        'zoom': 0L}),
992 994
                      ('debug-watch',
993 995
                       'wide',
@@ -1035,467 +1037,261 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1035 1037
                        'selection_end': 174L,
1036 1038
                        'selection_start': 174L,
1037 1039
                        'zoom': 0L})],
1038
-        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('sources/ltc.py'),
1039
-        {'attrib-starts': [('Source',
1040
-                            26)],
1041
-         'first-line': 16L,
1042
-         'folded-linenos': [108L,
1043
-                            131L,
1044
-                            160L,
1045
-                            220L,
1046
-                            231L,
1047
-                            257L,
1048
-                            276L,
1049
-                            295L,
1050
-                            319L,
1051
-                            349L,
1052
-                            350L,
1053
-                            367L,
1054
-                            398L,
1055
-                            411L,
1056
-                            525L],
1057
-         'sel-line': 27L,
1058
-         'sel-line-start': 1064L,
1059
-         'selection_end': 1064L,
1060
-         'selection_start': 1064L,
1040
+        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('run.py'),
1041
+        {'attrib-starts': [('player',
1042
+                            683)],
1043
+         'first-line': 717L,
1044
+         'folded-linenos': [],
1045
+         'sel-line': 725L,
1046
+         'sel-line-start': 29264L,
1047
+         'selection_end': 29264L,
1048
+         'selection_start': 29264L,
1061 1049
          'zoom': 0L},
1062
-        1530209630.762],
1063
-        [loc('sources/ltc.py'),
1064
-         {'attrib-starts': [('Source',
1065
-                             26),
1066
-                            ('Source.get_content',
1067
-                             78)],
1068
-          'first-line': 371L,
1069
-          'folded-linenos': [108L,
1070
-                             131L,
1071
-                             160L,
1072
-                             220L,
1073
-                             231L,
1074
-                             257L,
1075
-                             276L,
1076
-                             295L,
1077
-                             319L,
1078
-                             349L,
1079
-                             350L,
1080
-                             398L,
1081
-                             411L,
1082
-                             525L],
1083
-          'sel-line': 379L,
1084
-          'sel-line-start': 23333L,
1085
-          'selection_end': 23389L,
1086
-          'selection_start': 23381L,
1050
+        1531338200.155],
1051
+        [loc('run.py'),
1052
+         {'attrib-starts': [('player',
1053
+                             683)],
1054
+          'first-line': 675L,
1055
+          'folded-linenos': [],
1056
+          'sel-line': 683L,
1057
+          'sel-line-start': 27462L,
1058
+          'selection_end': 27525L,
1059
+          'selection_start': 27523L,
1087 1060
           'zoom': 0L},
1088
-         1530209631.365],
1089
-        [loc('sources/ltc.py'),
1090
-         {'attrib-starts': [('Source',
1091
-                             26),
1092
-                            ('Source.get_info2',
1093
-                             923)],
1094
-          'first-line': 927L,
1095
-          'folded-linenos': [108L,
1096
-                             131L,
1097
-                             160L,
1098
-                             220L,
1099
-                             231L,
1100
-                             257L,
1101
-                             276L,
1102
-                             295L,
1103
-                             319L,
1104
-                             349L,
1105
-                             350L,
1106
-                             398L,
1107
-                             411L,
1108
-                             525L],
1109
-          'sel-line': 935L,
1110
-          'sel-line-start': 48606L,
1111
-          'selection_end': 48625L,
1112
-          'selection_start': 48625L,
1061
+         1531338201.255],
1062
+        [loc('run.py'),
1063
+         {'attrib-starts': [('player',
1064
+                             683)],
1065
+          'first-line': 675L,
1066
+          'folded-linenos': [],
1067
+          'sel-line': 683L,
1068
+          'sel-line-start': 27462L,
1069
+          'selection_end': 27526L,
1070
+          'selection_start': 27523L,
1113 1071
           'zoom': 0L},
1114
-         1530209783.776],
1115
-        [loc('sources/ltc.py'),
1116
-         {'attrib-starts': [('Source',
1117
-                             26),
1118
-                            ('Source.get_info2',
1119
-                             923)],
1120
-          'first-line': 938L,
1121
-          'folded-linenos': [108L,
1122
-                             131L,
1123
-                             160L,
1124
-                             220L,
1125
-                             231L,
1126
-                             257L,
1127
-                             276L,
1128
-                             295L,
1129
-                             319L,
1130
-                             349L,
1131
-                             350L,
1132
-                             398L,
1133
-                             411L,
1134
-                             525L],
1135
-          'sel-line': 949L,
1136
-          'sel-line-start': 49233L,
1137
-          'selection_end': 49249L,
1138
-          'selection_start': 49249L,
1072
+         1531338201.778],
1073
+        [loc('run.py'),
1074
+         {'attrib-starts': [('player',
1075
+                             683)],
1076
+          'first-line': 675L,
1077
+          'folded-linenos': [],
1078
+          'sel-line': 683L,
1079
+          'sel-line-start': 27462L,
1080
+          'selection_end': 27527L,
1081
+          'selection_start': 27523L,
1139 1082
           'zoom': 0L},
1140
-         1530209829.028],
1141
-        [loc('sources/ltc.py'),
1142
-         {'attrib-starts': [('Source',
1143
-                             26),
1144
-                            ('Source.get_info2',
1145
-                             923)],
1146
-          'first-line': 941L,
1147
-          'folded-linenos': [108L,
1148
-                             131L,
1149
-                             160L,
1150
-                             220L,
1151
-                             231L,
1152
-                             257L,
1153
-                             276L,
1154
-                             295L,
1155
-                             319L,
1156
-                             349L,
1157
-                             350L,
1158
-                             398L,
1159
-                             411L,
1160
-                             525L],
1161
-          'sel-line': 949L,
1162
-          'sel-line-start': 49233L,
1163
-          'selection_end': 49267L,
1164
-          'selection_start': 49266L,
1083
+         1531338203.808],
1084
+        [loc('run.py'),
1085
+         {'attrib-starts': [('player',
1086
+                             683)],
1087
+          'first-line': 675L,
1088
+          'folded-linenos': [],
1089
+          'sel-line': 683L,
1090
+          'sel-line-start': 27462L,
1091
+          'selection_end': 27529L,
1092
+          'selection_start': 27523L,
1165 1093
           'zoom': 0L},
1166
-         1530209829.62],
1167
-        [loc('sources/ltc.py'),
1168
-         {'attrib-starts': [('Source',
1169
-                             26),
1170
-                            ('Source.get_content',
1171
-                             78)],
1172
-          'first-line': 114L,
1173
-          'folded-linenos': [132L,
1174
-                             161L,
1175
-                             221L,
1176
-                             232L,
1177
-                             258L,
1178
-                             277L,
1179
-                             296L,
1180
-                             320L,
1181
-                             350L,
1182
-                             351L,
1183
-                             399L,
1184
-                             412L,
1185
-                             526L],
1186
-          'sel-line': 120L,
1187
-          'sel-line-start': 5707L,
1188
-          'selection_end': 5727L,
1189
-          'selection_start': 5727L,
1094
+         1531338204.289],
1095
+        [loc('run.py'),
1096
+         {'attrib-starts': [('player',
1097
+                             683)],
1098
+          'first-line': 699L,
1099
+          'folded-linenos': [],
1100
+          'sel-line': 709L,
1101
+          'sel-line-start': 28739L,
1102
+          'selection_end': 28757L,
1103
+          'selection_start': 28757L,
1190 1104
           'zoom': 0L},
1191
-         1530209851.883],
1192
-        [loc('sources/ltc.py'),
1105
+         1531338235.312],
1106
+        [loc('sources/play24.py'),
1193 1107
          {'attrib-starts': [('Source',
1194
-                             26),
1108
+                             28),
1195 1109
                             ('Source.get_content',
1196
-                             78)],
1197
-          'first-line': 114L,
1198
-          'folded-linenos': [132L,
1199
-                             161L,
1200
-                             221L,
1201
-                             232L,
1202
-                             258L,
1203
-                             277L,
1204
-                             296L,
1205
-                             320L,
1206
-                             350L,
1207
-                             351L,
1208
-                             399L,
1209
-                             412L,
1210
-                             526L],
1211
-          'sel-line': 120L,
1212
-          'sel-line-start': 5707L,
1213
-          'selection_end': 5740L,
1214
-          'selection_start': 5739L,
1110
+                             37)],
1111
+          'first-line': 166L,
1112
+          'folded-linenos': [],
1113
+          'sel-line': 176L,
1114
+          'sel-line-start': 8111L,
1115
+          'selection_end': 8111L,
1116
+          'selection_start': 8111L,
1215 1117
           'zoom': 0L},
1216
-         1530209853.995],
1217
-        [loc('sources/ltc.py'),
1218
-         {'attrib-starts': [('Source',
1219
-                             26),
1220
-                            ('Source.get_content',
1221
-                             78)],
1222
-          'first-line': 427L,
1223
-          'folded-linenos': [132L,
1224
-                             161L,
1225
-                             221L,
1226
-                             232L,
1227
-                             258L,
1228
-                             277L,
1229
-                             296L,
1230
-                             320L,
1231
-                             350L,
1232
-                             351L,
1233
-                             399L,
1234
-                             412L,
1235
-                             527L],
1236
-          'sel-line': 438L,
1237
-          'sel-line-start': 26894L,
1238
-          'selection_end': 26914L,
1239
-          'selection_start': 26914L,
1118
+         1531338242.137],
1119
+        [loc('run.py'),
1120
+         {'attrib-starts': [('Main',
1121
+                             22),
1122
+                            ('Main.initUI',
1123
+                             47)],
1124
+          'first-line': 45L,
1125
+          'folded-linenos': [],
1126
+          'sel-line': 50L,
1127
+          'sel-line-start': 1765L,
1128
+          'selection_end': 1765L,
1129
+          'selection_start': 1765L,
1240 1130
           'zoom': 0L},
1241
-         1530209873.48],
1242
-        [loc('sources/ltc.py'),
1131
+         1531338245.587],
1132
+        [loc('sources/play24.py'),
1243 1133
          {'attrib-starts': [('Source',
1244
-                             26),
1134
+                             28),
1245 1135
                             ('Source.get_content',
1246
-                             78)],
1247
-          'first-line': 430L,
1248
-          'folded-linenos': [132L,
1249
-                             161L,
1250
-                             221L,
1251
-                             232L,
1252
-                             258L,
1253
-                             277L,
1254
-                             296L,
1255
-                             320L,
1256
-                             350L,
1257
-                             351L,
1258
-                             399L,
1259
-                             412L,
1260
-                             527L],
1261
-          'sel-line': 438L,
1262
-          'sel-line-start': 26894L,
1263
-          'selection_end': 26927L,
1264
-          'selection_start': 26926L,
1136
+                             37)],
1137
+          'first-line': 166L,
1138
+          'folded-linenos': [],
1139
+          'sel-line': 176L,
1140
+          'sel-line-start': 8111L,
1141
+          'selection_end': 8111L,
1142
+          'selection_start': 8111L,
1265 1143
           'zoom': 0L},
1266
-         1530209876.657],
1267
-        [loc('sources/ltc.py'),
1144
+         1531338266.096],
1145
+        [loc('run.py'),
1146
+         {'attrib-starts': [('player',
1147
+                             683)],
1148
+          'first-line': 712L,
1149
+          'folded-linenos': [],
1150
+          'sel-line': 722L,
1151
+          'sel-line-start': 29192L,
1152
+          'selection_end': 29192L,
1153
+          'selection_start': 29192L,
1154
+          'zoom': 0L},
1155
+         1531339005.898],
1156
+        [loc('sources/play24.py'),
1268 1157
          {'attrib-starts': [('Source',
1269
-                             26),
1158
+                             28),
1270 1159
                             ('Source.get_content',
1271
-                             78)],
1272
-          'first-line': 470L,
1273
-          'folded-linenos': [132L,
1274
-                             161L,
1275
-                             221L,
1276
-                             232L,
1277
-                             258L,
1278
-                             277L,
1279
-                             296L,
1280
-                             320L,
1281
-                             350L,
1282
-                             351L,
1283
-                             399L,
1284
-                             412L,
1285
-                             530L],
1286
-          'sel-line': 483L,
1287
-          'sel-line-start': 29084L,
1288
-          'selection_end': 29120L,
1289
-          'selection_start': 29120L,
1160
+                             37)],
1161
+          'first-line': 166L,
1162
+          'folded-linenos': [],
1163
+          'sel-line': 176L,
1164
+          'sel-line-start': 8111L,
1165
+          'selection_end': 8111L,
1166
+          'selection_start': 8111L,
1290 1167
           'zoom': 0L},
1291
-         1530209938.167],
1292
-        [loc('sources/ltc.py'),
1293
-         {'attrib-starts': [('Source',
1294
-                             26),
1295
-                            ('Source.get_info2',
1296
-                             928)],
1297
-          'first-line': 944L,
1298
-          'folded-linenos': [132L,
1299
-                             161L,
1300
-                             221L,
1301
-                             232L,
1302
-                             258L,
1303
-                             277L,
1304
-                             296L,
1305
-                             320L,
1306
-                             350L,
1307
-                             351L,
1308
-                             399L,
1309
-                             412L,
1310
-                             530L],
1311
-          'sel-line': 954L,
1312
-          'sel-line-start': 49416L,
1313
-          'selection_end': 49450L,
1314
-          'selection_start': 49449L,
1168
+         1531339030.185],
1169
+        [loc('run.py'),
1170
+         {'attrib-starts': [('player',
1171
+                             683)],
1172
+          'first-line': 712L,
1173
+          'folded-linenos': [],
1174
+          'sel-line': 722L,
1175
+          'sel-line-start': 29192L,
1176
+          'selection_end': 29192L,
1177
+          'selection_start': 29192L,
1315 1178
           'zoom': 0L},
1316
-         1530209940.401],
1317
-        [loc('sources/ltc.py'),
1179
+         1531339051.855],
1180
+        [loc('sources/play24.py'),
1318 1181
          {'attrib-starts': [('Source',
1319
-                             26),
1182
+                             28),
1320 1183
                             ('Source.get_content',
1321
-                             78)],
1322
-          'first-line': 115L,
1323
-          'folded-linenos': [132L,
1324
-                             161L,
1325
-                             221L,
1326
-                             232L,
1327
-                             258L,
1328
-                             277L,
1329
-                             296L,
1330
-                             320L,
1331
-                             350L,
1332
-                             351L,
1333
-                             399L,
1334
-                             412L,
1335
-                             530L],
1336
-          'sel-line': 120L,
1337
-          'sel-line-start': 5707L,
1338
-          'selection_end': 5740L,
1339
-          'selection_start': 5739L,
1184
+                             37)],
1185
+          'first-line': 163L,
1186
+          'folded-linenos': [],
1187
+          'sel-line': 176L,
1188
+          'sel-line-start': 8111L,
1189
+          'selection_end': 8111L,
1190
+          'selection_start': 8111L,
1340 1191
           'zoom': 0L},
1341
-         1530209942.171],
1342
-        [loc('sources/ltc.py'),
1192
+         1531339102.874],
1193
+        [loc('sources/play24.py'),
1343 1194
          {'attrib-starts': [('Source',
1344
-                             26),
1345
-                            ('Source.get_content',
1346
-                             78)],
1347
-          'first-line': 428L,
1348
-          'folded-linenos': [132L,
1349
-                             161L,
1350
-                             221L,
1351
-                             232L,
1352
-                             258L,
1353
-                             277L,
1354
-                             296L,
1355
-                             320L,
1356
-                             350L,
1357
-                             351L,
1358
-                             399L,
1359
-                             412L,
1360
-                             530L],
1361
-          'sel-line': 438L,
1362
-          'sel-line-start': 26894L,
1363
-          'selection_end': 26927L,
1364
-          'selection_start': 26926L,
1195
+                             28),
1196
+                            ('Source.__init__',
1197
+                             30)],
1198
+          'first-line': 24L,
1199
+          'folded-linenos': [],
1200
+          'sel-line': 33L,
1201
+          'sel-line-start': 1078L,
1202
+          'selection_end': 1108L,
1203
+          'selection_start': 1098L,
1365 1204
           'zoom': 0L},
1366
-         1530209984.345],
1367
-        [loc('sources/ltc.py'),
1205
+         1531339276.155],
1206
+        [loc('sources/play24.py'),
1368 1207
          {'attrib-starts': [('Source',
1369
-                             26),
1370
-                            ('Source.get_info2',
1371
-                             930)],
1372
-          'first-line': 934L,
1373
-          'folded-linenos': [132L,
1374
-                             161L,
1375
-                             221L,
1376
-                             232L,
1377
-                             258L,
1378
-                             277L,
1379
-                             296L,
1380
-                             320L,
1381
-                             350L,
1382
-                             351L,
1383
-                             399L,
1384
-                             412L,
1385
-                             532L],
1386
-          'sel-line': 944L,
1387
-          'sel-line-start': 48949L,
1388
-          'selection_end': 48949L,
1389
-          'selection_start': 48949L,
1208
+                             28),
1209
+                            ('Source.__init__',
1210
+                             30)],
1211
+          'first-line': 25L,
1212
+          'folded-linenos': [],
1213
+          'sel-line': 33L,
1214
+          'sel-line-start': 1078L,
1215
+          'selection_end': 1108L,
1216
+          'selection_start': 1098L,
1390 1217
           'zoom': 0L},
1391
-         1530474479.645],
1392
-        [loc('sources/replay.py'),
1218
+         1531339277.721],
1219
+        [loc('sources/play24.py'),
1393 1220
          {'attrib-starts': [('Source',
1394
-                             31),
1395
-                            ('Source.get_streams',
1396
-                             220)],
1397
-          'first-line': 263L,
1398
-          'folded-linenos': [70L,
1399
-                             89L,
1400
-                             143L,
1401
-                             166L,
1402
-                             284L],
1403
-          'sel-line': 268L,
1404
-          'sel-line-start': 13506L,
1405
-          'selection_end': 13506L,
1406
-          'selection_start': 13506L,
1221
+                             28),
1222
+                            ('Source.get_content',
1223
+                             37)],
1224
+          'first-line': 38L,
1225
+          'folded-linenos': [],
1226
+          'sel-line': 48L,
1227
+          'sel-line-start': 1646L,
1228
+          'selection_end': 1698L,
1229
+          'selection_start': 1695L,
1407 1230
           'zoom': 0L},
1408
-         1530474598.565],
1409
-        [loc('sources/replay.py'),
1231
+         1531339279.063],
1232
+        [loc('sources/play24.py'),
1410 1233
          {'attrib-starts': [('Source',
1411
-                             31),
1412
-                            ('Source.get_streams',
1413
-                             220)],
1414
-          'first-line': 353L,
1415
-          'folded-linenos': [70L,
1416
-                             89L,
1417
-                             143L,
1418
-                             166L,
1419
-                             284L],
1420
-          'sel-line': 363L,
1421
-          'sel-line-start': 18452L,
1422
-          'selection_end': 18452L,
1423
-          'selection_start': 18452L,
1424
-          'zoom': 0L},
1425
-         1530474985.762],
1426
-        [loc('sources/SourceBase.py'),
1427
-         {'attrib-starts': [('SourceBase',
1428
-                             32),
1429
-                            ('SourceBase._http_request',
1430
-                             118)],
1431
-          'first-line': 120L,
1234
+                             28),
1235
+                            ('Source.get_content',
1236
+                             37)],
1237
+          'first-line': 155L,
1432 1238
           'folded-linenos': [],
1433
-          'sel-line': 128L,
1434
-          'sel-line-start': 4807L,
1435
-          'selection_end': 4807L,
1436
-          'selection_start': 4807L,
1239
+          'sel-line': 165L,
1240
+          'sel-line-start': 7576L,
1241
+          'selection_end': 7609L,
1242
+          'selection_start': 7606L,
1437 1243
           'zoom': 0L},
1438
-         1530475063.84],
1439
-        [loc('sources/replay.py'),
1244
+         1531339280.113],
1245
+        [loc('sources/play24.py'),
1440 1246
          {'attrib-starts': [('Source',
1441
-                             31),
1442
-                            ('Source.get_streams',
1443
-                             220)],
1444
-          'first-line': 356L,
1445
-          'folded-linenos': [70L,
1446
-                             89L,
1447
-                             143L,
1448
-                             166L,
1449
-                             284L],
1450
-          'sel-line': 361L,
1451
-          'sel-line-start': 18363L,
1452
-          'selection_end': 18393L,
1453
-          'selection_start': 18393L,
1247
+                             28),
1248
+                            ('Source.__init__',
1249
+                             30)],
1250
+          'first-line': 28L,
1251
+          'folded-linenos': [],
1252
+          'sel-line': 33L,
1253
+          'sel-line-start': 1078L,
1254
+          'selection_end': 1108L,
1255
+          'selection_start': 1105L,
1454 1256
           'zoom': 0L},
1455
-         1530566332.511],
1456
-        [loc('sources/replay.py'),
1257
+         1531339285.608],
1258
+        [loc('sources/play24.py'),
1457 1259
          {'attrib-starts': [('Source',
1458
-                             31),
1459
-                            ('Source.get_streams',
1460
-                             220)],
1461
-          'first-line': 354L,
1462
-          'folded-linenos': [70L,
1463
-                             89L,
1464
-                             143L,
1465
-                             166L,
1466
-                             284L],
1467
-          'sel-line': 363L,
1468
-          'sel-line-start': 18441L,
1469
-          'selection_end': 18441L,
1470
-          'selection_start': 18441L,
1260
+                             28),
1261
+                            ('Source.get_content',
1262
+                             37)],
1263
+          'first-line': 38L,
1264
+          'folded-linenos': [],
1265
+          'sel-line': 48L,
1266
+          'sel-line-start': 1646L,
1267
+          'selection_end': 1698L,
1268
+          'selection_start': 1695L,
1471 1269
           'zoom': 0L},
1472
-         1530566479.33],
1473
-        [loc('sources/SourceBase.py'),
1474
-         {'attrib-starts': [('SourceBase',
1475
-                             32),
1476
-                            ('SourceBase._http_request',
1477
-                             118)],
1478
-          'first-line': 117L,
1270
+         1531339286.524],
1271
+        [loc('sources/play24.py'),
1272
+         {'attrib-starts': [('Source',
1273
+                             28),
1274
+                            ('Source.get_content',
1275
+                             37)],
1276
+          'first-line': 155L,
1479 1277
           'folded-linenos': [],
1480
-          'sel-line': 127L,
1481
-          'sel-line-start': 4774L,
1482
-          'selection_end': 4774L,
1483
-          'selection_start': 4774L,
1278
+          'sel-line': 165L,
1279
+          'sel-line-start': 7576L,
1280
+          'selection_end': 7605L,
1281
+          'selection_start': 7599L,
1484 1282
           'zoom': 0L},
1485
-         1530566541.211]],
1283
+         1531339301.493]],
1486 1284
         20),
1487
-        'current-loc': loc('sources/replay.py'),
1285
+        'current-loc': loc('sources/play24.py'),
1488 1286
         'editor-state-list': [(loc('run.py'),
1489
-                               {'attrib-starts': [('Main',
1490
-        22),
1491
-        ('Main.play_video',
1492
-         242)],
1493
-                                'first-line': 243L,
1287
+                               {'attrib-starts': [('player',
1288
+        683)],
1289
+                                'first-line': 712L,
1494 1290
                                 'folded-linenos': [],
1495
-                                'sel-line': 254L,
1496
-                                'sel-line-start': 9998L,
1497
-                                'selection_end': 9998L,
1498
-                                'selection_start': 9998L,
1291
+                                'sel-line': 722L,
1292
+                                'sel-line-start': 29192L,
1293
+                                'selection_end': 29192L,
1294
+                                'selection_start': 29192L,
1499 1295
                                 'zoom': 0L}),
1500 1296
                               (loc('util.py'),
1501 1297
                                {'attrib-starts': [('unescape',
@@ -1535,20 +1331,17 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1535 1331
                                 'selection_start': 48949L,
1536 1332
                                 'zoom': 0L}),
1537 1333
                               (loc('sources/replay.py'),
1538
-                               {'attrib-starts': [('Source',
1539
-        31),
1540
-        ('Source.get_streams',
1541
-         220)],
1542
-                                'first-line': 360L,
1334
+                               {'attrib-starts': [],
1335
+                                'first-line': 4L,
1543 1336
                                 'folded-linenos': [70L,
1544 1337
         89L,
1545 1338
         143L,
1546 1339
         166L,
1547 1340
         284L],
1548
-                                'sel-line': 386L,
1549
-                                'sel-line-start': 19370L,
1550
-                                'selection_end': 19405L,
1551
-                                'selection_start': 19405L,
1341
+                                'sel-line': 12L,
1342
+                                'sel-line-start': 356L,
1343
+                                'selection_end': 356L,
1344
+                                'selection_start': 356L,
1552 1345
                                 'zoom': 0L}),
1553 1346
                               (loc('sources/lmt.py'),
1554 1347
                                {'attrib-starts': [('Source',
@@ -1619,14 +1412,26 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1619 1412
                               (loc('sources/SourceBase.py'),
1620 1413
                                {'attrib-starts': [('SourceBase',
1621 1414
         32),
1622
-        ('SourceBase._http_request',
1623
-         118)],
1624
-                                'first-line': 117L,
1415
+        ('SourceBase.get_streams',
1416
+         61)],
1417
+                                'first-line': 62L,
1418
+                                'folded-linenos': [],
1419
+                                'sel-line': 73L,
1420
+                                'sel-line-start': 2592L,
1421
+                                'selection_end': 2592L,
1422
+                                'selection_start': 2592L,
1423
+                                'zoom': 0L}),
1424
+                              (loc('sources/play24.py'),
1425
+                               {'attrib-starts': [('Source',
1426
+        28),
1427
+        ('Source.__init__',
1428
+         30)],
1429
+                                'first-line': 28L,
1625 1430
                                 'folded-linenos': [],
1626
-                                'sel-line': 127L,
1627
-                                'sel-line-start': 4774L,
1628
-                                'selection_end': 4774L,
1629
-                                'selection_start': 4774L,
1431
+                                'sel-line': 33L,
1432
+                                'sel-line-start': 1078L,
1433
+                                'selection_end': 1094L,
1434
+                                'selection_start': 1086L,
1630 1435
                                 'zoom': 0L})],
1631 1436
         'has-focus': True,
1632 1437
         'locked': False},
@@ -1640,18 +1445,20 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1640 1445
          loc('changelog.md'),
1641 1446
          loc('sources/filmix.py'),
1642 1447
          loc('sources/filmas.py'),
1643
-         loc('sources/SourceBase.py')]),
1448
+         loc('sources/SourceBase.py'),
1449
+         loc('sources/play24.py')]),
1644 1450
                                'open_files': [u'changelog.md',
1645
-        u'run.py',
1451
+        u'sources/SourceBase.py',
1646 1452
         u'sources/config.py',
1647 1453
         u'sources/euronews.py',
1648 1454
         u'sources/filmas.py',
1649 1455
         u'sources/filmix.py',
1650 1456
         u'sources/lmt.py',
1651 1457
         u'sources/ltc.py',
1458
+        u'sources/replay.py',
1652 1459
         u'util.py',
1653
-        u'sources/SourceBase.py',
1654
-        u'sources/replay.py']},
1460
+        u'run.py',
1461
+        u'sources/play24.py']},
1655 1462
         'saved_notebook_display': None,
1656 1463
         'split_percents': {0: 0.47474747474747475},
1657 1464
         'splits': 2,
@@ -1666,13 +1473,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1666 1473
                          91,
1667 1474
                          2455,
1668 1475
                          1462)}]}
1669
-guimgr.recent-documents = [loc('sources/replay.py'),
1670
-                           loc('sources/SourceBase.py'),
1476
+guimgr.recent-documents = [loc('sources/play24.py'),
1477
+                           loc('run.py'),
1671 1478
                            loc('util.py'),
1479
+                           loc('sources/SourceBase.py'),
1480
+                           loc('sources/replay.py'),
1672 1481
                            loc('sources/ltc.py'),
1673 1482
                            loc('sources/filmix.py'),
1674 1483
                            loc('sources/filmas.py'),
1675
-                           loc('run.py'),
1676 1484
                            loc('sources/lmt.py'),
1677 1485
                            loc('changelog.md'),
1678 1486
                            loc('sources/config.py'),
@@ -2093,6 +1901,14 @@ guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
2093 1901
         'sel-line-start': 5306L,
2094 1902
         'selection_end': 5306L,
2095 1903
         'selection_start': 5306L,
1904
+        'zoom': 0L},
1905
+                       loc('sources/tmp/play24.py'): {'attrib-starts': [],
1906
+        'first-line': 0L,
1907
+        'folded-linenos': [],
1908
+        'sel-line': 0L,
1909
+        'sel-line-start': 0L,
1910
+        'selection_end': 0L,
1911
+        'selection_start': 0L,
2096 1912
         'zoom': 0L},
2097 1913
                        loc('sources/tvdom.py'): {'attrib-starts': [('Source',
2098 1914
         32),
@@ -2251,11 +2067,45 @@ proj.build-cmd = {None: ('default',
2251 2067
                          None)}
2252 2068
 proj.env-vars = {None: ('default',
2253 2069
                         [u''])}
2070
+proj.matplotlib-event-loop = False
2071
+proj.template-debugging = False
2072
+proj.vcs-system-config = ('prefs',
2073
+                          {'bzr': {'versioncontrol.bzr.active': 'active-if-p'\
2074
+        'roject-dir',
2075
+                                   'versioncontrol.bzr.executable': u'bzr'},
2076
+                           'cvs': {'versioncontrol.cvs.active': 'active-if-p'\
2077
+        'roject-dir',
2078
+                                   'versioncontrol.cvs.executable': u'cvs',
2079
+                                   'versioncontrol.cvs.extra-global-args': '-'\
2080
+        'z3'},
2081
+                           'git': {'versioncontrol.git.active': 'active-if-p'\
2082
+        'roject-dir',
2083
+                                   'versioncontrol.git.executable': u'git',
2084
+                                   'versioncontrol.git.use-porcelain': True},
2085
+                           'hg': {'versioncontrol.hg.active': 'active-if-pro'\
2086
+        'ject-dir',
2087
+                                  'versioncontrol.hg.dont-find-unregistered': True,
2088
+                                  'versioncontrol.hg.executable': u'hg',
2089
+                                  'versioncontrol.hg.extra-global-args': '--'\
2090
+        'encoding=utf8'},
2091
+                           'perforce': {'versioncontrol.perforce.active': 'n'\
2092
+        'ot-active',
2093
+        'versioncontrol.perforce.dont-find-unregistered': True,
2094
+        'versioncontrol.perforce.executable': u'p4',
2095
+        'versioncontrol.perforce.extra-global-args': ''},
2096
+                           'svn': {'versioncontrol.svn.active': 'active-if-p'\
2097
+        'roject-dir',
2098
+                                   'versioncontrol.svn.executable': u'svn',
2099
+                                   'versioncontrol.svn.extra-global-args': '',
2100
+                                   'versioncontrol.svn.svnadmin-executable': u'svnadmin'}})
2254 2101
 search.replace-history = [u'filmix.co',
2255 2102
                           u'https://replay.lsm.lv',
2256 2103
                           u'www.shortcut.lv',
2257 2104
                           u'shortcut.lv']
2258
-search.search-history = [u'~',
2105
+search.search-history = [u'riga24',
2106
+                         u'png',
2107
+                         u'ffplay',
2108
+                         u'~',
2259 2109
                          u'title =',
2260 2110
                          u'title',
2261 2111
                          u'nfo',
@@ -2271,10 +2121,7 @@ search.search-history = [u'~',
2271 2121
                          u'http://replay.lsm.lv',
2272 2122
                          u'img0',
2273 2123
                          u'get_movie_info',
2274
-                         u'player_data',
2275
-                         u'cfg_file',
2276
-                         u'read_streams',
2277
-                         u'read_stream']
2124
+                         u'player_data']
2278 2125
 testing.stored-results = (1,
2279 2126
                           [],
2280 2127
                           {})

+ 1
- 1
run.py Zobrazit soubor

@@ -707,7 +707,7 @@ def player(url, title = "", subfile = "",headers={}, player="ffplay"):
707 707
         subfile = subfile.replace("\\", "\\\\\\\\")
708 708
         subfile = re.sub("\w:", "", subfile)
709 709
         vf = 'subtitles=%s,' % subfile + vf
710
-    cmd3 = ["ffplay.exe",url, "-window_title", title, "-vf", vf]
710
+    cmd3 = ["c:\\Util\\ffplay.exe",url, "-window_title", title, "-vf", vf]
711 711
     if headers:
712 712
         cmd3.append("-headers")
713 713
         hd = []

+ 2
- 1
sources/play24.py Zobrazit soubor

@@ -11,7 +11,7 @@ except:
11 11
     import simplejson as json
12 12
 
13 13
 import urllib2, urllib
14
-import datetime, re, sys
14
+import datetime, re, sys, os
15 15
 import ssl
16 16
 if "_create_unverified_context" in dir(ssl):
17 17
     ssl._create_default_https_context = ssl._create_unverified_context
@@ -163,6 +163,7 @@ class Source(SourceBase):
163 163
             else:
164 164
                 url = "http://player.tvnet.lv/l/11"
165 165
                 desc = ""
166
+                img = "riga24.png"
166 167
             r = self._http_request(url)
167 168
             m = re.search('<h1 class="static title">.+?<a href="[^"]+">([^<]+)</a>', r, re.DOTALL)
168 169
             title = m.group(1) if m else ""