Ivars 6 роки тому
джерело
коміт
dc2f7ac10c
2 змінених файлів з 303 додано та 239 видалено
  1. 299
    237
      project.wpr
  2. 4
    2
      resolvers/cloudsany.py

+ 299
- 237
project.wpr Переглянути файл

@@ -74,10 +74,26 @@ debug.breakpoints = {loc('Downloader.py'): {182L: (0,
74 74
                None,
75 75
                1,
76 76
                0)},
77
-                     loc('resolvers/cloudsany.py'): {115L: (0,
77
+                     loc('resolvers/cloudsany.py'): {48L: (0,
78 78
         None,
79 79
         1,
80
-        0)},
80
+        0),
81
+        53L: (0,
82
+              None,
83
+              1,
84
+              0),
85
+        86L: (0,
86
+              None,
87
+              1,
88
+              0),
89
+        89L: (0,
90
+              None,
91
+              1,
92
+              0),
93
+        117L: (0,
94
+               None,
95
+               1,
96
+               0)},
81 97
                      loc('run.py'): {111L: (0,
82 98
         None,
83 99
         1,
@@ -105,6 +121,10 @@ debug.breakpoints = {loc('Downloader.py'): {182L: (0,
105 121
                      loc('sources/euronews.py'): {161L: (0,
106 122
         None,
107 123
         1,
124
+        0)},
125
+                     loc('sources/filmon.py'): {49L: (0,
126
+        None,
127
+        1,
108 128
         0)},
109 129
                      loc('sources/ltc.py'): {79L: (0,
110 130
         None,
@@ -807,7 +827,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
807 827
                  'primary_view_state': {'area': 'wide',
808 828
         'constraint': None,
809 829
         'current_pages': [2,
810
-                          1],
830
+                          0],
811 831
         'notebook_display': 'normal',
812 832
         'notebook_percent': 0.4761133603238866,
813 833
         'override_title': None,
@@ -842,7 +862,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
842 862
                                        'fRegexFlags': 46,
843 863
                                        'fReplaceText': u'www.shortcut.lv',
844 864
                                        'fReverse': False,
845
-                                       'fSearchText': u'img',
865
+                                       'fSearchText': u'raise',
846 866
                                        'fStartPos': 0,
847 867
                                        'fStyle': 'text',
848 868
                                        'fWholeWords': False,
@@ -916,12 +936,24 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
916 936
         -1,
917 937
         -1),
918 938
                        'attrib-starts': [],
919
-                       'first-line': 126L,
939
+                       'first-line': 219L,
920 940
                        'folded-linenos': [],
921 941
                        'history': {u'file:C:/Data/Programming/enigma2/PlayStream2/content/run.py': ['p'\
922 942
         'rint url\n',
923 943
         'url\n',
924 944
         'params\n'],
945
+                                   u'file:C:/Data/Programming/enigma2/PlayStream2/content/sources/cinemalive.py': ['p'\
946
+        'rint p0\n',
947
+        'p\n',
948
+        'm2\n',
949
+        'dict(m2.groups())\n',
950
+        'm2.groups().dict()\n',
951
+        'm2.groups()\n',
952
+        'list(m2.groups())\n',
953
+        'l = list(m2.groups())\n',
954
+        'l.remove(2)\n',
955
+        'l.remove("video")\n',
956
+        'l\n'],
925 957
                                    u'file:C:/Data/Programming/enigma2/PlayStream2/content/sources/euronews.py': ['d'\
926 958
         'ata\n',
927 959
         'content\n',
@@ -931,10 +963,10 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
931 963
         'article["text"]\n',
932 964
         'cmd\n']},
933 965
                        'launch-id': None,
934
-                       'sel-line': 133L,
935
-                       'sel-line-start': 14280L,
936
-                       'selection_end': 14280L,
937
-                       'selection_start': 14280L,
966
+                       'sel-line': 231L,
967
+                       'sel-line-start': 16224L,
968
+                       'selection_end': 16245L,
969
+                       'selection_start': 16224L,
938 970
                        'zoom': 0L}),
939 971
                      ('debug-watch',
940 972
                       'wide',
@@ -980,260 +1012,248 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
980 1012
                        'selection_end': 174L,
981 1013
                        'selection_start': 174L,
982 1014
                        'zoom': 0L})],
983
-        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('run.py'),
984
-        {'attrib-starts': [('Main',
985
-                            22),
986
-                           ('Main.play_video',
987
-                            242)],
988
-         'first-line': 242L,
1015
+        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('sources/cinemalive.py'),
1016
+        {'attrib-starts': [('Source',
1017
+                            29),
1018
+                           ('Source.get_streams',
1019
+                            166)],
1020
+         'first-line': 176L,
989 1021
          'folded-linenos': [],
990
-         'sel-line': 283L,
991
-         'sel-line-start': 11252L,
992
-         'selection_end': 11252L,
993
-         'selection_start': 11252L,
1022
+         'sel-line': 184L,
1023
+         'sel-line-start': 9045L,
1024
+         'selection_end': 9087L,
1025
+         'selection_start': 9074L,
994 1026
          'zoom': 0L},
995
-        1513032902.628],
996
-        [loc('run.py'),
997
-         {'attrib-starts': [('Main',
998
-                             22),
999
-                            ('Main.play_video',
1000
-                             242)],
1001
-          'first-line': 286L,
1027
+        1513038881.367],
1028
+        [loc('resolver.py'),
1029
+         {'attrib-starts': [],
1030
+          'first-line': 0L,
1002 1031
           'folded-linenos': [],
1003
-          'sel-line': 242L,
1004
-          'sel-line-start': 9544L,
1005
-          'selection_end': 9562L,
1006
-          'selection_start': 9552L,
1032
+          'sel-line': 0L,
1033
+          'sel-line-start': 0L,
1034
+          'selection_end': 0L,
1035
+          'selection_start': 0L,
1007 1036
           'zoom': 0L},
1008
-         1513032925.706],
1009
-        [loc('run.py'),
1010
-         {'attrib-starts': [('play_video',
1011
-                             625)],
1012
-          'first-line': 621L,
1037
+         1513038900.236],
1038
+        [loc('resolvers/cloudsany.py'),
1039
+         {'attrib-starts': [('resolve',
1040
+                             30)],
1041
+          'first-line': 56L,
1013 1042
           'folded-linenos': [],
1014
-          'sel-line': 625L,
1015
-          'sel-line-start': 25289L,
1016
-          'selection_end': 25303L,
1017
-          'selection_start': 25293L,
1043
+          'sel-line': 66L,
1044
+          'sel-line-start': 1937L,
1045
+          'selection_end': 1972L,
1046
+          'selection_start': 1972L,
1018 1047
           'zoom': 0L},
1019
-         1513032941.402],
1020
-        [loc('run.py'),
1021
-         {'attrib-starts': [('play_stream',
1022
-                             644)],
1023
-          'first-line': 670L,
1048
+         1513038911.299],
1049
+        [loc('resolvers/cloudsany.py'),
1050
+         {'attrib-starts': [('resolve',
1051
+                             30)],
1052
+          'first-line': 77L,
1024 1053
           'folded-linenos': [],
1025
-          'sel-line': 644L,
1026
-          'sel-line-start': 25870L,
1027
-          'selection_end': 25885L,
1028
-          'selection_start': 25874L,
1054
+          'sel-line': 84L,
1055
+          'sel-line-start': 2550L,
1056
+          'selection_end': 2580L,
1057
+          'selection_start': 2580L,
1029 1058
           'zoom': 0L},
1030
-         1513032960.917],
1031
-        [loc('sources/euronews.py'),
1059
+         1513038986.051],
1060
+        [loc('sources/cinemalive.py'),
1032 1061
          {'attrib-starts': [('Source',
1033
-                             26),
1062
+                             29),
1034 1063
                             ('Source.get_streams',
1035
-                             150)],
1036
-          'first-line': 189L,
1064
+                             166)],
1065
+          'first-line': 176L,
1037 1066
           'folded-linenos': [],
1038
-          'sel-line': 194L,
1039
-          'sel-line-start': 8688L,
1040
-          'selection_end': 8688L,
1041
-          'selection_start': 8688L,
1067
+          'sel-line': 184L,
1068
+          'sel-line-start': 9045L,
1069
+          'selection_end': 9087L,
1070
+          'selection_start': 9074L,
1042 1071
           'zoom': 0L},
1043
-         1513032975.934],
1044
-        [loc('run.py'),
1045
-         {'attrib-starts': [('player',
1046
-                             683)],
1047
-          'first-line': 680L,
1072
+         1513039022.989],
1073
+        [loc('resolvers/cloudsany.py'),
1074
+         {'attrib-starts': [('resolve',
1075
+                             30)],
1076
+          'first-line': 77L,
1048 1077
           'folded-linenos': [],
1049
-          'sel-line': 686L,
1050
-          'sel-line-start': 27598L,
1051
-          'selection_end': 27621L,
1052
-          'selection_start': 27621L,
1078
+          'sel-line': 84L,
1079
+          'sel-line-start': 2550L,
1080
+          'selection_end': 2580L,
1081
+          'selection_start': 2580L,
1053 1082
           'zoom': 0L},
1054
-         1513033033.091],
1055
-        [loc('Downloader.py'),
1056
-         {'attrib-starts': [('get_header',
1057
-                             195)],
1058
-          'first-line': 175L,
1059
-          'folded-linenos': [],
1060
-          'sel-line': 198L,
1061
-          'sel-line-start': 7992L,
1062
-          'selection_end': 8012L,
1063
-          'selection_start': 8012L,
1064
-          'zoom': 0L},
1065
-         1513033035.827],
1066
-        [loc('kivy_test2.py'),
1067
-         {'attrib-starts': [],
1068
-          'first-line': 0L,
1083
+         1513039024.31],
1084
+        [loc('resolvers/cloudsany.py'),
1085
+         {'attrib-starts': [('resolve',
1086
+                             30)],
1087
+          'first-line': 77L,
1069 1088
           'folded-linenos': [],
1070
-          'sel-line': 1L,
1071
-          'sel-line-start': 11L,
1072
-          'selection_end': 42L,
1073
-          'selection_start': 42L,
1089
+          'sel-line': 85L,
1090
+          'sel-line-start': 2581L,
1091
+          'selection_end': 2619L,
1092
+          'selection_start': 2606L,
1074 1093
           'zoom': 0L},
1075
-         1513033036.487],
1076
-        [loc('Downloader.py'),
1077
-         {'attrib-starts': [('get_header',
1078
-                             195)],
1079
-          'first-line': 175L,
1094
+         1513039024.825],
1095
+        [loc('resolvers/cloudsany.py'),
1096
+         {'attrib-starts': [('resolve',
1097
+                             30)],
1098
+          'first-line': 47L,
1080 1099
           'folded-linenos': [],
1081
-          'sel-line': 198L,
1082
-          'sel-line-start': 7992L,
1083
-          'selection_end': 8012L,
1084
-          'selection_start': 8012L,
1100
+          'sel-line': 52L,
1101
+          'sel-line-start': 1489L,
1102
+          'selection_end': 1527L,
1103
+          'selection_start': 1514L,
1085 1104
           'zoom': 0L},
1086
-         1513033037.942],
1087
-        [loc('sources/mtgplay.py'),
1088
-         {'attrib-starts': [('Source',
1089
-                             40),
1090
-                            ('Source.get_content',
1091
-                             51)],
1092
-          'first-line': 155L,
1105
+         1513039026.067],
1106
+        [loc('resolvers/cloudsany.py'),
1107
+         {'attrib-starts': [('resolve',
1108
+                             30)],
1109
+          'first-line': 63L,
1093 1110
           'folded-linenos': [],
1094
-          'sel-line': 162L,
1095
-          'sel-line-start': 8033L,
1096
-          'selection_end': 8077L,
1097
-          'selection_start': 8077L,
1111
+          'sel-line': 85L,
1112
+          'sel-line-start': 2581L,
1113
+          'selection_end': 2619L,
1114
+          'selection_start': 2606L,
1098 1115
           'zoom': 0L},
1099
-         1513033038.606],
1100
-        [loc('Downloader.py'),
1101
-         {'attrib-starts': [('get_header',
1102
-                             195)],
1103
-          'first-line': 175L,
1116
+         1513039049.916],
1117
+        [loc('resolvers/cloudsany.py'),
1118
+         {'attrib-starts': [('resolve',
1119
+                             30)],
1120
+          'first-line': 75L,
1104 1121
           'folded-linenos': [],
1105
-          'sel-line': 198L,
1106
-          'sel-line-start': 7992L,
1107
-          'selection_end': 8012L,
1108
-          'selection_start': 8012L,
1122
+          'sel-line': 85L,
1123
+          'sel-line-start': 2581L,
1124
+          'selection_end': 2619L,
1125
+          'selection_start': 2606L,
1109 1126
           'zoom': 0L},
1110
-         1513033040.566],
1111
-        [loc('sources/euronews.py'),
1112
-         {'attrib-starts': [('Source',
1113
-                             26),
1114
-                            ('Source.get_streams',
1115
-                             150)],
1116
-          'first-line': 189L,
1127
+         1513039051.812],
1128
+        [loc('resolvers/cloudsany.py'),
1129
+         {'attrib-starts': [('resolve',
1130
+                             30)],
1131
+          'first-line': 42L,
1117 1132
           'folded-linenos': [],
1118
-          'sel-line': 194L,
1119
-          'sel-line-start': 8688L,
1120
-          'selection_end': 8688L,
1121
-          'selection_start': 8688L,
1133
+          'sel-line': 47L,
1134
+          'sel-line-start': 1343L,
1135
+          'selection_end': 1356L,
1136
+          'selection_start': 1351L,
1122 1137
           'zoom': 0L},
1123
-         1513033057.914],
1124
-        [loc('run.py'),
1125
-         {'attrib-starts': [('player',
1126
-                             683)],
1127
-          'first-line': 706L,
1138
+         1513039058.41],
1139
+        [loc('resolvers/cloudsany.py'),
1140
+         {'attrib-starts': [('resolve',
1141
+                             30)],
1142
+          'first-line': 42L,
1128 1143
           'folded-linenos': [],
1129
-          'sel-line': 715L,
1130
-          'sel-line-start': 28951L,
1131
-          'selection_end': 28951L,
1132
-          'selection_start': 28951L,
1144
+          'sel-line': 52L,
1145
+          'sel-line-start': 1489L,
1146
+          'selection_end': 1502L,
1147
+          'selection_start': 1497L,
1133 1148
           'zoom': 0L},
1134
-         1513033170.178],
1135
-        [loc('sources/euronews.py'),
1136
-         {'attrib-starts': [('Source',
1137
-                             26),
1138
-                            ('Source.get_streams',
1139
-                             150)],
1140
-          'first-line': 197L,
1149
+         1513039058.793],
1150
+        [loc('resolvers/cloudsany.py'),
1151
+         {'attrib-starts': [('resolve',
1152
+                             30)],
1153
+          'first-line': 75L,
1141 1154
           'folded-linenos': [],
1142
-          'sel-line': 205L,
1143
-          'sel-line-start': 9212L,
1144
-          'selection_end': 9212L,
1145
-          'selection_start': 9212L,
1155
+          'sel-line': 85L,
1156
+          'sel-line-start': 2581L,
1157
+          'selection_end': 2594L,
1158
+          'selection_start': 2589L,
1146 1159
           'zoom': 0L},
1147
-         1513033216.112],
1148
-        [loc('run.py'),
1149
-         {'attrib-starts': [('Main',
1150
-                             22),
1151
-                            ('Main.play_video',
1152
-                             242)],
1153
-          'first-line': 254L,
1160
+         1513039059.535],
1161
+        [loc('resolvers/cloudsany.py'),
1162
+         {'attrib-starts': [('resolve',
1163
+                             30)],
1164
+          'first-line': 78L,
1154 1165
           'folded-linenos': [],
1155
-          'sel-line': 259L,
1156
-          'sel-line-start': 10189L,
1157
-          'selection_end': 10189L,
1158
-          'selection_start': 10189L,
1166
+          'sel-line': 90L,
1167
+          'sel-line-start': 2795L,
1168
+          'selection_end': 2819L,
1169
+          'selection_start': 2819L,
1159 1170
           'zoom': 0L},
1160
-         1513033227.279],
1161
-        [loc('sources/euronews.py'),
1171
+         1513039704.266],
1172
+        [loc('sources/cinemalive.py'),
1162 1173
          {'attrib-starts': [('Source',
1163
-                             26),
1174
+                             29),
1164 1175
                             ('Source.get_streams',
1165
-                             150)],
1166
-          'first-line': 197L,
1176
+                             166)],
1177
+          'first-line': 176L,
1167 1178
           'folded-linenos': [],
1168
-          'sel-line': 205L,
1169
-          'sel-line-start': 9212L,
1170
-          'selection_end': 9212L,
1171
-          'selection_start': 9212L,
1179
+          'sel-line': 184L,
1180
+          'sel-line-start': 9045L,
1181
+          'selection_end': 9087L,
1182
+          'selection_start': 9074L,
1172 1183
           'zoom': 0L},
1173
-         1513033233.06],
1174
-        [loc('sources/euronews.py'),
1184
+         1513039740.396],
1185
+        [loc('resolvers/cloudsany.py'),
1186
+         {'attrib-starts': [('resolve',
1187
+                             30)],
1188
+          'first-line': 78L,
1189
+          'folded-linenos': [],
1190
+          'sel-line': 88L,
1191
+          'sel-line-start': 2726L,
1192
+          'selection_end': 2743L,
1193
+          'selection_start': 2743L,
1194
+          'zoom': 0L},
1195
+         1513039768.169],
1196
+        [loc('sources/cinemalive.py'),
1175 1197
          {'attrib-starts': [('Source',
1176
-                             26),
1198
+                             29),
1177 1199
                             ('Source.get_streams',
1178
-                             150)],
1179
-          'first-line': 179L,
1200
+                             166)],
1201
+          'first-line': 176L,
1180 1202
           'folded-linenos': [],
1181
-          'sel-line': 188L,
1182
-          'sel-line-start': 8435L,
1183
-          'selection_end': 8435L,
1184
-          'selection_start': 8435L,
1203
+          'sel-line': 184L,
1204
+          'sel-line-start': 9045L,
1205
+          'selection_end': 9087L,
1206
+          'selection_start': 9074L,
1185 1207
           'zoom': 0L},
1186
-         1513033592.24],
1187
-        [loc('run.py'),
1188
-         {'attrib-starts': [('player',
1189
-                             683)],
1190
-          'first-line': 706L,
1208
+         1513039803.617],
1209
+        [loc('resolvers/cloudsany.py'),
1210
+         {'attrib-starts': [('resolve',
1211
+                             30)],
1212
+          'first-line': 81L,
1191 1213
           'folded-linenos': [],
1192
-          'sel-line': 715L,
1193
-          'sel-line-start': 28951L,
1194
-          'selection_end': 28951L,
1195
-          'selection_start': 28951L,
1214
+          'sel-line': 88L,
1215
+          'sel-line-start': 2726L,
1216
+          'selection_end': 2726L,
1217
+          'selection_start': 2726L,
1196 1218
           'zoom': 0L},
1197
-         1513033609.634],
1198
-        [loc('sources/euronews.py'),
1219
+         1513039835.015],
1220
+        [loc('sources/cinemalive.py'),
1199 1221
          {'attrib-starts': [('Source',
1200
-                             26),
1201
-                            ('Source.get_content',
1202
-                             54)],
1203
-          'first-line': 50L,
1222
+                             29),
1223
+                            ('Source.get_streams',
1224
+                             166)],
1225
+          'first-line': 176L,
1204 1226
           'folded-linenos': [],
1205
-          'sel-line': 55L,
1206
-          'sel-line-start': 1756L,
1207
-          'selection_end': 1756L,
1208
-          'selection_start': 1756L,
1227
+          'sel-line': 184L,
1228
+          'sel-line-start': 9045L,
1229
+          'selection_end': 9087L,
1230
+          'selection_start': 9074L,
1209 1231
           'zoom': 0L},
1210
-         1513033943.681],
1211
-        [loc('sources/euronews.py'),
1212
-         {'attrib-starts': [('Source',
1213
-                             26),
1214
-                            ('Source.get_streams',
1215
-                             150)],
1216
-          'first-line': 168L,
1232
+         1513039853.364],
1233
+        [loc('resolvers/cloudsany.py'),
1234
+         {'attrib-starts': [('resolve',
1235
+                             30)],
1236
+          'first-line': 81L,
1217 1237
           'folded-linenos': [],
1218
-          'sel-line': 176L,
1219
-          'sel-line-start': 7974L,
1220
-          'selection_end': 7974L,
1221
-          'selection_start': 7974L,
1238
+          'sel-line': 90L,
1239
+          'sel-line-start': 2808L,
1240
+          'selection_end': 2834L,
1241
+          'selection_start': 2834L,
1222 1242
           'zoom': 0L},
1223
-         1513034626.779]],
1243
+         1513039884.569]],
1224 1244
         20),
1225
-        'current-loc': loc('run.py'),
1245
+        'current-loc': loc('sources/cinemalive.py'),
1226 1246
         'editor-state-list': [(loc('ContentSources.py'),
1227 1247
                                {'attrib-starts': [('ContentSources',
1228 1248
         16),
1229
-        ('ContentSources.__init__',
1230
-         20)],
1231
-                                'first-line': 9L,
1249
+        ('ContentSources.get_content',
1250
+         64)],
1251
+                                'first-line': 80L,
1232 1252
                                 'folded-linenos': [],
1233
-                                'sel-line': 38L,
1234
-                                'sel-line-start': 1556L,
1235
-                                'selection_end': 1556L,
1236
-                                'selection_start': 1556L,
1253
+                                'sel-line': 89L,
1254
+                                'sel-line-start': 4016L,
1255
+                                'selection_end': 4016L,
1256
+                                'selection_start': 4016L,
1237 1257
                                 'zoom': 0L}),
1238 1258
                               (loc('sources/ltc.py'),
1239 1259
                                {'attrib-starts': [('Source',
@@ -1274,12 +1294,12 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1274 1294
         29),
1275 1295
         ('Source.get_streams',
1276 1296
          166)],
1277
-                                'first-line': 188L,
1297
+                                'first-line': 176L,
1278 1298
                                 'folded-linenos': [],
1279
-                                'sel-line': 196L,
1280
-                                'sel-line-start': 9465L,
1281
-                                'selection_end': 9465L,
1282
-                                'selection_start': 9465L,
1299
+                                'sel-line': 184L,
1300
+                                'sel-line-start': 9045L,
1301
+                                'selection_end': 9087L,
1302
+                                'selection_start': 9074L,
1283 1303
                                 'zoom': 0L}),
1284 1304
                               (loc('sources/lmt.py'),
1285 1305
                                {'attrib-starts': [],
@@ -1334,14 +1354,16 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1334 1354
                                 'selection_start': 8012L,
1335 1355
                                 'zoom': 0L}),
1336 1356
                               (loc('run.py'),
1337
-                               {'attrib-starts': [('player',
1338
-        683)],
1339
-                                'first-line': 706L,
1357
+                               {'attrib-starts': [('Main',
1358
+        22),
1359
+        ('Main.play_video',
1360
+         242)],
1361
+                                'first-line': 255L,
1340 1362
                                 'folded-linenos': [],
1341
-                                'sel-line': 715L,
1342
-                                'sel-line-start': 28951L,
1343
-                                'selection_end': 28951L,
1344
-                                'selection_start': 28951L,
1363
+                                'sel-line': 264L,
1364
+                                'sel-line-start': 10415L,
1365
+                                'selection_end': 10415L,
1366
+                                'selection_start': 10415L,
1345 1367
                                 'zoom': 0L}),
1346 1368
                               (loc('sources/euronews.py'),
1347 1369
                                {'attrib-starts': [('Source',
@@ -1354,6 +1376,37 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1354 1376
                                 'sel-line-start': 7974L,
1355 1377
                                 'selection_end': 7974L,
1356 1378
                                 'selection_start': 7974L,
1379
+                                'zoom': 0L}),
1380
+                              (loc('sources/filmon.py'),
1381
+                               {'attrib-starts': [('Source',
1382
+        32),
1383
+        ('Source.get_content',
1384
+         47)],
1385
+                                'first-line': 113L,
1386
+                                'folded-linenos': [],
1387
+                                'sel-line': 122L,
1388
+                                'sel-line-start': 4665L,
1389
+                                'selection_end': 4665L,
1390
+                                'selection_start': 4665L,
1391
+                                'zoom': 0L}),
1392
+                              (loc('resolver.py'),
1393
+                               {'attrib-starts': [],
1394
+                                'first-line': 0L,
1395
+                                'folded-linenos': [],
1396
+                                'sel-line': 0L,
1397
+                                'sel-line-start': 0L,
1398
+                                'selection_end': 0L,
1399
+                                'selection_start': 0L,
1400
+                                'zoom': 0L}),
1401
+                              (loc('resolvers/cloudsany.py'),
1402
+                               {'attrib-starts': [('resolve',
1403
+        30)],
1404
+                                'first-line': 81L,
1405
+                                'folded-linenos': [],
1406
+                                'sel-line': 90L,
1407
+                                'sel-line-start': 2808L,
1408
+                                'selection_end': 2834L,
1409
+                                'selection_start': 2834L,
1357 1410
                                 'zoom': 0L})],
1358 1411
         'has-focus': True,
1359 1412
         'locked': False},
@@ -1368,10 +1421,11 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1368 1421
          loc('sources/filmix.py'),
1369 1422
          loc('Downloader.py'),
1370 1423
          loc('run.py'),
1371
-         loc('sources/euronews.py')]),
1372
-                               'open_files': [u'ContentSources.py',
1373
-        u'kivy_test.py',
1374
-        u'sources/cinemalive.py',
1424
+         loc('sources/euronews.py'),
1425
+         loc('sources/filmon.py'),
1426
+         loc('resolver.py'),
1427
+         loc('resolvers/cloudsany.py')]),
1428
+                               'open_files': [u'kivy_test.py',
1375 1429
         u'sources/filmas.py',
1376 1430
         u'sources/filmix.py',
1377 1431
         u'sources/lmt.py',
@@ -1380,7 +1434,12 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1380 1434
         u'util.py',
1381 1435
         u'Downloader.py',
1382 1436
         u'sources/euronews.py',
1383
-        u'run.py']},
1437
+        u'ContentSources.py',
1438
+        u'sources/filmon.py',
1439
+        u'run.py',
1440
+        u'resolver.py',
1441
+        u'resolvers/cloudsany.py',
1442
+        u'sources/cinemalive.py']},
1384 1443
         'saved_notebook_display': None,
1385 1444
         'split_percents': {0: 0.42670046472327844},
1386 1445
         'splits': 2,
@@ -1395,7 +1454,12 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1395 1454
                          -1080,
1396 1455
                          1858,
1397 1456
                          1080)}]}
1398
-guimgr.recent-documents = [loc('run.py'),
1457
+guimgr.recent-documents = [loc('sources/cinemalive.py'),
1458
+                           loc('resolvers/cloudsany.py'),
1459
+                           loc('resolver.py'),
1460
+                           loc('run.py'),
1461
+                           loc('sources/filmon.py'),
1462
+                           loc('ContentSources.py'),
1399 1463
                            loc('sources/euronews.py'),
1400 1464
                            loc('Downloader.py'),
1401 1465
                            loc('util.py'),
@@ -1403,8 +1467,6 @@ guimgr.recent-documents = [loc('run.py'),
1403 1467
                            loc('kivy_test.py'),
1404 1468
                            loc('sources/ltc.py'),
1405 1469
                            loc('sources/filmix.py'),
1406
-                           loc('sources/cinemalive.py'),
1407
-                           loc('ContentSources.py'),
1408 1470
                            loc('sources/lmt.py'),
1409 1471
                            loc('sources/replay.py')]
1410 1472
 guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
@@ -1923,7 +1985,9 @@ proj.env-vars = {None: ('default',
1923 1985
                         [u''])}
1924 1986
 search.replace-history = [u'www.shortcut.lv',
1925 1987
                           u'shortcut.lv']
1926
-search.search-history = [u'img',
1988
+search.search-history = [u'raise',
1989
+                         u'can not find ',
1990
+                         u'img',
1927 1991
                          u'get_head',
1928 1992
                          u'base_url',
1929 1993
                          u'download',
@@ -1940,9 +2004,7 @@ search.search-history = [u'img',
1940 2004
                          u'url_sub',
1941 2005
                          u'.pack',
1942 2006
                          u'Text',
1943
-                         u'VideoInfo',
1944
-                         u'subs',
1945
-                         u'tmp_path']
2007
+                         u'VideoInfo']
1946 2008
 testing.stored-results = (1,
1947 2009
                           [],
1948 2010
                           {})

+ 4
- 2
resolvers/cloudsany.py Переглянути файл

@@ -77,7 +77,7 @@ def resolve(url):
77 77
 
78 78
     # Stream URL
79 79
     # co|sanii|dl1|file
80
-    m1 = re.search("\|(co)\|(\w+)\|(\w+)\|", p0)
80
+    m1 = re.search("\|(co)\|(\w*)\|(\w*)\|(\w*)\|", p0)
81 81
     # tracks|mp4|video|ut4dluxu56tyll|files
82 82
     m2 = re.search(r"tracks\|(\w+)\|(\w+)\|(\w+)\|files", p0)
83 83
     # 0://c.b.a/1t/6/1s/1r.1q
@@ -85,8 +85,10 @@ def resolve(url):
85 85
     if not (m1 and m2 and m3):
86 86
         raise Exception("Can not find stream url")
87 87
     # https://dl1.sanii.co/files/6/ut4dluxu56tyll/video.mp4
88
+    l1 = list(m1.groups())
89
+    if "" in l1: l1.remove("")
88 90
     url = "https://%s.%s.%s/files/%s/%s/%s.%s" % (
89
-        m1.group(3), m1.group(2), m1.group(1), m3.group(1), m2.group(3), m2.group(2), m2.group(1))
91
+        l1[2], l1[1], l1[0], m3.group(1), m2.group(3), m2.group(2), m2.group(1))
90 92
     print url
91 93
 
92 94
     s = util.item()