Browse Source

ltc paziņojums

Ivars 6 years ago
parent
commit
bb2fc1b6d8
2 changed files with 227 additions and 160 deletions
  1. 225
    160
      project.wpr
  2. 2
    0
      sources/ltc.py

+ 225
- 160
project.wpr View File

@@ -33,7 +33,7 @@ proj.launch-config = {loc('ContentSources.py'): ('project',
33 33
         (u'https://walterebert.com/playground/video/hls/sintel-trailer.m3u8',
34 34
          '')),
35 35
                       loc('run.py'): ('project',
36
-                                      (u'config::home  ftp://user:xxxx@home.blue.lv/hdd/streams.cfg',
36
+                                      (u'config::home  ftp://user:Kaskade7@home.blue.lv/hdd/streams.cfg',
37 37
                                        '')),
38 38
                       loc('sources/lmt.py'): ('project',
39 39
         (u'home',
@@ -147,6 +147,10 @@ debug.breakpoints = {loc('Downloader.py'): {94: (0,
147 147
         None,
148 148
         1,
149 149
         0),
150
+        580L: (0,
151
+               None,
152
+               1,
153
+               0),
150 154
         803L: (0,
151 155
                None,
152 156
                1,
@@ -167,6 +171,10 @@ debug.breakpoints = {loc('Downloader.py'): {94: (0,
167 171
                None,
168 172
                1,
169 173
                0)},
174
+                     loc('sources/tmp/ltc.py'): {580L: (0,
175
+        None,
176
+        1,
177
+        0)},
170 178
                      loc('sources/tvdom.py'): {292L: (0,
171 179
         None,
172 180
         1,
@@ -261,12 +269,12 @@ debug.recent-run-args = {loc('ContentSources.py'): [u'config::home streams_bernu
261 269
         u'--slud'],
262 270
                          loc('kivy_test.py'): [u'https://walterebert.com/playground/video/hls/sintel-trailer.m3u8',
263 271
         u'https://dl4.sanii.co/files/2/60e13omc1cpph2/video.mp4'],
264
-                         loc('run.py'): [u'config::home  ftp://user:xxxx@home.blue.lv/hdd/streams.cfg',
272
+                         loc('run.py'): [u'config::home  ftp://user:Kaskade7@home.blue.lv/hdd/streams.cfg',
265 273
         u'config::home sources\\cfg0\\streams_al.cfg',
266 274
         u'config::home ',
267
-        u'config::home  ftp://user:xxxx@home.blue.lv/hdd/streams_al.cfg',
268
-        u'config::home  ftps://user:xxxx@home.blue.lv/hdd/streams_al.cfg',
269
-        u'config::home  ftp://user:xxxx@home.blue.lv/hdd/streams_al.cfg2',
275
+        u'config::home  ftp://user:Kaskade7@home.blue.lv/hdd/streams_al.cfg',
276
+        u'config::home  ftps://user:Kaskade7@home.blue.lv/hdd/streams_al.cfg',
277
+        u'config::home  ftp://user:Kaskade7@home.blue.lv/hdd/streams_al.cfg2',
270 278
         u'config::home  ftp://home.blue.lv/hdd/streams_al.cfg',
271 279
         u'config::home  ',
272 280
         u'config::home  streams_bernu.cfg',
@@ -699,7 +707,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
699 707
         'vid2')]],
700 708
                                 'top-node': [('generic attribute',
701 709
         loc('sources/ltc.py'),
702
-        'API_URL')]},
710
+        'cmd')]},
703 711
         loc('sources/replay.py'): {'expanded-nodes': [],
704 712
                                    'selected-nodes': [[('class def',
705 713
         loc('sources/replay.py'),
@@ -707,6 +715,16 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
707 715
                                    'top-node': [('generic attribute',
708 716
         loc('sources/replay.py'),
709 717
         'API_URL')]},
718
+        loc('sources/tmp/SourceBase.py'): {'expanded-nodes': [],
719
+        'selected-nodes': [],
720
+        'top-node': [('generic attribute',
721
+                      loc('sources/tmp/SourceBase.py'),
722
+                      'headers2dict')]},
723
+        loc('sources/tmp/ltc.py'): {'expanded-nodes': [],
724
+                                    'selected-nodes': [],
725
+                                    'top-node': [('generic attribute',
726
+        loc('sources/tmp/ltc.py'),
727
+        'cmd')]},
710 728
         loc('sources/tvdom.py'): {'expanded-nodes': [],
711 729
                                   'selected-nodes': [],
712 730
                                   'top-node': [('generic attribute',
@@ -871,7 +889,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
871 889
                                None)],
872 890
                  'primary_view_state': {'area': 'wide',
873 891
         'constraint': None,
874
-        'current_pages': [4,
892
+        'current_pages': [3,
875 893
                           0],
876 894
         'notebook_display': 'normal',
877 895
         'notebook_percent': 0.33947157726180943,
@@ -1045,138 +1063,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1045 1063
                             32),
1046 1064
                            ('Source.get_content',
1047 1065
                             62)],
1048
-         'first-line': 117L,
1049
-         'folded-linenos': [],
1050
-         'sel-line': 127L,
1051
-         'sel-line-start': 5744L,
1052
-         'selection_end': 5781L,
1053
-         'selection_start': 5755L,
1066
+         'first-line': 124L,
1067
+         'folded-linenos': [159L],
1068
+         'sel-line': 129L,
1069
+         'sel-line-start': 5841L,
1070
+         'selection_end': 5878L,
1071
+         'selection_start': 5852L,
1054 1072
          'zoom': 0L},
1055
-        1538212621.538],
1056
-        [loc('sources/tvplay.py'),
1057
-         {'attrib-starts': [('Source',
1058
-                             32),
1059
-                            ('Source.get_content',
1060
-                             62)],
1061
-          'first-line': 125L,
1062
-          'folded-linenos': [],
1063
-          'sel-line': 140L,
1064
-          'sel-line-start': 6359L,
1065
-          'selection_end': 6396L,
1066
-          'selection_start': 6370L,
1067
-          'zoom': 0L},
1068
-         1538212622.826],
1069
-        [loc('sources/tvplay.py'),
1070
-         {'attrib-starts': [('Source',
1071
-                             32),
1072
-                            ('Source.get_content',
1073
-                             62)],
1074
-          'first-line': 117L,
1075
-          'folded-linenos': [],
1076
-          'sel-line': 127L,
1077
-          'sel-line-start': 5744L,
1078
-          'selection_end': 5781L,
1079
-          'selection_start': 5755L,
1080
-          'zoom': 0L},
1081
-         1538212626.538],
1082
-        [loc('sources/tvplay.py'),
1083
-         {'attrib-starts': [],
1084
-          'first-line': 0L,
1085
-          'folded-linenos': [155L],
1086
-          'sel-line': 4L,
1087
-          'sel-line-start': 136L,
1088
-          'selection_end': 174L,
1089
-          'selection_start': 174L,
1090
-          'zoom': 0L},
1091
-         1538212649.721],
1092
-        [loc('sources/tvplay.py'),
1093
-         {'attrib-starts': [('Source',
1094
-                             32),
1095
-                            ('Source.get_content',
1096
-                             62)],
1097
-          'first-line': 112L,
1098
-          'folded-linenos': [155L],
1099
-          'sel-line': 127L,
1100
-          'sel-line-start': 5744L,
1101
-          'selection_end': 5781L,
1102
-          'selection_start': 5755L,
1103
-          'zoom': 0L},
1104
-         1538212673.477],
1105
-        [loc('sources/tvplay.py'),
1106
-         {'attrib-starts': [],
1107
-          'first-line': 0L,
1108
-          'folded-linenos': [155L],
1109
-          'sel-line': 5L,
1110
-          'sel-line-start': 188L,
1111
-          'selection_end': 214L,
1112
-          'selection_start': 214L,
1113
-          'zoom': 0L},
1114
-         1538212677.553],
1115
-        [loc('sources/tvplay.py'),
1116
-         {'attrib-starts': [('Source',
1117
-                             32),
1118
-                            ('Source.get_content',
1119
-                             62)],
1120
-          'first-line': 112L,
1121
-          'folded-linenos': [157L],
1122
-          'sel-line': 127L,
1123
-          'sel-line-start': 5744L,
1124
-          'selection_end': 5841L,
1125
-          'selection_start': 5744L,
1126
-          'zoom': 0L},
1127
-         1538212820.898],
1128
-        [loc('sources/tvplay.py'),
1129
-         {'attrib-starts': [('Source',
1130
-                             32),
1131
-                            ('Source.get_content',
1132
-                             62)],
1133
-          'first-line': 119L,
1134
-          'folded-linenos': [157L],
1135
-          'sel-line': 129L,
1136
-          'sel-line-start': 5841L,
1137
-          'selection_end': 5878L,
1138
-          'selection_start': 5852L,
1139
-          'zoom': 0L},
1140
-         1538212825.218],
1141
-        [loc('sources/tvplay.py'),
1142
-         {'attrib-starts': [('Source',
1143
-                             32),
1144
-                            ('Source.get_content',
1145
-                             62)],
1146
-          'first-line': 127L,
1147
-          'folded-linenos': [159L],
1148
-          'sel-line': 143L,
1149
-          'sel-line-start': 6492L,
1150
-          'selection_end': 6551L,
1151
-          'selection_start': 6551L,
1152
-          'zoom': 0L},
1153
-         1538212833.955],
1154
-        [loc('sources/tvplay.py'),
1155
-         {'attrib-starts': [('Source',
1156
-                             32),
1157
-                            ('Source.get_content',
1158
-                             62)],
1159
-          'first-line': 134L,
1160
-          'folded-linenos': [159L],
1161
-          'sel-line': 144L,
1162
-          'sel-line-start': 6564L,
1163
-          'selection_end': 6601L,
1164
-          'selection_start': 6575L,
1165
-          'zoom': 0L},
1166
-         1538212835.157],
1167
-        [loc('sources/tvplay.py'),
1168
-         {'attrib-starts': [('Source',
1169
-                             32),
1170
-                            ('Source.get_content',
1171
-                             62)],
1172
-          'first-line': 124L,
1173
-          'folded-linenos': [159L],
1174
-          'sel-line': 129L,
1175
-          'sel-line-start': 5841L,
1176
-          'selection_end': 5878L,
1177
-          'selection_start': 5852L,
1178
-          'zoom': 0L},
1179
-         1538212838.81],
1073
+        1538212838.81],
1180 1074
         [loc('sources/tvplay.py'),
1181 1075
          {'attrib-starts': [('Source',
1182 1076
                              32),
@@ -1293,9 +1187,163 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1293 1187
           'selection_end': 6601L,
1294 1188
           'selection_start': 6575L,
1295 1189
           'zoom': 0L},
1296
-         1538212867.204]],
1190
+         1538212867.204],
1191
+        [loc('sources/tvplay.py'),
1192
+         {'attrib-starts': [],
1193
+          'first-line': 0L,
1194
+          'folded-linenos': [159L],
1195
+          'sel-line': 14L,
1196
+          'sel-line-start': 421L,
1197
+          'selection_end': 431L,
1198
+          'selection_start': 431L,
1199
+          'zoom': 0L},
1200
+         1538242100.48],
1201
+        [loc('sources/tmp/ltc.py'),
1202
+         {'attrib-starts': [('Source',
1203
+                             26),
1204
+                            ('Source.get_content',
1205
+                             78)],
1206
+          'first-line': 117L,
1207
+          'folded-linenos': [],
1208
+          'sel-line': 123L,
1209
+          'sel-line-start': 5880L,
1210
+          'selection_end': 5911L,
1211
+          'selection_start': 5911L,
1212
+          'zoom': 0L},
1213
+         1538242117.32],
1214
+        [loc('sources/tmp/ltc.py'),
1215
+         {'attrib-starts': [('Source',
1216
+                             26),
1217
+                            ('Source.get_streams',
1218
+                             572)],
1219
+          'first-line': 574L,
1220
+          'folded-linenos': [],
1221
+          'sel-line': 572L,
1222
+          'sel-line-start': 33932L,
1223
+          'selection_end': 33951L,
1224
+          'selection_start': 33940L,
1225
+          'zoom': 0L},
1226
+         1538242153.844],
1227
+        [loc('sources/tmp/SourceBase.py'),
1228
+         {'attrib-starts': [],
1229
+          'first-line': 11L,
1230
+          'folded-linenos': [],
1231
+          'sel-line': 28L,
1232
+          'sel-line-start': 906L,
1233
+          'selection_end': 906L,
1234
+          'selection_start': 906L,
1235
+          'zoom': 0L},
1236
+         1538242175.463],
1237
+        [loc('sources/tvplay.py'),
1238
+         {'attrib-starts': [],
1239
+          'first-line': 0L,
1240
+          'folded-linenos': [159L],
1241
+          'sel-line': 14L,
1242
+          'sel-line-start': 421L,
1243
+          'selection_end': 431L,
1244
+          'selection_start': 431L,
1245
+          'zoom': 0L},
1246
+         1538242185.735],
1247
+        [loc('sources/ltc.py'),
1248
+         {'attrib-starts': [('Source',
1249
+                             26),
1250
+                            ('Source.get_info2',
1251
+                             930)],
1252
+          'first-line': 925L,
1253
+          'folded-linenos': [132L,
1254
+                             161L,
1255
+                             221L,
1256
+                             232L,
1257
+                             258L,
1258
+                             277L,
1259
+                             296L,
1260
+                             320L,
1261
+                             350L,
1262
+                             351L,
1263
+                             399L,
1264
+                             412L,
1265
+                             532L],
1266
+          'sel-line': 944L,
1267
+          'sel-line-start': 48949L,
1268
+          'selection_end': 48949L,
1269
+          'selection_start': 48949L,
1270
+          'zoom': 0L},
1271
+         1538242192.809],
1272
+        [loc('sources/tmp/SourceBase.py'),
1273
+         {'attrib-starts': [],
1274
+          'first-line': 11L,
1275
+          'folded-linenos': [],
1276
+          'sel-line': 28L,
1277
+          'sel-line-start': 906L,
1278
+          'selection_end': 906L,
1279
+          'selection_start': 906L,
1280
+          'zoom': 0L},
1281
+         1538242194.523],
1282
+        [loc('sources/ltc.py'),
1283
+         {'attrib-starts': [('Source',
1284
+                             26),
1285
+                            ('Source.get_info2',
1286
+                             930)],
1287
+          'first-line': 925L,
1288
+          'folded-linenos': [132L,
1289
+                             161L,
1290
+                             221L,
1291
+                             232L,
1292
+                             258L,
1293
+                             277L,
1294
+                             296L,
1295
+                             320L,
1296
+                             350L,
1297
+                             351L,
1298
+                             399L,
1299
+                             412L,
1300
+                             532L],
1301
+          'sel-line': 944L,
1302
+          'sel-line-start': 48949L,
1303
+          'selection_end': 48949L,
1304
+          'selection_start': 48949L,
1305
+          'zoom': 0L},
1306
+         1538242196.177],
1307
+        [loc('sources/tmp/ltc.py'),
1308
+         {'attrib-starts': [('Source',
1309
+                             26),
1310
+                            ('Source.get_streams',
1311
+                             572)],
1312
+          'first-line': 574L,
1313
+          'folded-linenos': [],
1314
+          'sel-line': 572L,
1315
+          'sel-line-start': 33932L,
1316
+          'selection_end': 33951L,
1317
+          'selection_start': 33940L,
1318
+          'zoom': 0L},
1319
+         1538242196.984],
1320
+        [loc('sources/ltc.py'),
1321
+         {'attrib-starts': [('Source',
1322
+                             26),
1323
+                            ('Source.get_info2',
1324
+                             930)],
1325
+          'first-line': 925L,
1326
+          'folded-linenos': [132L,
1327
+                             161L,
1328
+                             221L,
1329
+                             232L,
1330
+                             258L,
1331
+                             277L,
1332
+                             296L,
1333
+                             320L,
1334
+                             350L,
1335
+                             351L,
1336
+                             399L,
1337
+                             412L,
1338
+                             532L],
1339
+          'sel-line': 932L,
1340
+          'sel-line-start': 48309L,
1341
+          'selection_end': 48345L,
1342
+          'selection_start': 48325L,
1343
+          'zoom': 0L},
1344
+         1538242212.028]],
1297 1345
         20),
1298
-        'current-loc': loc('sources/tvplay.py'),
1346
+        'current-loc': loc('sources/ltc.py'),
1299 1347
         'editor-state-list': [(loc('run.py'),
1300 1348
                                {'attrib-starts': [('VideoInfo',
1301 1349
         343),
@@ -1324,9 +1372,9 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1324 1372
                               (loc('sources/ltc.py'),
1325 1373
                                {'attrib-starts': [('Source',
1326 1374
         26),
1327
-        ('Source.get_info2',
1328
-         930)],
1329
-                                'first-line': 934L,
1375
+        ('Source.get_streams',
1376
+         572)],
1377
+                                'first-line': 562L,
1330 1378
                                 'folded-linenos': [132L,
1331 1379
         161L,
1332 1380
         221L,
@@ -1340,10 +1388,10 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1340 1388
         399L,
1341 1389
         412L,
1342 1390
         532L],
1343
-                                'sel-line': 944L,
1344
-                                'sel-line-start': 48949L,
1345
-                                'selection_end': 48949L,
1346
-                                'selection_start': 48949L,
1391
+                                'sel-line': 572L,
1392
+                                'sel-line-start': 33932L,
1393
+                                'selection_end': 33951L,
1394
+                                'selection_start': 33940L,
1347 1395
                                 'zoom': 0L}),
1348 1396
                               (loc('sources/replay.py'),
1349 1397
                                {'attrib-starts': [],
@@ -1359,16 +1407,13 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1359 1407
                                 'selection_start': 356L,
1360 1408
                                 'zoom': 0L}),
1361 1409
                               (loc('sources/tvplay.py'),
1362
-                               {'attrib-starts': [('Source',
1363
-        32),
1364
-        ('Source.get_content',
1365
-         62)],
1366
-                                'first-line': 124L,
1410
+                               {'attrib-starts': [],
1411
+                                'first-line': 0L,
1367 1412
                                 'folded-linenos': [159L],
1368
-                                'sel-line': 129L,
1369
-                                'sel-line-start': 5841L,
1370
-                                'selection_end': 5878L,
1371
-                                'selection_start': 5852L,
1413
+                                'sel-line': 14L,
1414
+                                'sel-line-start': 421L,
1415
+                                'selection_end': 431L,
1416
+                                'selection_start': 431L,
1372 1417
                                 'zoom': 0L}),
1373 1418
                               (loc('sources/euronews.py'),
1374 1419
                                {'attrib-starts': [('Source',
@@ -1445,10 +1490,10 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1445 1490
         u'sources/euronews.py',
1446 1491
         u'sources/filmas.py',
1447 1492
         u'sources/filmix.py',
1448
-        u'sources/ltc.py',
1449 1493
         u'sources/replay.py',
1450 1494
         u'util.py',
1451
-        u'sources/tvplay.py']},
1495
+        u'sources/tvplay.py',
1496
+        u'sources/ltc.py']},
1452 1497
         'saved_notebook_display': None,
1453 1498
         'split_percents': {0: 0.587782340862423},
1454 1499
         'splits': 2,
@@ -1463,12 +1508,12 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1463 1508
                          0,
1464 1509
                          2393,
1465 1510
                          1440)}]}
1466
-guimgr.recent-documents = [loc('sources/tvplay.py'),
1511
+guimgr.recent-documents = [loc('sources/ltc.py'),
1512
+                           loc('sources/tvplay.py'),
1467 1513
                            loc('util.py'),
1468 1514
                            loc('run.py'),
1469 1515
                            loc('sources/euronews.py'),
1470 1516
                            loc('sources/replay.py'),
1471
-                           loc('sources/ltc.py'),
1472 1517
                            loc('sources/filmix.py'),
1473 1518
                            loc('sources/filmas.py'),
1474 1519
                            loc('changelog.md'),
@@ -1889,6 +1934,26 @@ guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
1889 1934
         'sel-line-start': 5306L,
1890 1935
         'selection_end': 5306L,
1891 1936
         'selection_start': 5306L,
1937
+        'zoom': 0L},
1938
+                       loc('sources/tmp/SourceBase.py'): {'attrib-starts': [],
1939
+        'first-line': 11L,
1940
+        'folded-linenos': [],
1941
+        'sel-line': 28L,
1942
+        'sel-line-start': 906L,
1943
+        'selection_end': 906L,
1944
+        'selection_start': 906L,
1945
+        'zoom': 0L},
1946
+                       loc('sources/tmp/ltc.py'): {'attrib-starts': [('Sourc'\
1947
+        'e',
1948
+        26),
1949
+        ('Source.get_streams',
1950
+         572)],
1951
+        'first-line': 574L,
1952
+        'folded-linenos': [],
1953
+        'sel-line': 572L,
1954
+        'sel-line-start': 33932L,
1955
+        'selection_end': 33951L,
1956
+        'selection_start': 33940L,
1892 1957
         'zoom': 0L},
1893 1958
                        loc('sources/tvdom.py'): {'attrib-starts': [('Source',
1894 1959
         32),

+ 2
- 0
sources/ltc.py View File

@@ -995,6 +995,8 @@ Host: manstv.lattelecom.tv
995 995
         r = response.read()
996 996
         servers = re.findall("(?s)<origin>([^<]+)</origin>", r)
997 997
         streams_xml = re.findall('<stream quality="\w+">(mp4:\w+(\w\w)_(\w\w).mp4)</stream>',r)
998
+        if not streams_xml:
999
+            raise Exception("No stream, buy movie?")
998 1000
         resource_id = re.search("(?s)<resource_id>([^<]+)</resource_id>", r).group(1)
999 1001
         token = re.search("(?s)<auth_token>([^<]+)</auth_token>", r).group(1)
1000 1002
         streams=[]