Ivars 5 jaren geleden
bovenliggende
commit
5c19ffde90
1 gewijzigde bestanden met toevoegingen van 188 en 297 verwijderingen
  1. 188
    297
      project.wpr

+ 188
- 297
project.wpr Bestand weergeven

@@ -11,10 +11,7 @@ proj.directory-list = [{'dirloc': loc('.'),
11 11
                         'recursive': True,
12 12
                         'watch_for_changes': True}]
13 13
 proj.file-type = 'normal'
14
-proj.launch-config = {loc('ContentSources.py'): ('project',
15
-        (u'config::home streams_bernu.cfg',
16
-         '')),
17
-                      loc('iub_db.py'): ('project',
14
+proj.launch-config = {loc('iub_db.py'): ('project',
18 15
         (u'-d 90   -s -o',
19 16
          '')),
20 17
                       loc('iub_db2.py'): ('project',
@@ -314,7 +311,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
314 311
         'list-files-first': 0,
315 312
         'tree-states': {'deep': {'expanded-nodes': [(6,)],
316 313
                                  'selected-nodes': [(6,
317
-        22)],
314
+        23)],
318 315
                                  'top-node': (6,
319 316
         12)}},
320 317
         'tree-style': 'deep'}}),
@@ -833,53 +830,50 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
833 830
         'top-node': [('generic attribute',
834 831
                       loc('../../SplashData/remdup.py'),
835 832
                       'f')]},
836
-        loc('../../../../../Python27/Lib/lib-tk/Tkinter.py'): {'expanded-nod'\
833
+        loc('../../../../../Python27/lib/lib-tk/Tkinter.py'): {'expanded-nod'\
837 834
         'es': [],
838 835
         'selected-nodes': [],
839 836
         'top-node': [('function def',
840
-                      loc('../../../../../Python27/Lib/lib-tk/Tkinter.py'),
837
+                      loc('../../../../../Python27/lib/lib-tk/Tkinter.py'),
841 838
                       'At')]},
842
-        loc('../../../../../Python27/Lib/lib-tk/tkCommonDialog.py'): {'expan'\
839
+        loc('../../../../../Python27/lib/lib-tk/tkCommonDialog.py'): {'expan'\
843 840
         'ded-nodes': [],
844 841
         'selected-nodes': [],
845 842
         'top-node': [('class def',
846
-                      loc('../../../../../Python27/Lib/lib-tk/tkCommonDialog.py'),
843
+                      loc('../../../../../Python27/lib/lib-tk/tkCommonDialog.py'),
847 844
                       'Dialog')]},
848
-        loc('../../../../../Python27/Lib/lib-tk/tkMessageBox.py'): {'expande'\
845
+        loc('../../../../../Python27/lib/lib-tk/tkMessageBox.py'): {'expande'\
849 846
         'd-nodes': [],
850 847
         'selected-nodes': [],
851 848
         'top-node': [('generic attribute',
852
-                      loc('../../../../../Python27/Lib/lib-tk/tkMessageBox.py'),
849
+                      loc('../../../../../Python27/lib/lib-tk/tkMessageBox.py'),
853 850
                       'ABORT')]},
854
-        loc('../../../../../Python27/Lib/lib-tk/tkSimpleDialog.py'): {'expan'\
851
+        loc('../../../../../Python27/lib/lib-tk/tkSimpleDialog.py'): {'expan'\
855 852
         'ded-nodes': [],
856 853
         'selected-nodes': [],
857 854
         'top-node': [('function def',
858
-                      loc('../../../../../Python27/Lib/lib-tk/tkSimpleDialog.py'),
855
+                      loc('../../../../../Python27/lib/lib-tk/tkSimpleDialog.py'),
859 856
                       'askfloat')]},
860
-        loc('../../../../../Python27/Lib/lib-tk/ttk.py'): {'expanded-nodes': [],
857
+        loc('../../../../../Python27/lib/lib-tk/ttk.py'): {'expanded-nodes': [],
861 858
         'selected-nodes': [],
862 859
         'top-node': [('class def',
863
-                      loc('../../../../../Python27/Lib/lib-tk/ttk.py'),
860
+                      loc('../../../../../Python27/lib/lib-tk/ttk.py'),
864 861
                       'Button')]},
865
-        loc('../../../../../Python27/Lib/site-packages/PIL/Image.py'): {'exp'\
862
+        loc('../../../../../Python27/lib/site-packages/PIL/Image.py'): {'exp'\
866 863
         'anded-nodes': [],
867 864
         'selected-nodes': [],
868 865
         'top-node': [('generic attribute',
869
-                      loc('../../../../../Python27/Lib/site-packages/PIL/Image.py'),
866
+                      loc('../../../../../Python27/lib/site-packages/PIL/Image.py'),
870 867
                       'ADAPTIVE')]},
871
-        loc('../../../../../Python27/Lib/site-packages/PIL/ImageTk.py'): {'e'\
868
+        loc('../../../../../Python27/lib/site-packages/PIL/ImageTk.py'): {'e'\
872 869
         'xpanded-nodes': [],
873 870
         'selected-nodes': [[('function def',
874
-                             loc('../../../../../Python27/Lib/site-packages/PIL/ImageTk.py'),
871
+                             loc('../../../../../Python27/lib/site-packages/PIL/ImageTk.py'),
875 872
                              '_show')]],
876 873
         'top-node': [('class def',
877
-                      loc('../../../../../Python27/Lib/site-packages/PIL/ImageTk.py'),
874
+                      loc('../../../../../Python27/lib/site-packages/PIL/ImageTk.py'),
878 875
                       'BitmapImage')]},
879
-        loc('unknown:<untitled> #3'): {'expanded-nodes': [],
880
-                                       'selected-nodes': [],
881
-                                       'top-node': None},
882
-        loc('unknown:<untitled> #6'): {'column-widths': [1.0],
876
+        loc('unknown:<untitled> #4'): {'column-widths': [1.0],
883 877
                                        'expanded-nodes': [],
884 878
                                        'selected-nodes': [],
885 879
                                        'top-node': None},
@@ -887,7 +881,10 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
887 881
                                        'expanded-nodes': [],
888 882
                                        'selected-nodes': [],
889 883
                                        'top-node': None},
890
-        loc('unknown:<untitled> #4'): {'expanded-nodes': [],
884
+        loc('unknown:<untitled> #3'): {'expanded-nodes': [],
885
+                                       'selected-nodes': [],
886
+                                       'top-node': None},
887
+        loc('unknown:<untitled> #6'): {'expanded-nodes': [],
891 888
                                        'selected-nodes': [],
892 889
                                        'top-node': None}},
893 890
                                 'browse_mode': u'Current Module',
@@ -917,7 +914,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
917 914
         'current_pages': [2,
918 915
                           0],
919 916
         'notebook_display': 'normal',
920
-        'notebook_percent': 0.5,
917
+        'notebook_percent': 0.20496397117694154,
921 918
         'override_title': None,
922 919
         'pagelist': [('debug-breakpoints',
923 920
                       'wide',
@@ -1024,101 +1021,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1024 1021
         -1,
1025 1022
         -1),
1026 1023
                        'attrib-starts': [],
1027
-                       'first-line': 389L,
1024
+                       'first-line': 0L,
1028 1025
                        'folded-linenos': [],
1029
-                       'history': {u'file:C:/Data/Programming/enigma2/PlayStream2/content/playstreamproxyX.py': ['S'\
1030
-        'PLIT_CHAR\n',
1031
-        'path\n',
1032
-        'qs[0]\n',
1033
-        'qs[1]\n',
1034
-        'h\n',
1035
-        'qs2\n',
1036
-        'cmd\n',
1037
-        'data\n',
1038
-        'qs\n',
1039
-        'cmd, data, headers, qs = streamproxy_decode3(self.path)\n',
1040
-        'self.path\n',
1041
-        'print txt\n',
1042
-        '"/".join(url2.split("/")[0:-1])\n',
1043
-        'url2\n',
1044
-        'q\n',
1045
-        'stream.keys()\n',
1046
-        'streams[0].keys()\n',
1047
-        'streams[0].keys()["headers"]\n',
1048
-        'streams[0]["headers"]\n',
1049
-        'print url\n',
1050
-        'print track\n',
1051
-        'print chunk\n',
1052
-        'headers\n',
1053
-        'chunk\n',
1054
-        'len(r.content)\n',
1055
-        'r.headers["content-length"]\n',
1056
-        'r.content\n',
1057
-        'len(r.raw)\n',
1058
-        'r.raw\n',
1059
-        'len(r.raw.read())\n',
1060
-        '"/".join(url2.split("/")[0:1])+ "/"\n',
1061
-        '"/".join(url2.split("/")[0:2])+ "/"\n',
1062
-        '"/".join(url2.split("/")[0:3])+ "/"\n',
1063
-        'slinks[base_data]["urlp"]\n',
1064
-        'slinks[base_data]\n',
1065
-        'slinks[base_data]["base_url"]\n',
1066
-        'r.headers\n',
1067
-        'path.split("/")[2]\n',
1068
-        'urlp\n',
1069
-        'self.headers\n',
1070
-        'self.headers.dict\n',
1071
-        'headers2\n',
1072
-        'e\n',
1073
-        'r2 =ses.get(url)\n',
1074
-        'r2.status_code\n',
1075
-        'r2.headers\n',
1076
-        'url\n',
1077
-        'r2 =ses.get(url, stream=stream, verify=False)\n',
1078
-        'r2 =ses.get(url, verify=False)\n',
1079
-        'r2 =ses.get(url, redirect=False)\n',
1080
-        'ses.headers\n'],
1081
-                                   u'file:C:/Data/Programming/enigma2/PlayStream2/content/sources/tvdom.py': ['j'\
1082
-        's = json.load(r)\n',
1083
-        'js = json.loads(r)\n',
1084
-        'r\n',
1085
-        'json.load(m.group(1))\n',
1086
-        'txt = m.group(1)\n',
1087
-        'txt\n',
1088
-        'json.loads(txt)\n',
1089
-        'js json.loads(txt)\n',
1090
-        'json = json.loads(txt)\n',
1091
-        'js\n',
1092
-        'js[1]\n',
1093
-        'js["scr"]\n',
1094
-        'js.keys()\n',
1095
-        'js[0]\n',
1096
-        'js[0]["scr"]\n',
1097
-        'js[0]["src"]\n',
1098
-        "re.search('title: \"([^\"]+)\"', r, re.DOTALL)\n",
1099
-        "re.search('<div id=\"panel\">([^<]+)<', r, re.DOTALL)\n",
1100
-        'm.group(1)\n',
1101
-        'm\n',
1102
-        'm.group(0)\n',
1103
-        'fcache\n',
1104
-        'self.listbox.curselection()\n',
1105
-        'self.listbox.curselection()[0]\n',
1106
-        'cs\n',
1107
-        'data\n',
1108
-        "re.search('materialIdentifier:\"(\\d+)', r, re.DOTALL)\n",
1109
-        "vid=re.search('materialIdentifier\":\"(\\d+)', r, re.DOTALL).group("\
1110
-        "1)\n",
1111
-        'vid\n',
1112
-        'print img\n',
1113
-        'item\n',
1114
-        'item[1]\n',
1115
-        'pname\n',
1116
-        'plist\n']},
1026
+                       'history': {},
1117 1027
                        'launch-id': None,
1118
-                       'sel-line': 397L,
1119
-                       'sel-line-start': 825956L,
1120
-                       'selection_end': 825956L,
1121
-                       'selection_start': 825956L,
1028
+                       'sel-line': 0L,
1029
+                       'sel-line-start': 0L,
1030
+                       'selection_end': 0L,
1031
+                       'selection_start': 0L,
1122 1032
                        'zoom': 0L}),
1123 1033
                      ('debug-watch',
1124 1034
                       'wide',
@@ -1169,133 +1079,22 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1169 1079
         'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('playstreamproxyX.py'),
1170 1080
         {'attrib-starts': [('StreamHandler',
1171 1081
                             61),
1172
-                           ('StreamHandler.fetch_source',
1173
-                            132)],
1174
-         'first-line': 141L,
1082
+                           ('StreamHandler.get_page_ses',
1083
+                            205)],
1084
+         'first-line': 171L,
1175 1085
          'folded-linenos': [63L,
1176
-                            235L,
1177 1086
                             238L,
1178
-                            249L,
1179
-                            373L,
1180
-                            377L,
1181
-                            404L],
1182
-         'sel-line': 133L,
1183
-         'sel-line-start': 4439L,
1184
-         'selection_end': 4439L,
1185
-         'selection_start': 4439L,
1087
+                            241L,
1088
+                            252L,
1089
+                            376L,
1090
+                            380L,
1091
+                            407L],
1092
+         'sel-line': 212L,
1093
+         'sel-line-start': 7584L,
1094
+         'selection_end': 7584L,
1095
+         'selection_start': 7584L,
1186 1096
          'zoom': 0L},
1187
-        1551023119.075],
1188
-        [loc('playstreamproxyX.py'),
1189
-         {'attrib-starts': [('StreamHandler',
1190
-                             61),
1191
-                            ('StreamHandler.fetch_source',
1192
-                             132)],
1193
-          'first-line': 156L,
1194
-          'folded-linenos': [63L,
1195
-                             235L,
1196
-                             238L,
1197
-                             249L,
1198
-                             373L,
1199
-                             377L,
1200
-                             404L],
1201
-          'sel-line': 164L,
1202
-          'sel-line-start': 5856L,
1203
-          'selection_end': 5882L,
1204
-          'selection_start': 5880L,
1205
-          'zoom': 0L},
1206
-         1551023119.601],
1207
-        [loc('playstreamproxyX.py'),
1208
-         {'attrib-starts': [('StreamHandler',
1209
-                             61),
1210
-                            ('StreamHandler.fetch_source',
1211
-                             132)],
1212
-          'first-line': 149L,
1213
-          'folded-linenos': [63L,
1214
-                             238L,
1215
-                             241L,
1216
-                             252L,
1217
-                             376L,
1218
-                             380L,
1219
-                             407L],
1220
-          'sel-line': 163L,
1221
-          'sel-line-start': 5825L,
1222
-          'selection_end': 5886L,
1223
-          'selection_start': 5886L,
1224
-          'zoom': 0L},
1225
-         1551023767.345],
1226
-        [loc('playstreamproxyX.py'),
1227
-         {'attrib-starts': [],
1228
-          'first-line': 428L,
1229
-          'folded-linenos': [63L,
1230
-                             238L,
1231
-                             241L,
1232
-                             252L,
1233
-                             376L,
1234
-                             380L,
1235
-                             407L],
1236
-          'sel-line': 438L,
1237
-          'sel-line-start': 14874L,
1238
-          'selection_end': 14874L,
1239
-          'selection_start': 14874L,
1240
-          'zoom': 0L},
1241
-         1551023770.376],
1242
-        [loc('playstreamproxyX.py'),
1243
-         {'attrib-starts': [('StreamHandler',
1244
-                             61),
1245
-                            ('StreamHandler.get_page_ses',
1246
-                             205)],
1247
-          'first-line': 204L,
1248
-          'folded-linenos': [63L,
1249
-                             238L,
1250
-                             241L,
1251
-                             252L,
1252
-                             376L,
1253
-                             380L,
1254
-                             407L],
1255
-          'sel-line': 212L,
1256
-          'sel-line-start': 7584L,
1257
-          'selection_end': 7584L,
1258
-          'selection_start': 7584L,
1259
-          'zoom': 0L},
1260
-         1551023781.405],
1261
-        [loc('playstreamproxyX.py'),
1262
-         {'attrib-starts': [('StreamHandler',
1263
-                             61),
1264
-                            ('StreamHandler.do_GET',
1265
-                             78)],
1266
-          'first-line': 63L,
1267
-          'folded-linenos': [63L,
1268
-                             238L,
1269
-                             241L,
1270
-                             252L,
1271
-                             376L,
1272
-                             380L,
1273
-                             407L],
1274
-          'sel-line': 118L,
1275
-          'sel-line-start': 3991L,
1276
-          'selection_end': 3991L,
1277
-          'selection_start': 3991L,
1278
-          'zoom': 0L},
1279
-         1551024057.515],
1280
-        [loc('playstreamproxyX.py'),
1281
-         {'attrib-starts': [('StreamHandler',
1282
-                             61),
1283
-                            ('StreamHandler.get_page_ses',
1284
-                             205)],
1285
-          'first-line': 171L,
1286
-          'folded-linenos': [63L,
1287
-                             238L,
1288
-                             241L,
1289
-                             252L,
1290
-                             376L,
1291
-                             380L,
1292
-                             407L],
1293
-          'sel-line': 212L,
1294
-          'sel-line-start': 7584L,
1295
-          'selection_end': 7584L,
1296
-          'selection_start': 7584L,
1297
-          'zoom': 0L},
1298
-         1551024378.338],
1097
+        1551024378.338],
1299 1098
         [loc('playstreamproxyX.py'),
1300 1099
          {'attrib-starts': [('StreamHandler',
1301 1100
                              61),
@@ -1391,7 +1190,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1391 1190
           'selection_start': 7636L,
1392 1191
           'zoom': 0L},
1393 1192
          1551024440.385],
1394
-        [loc('../../../../../Python27/Lib/site-packages/requests/sessions.py'),
1193
+        [loc('../../../../../Python27/lib/site-packages/requests/sessions.py'),
1395 1194
          {'attrib-starts': [('Session',
1396 1195
                              318),
1397 1196
                             ('Session.get',
@@ -1524,20 +1323,119 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1524 1323
           'selection_end': 14533L,
1525 1324
           'selection_start': 14434L,
1526 1325
           'zoom': 0L},
1527
-         1551026101.864]],
1326
+         1551026101.864],
1327
+        [loc('playstreamproxyX.py'),
1328
+         {'attrib-starts': [],
1329
+          'first-line': 0L,
1330
+          'folded-linenos': [63L,
1331
+                             239L,
1332
+                             242L,
1333
+                             253L,
1334
+                             377L,
1335
+                             381L,
1336
+                             408L],
1337
+          'sel-line': 8L,
1338
+          'sel-line-start': 201L,
1339
+          'selection_end': 212L,
1340
+          'selection_start': 212L,
1341
+          'zoom': 0L},
1342
+         1551026167.007],
1343
+        [loc('util.py'),
1344
+         {'attrib-starts': [('streamproxy_decode3',
1345
+                             260)],
1346
+          'first-line': 67L,
1347
+          'folded-linenos': [179L,
1348
+                             196L,
1349
+                             209L,
1350
+                             224L,
1351
+                             237L,
1352
+                             284L,
1353
+                             621L,
1354
+                             624L,
1355
+                             657L,
1356
+                             679L],
1357
+          'sel-line': 264L,
1358
+          'sel-line-start': 9128L,
1359
+          'selection_end': 9128L,
1360
+          'selection_start': 9128L,
1361
+          'zoom': 0L},
1362
+         1551026206.283],
1363
+        [loc('playstreamproxyX.py'),
1364
+         {'attrib-starts': [],
1365
+          'first-line': 0L,
1366
+          'folded-linenos': [63L,
1367
+                             239L,
1368
+                             242L,
1369
+                             253L,
1370
+                             377L,
1371
+                             381L,
1372
+                             408L],
1373
+          'sel-line': 8L,
1374
+          'sel-line-start': 201L,
1375
+          'selection_end': 212L,
1376
+          'selection_start': 212L,
1377
+          'zoom': 0L},
1378
+         1551026237.376],
1379
+        [loc('util.py'),
1380
+         {'attrib-starts': [('streamproxy_decode3',
1381
+                             260)],
1382
+          'first-line': 67L,
1383
+          'folded-linenos': [179L,
1384
+                             196L,
1385
+                             209L,
1386
+                             224L,
1387
+                             237L,
1388
+                             284L,
1389
+                             621L,
1390
+                             624L,
1391
+                             657L,
1392
+                             679L],
1393
+          'sel-line': 264L,
1394
+          'sel-line-start': 9128L,
1395
+          'selection_end': 9128L,
1396
+          'selection_start': 9128L,
1397
+          'zoom': 0L},
1398
+         1551043069.671],
1399
+        [loc('run.py'),
1400
+         {'attrib-starts': [('VideoInfo',
1401
+                             343),
1402
+                            ('VideoInfo.body',
1403
+                             370)],
1404
+          'first-line': 0L,
1405
+          'folded-linenos': [],
1406
+          'sel-line': 408L,
1407
+          'sel-line-start': 16292L,
1408
+          'selection_end': 16316L,
1409
+          'selection_start': 16316L,
1410
+          'zoom': 0L},
1411
+         1551043098.632],
1412
+        [loc('ContentSources.py'),
1413
+         {'attrib-starts': [],
1414
+          'first-line': 18L,
1415
+          'folded-linenos': [20L,
1416
+                             64L,
1417
+                             96L,
1418
+                             128L,
1419
+                             149L,
1420
+                             152L,
1421
+                             161L,
1422
+                             171L],
1423
+          'sel-line': 183L,
1424
+          'sel-line-start': 7260L,
1425
+          'selection_end': 7275L,
1426
+          'selection_start': 7275L,
1427
+          'zoom': 0L},
1428
+         1551043861.008]],
1528 1429
         20),
1529
-        'current-loc': loc('playstreamproxyX.py'),
1430
+        'current-loc': loc('run.py'),
1530 1431
         'editor-state-list': [(loc('run.py'),
1531
-                               {'attrib-starts': [('VideoInfo',
1532
-        343),
1533
-        ('VideoInfo.body',
1534
-         370)],
1535
-                                'first-line': 397L,
1432
+                               {'attrib-starts': [],
1433
+                                'first-line': 715L,
1536 1434
                                 'folded-linenos': [],
1537
-                                'sel-line': 408L,
1538
-                                'sel-line-start': 16292L,
1539
-                                'selection_end': 16316L,
1540
-                                'selection_start': 16316L,
1435
+                                'sel-line': 734L,
1436
+                                'sel-line-start': 29564L,
1437
+                                'selection_end': 29586L,
1438
+                                'selection_start': 29566L,
1541 1439
                                 'zoom': 0L}),
1542 1440
                               (loc('util.py'),
1543 1441
                                {'attrib-starts': [('streamproxy_decode3',
@@ -1558,21 +1456,6 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1558 1456
                                 'selection_end': 9128L,
1559 1457
                                 'selection_start': 9128L,
1560 1458
                                 'zoom': 0L}),
1561
-                              (loc('playstreamproxyX.py'),
1562
-                               {'attrib-starts': [],
1563
-                                'first-line': 0L,
1564
-                                'folded-linenos': [63L,
1565
-        239L,
1566
-        242L,
1567
-        253L,
1568
-        377L,
1569
-        381L,
1570
-        408L],
1571
-                                'sel-line': 8L,
1572
-                                'sel-line-start': 201L,
1573
-                                'selection_end': 212L,
1574
-                                'selection_start': 212L,
1575
-                                'zoom': 0L}),
1576 1459
                               (loc('sources/ltc.py'),
1577 1460
                                {'attrib-starts': [('Source',
1578 1461
         26),
@@ -1681,11 +1564,8 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1681 1564
                                 'selection_start': 9851L,
1682 1565
                                 'zoom': 0L}),
1683 1566
                               (loc('ContentSources.py'),
1684
-                               {'attrib-starts': [('ContentSources',
1685
-        16),
1686
-        ('ContentSources.options_write',
1687
-         171)],
1688
-                                'first-line': 12L,
1567
+                               {'attrib-starts': [],
1568
+                                'first-line': 18L,
1689 1569
                                 'folded-linenos': [20L,
1690 1570
         64L,
1691 1571
         96L,
@@ -1694,10 +1574,10 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1694 1574
         152L,
1695 1575
         161L,
1696 1576
         171L],
1697
-                                'sel-line': 171L,
1698
-                                'sel-line-start': 6794L,
1699
-                                'selection_end': 6844L,
1700
-                                'selection_start': 6844L,
1577
+                                'sel-line': 183L,
1578
+                                'sel-line-start': 7260L,
1579
+                                'selection_end': 7275L,
1580
+                                'selection_start': 7275L,
1701 1581
                                 'zoom': 0L}),
1702 1582
                               (loc('sources/tvdom.py'),
1703 1583
                                {'attrib-starts': [('Source',
@@ -1715,7 +1595,6 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1715 1595
         'locked': False},
1716 1596
         [loc('run.py'),
1717 1597
          loc('util.py'),
1718
-         loc('playstreamproxyX.py'),
1719 1598
          loc('sources/ltc.py'),
1720 1599
          loc('sources/replay.py'),
1721 1600
          loc('sources/tvplay.py'),
@@ -1730,15 +1609,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1730 1609
         u'sources/config.py',
1731 1610
         u'sources/filmix.py',
1732 1611
         u'sources/lmt.py',
1733
-        u'sources/tvplay.py',
1734
-        u'sources/xtv.py',
1735
-        u'sources/tvdom.py',
1736
-        u'ContentSources.py',
1737 1612
         u'sources/ltc.py',
1738
-        u'run.py',
1739 1613
         u'sources/replay.py',
1614
+        u'sources/tvdom.py',
1615
+        u'sources/tvplay.py',
1616
+        u'sources/xtv.py',
1740 1617
         u'util.py',
1741
-        u'playstreamproxyX.py']},
1618
+        u'ContentSources.py',
1619
+        u'run.py']},
1742 1620
         'saved_notebook_display': None,
1743 1621
         'split_percents': {0: 0.5025380710659898},
1744 1622
         'splits': 2,
@@ -1753,12 +1631,11 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1753 1631
                          0,
1754 1632
                          2432,
1755 1633
                          1440)}]}
1756
-guimgr.recent-documents = [loc('playstreamproxyX.py'),
1634
+guimgr.recent-documents = [loc('run.py'),
1635
+                           loc('ContentSources.py'),
1757 1636
                            loc('util.py'),
1758 1637
                            loc('sources/replay.py'),
1759
-                           loc('run.py'),
1760 1638
                            loc('sources/ltc.py'),
1761
-                           loc('ContentSources.py'),
1762 1639
                            loc('sources/tvdom.py'),
1763 1640
                            loc('sources/xtv.py'),
1764 1641
                            loc('sources/tvplay.py'),
@@ -1985,6 +1862,20 @@ guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
1985 1862
         'sel-line-start': 14434L,
1986 1863
         'selection_end': 14533L,
1987 1864
         'selection_start': 14434L,
1865
+        'zoom': 0L},
1866
+                       loc('playstreamproxyX.py'): {'attrib-starts': [],
1867
+        'first-line': 0L,
1868
+        'folded-linenos': [63L,
1869
+                           239L,
1870
+                           242L,
1871
+                           253L,
1872
+                           377L,
1873
+                           381L,
1874
+                           408L],
1875
+        'sel-line': 8L,
1876
+        'sel-line-start': 201L,
1877
+        'selection_end': 212L,
1878
+        'selection_start': 212L,
1988 1879
         'zoom': 0L},
1989 1880
                        loc('resolver.py'): {'attrib-starts': [],
1990 1881
         'first-line': 0L,
@@ -2291,7 +2182,7 @@ guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
2291 2182
         'sel-line-start': 0,
2292 2183
         'selection_end': 1,
2293 2184
         'selection_start': 1},
2294
-                       loc('../../../../../Python27/Lib/ftplib.py'): {'attri'\
2185
+                       loc('../../../../../Python27/lib/ftplib.py'): {'attri'\
2295 2186
         'b-starts': [],
2296 2187
         'first-line': 0L,
2297 2188
         'folded-linenos': [],
@@ -2300,7 +2191,7 @@ guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
2300 2191
         'selection_end': 0L,
2301 2192
         'selection_start': 0L,
2302 2193
         'zoom': 0L},
2303
-                       loc('../../../../../Python27/Lib/lib-tk/Tkinter.py'): {'a'\
2194
+                       loc('../../../../../Python27/lib/lib-tk/Tkinter.py'): {'a'\
2304 2195
         'ttrib-starts': [('CallWrapper',
2305 2196
                           1528),
2306 2197
                          ('CallWrapper.__call__',
@@ -2312,7 +2203,7 @@ guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
2312 2203
         'selection_end': 60799L,
2313 2204
         'selection_start': 60799L,
2314 2205
         'zoom': 0L},
2315
-                       loc('../../../../../Python27/Lib/lib-tk/tkCommonDialog.py'): {'a'\
2206
+                       loc('../../../../../Python27/lib/lib-tk/tkCommonDialog.py'): {'a'\
2316 2207
         'ttrib-starts': [('Dialog',
2317 2208
                           12)],
2318 2209
         'first-line': 12L,
@@ -2322,7 +2213,7 @@ guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
2322 2213
         'selection_end': 298L,
2323 2214
         'selection_start': 298L,
2324 2215
         'zoom': 0L},
2325
-                       loc('../../../../../Python27/Lib/lib-tk/tkSimpleDialog.py'): {'a'\
2216
+                       loc('../../../../../Python27/lib/lib-tk/tkSimpleDialog.py'): {'a'\
2326 2217
         'ttrib-starts': [('Dialog',
2327 2218
                           29),
2328 2219
                          ('Dialog.__init__',
@@ -2334,7 +2225,7 @@ guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
2334 2225
         'selection_end': 1686L,
2335 2226
         'selection_start': 1686L,
2336 2227
         'zoom': 0L},
2337
-                       loc('../../../../../Python27/Lib/site-packages/PIL/Image.py'): {'a'\
2228
+                       loc('../../../../../Python27/lib/site-packages/PIL/Image.py'): {'a'\
2338 2229
         'ttrib-starts': [('DecompressionBombError',
2339 2230
                           73)],
2340 2231
         'first-line': 40L,
@@ -2344,7 +2235,7 @@ guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
2344 2235
         'selection_end': 1583L,
2345 2236
         'selection_start': 1583L,
2346 2237
         'zoom': 0L},
2347
-                       loc('../../../../../Python27/Lib/site-packages/PIL/ImageTk.py'): {'a'\
2238
+                       loc('../../../../../Python27/lib/site-packages/PIL/ImageTk.py'): {'a'\
2348 2239
         'ttrib-starts': [('PhotoImage',
2349 2240
                           69),
2350 2241
                          ('PhotoImage.paste',
@@ -2356,7 +2247,7 @@ guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
2356 2247
         'selection_end': 5668L,
2357 2248
         'selection_start': 5665L,
2358 2249
         'zoom': 0L},
2359
-                       loc('../../../../../Python27/Lib/site-packages/requests/adapters.py'): {'a'\
2250
+                       loc('../../../../../Python27/lib/site-packages/requests/adapters.py'): {'a'\
2360 2251
         'ttrib-starts': [('HTTPAdapter',
2361 2252
                           80),
2362 2253
                          ('HTTPAdapter.send',
@@ -2368,7 +2259,7 @@ guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
2368 2259
         'selection_end': 20166L,
2369 2260
         'selection_start': 20166L,
2370 2261
         'zoom': 0L},
2371
-                       loc('../../../../../Python27/Lib/site-packages/requests/models.py'): {'a'\
2262
+                       loc('../../../../../Python27/lib/site-packages/requests/models.py'): {'a'\
2372 2263
         'ttrib-starts': [('Response',
2373 2264
                           577),
2374 2265
                          ('Response.content',