浏览代码

replay eksperimenti

Ivars 6 年前
父节点
当前提交
f821100e23
共有 2 个文件被更改,包括 223 次插入244 次删除
  1. 215
    240
      project.wpr
  2. 8
    4
      sources/replay.py

+ 215
- 240
project.wpr 查看文件

@@ -138,10 +138,22 @@ debug.breakpoints = {loc('Downloader.py'): {182L: (0,
138 138
         None,
139 139
         1,
140 140
         0)},
141
-                     loc('sources/replay.py'): {256L: (0,
141
+                     loc('sources/replay.py'): {208L: (0,
142 142
         None,
143 143
         1,
144
-        0)},
144
+        0),
145
+        238L: (0,
146
+               None,
147
+               1,
148
+               0),
149
+        252L: (0,
150
+               None,
151
+               1,
152
+               0),
153
+        260L: (0,
154
+               None,
155
+               1,
156
+               0)},
145 157
                      loc('sources/tvdom.py'): {292L: (0,
146 158
         None,
147 159
         1,
@@ -799,18 +811,18 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
799 811
         'top-node': [('generic attribute',
800 812
                       loc('../../../../../Python27/lib/site-packages/PIL/Image.py'),
801 813
                       'ADAPTIVE')]},
802
-        loc('unknown:<untitled> #4'): {'column-widths': [1.0],
803
-                                       'expanded-nodes': [],
814
+        loc('unknown:<untitled> #4'): {'expanded-nodes': [],
804 815
                                        'selected-nodes': [],
805 816
                                        'top-node': None},
806
-        loc('unknown:<untitled> #6'): {'expanded-nodes': [],
817
+        loc('unknown:<untitled> #3'): {'column-widths': [1.0],
818
+                                       'expanded-nodes': [],
807 819
                                        'selected-nodes': [],
808 820
                                        'top-node': None},
809 821
         loc('unknown:<untitled> #5'): {'column-widths': [1.0],
810 822
                                        'expanded-nodes': [],
811 823
                                        'selected-nodes': [],
812 824
                                        'top-node': None},
813
-        loc('unknown:<untitled> #3'): {'expanded-nodes': [],
825
+        loc('unknown:<untitled> #6'): {'expanded-nodes': [],
814 826
                                        'selected-nodes': [],
815 827
                                        'top-node': None}},
816 828
                                 'browse_mode': u'Current Module',
@@ -837,7 +849,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
837 849
                                None)],
838 850
                  'primary_view_state': {'area': 'wide',
839 851
         'constraint': None,
840
-        'current_pages': [4,
852
+        'current_pages': [2,
841 853
                           0],
842 854
         'notebook_display': 'normal',
843 855
         'notebook_percent': 0.4595676541232986,
@@ -873,7 +885,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
873 885
                                        'fRegexFlags': 46,
874 886
                                        'fReplaceText': u'https://ltv.lsm.lv',
875 887
                                        'fReverse': False,
876
-                                       'fSearchText': u'http://ltv.lsm.lv',
888
+                                       'fSearchText': u'img =',
877 889
                                        'fStartPos': 0,
878 890
                                        'fStyle': 'text',
879 891
                                        'fWholeWords': False,
@@ -886,7 +898,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
886 898
                                       'fReplaceOnDisk': False,
887 899
                                       'fShowFirstMatch': False,
888 900
                                       'fShowLineno': True,
889
-                                      'fShowReplaceWidgets': True}}),
901
+                                      'fShowReplaceWidgets': False}}),
890 902
                      ('batch-search',
891 903
                       'wide',
892 904
                       0,
@@ -949,12 +961,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
949 961
                        'attrib-starts': [],
950 962
                        'first-line': 0L,
951 963
                        'folded-linenos': [],
952
-                       'history': {},
964
+                       'history': {u'file:C:/Data/Programming/Plex/PlayStream.bundle/Contents/Libraries/Shared/content/sources/replay.py': ['i'\
965
+        'tem[1]\n',
966
+        'print item[1]\n']},
953 967
                        'launch-id': None,
954
-                       'sel-line': 0L,
955
-                       'sel-line-start': 0L,
956
-                       'selection_end': 0L,
957
-                       'selection_start': 0L,
968
+                       'sel-line': 3L,
969
+                       'sel-line-start': 83L,
970
+                       'selection_end': 140L,
971
+                       'selection_start': 83L,
958 972
                        'zoom': 0L}),
959 973
                      ('debug-watch',
960 974
                       'wide',
@@ -1001,301 +1015,262 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1001 1015
                        'selection_end': 174L,
1002 1016
                        'selection_start': 174L,
1003 1017
                        'zoom': 0L})],
1004
-        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('sources/ltc.py'),
1018
+        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('sources/replay.py'),
1005 1019
         {'attrib-starts': [('Source',
1006
-                            26),
1020
+                            31),
1007 1021
                            ('Source.get_content',
1008
-                            78)],
1009
-         'first-line': 88L,
1010
-         'folded-linenos': [131L,
1011
-                            160L,
1012
-                            170L,
1013
-                            183L,
1014
-                            220L,
1015
-                            231L,
1016
-                            257L,
1017
-                            276L,
1018
-                            295L,
1019
-                            319L,
1020
-                            349L,
1021
-                            350L,
1022
-                            367L,
1023
-                            398L,
1024
-                            411L,
1025
-                            525L],
1026
-         'sel-line': 97L,
1027
-         'sel-line-start': 4220L,
1028
-         'selection_end': 4322L,
1029
-         'selection_start': 4322L,
1022
+                            42)],
1023
+         'first-line': 225L,
1024
+         'folded-linenos': [],
1025
+         'sel-line': 235L,
1026
+         'sel-line-start': 12269L,
1027
+         'selection_end': 12301L,
1028
+         'selection_start': 12301L,
1030 1029
          'zoom': 0L},
1031
-        1523348312.767],
1032
-        [loc('sources/ltc.py'),
1033
-         {'attrib-starts': [('Source',
1034
-                             26),
1035
-                            ('Source.get_streams',
1036
-                             549)],
1037
-          'first-line': 45L,
1038
-          'folded-linenos': [131L,
1039
-                             160L,
1040
-                             170L,
1041
-                             183L,
1042
-                             220L,
1043
-                             231L,
1044
-                             257L,
1045
-                             276L,
1046
-                             295L,
1047
-                             319L,
1048
-                             349L,
1049
-                             350L,
1050
-                             367L,
1051
-                             398L,
1052
-                             411L,
1053
-                             525L],
1054
-          'sel-line': 549L,
1055
-          'sel-line-start': 32845L,
1056
-          'selection_end': 32864L,
1057
-          'selection_start': 32853L,
1058
-          'zoom': 0L},
1059
-         1523382892.906],
1060
-        [loc('sources/ltc.py'),
1030
+        1523886475.688],
1031
+        [loc('sources/replay.py'),
1061 1032
          {'attrib-starts': [('Source',
1062
-                             26),
1033
+                             31),
1063 1034
                             ('Source.get_content',
1064
-                             78)],
1065
-          'first-line': 85L,
1066
-          'folded-linenos': [131L,
1067
-                             160L,
1068
-                             170L,
1069
-                             183L,
1070
-                             220L,
1071
-                             231L,
1072
-                             257L,
1073
-                             276L,
1074
-                             295L,
1075
-                             319L,
1076
-                             349L,
1077
-                             350L,
1078
-                             367L,
1079
-                             398L,
1080
-                             411L,
1081
-                             525L],
1082
-          'sel-line': 97L,
1083
-          'sel-line-start': 4220L,
1084
-          'selection_end': 4237L,
1085
-          'selection_start': 4237L,
1035
+                             42)],
1036
+          'first-line': 225L,
1037
+          'folded-linenos': [],
1038
+          'sel-line': 235L,
1039
+          'sel-line-start': 12269L,
1040
+          'selection_end': 12325L,
1041
+          'selection_start': 12320L,
1086 1042
           'zoom': 0L},
1087
-         1523383228.243],
1088
-        [loc('changelog.md'),
1043
+         1523886477.356],
1044
+        [loc('sources/replay.py'),
1089 1045
          {'attrib-starts': [],
1090 1046
           'first-line': 0L,
1091 1047
           'folded-linenos': [],
1092
-          'sel-line': 1L,
1093
-          'sel-line-start': 17L,
1094
-          'selection_end': 59L,
1095
-          'selection_start': 59L,
1048
+          'sel-line': 5L,
1049
+          'sel-line-start': 188L,
1050
+          'selection_end': 248L,
1051
+          'selection_start': 243L,
1096 1052
           'zoom': 0L},
1097
-         1523808221.127],
1053
+         1523886478.557],
1098 1054
         [loc('sources/replay.py'),
1099
-         {'attrib-starts': [],
1100
-          'first-line': 0L,
1055
+         {'attrib-starts': [('Source',
1056
+                             31),
1057
+                            ('Source.get_content',
1058
+                             42)],
1059
+          'first-line': 184L,
1101 1060
           'folded-linenos': [],
1102
-          'sel-line': 3L,
1103
-          'sel-line-start': 41L,
1104
-          'selection_end': 134L,
1105
-          'selection_start': 134L,
1061
+          'sel-line': 194L,
1062
+          'sel-line-start': 9081L,
1063
+          'selection_end': 9140L,
1064
+          'selection_start': 9135L,
1106 1065
           'zoom': 0L},
1107
-         1523808236.472],
1066
+         1523886480.12],
1108 1067
         [loc('sources/replay.py'),
1109 1068
          {'attrib-starts': [('Source',
1110
-                             30),
1111
-                            ('Source.__init__',
1112
-                             32)],
1113
-          'first-line': 27L,
1069
+                             31),
1070
+                            ('Source.get_content',
1071
+                             42)],
1072
+          'first-line': 197L,
1114 1073
           'folded-linenos': [],
1115
-          'sel-line': 35L,
1116
-          'sel-line-start': 1150L,
1117
-          'selection_end': 1166L,
1118
-          'selection_start': 1163L,
1074
+          'sel-line': 207L,
1075
+          'sel-line-start': 10466L,
1076
+          'selection_end': 10498L,
1077
+          'selection_start': 10498L,
1119 1078
           'zoom': 0L},
1120
-         1523808238.714],
1079
+         1523886488.428],
1121 1080
         [loc('sources/replay.py'),
1122 1081
          {'attrib-starts': [('Source',
1123
-                             30),
1124
-                            ('Source.__init__',
1125
-                             32)],
1126
-          'first-line': 27L,
1082
+                             31),
1083
+                            ('Source.get_content',
1084
+                             42)],
1085
+          'first-line': 197L,
1127 1086
           'folded-linenos': [],
1128
-          'sel-line': 35L,
1129
-          'sel-line-start': 1150L,
1130
-          'selection_end': 1167L,
1131
-          'selection_start': 1163L,
1087
+          'sel-line': 207L,
1088
+          'sel-line-start': 10466L,
1089
+          'selection_end': 10522L,
1090
+          'selection_start': 10517L,
1132 1091
           'zoom': 0L},
1133
-         1523808239.255],
1092
+         1523886489.496],
1134 1093
         [loc('sources/replay.py'),
1135 1094
          {'attrib-starts': [('Source',
1136
-                             30),
1137
-                            ('Source.__init__',
1138
-                             32)],
1139
-          'first-line': 27L,
1095
+                             31),
1096
+                            ('Source.get_content',
1097
+                             42)],
1098
+          'first-line': 216L,
1140 1099
           'folded-linenos': [],
1141
-          'sel-line': 35L,
1142
-          'sel-line-start': 1150L,
1143
-          'selection_end': 1168L,
1144
-          'selection_start': 1163L,
1100
+          'sel-line': 226L,
1101
+          'sel-line-start': 11656L,
1102
+          'selection_end': 11712L,
1103
+          'selection_start': 11707L,
1145 1104
           'zoom': 0L},
1146
-         1523808239.675],
1105
+         1523886491.833],
1147 1106
         [loc('sources/replay.py'),
1148 1107
          {'attrib-starts': [('Source',
1149
-                             30),
1108
+                             31),
1150 1109
                             ('Source.get_content',
1151
-                             41)],
1152
-          'first-line': 76L,
1110
+                             42)],
1111
+          'first-line': 225L,
1112
+          'folded-linenos': [],
1113
+          'sel-line': 235L,
1114
+          'sel-line-start': 12271L,
1115
+          'selection_end': 12327L,
1116
+          'selection_start': 12322L,
1117
+          'zoom': 0L},
1118
+         1523886493.143],
1119
+        [loc('sources/replay.py'),
1120
+         {'attrib-starts': [],
1121
+          'first-line': 0L,
1153 1122
           'folded-linenos': [],
1154
-          'sel-line': 86L,
1155
-          'sel-line-start': 3989L,
1156
-          'selection_end': 4010L,
1157
-          'selection_start': 4005L,
1123
+          'sel-line': 5L,
1124
+          'sel-line-start': 188L,
1125
+          'selection_end': 248L,
1126
+          'selection_start': 243L,
1158 1127
           'zoom': 0L},
1159
-         1523808243.84],
1128
+         1523886493.905],
1160 1129
         [loc('sources/replay.py'),
1161 1130
          {'attrib-starts': [('Source',
1162
-                             30),
1131
+                             31),
1163 1132
                             ('Source.get_content',
1164
-                             41)],
1165
-          'first-line': 88L,
1133
+                             42)],
1134
+          'first-line': 184L,
1166 1135
           'folded-linenos': [],
1167
-          'sel-line': 98L,
1168
-          'sel-line-start': 4629L,
1169
-          'selection_end': 4650L,
1170
-          'selection_start': 4645L,
1136
+          'sel-line': 194L,
1137
+          'sel-line-start': 9081L,
1138
+          'selection_end': 9140L,
1139
+          'selection_start': 9135L,
1171 1140
           'zoom': 0L},
1172
-         1523808244.499],
1141
+         1523886495.634],
1173 1142
         [loc('sources/replay.py'),
1174 1143
          {'attrib-starts': [('Source',
1175
-                             30),
1144
+                             31),
1176 1145
                             ('Source.get_content',
1177
-                             41)],
1178
-          'first-line': 107L,
1146
+                             42)],
1147
+          'first-line': 215L,
1179 1148
           'folded-linenos': [],
1180
-          'sel-line': 117L,
1181
-          'sel-line-start': 5571L,
1182
-          'selection_end': 5614L,
1183
-          'selection_start': 5594L,
1149
+          'sel-line': 202L,
1150
+          'sel-line-start': 9690L,
1151
+          'selection_end': 9730L,
1152
+          'selection_start': 9730L,
1184 1153
           'zoom': 0L},
1185
-         1523808257.632],
1154
+         1523888439.127],
1186 1155
         [loc('sources/replay.py'),
1187 1156
          {'attrib-starts': [('Source',
1188
-                             30),
1157
+                             31),
1189 1158
                             ('Source.get_content',
1190
-                             41)],
1191
-          'first-line': 100L,
1159
+                             42)],
1160
+          'first-line': 202L,
1192 1161
           'folded-linenos': [],
1193
-          'sel-line': 105L,
1194
-          'sel-line-start': 4870L,
1195
-          'selection_end': 4911L,
1196
-          'selection_start': 4911L,
1162
+          'sel-line': 207L,
1163
+          'sel-line-start': 10466L,
1164
+          'selection_end': 10485L,
1165
+          'selection_start': 10482L,
1197 1166
           'zoom': 0L},
1198
-         1523808304.57],
1167
+         1523888439.692],
1199 1168
         [loc('sources/replay.py'),
1200 1169
          {'attrib-starts': [('Source',
1201
-                             30),
1170
+                             31),
1202 1171
                             ('Source.get_content',
1203
-                             41)],
1204
-          'first-line': 100L,
1172
+                             42)],
1173
+          'first-line': 202L,
1205 1174
           'folded-linenos': [],
1206
-          'sel-line': 105L,
1207
-          'sel-line-start': 4870L,
1208
-          'selection_end': 4911L,
1209
-          'selection_start': 4890L,
1175
+          'sel-line': 207L,
1176
+          'sel-line-start': 10466L,
1177
+          'selection_end': 10487L,
1178
+          'selection_start': 10482L,
1210 1179
           'zoom': 0L},
1211
-         1523808304.709],
1180
+         1523888441.616],
1212 1181
         [loc('sources/replay.py'),
1213 1182
          {'attrib-starts': [('Source',
1214
-                             30),
1183
+                             31),
1215 1184
                             ('Source.get_content',
1216
-                             41)],
1217
-          'first-line': 100L,
1185
+                             42)],
1186
+          'first-line': 209L,
1218 1187
           'folded-linenos': [],
1219
-          'sel-line': 107L,
1220
-          'sel-line-start': 4972L,
1221
-          'selection_end': 5012L,
1222
-          'selection_start': 4991L,
1188
+          'sel-line': 217L,
1189
+          'sel-line-start': 11052L,
1190
+          'selection_end': 11073L,
1191
+          'selection_start': 11068L,
1223 1192
           'zoom': 0L},
1224
-         1523808307.166],
1193
+         1523888442.838],
1225 1194
         [loc('sources/replay.py'),
1226 1195
          {'attrib-starts': [('Source',
1227
-                             30),
1196
+                             31),
1228 1197
                             ('Source.get_content',
1229
-                             41)],
1230
-          'first-line': 107L,
1198
+                             42)],
1199
+          'first-line': 216L,
1231 1200
           'folded-linenos': [],
1232
-          'sel-line': 117L,
1233
-          'sel-line-start': 5573L,
1234
-          'selection_end': 5617L,
1235
-          'selection_start': 5596L,
1201
+          'sel-line': 226L,
1202
+          'sel-line-start': 11656L,
1203
+          'selection_end': 11677L,
1204
+          'selection_start': 11672L,
1236 1205
           'zoom': 0L},
1237
-         1523808308.284],
1206
+         1523888448.748],
1238 1207
         [loc('sources/replay.py'),
1239 1208
          {'attrib-starts': [('Source',
1240
-                             30),
1209
+                             31),
1241 1210
                             ('Source.get_content',
1242
-                             41)],
1243
-          'first-line': 119L,
1211
+                             42)],
1212
+          'first-line': 225L,
1244 1213
           'folded-linenos': [],
1245
-          'sel-line': 129L,
1246
-          'sel-line-start': 6100L,
1247
-          'selection_end': 6141L,
1248
-          'selection_start': 6141L,
1214
+          'sel-line': 235L,
1215
+          'sel-line-start': 12271L,
1216
+          'selection_end': 12292L,
1217
+          'selection_start': 12287L,
1249 1218
           'zoom': 0L},
1250
-         1523808311.752],
1219
+         1523888450.94],
1251 1220
         [loc('sources/replay.py'),
1252 1221
          {'attrib-starts': [('Source',
1253
-                             30),
1222
+                             31),
1254 1223
                             ('Source.get_content',
1255
-                             41)],
1256
-          'first-line': 119L,
1224
+                             42)],
1225
+          'first-line': 238L,
1257 1226
           'folded-linenos': [],
1258
-          'sel-line': 129L,
1259
-          'sel-line-start': 6100L,
1260
-          'selection_end': 6141L,
1261
-          'selection_start': 6120L,
1227
+          'sel-line': 248L,
1228
+          'sel-line-start': 12904L,
1229
+          'selection_end': 12925L,
1230
+          'selection_start': 12920L,
1262 1231
           'zoom': 0L},
1263
-         1523808311.892],
1232
+         1523888457.626],
1264 1233
         [loc('sources/replay.py'),
1265
-         {'attrib-starts': [],
1266
-          'first-line': 0L,
1234
+         {'attrib-starts': [('Source',
1235
+                             31),
1236
+                            ('Source.get_content',
1237
+                             42)],
1238
+          'first-line': 259L,
1267 1239
           'folded-linenos': [],
1268
-          'sel-line': 13L,
1269
-          'sel-line-start': 367L,
1270
-          'selection_end': 381L,
1271
-          'selection_start': 381L,
1240
+          'sel-line': 269L,
1241
+          'sel-line-start': 14147L,
1242
+          'selection_end': 14173L,
1243
+          'selection_start': 14168L,
1272 1244
           'zoom': 0L},
1273
-         1523808605.094],
1245
+         1523888458.616],
1274 1246
         [loc('sources/replay.py'),
1275
-         {'attrib-starts': [],
1276
-          'first-line': 18L,
1247
+         {'attrib-starts': [('Source',
1248
+                             31),
1249
+                            ('Source.__init__',
1250
+                             33)],
1251
+          'first-line': 31L,
1277 1252
           'folded-linenos': [],
1278
-          'sel-line': 20L,
1279
-          'sel-line-start': 584L,
1280
-          'selection_end': 595L,
1281
-          'selection_start': 595L,
1253
+          'sel-line': 36L,
1254
+          'sel-line-start': 1153L,
1255
+          'selection_end': 1171L,
1256
+          'selection_start': 1166L,
1282 1257
           'zoom': 0L},
1283
-         1523810346.475],
1258
+         1523888459.999],
1284 1259
         [loc('sources/replay.py'),
1285 1260
          {'attrib-starts': [('Source',
1286 1261
                              31),
1287 1262
                             ('Source.get_content',
1288 1263
                              42)],
1289
-          'first-line': 149L,
1264
+          'first-line': 285L,
1290 1265
           'folded-linenos': [],
1291
-          'sel-line': 156L,
1292
-          'sel-line-start': 7535L,
1293
-          'selection_end': 7565L,
1294
-          'selection_start': 7565L,
1266
+          'sel-line': 298L,
1267
+          'sel-line-start': 15564L,
1268
+          'selection_end': 15564L,
1269
+          'selection_start': 15564L,
1295 1270
           'zoom': 0L},
1296
-         1523810358.709]],
1271
+         1523904590.624]],
1297 1272
         20),
1298
-        'current-loc': loc('sources/replay.py'),
1273
+        'current-loc': loc('sources/ltc.py'),
1299 1274
         'editor-state-list': [(loc('run.py'),
1300 1275
                                {'attrib-starts': [('Main',
1301 1276
         22),
@@ -1362,12 +1337,12 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1362 1337
         31),
1363 1338
         ('Source.get_content',
1364 1339
          42)],
1365
-                                'first-line': 149L,
1340
+                                'first-line': 285L,
1366 1341
                                 'folded-linenos': [],
1367
-                                'sel-line': 159L,
1368
-                                'sel-line-start': 7711L,
1369
-                                'selection_end': 7752L,
1370
-                                'selection_start': 7735L,
1342
+                                'sel-line': 298L,
1343
+                                'sel-line-start': 15564L,
1344
+                                'selection_end': 15564L,
1345
+                                'selection_start': 15564L,
1371 1346
                                 'zoom': 0L}),
1372 1347
                               (loc('sources/lmt.py'),
1373 1348
                                {'attrib-starts': [],
@@ -1442,15 +1417,15 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1442 1417
          loc('changelog.md')]),
1443 1418
                                'open_files': [u'ContentSources.py',
1444 1419
         u'Downloader.py',
1420
+        u'changelog.md',
1445 1421
         u'resolver.py',
1446 1422
         u'run.py',
1447 1423
         u'sources/config.py',
1448 1424
         u'sources/euronews.py',
1449 1425
         u'sources/lmt.py',
1450
-        u'sources/ltc.py',
1451 1426
         u'util.py',
1452
-        u'changelog.md',
1453
-        u'sources/replay.py']},
1427
+        u'sources/replay.py',
1428
+        u'sources/ltc.py']},
1454 1429
         'saved_notebook_display': None,
1455 1430
         'split_percents': {0: 0.5061155630535639},
1456 1431
         'splits': 2,
@@ -1465,10 +1440,10 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1465 1440
                          0,
1466 1441
                          2434,
1467 1442
                          1440)}]}
1468
-guimgr.recent-documents = [loc('sources/replay.py'),
1469
-                           loc('changelog.md'),
1443
+guimgr.recent-documents = [loc('sources/ltc.py'),
1444
+                           loc('sources/replay.py'),
1470 1445
                            loc('util.py'),
1471
-                           loc('sources/ltc.py'),
1446
+                           loc('changelog.md'),
1472 1447
                            loc('run.py'),
1473 1448
                            loc('sources/config.py'),
1474 1449
                            loc('ContentSources.py'),
@@ -2021,8 +1996,9 @@ proj.env-vars = {None: ('default',
2021 1996
 search.replace-history = [u'https://replay.lsm.lv',
2022 1997
                           u'www.shortcut.lv',
2023 1998
                           u'shortcut.lv']
2024
-search.search-history = [u'http://replay.lsm.lv',
2025
-                         u'img =',
1999
+search.search-history = [u'img =',
2000
+                         u'http:',
2001
+                         u'http://replay.lsm.lv',
2026 2002
                          u'img0',
2027 2003
                          u'get_movie_info',
2028 2004
                          u'player_data',
@@ -2039,8 +2015,7 @@ search.search-history = [u'http://replay.lsm.lv',
2039 2015
                          u'can not find ',
2040 2016
                          u'get_head',
2041 2017
                          u'base_url',
2042
-                         u'download',
2043
-                         u'order=']
2018
+                         u'download']
2044 2019
 testing.stored-results = (1,
2045 2020
                           [],
2046 2021
                           {})

+ 8
- 4
sources/replay.py 查看文件

@@ -168,7 +168,7 @@ class Source(SourceBase):
168 168
 
169 169
             else: # audio
170 170
                 lrn = ch.replace("lr","")
171
-                url = "http://www.latvijasradio.lsm.lv/lv/tiesraide/?channel=%s"%lrn
171
+                url = "https:///www.latvijasradio.lsm.lv/lv/tiesraide/?channel=%s"%lrn
172 172
                 r = self._http_request(url)
173 173
                 m = re.search('"file":"([^"]+?m3u8.*?)"', r)
174 174
                 if not m:
@@ -205,7 +205,8 @@ class Source(SourceBase):
205 205
                 if item[1]=="lr":continue
206 206
                 title = "%s - %s (%s)"%(item[3],item[5],item[7])
207 207
                 data2 = item[4].replace("/%s/"%lang,"")+"?lang=%s"%lang
208
-                img = item[0].replace("https:","http:")
208
+                img = item[0]  #.replace("https:","http:")
209
+                img = img.replace("lv//", "lv/")  # TODO eksperiments
209 210
                 desc = title
210 211
                 content.append((title,self.name+"::"+data2,img,desc))
211 212
 
@@ -224,7 +225,8 @@ class Source(SourceBase):
224 225
             for item in re.findall('(?i)<figure><a href="([^"]+)" itemprop="image" data-image="([^"]+)".+class="thumbnail__duration">([^<]+)</time></figure><figcaption><h4 itemprop="about"><a href="[^"]+">([^<]+)</a></h4>.+>([^<]+).*</h5>.+>([^<]+)</time></figcaption>', r):
225 226
                 title = item[3].strip()
226 227
                 data2 = item[0].replace("/%s/"%lang,"")+"?lang=%s"%lang
227
-                img = item[1].replace("https:","http:")
228
+                img = item[1]  #.replace("https:","http:")
229
+                img = img.replace("lv//", "lv/")  # TODO eksperiments
228 230
                 desc  = "%s - %s\n%s"%(item[5],item[2],item[4])
229 231
                 content.append((title,self.name+"::"+data2,img,desc))
230 232
 
@@ -233,7 +235,8 @@ class Source(SourceBase):
233 235
             for item in re.findall('<article .+ href="([^"]+)".+image="([^"]+)".+class="thumbnail__duration">([^<]+).+">([^<]+).+class="thumbnail__date ">([^"]+)</time></figcaption></article>', r):
234 236
                 title = item[3].strip()
235 237
                 data2 = item[0].replace("/%s/"%lang,"")+"?lang=%s"%lang
236
-                img = item[1].replace("https:","http:")
238
+                img = item[1]  #.replace("https:","http:")
239
+                img = img.replace("lv//", "lv/")  # TODO eksperiments
237 240
                 desc = "%s - %s"%(item[4],item[2])
238 241
                 desc = desc.strip()
239 242
                 content.append((title,self.name+"::"+data2,img,desc))
@@ -247,6 +250,7 @@ class Source(SourceBase):
247 250
                 title = m.group(1)
248 251
                 m = re.search('<meta property="og:image" content="([^"]+)"', r, re.DOTALL)
249 252
                 img = m.group(1)
253
+                img = img.replace("lv//", "lv/")  # TODO eksperiments
250 254
                 m = re.search('<meta property="og:description" content="([^"]+)"', r, re.DOTALL)
251 255
                 desc = m.group(1)
252 256
                 m = re.search('<div class="media-description">(.+)<div id="tab-comments">', r, re.DOTALL)