Преглед изворни кода

Merge branch 'master' of http://git.blue.lv/home/content

# Conflicts:
#	project.wpr
Ivars пре 5 година
родитељ
комит
c0b42c5f72
3 измењених фајлова са 464 додато и 277 уклоњено
  1. 454
    275
      project.wpr
  2. 1
    1
      sources/filmas.py
  3. 9
    1
      sources/replay.py

+ 454
- 275
project.wpr Прегледај датотеку

@@ -159,10 +159,6 @@ debug.breakpoints = {loc('Downloader.py'): {94: (0,
159 159
                None,
160 160
                1,
161 161
                0)},
162
-                     loc('sources/play24.py'): {39L: (0,
163
-        None,
164
-        1,
165
-        0)},
166 162
                      loc('sources/replay.py'): {13L: (0,
167 163
         None,
168 164
         1,
@@ -315,7 +311,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
315 311
                                {'tree-state': {'file-sort-method': 'by name',
316 312
         'list-files-first': 0,
317 313
         'tree-states': {'deep': {'expanded-nodes': [],
318
-                                 'selected-nodes': [(36,)],
314
+                                 'selected-nodes': [],
319 315
                                  'top-node': (0,)}},
320 316
         'tree-style': 'deep'}}),
321 317
                               ('snippets',
@@ -465,6 +461,12 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
465 461
         'top-node': [('generic attribute',
466 462
                       loc('../../../Python27/Lib/site-packages/win32com/client/dynamic.py'),
467 463
                       'ALL_INVOKE_TYPES')]},
464
+        loc('../../SplashData/remdup.py'): {'column-widths': [1.0],
465
+        'expanded-nodes': [],
466
+        'selected-nodes': [],
467
+        'top-node': [('generic attribute',
468
+                      loc('../../SplashData/remdup.py'),
469
+                      'f')]},
468 470
         loc('../$test/test2.py'): {'column-widths': [1.0],
469 471
                                    'expanded-nodes': [],
470 472
                                    'selected-nodes': [],
@@ -793,12 +795,6 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
793 795
                                       'top-node': [('generic attribute',
794 796
         loc('../vietas/vietas2.py'),
795 797
         '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')]},
802 798
         loc('../../../../../Python27/lib/lib-tk/Tkinter.py'): {'expanded-nod'\
803 799
         'es': [],
804 800
         'selected-nodes': [],
@@ -838,14 +834,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
838 834
                                        'expanded-nodes': [],
839 835
                                        'selected-nodes': [],
840 836
                                        'top-node': None},
841
-        loc('unknown:<untitled> #5'): {'expanded-nodes': [],
837
+        loc('unknown:<untitled> #3'): {'column-widths': [1.0],
838
+                                       'expanded-nodes': [],
842 839
                                        'selected-nodes': [],
843 840
                                        'top-node': None},
844
-        loc('unknown:<untitled> #6'): {'expanded-nodes': [],
841
+        loc('unknown:<untitled> #5'): {'expanded-nodes': [],
845 842
                                        'selected-nodes': [],
846 843
                                        'top-node': None},
847
-        loc('unknown:<untitled> #3'): {'column-widths': [1.0],
848
-                                       'expanded-nodes': [],
844
+        loc('unknown:<untitled> #6'): {'expanded-nodes': [],
849 845
                                        'selected-nodes': [],
850 846
                                        'top-node': None}},
851 847
                                 'browse_mode': u'Current Module',
@@ -872,7 +868,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
872 868
                                None)],
873 869
                  'primary_view_state': {'area': 'wide',
874 870
         'constraint': None,
875
-        'current_pages': [4,
871
+        'current_pages': [2,
876 872
                           0],
877 873
         'notebook_display': 'normal',
878 874
         'notebook_percent': 0.4595676541232986,
@@ -908,7 +904,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
908 904
                                        'fRegexFlags': 46,
909 905
                                        'fReplaceText': u'filmix.co',
910 906
                                        'fReverse': False,
911
-                                       'fSearchText': u'riga24',
907
+                                       'fSearchText': u'~',
912 908
                                        'fStartPos': 0,
913 909
                                        'fStyle': 'text',
914 910
                                        'fWholeWords': False,
@@ -1037,261 +1033,467 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1037 1033
                        'selection_end': 174L,
1038 1034
                        'selection_start': 174L,
1039 1035
                        'zoom': 0L})],
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,
1036
+        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('sources/ltc.py'),
1037
+        {'attrib-starts': [('Source',
1038
+                            26)],
1039
+         'first-line': 16L,
1040
+         'folded-linenos': [108L,
1041
+                            131L,
1042
+                            160L,
1043
+                            220L,
1044
+                            231L,
1045
+                            257L,
1046
+                            276L,
1047
+                            295L,
1048
+                            319L,
1049
+                            349L,
1050
+                            350L,
1051
+                            367L,
1052
+                            398L,
1053
+                            411L,
1054
+                            525L],
1055
+         'sel-line': 27L,
1056
+         'sel-line-start': 1064L,
1057
+         'selection_end': 1064L,
1058
+         'selection_start': 1064L,
1049 1059
          'zoom': 0L},
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,
1060
-          'zoom': 0L},
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,
1060
+        1530209630.762],
1061
+        [loc('sources/ltc.py'),
1062
+         {'attrib-starts': [('Source',
1063
+                             26),
1064
+                            ('Source.get_content',
1065
+                             78)],
1066
+          'first-line': 371L,
1067
+          'folded-linenos': [108L,
1068
+                             131L,
1069
+                             160L,
1070
+                             220L,
1071
+                             231L,
1072
+                             257L,
1073
+                             276L,
1074
+                             295L,
1075
+                             319L,
1076
+                             349L,
1077
+                             350L,
1078
+                             398L,
1079
+                             411L,
1080
+                             525L],
1081
+          'sel-line': 379L,
1082
+          'sel-line-start': 23333L,
1083
+          'selection_end': 23389L,
1084
+          'selection_start': 23381L,
1071 1085
           'zoom': 0L},
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,
1086
+         1530209631.365],
1087
+        [loc('sources/ltc.py'),
1088
+         {'attrib-starts': [('Source',
1089
+                             26),
1090
+                            ('Source.get_info2',
1091
+                             923)],
1092
+          'first-line': 927L,
1093
+          'folded-linenos': [108L,
1094
+                             131L,
1095
+                             160L,
1096
+                             220L,
1097
+                             231L,
1098
+                             257L,
1099
+                             276L,
1100
+                             295L,
1101
+                             319L,
1102
+                             349L,
1103
+                             350L,
1104
+                             398L,
1105
+                             411L,
1106
+                             525L],
1107
+          'sel-line': 935L,
1108
+          'sel-line-start': 48606L,
1109
+          'selection_end': 48625L,
1110
+          'selection_start': 48625L,
1082 1111
           'zoom': 0L},
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,
1112
+         1530209783.776],
1113
+        [loc('sources/ltc.py'),
1114
+         {'attrib-starts': [('Source',
1115
+                             26),
1116
+                            ('Source.get_info2',
1117
+                             923)],
1118
+          'first-line': 938L,
1119
+          'folded-linenos': [108L,
1120
+                             131L,
1121
+                             160L,
1122
+                             220L,
1123
+                             231L,
1124
+                             257L,
1125
+                             276L,
1126
+                             295L,
1127
+                             319L,
1128
+                             349L,
1129
+                             350L,
1130
+                             398L,
1131
+                             411L,
1132
+                             525L],
1133
+          'sel-line': 949L,
1134
+          'sel-line-start': 49233L,
1135
+          'selection_end': 49249L,
1136
+          'selection_start': 49249L,
1093 1137
           'zoom': 0L},
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,
1138
+         1530209829.028],
1139
+        [loc('sources/ltc.py'),
1140
+         {'attrib-starts': [('Source',
1141
+                             26),
1142
+                            ('Source.get_info2',
1143
+                             923)],
1144
+          'first-line': 941L,
1145
+          'folded-linenos': [108L,
1146
+                             131L,
1147
+                             160L,
1148
+                             220L,
1149
+                             231L,
1150
+                             257L,
1151
+                             276L,
1152
+                             295L,
1153
+                             319L,
1154
+                             349L,
1155
+                             350L,
1156
+                             398L,
1157
+                             411L,
1158
+                             525L],
1159
+          'sel-line': 949L,
1160
+          'sel-line-start': 49233L,
1161
+          'selection_end': 49267L,
1162
+          'selection_start': 49266L,
1104 1163
           'zoom': 0L},
1105
-         1531338235.312],
1106
-        [loc('sources/play24.py'),
1164
+         1530209829.62],
1165
+        [loc('sources/ltc.py'),
1107 1166
          {'attrib-starts': [('Source',
1108
-                             28),
1167
+                             26),
1109 1168
                             ('Source.get_content',
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,
1117
-          'zoom': 0L},
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,
1169
+                             78)],
1170
+          'first-line': 114L,
1171
+          'folded-linenos': [132L,
1172
+                             161L,
1173
+                             221L,
1174
+                             232L,
1175
+                             258L,
1176
+                             277L,
1177
+                             296L,
1178
+                             320L,
1179
+                             350L,
1180
+                             351L,
1181
+                             399L,
1182
+                             412L,
1183
+                             526L],
1184
+          'sel-line': 120L,
1185
+          'sel-line-start': 5707L,
1186
+          'selection_end': 5727L,
1187
+          'selection_start': 5727L,
1130 1188
           'zoom': 0L},
1131
-         1531338245.587],
1132
-        [loc('sources/play24.py'),
1189
+         1530209851.883],
1190
+        [loc('sources/ltc.py'),
1133 1191
          {'attrib-starts': [('Source',
1134
-                             28),
1192
+                             26),
1135 1193
                             ('Source.get_content',
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,
1143
-          'zoom': 0L},
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,
1194
+                             78)],
1195
+          'first-line': 114L,
1196
+          'folded-linenos': [132L,
1197
+                             161L,
1198
+                             221L,
1199
+                             232L,
1200
+                             258L,
1201
+                             277L,
1202
+                             296L,
1203
+                             320L,
1204
+                             350L,
1205
+                             351L,
1206
+                             399L,
1207
+                             412L,
1208
+                             526L],
1209
+          'sel-line': 120L,
1210
+          'sel-line-start': 5707L,
1211
+          'selection_end': 5740L,
1212
+          'selection_start': 5739L,
1154 1213
           'zoom': 0L},
1155
-         1531339005.898],
1156
-        [loc('sources/play24.py'),
1214
+         1530209853.995],
1215
+        [loc('sources/ltc.py'),
1157 1216
          {'attrib-starts': [('Source',
1158
-                             28),
1217
+                             26),
1159 1218
                             ('Source.get_content',
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,
1219
+                             78)],
1220
+          'first-line': 427L,
1221
+          'folded-linenos': [132L,
1222
+                             161L,
1223
+                             221L,
1224
+                             232L,
1225
+                             258L,
1226
+                             277L,
1227
+                             296L,
1228
+                             320L,
1229
+                             350L,
1230
+                             351L,
1231
+                             399L,
1232
+                             412L,
1233
+                             527L],
1234
+          'sel-line': 438L,
1235
+          'sel-line-start': 26894L,
1236
+          'selection_end': 26914L,
1237
+          'selection_start': 26914L,
1167 1238
           'zoom': 0L},
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,
1178
-          'zoom': 0L},
1179
-         1531339051.855],
1180
-        [loc('sources/play24.py'),
1239
+         1530209873.48],
1240
+        [loc('sources/ltc.py'),
1181 1241
          {'attrib-starts': [('Source',
1182
-                             28),
1242
+                             26),
1183 1243
                             ('Source.get_content',
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,
1244
+                             78)],
1245
+          'first-line': 430L,
1246
+          'folded-linenos': [132L,
1247
+                             161L,
1248
+                             221L,
1249
+                             232L,
1250
+                             258L,
1251
+                             277L,
1252
+                             296L,
1253
+                             320L,
1254
+                             350L,
1255
+                             351L,
1256
+                             399L,
1257
+                             412L,
1258
+                             527L],
1259
+          'sel-line': 438L,
1260
+          'sel-line-start': 26894L,
1261
+          'selection_end': 26927L,
1262
+          'selection_start': 26926L,
1191 1263
           'zoom': 0L},
1192
-         1531339102.874],
1193
-        [loc('sources/play24.py'),
1264
+         1530209876.657],
1265
+        [loc('sources/ltc.py'),
1194 1266
          {'attrib-starts': [('Source',
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,
1267
+                             26),
1268
+                            ('Source.get_content',
1269
+                             78)],
1270
+          'first-line': 470L,
1271
+          'folded-linenos': [132L,
1272
+                             161L,
1273
+                             221L,
1274
+                             232L,
1275
+                             258L,
1276
+                             277L,
1277
+                             296L,
1278
+                             320L,
1279
+                             350L,
1280
+                             351L,
1281
+                             399L,
1282
+                             412L,
1283
+                             530L],
1284
+          'sel-line': 483L,
1285
+          'sel-line-start': 29084L,
1286
+          'selection_end': 29120L,
1287
+          'selection_start': 29120L,
1204 1288
           'zoom': 0L},
1205
-         1531339276.155],
1206
-        [loc('sources/play24.py'),
1289
+         1530209938.167],
1290
+        [loc('sources/ltc.py'),
1207 1291
          {'attrib-starts': [('Source',
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,
1292
+                             26),
1293
+                            ('Source.get_info2',
1294
+                             928)],
1295
+          'first-line': 944L,
1296
+          'folded-linenos': [132L,
1297
+                             161L,
1298
+                             221L,
1299
+                             232L,
1300
+                             258L,
1301
+                             277L,
1302
+                             296L,
1303
+                             320L,
1304
+                             350L,
1305
+                             351L,
1306
+                             399L,
1307
+                             412L,
1308
+                             530L],
1309
+          'sel-line': 954L,
1310
+          'sel-line-start': 49416L,
1311
+          'selection_end': 49450L,
1312
+          'selection_start': 49449L,
1217 1313
           'zoom': 0L},
1218
-         1531339277.721],
1219
-        [loc('sources/play24.py'),
1314
+         1530209940.401],
1315
+        [loc('sources/ltc.py'),
1220 1316
          {'attrib-starts': [('Source',
1221
-                             28),
1317
+                             26),
1222 1318
                             ('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,
1319
+                             78)],
1320
+          'first-line': 115L,
1321
+          'folded-linenos': [132L,
1322
+                             161L,
1323
+                             221L,
1324
+                             232L,
1325
+                             258L,
1326
+                             277L,
1327
+                             296L,
1328
+                             320L,
1329
+                             350L,
1330
+                             351L,
1331
+                             399L,
1332
+                             412L,
1333
+                             530L],
1334
+          'sel-line': 120L,
1335
+          'sel-line-start': 5707L,
1336
+          'selection_end': 5740L,
1337
+          'selection_start': 5739L,
1230 1338
           'zoom': 0L},
1231
-         1531339279.063],
1232
-        [loc('sources/play24.py'),
1339
+         1530209942.171],
1340
+        [loc('sources/ltc.py'),
1233 1341
          {'attrib-starts': [('Source',
1234
-                             28),
1342
+                             26),
1235 1343
                             ('Source.get_content',
1236
-                             37)],
1237
-          'first-line': 155L,
1238
-          'folded-linenos': [],
1239
-          'sel-line': 165L,
1240
-          'sel-line-start': 7576L,
1241
-          'selection_end': 7609L,
1242
-          'selection_start': 7606L,
1344
+                             78)],
1345
+          'first-line': 428L,
1346
+          'folded-linenos': [132L,
1347
+                             161L,
1348
+                             221L,
1349
+                             232L,
1350
+                             258L,
1351
+                             277L,
1352
+                             296L,
1353
+                             320L,
1354
+                             350L,
1355
+                             351L,
1356
+                             399L,
1357
+                             412L,
1358
+                             530L],
1359
+          'sel-line': 438L,
1360
+          'sel-line-start': 26894L,
1361
+          'selection_end': 26927L,
1362
+          'selection_start': 26926L,
1243 1363
           'zoom': 0L},
1244
-         1531339280.113],
1245
-        [loc('sources/play24.py'),
1364
+         1530209984.345],
1365
+        [loc('sources/ltc.py'),
1246 1366
          {'attrib-starts': [('Source',
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,
1367
+                             26),
1368
+                            ('Source.get_info2',
1369
+                             930)],
1370
+          'first-line': 934L,
1371
+          'folded-linenos': [132L,
1372
+                             161L,
1373
+                             221L,
1374
+                             232L,
1375
+                             258L,
1376
+                             277L,
1377
+                             296L,
1378
+                             320L,
1379
+                             350L,
1380
+                             351L,
1381
+                             399L,
1382
+                             412L,
1383
+                             532L],
1384
+          'sel-line': 944L,
1385
+          'sel-line-start': 48949L,
1386
+          'selection_end': 48949L,
1387
+          'selection_start': 48949L,
1256 1388
           'zoom': 0L},
1257
-         1531339285.608],
1258
-        [loc('sources/play24.py'),
1389
+         1530474479.645],
1390
+        [loc('sources/replay.py'),
1259 1391
          {'attrib-starts': [('Source',
1260
-                             28),
1261
-                            ('Source.get_content',
1262
-                             37)],
1263
-          'first-line': 38L,
1392
+                             31),
1393
+                            ('Source.get_streams',
1394
+                             220)],
1395
+          'first-line': 263L,
1396
+          'folded-linenos': [70L,
1397
+                             89L,
1398
+                             143L,
1399
+                             166L,
1400
+                             284L],
1401
+          'sel-line': 268L,
1402
+          'sel-line-start': 13506L,
1403
+          'selection_end': 13506L,
1404
+          'selection_start': 13506L,
1405
+          'zoom': 0L},
1406
+         1530474598.565],
1407
+        [loc('sources/replay.py'),
1408
+         {'attrib-starts': [('Source',
1409
+                             31),
1410
+                            ('Source.get_streams',
1411
+                             220)],
1412
+          'first-line': 353L,
1413
+          'folded-linenos': [70L,
1414
+                             89L,
1415
+                             143L,
1416
+                             166L,
1417
+                             284L],
1418
+          'sel-line': 363L,
1419
+          'sel-line-start': 18452L,
1420
+          'selection_end': 18452L,
1421
+          'selection_start': 18452L,
1422
+          'zoom': 0L},
1423
+         1530474985.762],
1424
+        [loc('sources/SourceBase.py'),
1425
+         {'attrib-starts': [('SourceBase',
1426
+                             32),
1427
+                            ('SourceBase._http_request',
1428
+                             118)],
1429
+          'first-line': 120L,
1264 1430
           'folded-linenos': [],
1265
-          'sel-line': 48L,
1266
-          'sel-line-start': 1646L,
1267
-          'selection_end': 1698L,
1268
-          'selection_start': 1695L,
1431
+          'sel-line': 128L,
1432
+          'sel-line-start': 4807L,
1433
+          'selection_end': 4807L,
1434
+          'selection_start': 4807L,
1269 1435
           'zoom': 0L},
1270
-         1531339286.524],
1271
-        [loc('sources/play24.py'),
1436
+         1530475063.84],
1437
+        [loc('sources/replay.py'),
1272 1438
          {'attrib-starts': [('Source',
1273
-                             28),
1274
-                            ('Source.get_content',
1275
-                             37)],
1276
-          'first-line': 155L,
1439
+                             31),
1440
+                            ('Source.get_streams',
1441
+                             220)],
1442
+          'first-line': 356L,
1443
+          'folded-linenos': [70L,
1444
+                             89L,
1445
+                             143L,
1446
+                             166L,
1447
+                             284L],
1448
+          'sel-line': 361L,
1449
+          'sel-line-start': 18363L,
1450
+          'selection_end': 18393L,
1451
+          'selection_start': 18393L,
1452
+          'zoom': 0L},
1453
+         1530566332.511],
1454
+        [loc('sources/replay.py'),
1455
+         {'attrib-starts': [('Source',
1456
+                             31),
1457
+                            ('Source.get_streams',
1458
+                             220)],
1459
+          'first-line': 354L,
1460
+          'folded-linenos': [70L,
1461
+                             89L,
1462
+                             143L,
1463
+                             166L,
1464
+                             284L],
1465
+          'sel-line': 363L,
1466
+          'sel-line-start': 18441L,
1467
+          'selection_end': 18441L,
1468
+          'selection_start': 18441L,
1469
+          'zoom': 0L},
1470
+         1530566479.33],
1471
+        [loc('sources/SourceBase.py'),
1472
+         {'attrib-starts': [('SourceBase',
1473
+                             32),
1474
+                            ('SourceBase._http_request',
1475
+                             118)],
1476
+          'first-line': 117L,
1277 1477
           'folded-linenos': [],
1278
-          'sel-line': 165L,
1279
-          'sel-line-start': 7576L,
1280
-          'selection_end': 7605L,
1281
-          'selection_start': 7599L,
1478
+          'sel-line': 127L,
1479
+          'sel-line-start': 4774L,
1480
+          'selection_end': 4774L,
1481
+          'selection_start': 4774L,
1282 1482
           'zoom': 0L},
1283
-         1531339301.493]],
1483
+         1530566541.211]],
1284 1484
         20),
1285
-        'current-loc': loc('sources/play24.py'),
1485
+        'current-loc': loc('sources/replay.py'),
1286 1486
         'editor-state-list': [(loc('run.py'),
1287
-                               {'attrib-starts': [('player',
1288
-        683)],
1289
-                                'first-line': 712L,
1487
+                               {'attrib-starts': [('Main',
1488
+        22),
1489
+        ('Main.play_video',
1490
+         242)],
1491
+                                'first-line': 243L,
1290 1492
                                 'folded-linenos': [],
1291
-                                'sel-line': 722L,
1292
-                                'sel-line-start': 29192L,
1293
-                                'selection_end': 29192L,
1294
-                                'selection_start': 29192L,
1493
+                                'sel-line': 254L,
1494
+                                'sel-line-start': 9998L,
1495
+                                'selection_end': 9998L,
1496
+                                'selection_start': 9998L,
1295 1497
                                 'zoom': 0L}),
1296 1498
                               (loc('util.py'),
1297 1499
                                {'attrib-starts': [('unescape',
@@ -1412,28 +1614,16 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1412 1614
                               (loc('sources/SourceBase.py'),
1413 1615
                                {'attrib-starts': [('SourceBase',
1414 1616
         32),
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,
1617
+        ('SourceBase._http_request',
1618
+         118)],
1619
+                                'first-line': 117L,
1430 1620
                                 'folded-linenos': [],
1431
-                                'sel-line': 33L,
1432
-                                'sel-line-start': 1078L,
1433
-                                'selection_end': 1094L,
1434
-                                'selection_start': 1086L,
1621
+                                'sel-line': 127L,
1622
+                                'sel-line-start': 4774L,
1623
+                                'selection_end': 4774L,
1624
+                                'selection_start': 4774L,
1435 1625
                                 'zoom': 0L})],
1436
-        'has-focus': True,
1626
+        'has-focus': False,
1437 1627
         'locked': False},
1438 1628
         [loc('run.py'),
1439 1629
          loc('util.py'),
@@ -1445,9 +1635,9 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1445 1635
          loc('changelog.md'),
1446 1636
          loc('sources/filmix.py'),
1447 1637
          loc('sources/filmas.py'),
1448
-         loc('sources/SourceBase.py'),
1449
-         loc('sources/play24.py')]),
1638
+         loc('sources/SourceBase.py')]),
1450 1639
                                'open_files': [u'changelog.md',
1640
+        u'run.py',
1451 1641
         u'sources/SourceBase.py',
1452 1642
         u'sources/config.py',
1453 1643
         u'sources/euronews.py',
@@ -1455,10 +1645,8 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1455 1645
         u'sources/filmix.py',
1456 1646
         u'sources/lmt.py',
1457 1647
         u'sources/ltc.py',
1458
-        u'sources/replay.py',
1459 1648
         u'util.py',
1460
-        u'run.py',
1461
-        u'sources/play24.py']},
1649
+        u'sources/replay.py']},
1462 1650
         'saved_notebook_display': None,
1463 1651
         'split_percents': {0: 0.47474747474747475},
1464 1652
         'splits': 2,
@@ -1473,14 +1661,13 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1473 1661
                          91,
1474 1662
                          2455,
1475 1663
                          1462)}]}
1476
-guimgr.recent-documents = [loc('sources/play24.py'),
1477
-                           loc('run.py'),
1664
+guimgr.recent-documents = [loc('sources/replay.py'),
1478 1665
                            loc('util.py'),
1479 1666
                            loc('sources/SourceBase.py'),
1480
-                           loc('sources/replay.py'),
1481 1667
                            loc('sources/ltc.py'),
1482 1668
                            loc('sources/filmix.py'),
1483 1669
                            loc('sources/filmas.py'),
1670
+                           loc('run.py'),
1484 1671
                            loc('sources/lmt.py'),
1485 1672
                            loc('changelog.md'),
1486 1673
                            loc('sources/config.py'),
@@ -1901,14 +2088,6 @@ guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
1901 2088
         'sel-line-start': 5306L,
1902 2089
         'selection_end': 5306L,
1903 2090
         '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,
1912 2091
         'zoom': 0L},
1913 2092
                        loc('sources/tvdom.py'): {'attrib-starts': [('Source',
1914 2093
         32),
@@ -2102,10 +2281,7 @@ search.replace-history = [u'filmix.co',
2102 2281
                           u'https://replay.lsm.lv',
2103 2282
                           u'www.shortcut.lv',
2104 2283
                           u'shortcut.lv']
2105
-search.search-history = [u'riga24',
2106
-                         u'png',
2107
-                         u'ffplay',
2108
-                         u'~',
2284
+search.search-history = [u'~',
2109 2285
                          u'title =',
2110 2286
                          u'title',
2111 2287
                          u'nfo',
@@ -2121,7 +2297,10 @@ search.search-history = [u'riga24',
2121 2297
                          u'http://replay.lsm.lv',
2122 2298
                          u'img0',
2123 2299
                          u'get_movie_info',
2124
-                         u'player_data']
2300
+                         u'player_data',
2301
+                         u'cfg_file',
2302
+                         u'read_streams',
2303
+                         u'read_stream']
2125 2304
 testing.stored-results = (1,
2126 2305
                           [],
2127 2306
                           {})

+ 1
- 1
sources/filmas.py Прегледај датотеку

@@ -78,7 +78,7 @@ Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
78 78
             r=self.call(data)
79 79
             result = re.findall(r'<a href="/(movie/\d+)">.+?<img src="/([^"]+)">.+?Pieejama.+?<div class="katalogs-filma-teksts">\s*(.+?)\s*<span style="font-weight:normal; ">\((\d+)\)</span>', r, re.DOTALL)
80 80
             for item in result:
81
-                title = item[2]+'(%s)'%item[3]
81
+                title = item[2]+' (%s)'%item[3]
82 82
                 data2 = item[0]
83 83
                 img = self.url + item[1].replace("thumbs_m/","")
84 84
                 desc = title

+ 9
- 1
sources/replay.py Прегледај датотеку

@@ -333,6 +333,14 @@ class Source(SourceBase):
333 333
             desc.append(plot)
334 334
             desc = "\n".join(desc)
335 335
 
336
+            nfo["title"] = title
337
+            nfo["thumb"] = img
338
+            #nfo["runtime"] = None
339
+            #nfo["quality"] = None
340
+            nfo["plot"] = desc
341
+            nfo["tagline"] = plot
342
+
343
+
336 344
             headers = headers2dict("""
337 345
 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/67.0.3396.87 Safari/537.36
338 346
 Referer: https://replay.lsm.lv/%s/%s
@@ -403,7 +411,7 @@ Referer: https://replay.lsm.lv/%s/%s
403 411
             stream["desc"] = desc
404 412
             stream["resolver"] = "replay"
405 413
             stream["headers"] = headers
406
-            stream["nfo"] = nfo
414
+            stream["nfo"] = {"movie":nfo}
407 415
             stream["quality"] = resolution
408 416
             stream["order"] = bitrate
409 417
             #stream["filename"] = filename # TODO jāģenere jēdzigs faila nosaukums, kuru pēc tam izmanto downloads