Browse Source

filmix salabots

Ivars 6 years ago
parent
commit
2399bda136
2 changed files with 290 additions and 264 deletions
  1. 285
    260
      project.wpr
  2. 5
    4
      sources/filmix.py

+ 285
- 260
project.wpr View File

@@ -36,7 +36,7 @@ proj.launch-config = {loc('ContentSources.py'): ('project',
36 36
         (u'https://walterebert.com/playground/video/hls/sintel-trailer.m3u8',
37 37
          '')),
38 38
                       loc('run.py'): ('project',
39
-                                      (u'config::home sources\\cfg0\\streams_al.cfg',
39
+                                      (u'config::home  ftp://user:Kaskade7@home.blue.lv/hdd/streams.cfg',
40 40
                                        '')),
41 41
                       loc('sources/lmt.py'): ('project',
42 42
         (u'home',
@@ -130,6 +130,22 @@ debug.breakpoints = {loc('Downloader.py'): {182L: (0,
130 130
         None,
131 131
         1,
132 132
         0)},
133
+                     loc('sources/filmix.py'): {142L: (0,
134
+        None,
135
+        1,
136
+        0),
137
+        286L: (0,
138
+               None,
139
+               1,
140
+               0),
141
+        312L: (0,
142
+               None,
143
+               1,
144
+               0),
145
+        322L: (0,
146
+               None,
147
+               1,
148
+               0)},
133 149
                      loc('sources/filmon.py'): {49L: (0,
134 150
         None,
135 151
         1,
@@ -230,7 +246,8 @@ debug.recent-run-args = {loc('ContentSources.py'): [u'config::home streams_bernu
230 246
         u'--slud'],
231 247
                          loc('kivy_test.py'): [u'https://walterebert.com/playground/video/hls/sintel-trailer.m3u8',
232 248
         u'https://dl4.sanii.co/files/2/60e13omc1cpph2/video.mp4'],
233
-                         loc('run.py'): [u'config::home sources\\cfg0\\streams_al.cfg',
249
+                         loc('run.py'): [u'config::home  ftp://user:Kaskade7@home.blue.lv/hdd/streams.cfg',
250
+        u'config::home sources\\cfg0\\streams_al.cfg',
234 251
         u'config::home ',
235 252
         u'config::home  ftp://user:Kaskade7@home.blue.lv/hdd/streams_al.cfg',
236 253
         u'config::home  ftps://user:Kaskade7@home.blue.lv/hdd/streams_al.cfg',
@@ -266,7 +283,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
266 283
                  'current_pages': [0,
267 284
                                    2],
268 285
                  'full-screen': False,
269
-                 'notebook_display': 'normal',
286
+                 'notebook_display': 'tabs only',
270 287
                  'notebook_percent': 0.17992831541218635,
271 288
                  'override_title': None,
272 289
                  'pagelist': [('project',
@@ -794,10 +811,6 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
794 811
         'top-node': [('generic attribute',
795 812
                       loc('../../../../../Python27/lib/site-packages/PIL/Image.py'),
796 813
                       'ADAPTIVE')]},
797
-        loc('unknown:<untitled> #3'): {'column-widths': [1.0],
798
-                                       'expanded-nodes': [],
799
-                                       'selected-nodes': [],
800
-                                       'top-node': None},
801 814
         loc('unknown:<untitled> #4'): {'column-widths': [1.0],
802 815
                                        'expanded-nodes': [],
803 816
                                        'selected-nodes': [],
@@ -806,6 +819,10 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
806 819
                                        'selected-nodes': [],
807 820
                                        'top-node': None},
808 821
         loc('unknown:<untitled> #6'): {'expanded-nodes': [],
822
+                                       'selected-nodes': [],
823
+                                       'top-node': None},
824
+        loc('unknown:<untitled> #3'): {'column-widths': [1.0],
825
+                                       'expanded-nodes': [],
809 826
                                        'selected-nodes': [],
810 827
                                        'top-node': None}},
811 828
                                 'browse_mode': u'Current Module',
@@ -833,7 +850,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
833 850
                  'primary_view_state': {'area': 'wide',
834 851
         'constraint': None,
835 852
         'current_pages': [2,
836
-                          5],
853
+                          0],
837 854
         'notebook_display': 'normal',
838 855
         'notebook_percent': 0.4761133603238866,
839 856
         'override_title': None,
@@ -942,14 +959,19 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
942 959
         -1,
943 960
         -1),
944 961
                        'attrib-starts': [],
945
-                       'first-line': 0L,
962
+                       'first-line': 18L,
946 963
                        'folded-linenos': [],
947
-                       'history': {},
964
+                       'history': {u'file:C:/Data/Programming/Kodi/plugin.video.playstream/resources/lib/content/run.py': ['p'\
965
+        'ath\n',
966
+        'r\n',
967
+        'r.decode("")\n',
968
+        ' r.decode("cp1251")\n',
969
+        ' r.decode("cp1251", "replace")\n']},
948 970
                        'launch-id': None,
949
-                       'sel-line': 0L,
950
-                       'sel-line-start': 0L,
951
-                       'selection_end': 0L,
952
-                       'selection_start': 0L,
971
+                       'sel-line': 19L,
972
+                       'sel-line-start': 176083L,
973
+                       'selection_end': 176083L,
974
+                       'selection_start': 176083L,
953 975
                        'zoom': 0L}),
954 976
                      ('debug-watch',
955 977
                       'wide',
@@ -986,277 +1008,285 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
986 1008
         -1,
987 1009
         -1),
988 1010
                        'attrib-starts': [],
989
-                       'first-line': 2L,
1011
+                       'first-line': 0L,
990 1012
                        'folded-linenos': [],
991
-                       'history': {None: ['import StringIO\n',
992
-        'a = StringIO.StringIO()\n',
993
-        'a.write("adfaf")\n',
994
-        'a.write("\\nadfaf")\n',
995
-        'a\n',
996
-        'a.seek(0)\n',
997
-        'a.read()\n']},
1013
+                       'history': {None: ['path\n']},
998 1014
                        'launch-id': None,
999
-                       'sel-line': 14L,
1000
-                       'sel-line-start': 351L,
1001
-                       'selection_end': 351L,
1002
-                       'selection_start': 351L,
1015
+                       'sel-line': 6L,
1016
+                       'sel-line-start': 286L,
1017
+                       'selection_end': 286L,
1018
+                       'selection_start': 286L,
1003 1019
                        'zoom': 0L})],
1004
-        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('run.py'),
1005
-        {'attrib-starts': [],
1006
-         'first-line': 715L,
1020
+        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('sources/filmix.py'),
1021
+        {'attrib-starts': [('Source',
1022
+                            31),
1023
+                           ('Source.get_streams',
1024
+                            264)],
1025
+         'first-line': 302L,
1007 1026
          'folded-linenos': [],
1008
-         'sel-line': 724L,
1009
-         'sel-line-start': 29166L,
1010
-         'selection_end': 29178L,
1011
-         'selection_start': 29170L,
1027
+         'sel-line': 321L,
1028
+         'sel-line-start': 14159L,
1029
+         'selection_end': 14159L,
1030
+         'selection_start': 14159L,
1012 1031
          'zoom': 0L},
1013
-        1520694112.068],
1032
+        1520722822.612],
1014 1033
         [loc('run.py'),
1034
+         {'attrib-starts': [('Main',
1035
+                             22),
1036
+                            ('Main.list_action',
1037
+                             106)],
1038
+          'first-line': 134L,
1039
+          'folded-linenos': [],
1040
+          'sel-line': 144L,
1041
+          'sel-line-start': 5793L,
1042
+          'selection_end': 5809L,
1043
+          'selection_start': 5809L,
1044
+          'zoom': 0L},
1045
+         1520722826.625],
1046
+        [loc('../../../../../Python27/Lib/ftplib.py'),
1015 1047
          {'attrib-starts': [],
1016
-          'first-line': 720L,
1048
+          'first-line': 0L,
1017 1049
           'folded-linenos': [],
1018
-          'sel-line': 727L,
1019
-          'sel-line-start': 29296L,
1020
-          'selection_end': 29327L,
1021
-          'selection_start': 29319L,
1050
+          'sel-line': 0L,
1051
+          'sel-line-start': 0L,
1052
+          'selection_end': 0L,
1053
+          'selection_start': 0L,
1022 1054
           'zoom': 0L},
1023
-         1520694113.128],
1055
+         1520722827.225],
1024 1056
         [loc('run.py'),
1025
-         {'attrib-starts': [],
1026
-          'first-line': 720L,
1057
+         {'attrib-starts': [('Main',
1058
+                             22),
1059
+                            ('Main.list_action',
1060
+                             106)],
1061
+          'first-line': 134L,
1027 1062
           'folded-linenos': [],
1028
-          'sel-line': 727L,
1029
-          'sel-line-start': 29296L,
1030
-          'selection_end': 29336L,
1031
-          'selection_start': 29328L,
1063
+          'sel-line': 144L,
1064
+          'sel-line-start': 5793L,
1065
+          'selection_end': 5809L,
1066
+          'selection_start': 5809L,
1032 1067
           'zoom': 0L},
1033
-         1520694113.917],
1068
+         1520722835.281],
1069
+        [loc('sources/filmix.py'),
1070
+         {'attrib-starts': [('Source',
1071
+                             31),
1072
+                            ('Source.get_streams',
1073
+                             264)],
1074
+          'first-line': 302L,
1075
+          'folded-linenos': [],
1076
+          'sel-line': 321L,
1077
+          'sel-line-start': 14159L,
1078
+          'selection_end': 14159L,
1079
+          'selection_start': 14159L,
1080
+          'zoom': 0L},
1081
+         1520722841.137],
1034 1082
         [loc('run.py'),
1035 1083
          {'attrib-starts': [('Main',
1036 1084
                              22),
1037
-                            ('Main.__init__',
1038
-                             24)],
1039
-          'first-line': 19L,
1085
+                            ('Main.list_action',
1086
+                             106)],
1087
+          'first-line': 134L,
1088
+          'folded-linenos': [],
1089
+          'sel-line': 144L,
1090
+          'sel-line-start': 5793L,
1091
+          'selection_end': 5809L,
1092
+          'selection_start': 5809L,
1093
+          'zoom': 0L},
1094
+         1520722845.628],
1095
+        [loc('sources/filmix.py'),
1096
+         {'attrib-starts': [('Source',
1097
+                             31),
1098
+                            ('Source.get_streams',
1099
+                             264)],
1100
+          'first-line': 302L,
1040 1101
           'folded-linenos': [],
1041
-          'sel-line': 33L,
1042
-          'sel-line-start': 1001L,
1043
-          'selection_end': 1018L,
1044
-          'selection_start': 1018L,
1102
+          'sel-line': 302L,
1103
+          'sel-line-start': 13427L,
1104
+          'selection_end': 13490L,
1105
+          'selection_start': 13446L,
1045 1106
           'zoom': 0L},
1046
-         1520694125.794],
1107
+         1520722848.545],
1047 1108
         [loc('run.py'),
1048 1109
          {'attrib-starts': [('Main',
1049 1110
                              22),
1050
-                            ('Main.__init__',
1051
-                             24)],
1052
-          'first-line': 28L,
1111
+                            ('Main.list_action',
1112
+                             106)],
1113
+          'first-line': 134L,
1053 1114
           'folded-linenos': [],
1054
-          'sel-line': 37L,
1055
-          'sel-line-start': 1125L,
1056
-          'selection_end': 1166L,
1057
-          'selection_start': 1152L,
1115
+          'sel-line': 144L,
1116
+          'sel-line-start': 5793L,
1117
+          'selection_end': 5809L,
1118
+          'selection_start': 5809L,
1058 1119
           'zoom': 0L},
1059
-         1520694143.184],
1060
-        [loc('ContentSources.py'),
1061
-         {'attrib-starts': [],
1062
-          'first-line': 0L,
1120
+         1520722865.601],
1121
+        [loc('sources/filmix.py'),
1122
+         {'attrib-starts': [('Source',
1123
+                             31),
1124
+                            ('Source.is_video',
1125
+                             246)],
1126
+          'first-line': 251L,
1063 1127
           'folded-linenos': [],
1064
-          'sel-line': 0L,
1065
-          'sel-line-start': 0L,
1066
-          'selection_end': 21L,
1067
-          'selection_start': 21L,
1128
+          'sel-line': 259L,
1129
+          'sel-line-start': 11534L,
1130
+          'selection_end': 11534L,
1131
+          'selection_start': 11534L,
1068 1132
           'zoom': 0L},
1069
-         1520694148.372],
1133
+         1520722890.103],
1070 1134
         [loc('ContentSources.py'),
1071 1135
          {'attrib-starts': [('ContentSources',
1072 1136
                              16),
1073
-                            ('ContentSources.__init__',
1074
-                             20)],
1075
-          'first-line': 18L,
1137
+                            ('ContentSources.get_streams',
1138
+                             96)],
1139
+          'first-line': 106L,
1140
+          'folded-linenos': [],
1141
+          'sel-line': 113L,
1142
+          'sel-line-start': 4784L,
1143
+          'selection_end': 4784L,
1144
+          'selection_start': 4784L,
1145
+          'zoom': 0L},
1146
+         1520722901.997],
1147
+        [loc('sources/filmix.py'),
1148
+         {'attrib-starts': [('Source',
1149
+                             31),
1150
+                            ('Source.is_video',
1151
+                             246)],
1152
+          'first-line': 251L,
1076 1153
           'folded-linenos': [],
1077
-          'sel-line': 20L,
1078
-          'sel-line-start': 703L,
1079
-          'selection_end': 747L,
1080
-          'selection_start': 739L,
1154
+          'sel-line': 259L,
1155
+          'sel-line-start': 11534L,
1156
+          'selection_end': 11534L,
1157
+          'selection_start': 11534L,
1081 1158
           'zoom': 0L},
1082
-         1520694152.882],
1159
+         1520722947.201],
1083 1160
         [loc('ContentSources.py'),
1084 1161
          {'attrib-starts': [('ContentSources',
1085 1162
                              16),
1086
-                            ('ContentSources.__init__',
1087
-                             20)],
1088
-          'first-line': 28L,
1163
+                            ('ContentSources.is_video',
1164
+                             152)],
1165
+          'first-line': 147L,
1089 1166
           'folded-linenos': [],
1090
-          'sel-line': 38L,
1091
-          'sel-line-start': 1556L,
1092
-          'selection_end': 1621L,
1093
-          'selection_start': 1613L,
1167
+          'sel-line': 157L,
1168
+          'sel-line-start': 6347L,
1169
+          'selection_end': 6347L,
1170
+          'selection_start': 6347L,
1094 1171
           'zoom': 0L},
1095
-         1520694161.991],
1172
+         1520722949.952],
1096 1173
         [loc('run.py'),
1097 1174
          {'attrib-starts': [('Main',
1098 1175
                              22),
1099
-                            ('Main.__init__',
1100
-                             24)],
1101
-          'first-line': 28L,
1176
+                            ('Main.list_action',
1177
+                             106)],
1178
+          'first-line': 134L,
1102 1179
           'folded-linenos': [],
1103
-          'sel-line': 35L,
1104
-          'sel-line-start': 1074L,
1105
-          'selection_end': 1102L,
1106
-          'selection_start': 1102L,
1180
+          'sel-line': 144L,
1181
+          'sel-line-start': 5793L,
1182
+          'selection_end': 5793L,
1183
+          'selection_start': 5793L,
1107 1184
           'zoom': 0L},
1108
-         1520694959.722],
1109
-        [loc('sources/config.py'),
1185
+         1520722962.86],
1186
+        [loc('sources/filmix.py'),
1110 1187
          {'attrib-starts': [('Source',
1111
-                             12),
1112
-                            ('Source.__init__',
1113
-                             14)],
1114
-          'first-line': 11L,
1115
-          'folded-linenos': [],
1116
-          'sel-line': 18L,
1117
-          'sel-line-start': 616L,
1118
-          'selection_end': 623L,
1119
-          'selection_start': 623L,
1120
-          'zoom': 0L},
1121
-         1520697293.876],
1122
-        [loc('sources/config.py'),
1123
-         {'attrib-starts': [],
1124
-          'first-line': 142L,
1125
-          'folded-linenos': [],
1126
-          'sel-line': 151L,
1127
-          'sel-line-start': 5206L,
1128
-          'selection_end': 5206L,
1129
-          'selection_start': 5206L,
1130
-          'zoom': 0L},
1131
-         1520699114.77],
1132
-        [loc('../../../../../Python27/Lib/ftplib.py'),
1133
-         {'attrib-starts': [('FTP',
1134
-                             78),
1135
-                            ('FTP.getresp',
1136
-                             213)],
1137
-          'first-line': 211L,
1188
+                             31),
1189
+                            ('Source.is_video',
1190
+                             246)],
1191
+          'first-line': 251L,
1138 1192
           'folded-linenos': [],
1139
-          'sel-line': 223L,
1140
-          'sel-line-start': 7831L,
1141
-          'selection_end': 7831L,
1142
-          'selection_start': 7831L,
1193
+          'sel-line': 259L,
1194
+          'sel-line-start': 11534L,
1195
+          'selection_end': 11534L,
1196
+          'selection_start': 11534L,
1143 1197
           'zoom': 0L},
1144
-         1520699128.124],
1145
-        [loc('sources/config.py'),
1146
-         {'attrib-starts': [('Source',
1147
-                             12),
1148
-                            ('Source.replace_item',
1149
-                             143)],
1150
-          'first-line': 139L,
1198
+         1520722972.238],
1199
+        [loc('ContentSources.py'),
1200
+         {'attrib-starts': [('ContentSources',
1201
+                             16),
1202
+                            ('ContentSources.get_streams',
1203
+                             96)],
1204
+          'first-line': 103L,
1151 1205
           'folded-linenos': [],
1152
-          'sel-line': 143L,
1153
-          'sel-line-start': 4984L,
1154
-          'selection_end': 5003L,
1155
-          'selection_start': 5003L,
1206
+          'sel-line': 113L,
1207
+          'sel-line-start': 4784L,
1208
+          'selection_end': 4784L,
1209
+          'selection_start': 4784L,
1156 1210
           'zoom': 0L},
1157
-         1520699141.454],
1158
-        [loc('sources/config.py'),
1211
+         1520722995.991],
1212
+        [loc('sources/filmix.py'),
1159 1213
          {'attrib-starts': [('Source',
1160
-                             12),
1161
-                            ('Source.read_streams',
1162
-                             42)],
1163
-          'first-line': 57L,
1214
+                             31),
1215
+                            ('Source.get_streams',
1216
+                             264)],
1217
+          'first-line': 277L,
1164 1218
           'folded-linenos': [],
1165
-          'sel-line': 60L,
1166
-          'sel-line-start': 2316L,
1167
-          'selection_end': 2349L,
1168
-          'selection_start': 2349L,
1219
+          'sel-line': 311L,
1220
+          'sel-line-start': 13738L,
1221
+          'selection_end': 13738L,
1222
+          'selection_start': 13738L,
1169 1223
           'zoom': 0L},
1170
-         1520712354.147],
1171
-        [loc('sources/config.py'),
1224
+         1520723031.659],
1225
+        [loc('sources/filmix.py'),
1172 1226
          {'attrib-starts': [('Source',
1173
-                             12),
1174
-                            ('Source.move_item',
1175
-                             150)],
1176
-          'first-line': 145L,
1227
+                             31),
1228
+                            ('Source.get_streams',
1229
+                             264)],
1230
+          'first-line': 271L,
1177 1231
           'folded-linenos': [],
1178
-          'sel-line': 153L,
1179
-          'sel-line-start': 5305L,
1180
-          'selection_end': 5360L,
1181
-          'selection_start': 5360L,
1232
+          'sel-line': 285L,
1233
+          'sel-line-start': 12648L,
1234
+          'selection_end': 12732L,
1235
+          'selection_start': 12732L,
1182 1236
           'zoom': 0L},
1183
-         1520714785.095],
1184
-        [loc('sources/config.py'),
1185
-         {'attrib-starts': [('Source',
1186
-                             12),
1187
-                            ('Source.get_list_items',
1188
-                             120)],
1189
-          'first-line': 112L,
1237
+         1520723090.872],
1238
+        [loc('run.py'),
1239
+         {'attrib-starts': [('Main',
1240
+                             22),
1241
+                            ('Main.list_action',
1242
+                             106)],
1243
+          'first-line': 134L,
1190 1244
           'folded-linenos': [],
1191
-          'sel-line': 120L,
1192
-          'sel-line-start': 4375L,
1193
-          'selection_end': 4397L,
1194
-          'selection_start': 4383L,
1245
+          'sel-line': 144L,
1246
+          'sel-line-start': 5793L,
1247
+          'selection_end': 5793L,
1248
+          'selection_start': 5793L,
1195 1249
           'zoom': 0L},
1196
-         1520714801.445],
1197
-        [loc('sources/config.py'),
1250
+         1520723107.969],
1251
+        [loc('sources/filmix.py'),
1198 1252
          {'attrib-starts': [('Source',
1199
-                             12),
1200
-                            ('Source.get_content',
1201
-                             30)],
1202
-          'first-line': 22L,
1253
+                             31),
1254
+                            ('Source.get_streams',
1255
+                             264)],
1256
+          'first-line': 277L,
1203 1257
           'folded-linenos': [],
1204
-          'sel-line': 31L,
1205
-          'sel-line-start': 1177L,
1206
-          'selection_end': 1210L,
1207
-          'selection_start': 1210L,
1258
+          'sel-line': 285L,
1259
+          'sel-line-start': 12648L,
1260
+          'selection_end': 12731L,
1261
+          'selection_start': 12702L,
1208 1262
           'zoom': 0L},
1209
-         1520714819.691],
1210
-        [loc('sources/config.py'),
1263
+         1520723309.783],
1264
+        [loc('sources/filmix.py'),
1211 1265
          {'attrib-starts': [('Source',
1212
-                             12),
1213
-                            ('Source.write_streams',
1214
-                             73)],
1215
-          'first-line': 112L,
1266
+                             31),
1267
+                            ('Source.is_video',
1268
+                             246)],
1269
+          'first-line': 244L,
1216 1270
           'folded-linenos': [],
1217
-          'sel-line': 115L,
1218
-          'sel-line-start': 4309L,
1219
-          'selection_end': 4309L,
1220
-          'selection_start': 4309L,
1271
+          'sel-line': 256L,
1272
+          'sel-line-start': 11420L,
1273
+          'selection_end': 11493L,
1274
+          'selection_start': 11493L,
1221 1275
           'zoom': 0L},
1222
-         1520715655.96],
1223
-        [loc('util.py'),
1224
-         {'attrib-starts': [('_substitute_entity',
1225
-                             506)],
1226
-          'first-line': 537L,
1227
-          'folded-linenos': [],
1228
-          'sel-line': 522L,
1229
-          'sel-line-start': 16579L,
1230
-          'selection_end': 16598L,
1231
-          'selection_start': 16598L,
1232
-          'zoom': 0L},
1233
-         1520720563.343],
1234
-        [loc('sources/config.py'),
1235
-         {'attrib-starts': [('Source',
1236
-                             12),
1237
-                            ('Source.get_title',
1238
-                             123)],
1239
-          'first-line': 112L,
1240
-          'folded-linenos': [],
1241
-          'sel-line': 123L,
1242
-          'sel-line-start': 4446L,
1243
-          'selection_end': 4475L,
1244
-          'selection_start': 4475L,
1245
-          'zoom': 0L},
1246
-         1520720569.948]],
1276
+         1520723337.649]],
1247 1277
         20),
1248
-        'current-loc': loc('sources/config.py'),
1278
+        'current-loc': loc('run.py'),
1249 1279
         'editor-state-list': [(loc('run.py'),
1250 1280
                                {'attrib-starts': [('Main',
1251 1281
         22),
1252
-        ('Main.__init__',
1253
-         24)],
1254
-                                'first-line': 28L,
1282
+        ('Main.list_action',
1283
+         106)],
1284
+                                'first-line': 134L,
1255 1285
                                 'folded-linenos': [],
1256
-                                'sel-line': 35L,
1257
-                                'sel-line-start': 1074L,
1258
-                                'selection_end': 1102L,
1259
-                                'selection_start': 1102L,
1286
+                                'sel-line': 144L,
1287
+                                'sel-line-start': 5793L,
1288
+                                'selection_end': 5793L,
1289
+                                'selection_start': 5793L,
1260 1290
                                 'zoom': 0L}),
1261 1291
                               (loc('util.py'),
1262 1292
                                {'attrib-starts': [('_substitute_entity',
@@ -1271,14 +1301,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1271 1301
                               (loc('ContentSources.py'),
1272 1302
                                {'attrib-starts': [('ContentSources',
1273 1303
         16),
1274
-        ('ContentSources.__init__',
1275
-         20)],
1276
-                                'first-line': 28L,
1304
+        ('ContentSources.get_streams',
1305
+         96)],
1306
+                                'first-line': 103L,
1277 1307
                                 'folded-linenos': [],
1278
-                                'sel-line': 38L,
1279
-                                'sel-line-start': 1556L,
1280
-                                'selection_end': 1621L,
1281
-                                'selection_start': 1613L,
1308
+                                'sel-line': 113L,
1309
+                                'sel-line-start': 4784L,
1310
+                                'selection_end': 4784L,
1311
+                                'selection_start': 4784L,
1282 1312
                                 'zoom': 0L}),
1283 1313
                               (loc('sources/ltc.py'),
1284 1314
                                {'attrib-starts': [('Source',
@@ -1328,14 +1358,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1328 1358
                               (loc('sources/filmix.py'),
1329 1359
                                {'attrib-starts': [('Source',
1330 1360
         31),
1331
-        ('Source.get_streams',
1332
-         263)],
1333
-                                'first-line': 256L,
1361
+        ('Source.is_video',
1362
+         246)],
1363
+                                'first-line': 244L,
1334 1364
                                 'folded-linenos': [],
1335
-                                'sel-line': 264L,
1336
-                                'sel-line-start': 11576L,
1337
-                                'selection_end': 11619L,
1338
-                                'selection_start': 11619L,
1365
+                                'sel-line': 256L,
1366
+                                'sel-line-start': 11420L,
1367
+                                'selection_end': 11493L,
1368
+                                'selection_start': 11493L,
1339 1369
                                 'zoom': 0L}),
1340 1370
                               (loc('Downloader.py'),
1341 1371
                                {'attrib-starts': [('get_header',
@@ -1375,18 +1405,6 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1375 1405
                                 'selection_end': 1599L,
1376 1406
                                 'selection_start': 1599L,
1377 1407
                                 'zoom': 0L}),
1378
-                              (loc('../../../../../Python27/Lib/ftplib.py'),
1379
-                               {'attrib-starts': [('FTP',
1380
-        78),
1381
-        ('FTP.getresp',
1382
-         213)],
1383
-                                'first-line': 211L,
1384
-                                'folded-linenos': [],
1385
-                                'sel-line': 223L,
1386
-                                'sel-line-start': 7831L,
1387
-                                'selection_end': 7831L,
1388
-                                'selection_start': 7831L,
1389
-                                'zoom': 0L}),
1390 1408
                               (loc('sources/config.py'),
1391 1409
                                {'attrib-starts': [('Source',
1392 1410
         12),
@@ -1413,24 +1431,22 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1413 1431
          loc('sources/euronews.py'),
1414 1432
          loc('resolver.py'),
1415 1433
          loc('resolvers/cloudsany.py'),
1416
-         loc('../../../../../Python27/Lib/ftplib.py'),
1417 1434
          loc('sources/config.py')]),
1418
-                               'open_files': [u'ContentSources.py',
1419
-        u'Downloader.py',
1435
+                               'open_files': [u'Downloader.py',
1420 1436
         u'resolver.py',
1421 1437
         u'resolvers/cloudsany.py',
1422
-        u'run.py',
1423 1438
         u'sources/euronews.py',
1424 1439
         u'sources/filmas.py',
1425
-        u'sources/filmix.py',
1426 1440
         u'sources/lmt.py',
1427 1441
         u'sources/ltc.py',
1428 1442
         u'sources/replay.py',
1429
-        u'../../../../../Python27/Lib/ftplib.py',
1430 1443
         u'util.py',
1431
-        u'sources/config.py']},
1444
+        u'sources/config.py',
1445
+        u'ContentSources.py',
1446
+        u'sources/filmix.py',
1447
+        u'run.py']},
1432 1448
         'saved_notebook_display': None,
1433
-        'split_percents': {0: 0.42670046472327844},
1449
+        'split_percents': {0: 0.5061155630535639},
1434 1450
         'splits': 2,
1435 1451
         'tab_location': 'top',
1436 1452
         'user_data': {}},
@@ -1443,11 +1459,11 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1443 1459
                          -1080,
1444 1460
                          1858,
1445 1461
                          1080)}]}
1446
-guimgr.recent-documents = [loc('sources/config.py'),
1447
-                           loc('util.py'),
1448
-                           loc('run.py'),
1449
-                           loc('ContentSources.py'),
1462
+guimgr.recent-documents = [loc('run.py'),
1450 1463
                            loc('sources/filmix.py'),
1464
+                           loc('ContentSources.py'),
1465
+                           loc('sources/config.py'),
1466
+                           loc('util.py'),
1451 1467
                            loc('sources/ltc.py'),
1452 1468
                            loc('sources/replay.py'),
1453 1469
                            loc('resolvers/cloudsany.py'),
@@ -1902,6 +1918,15 @@ guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
1902 1918
         'sel-line-start': 0,
1903 1919
         'selection_end': 1,
1904 1920
         'selection_start': 1},
1921
+                       loc('../../../../../Python27/Lib/ftplib.py'): {'attri'\
1922
+        'b-starts': [],
1923
+        'first-line': 0L,
1924
+        'folded-linenos': [],
1925
+        'sel-line': 0L,
1926
+        'sel-line-start': 0L,
1927
+        'selection_end': 0L,
1928
+        'selection_start': 0L,
1929
+        'zoom': 0L},
1905 1930
                        loc('../../../../../Python27/lib/lib-tk/Tkinter.py'): {'a'\
1906 1931
         'ttrib-starts': [('Wm',
1907 1932
                           1590),

+ 5
- 4
sources/filmix.py View File

@@ -253,10 +253,11 @@ Cookie: FILMIXNET=%s;
253 253
             #r = r.decode("cp1251").encode("utf8")
254 254
             #m = re.search('itemprop="contentUrl" content="(.+?)"', r, re.IGNORECASE | re.DOTALL)
255 255
             #if not m:
256
-            if u"Фильм <a href=" in r.decode("cp1251"):
257
-                return True
258
-            else:
256
+            #if u"Фильм <a href=" in r.decode("cp1251"):
257
+            if u"Сериал <a href=" in  r.decode("cp1251", "replace"):
259 258
                 return False
259
+            else:
260
+                return True
260 261
 
261 262
         else:
262 263
             return False
@@ -282,7 +283,7 @@ Cookie: FILMIXNET=%s;
282 283
             raise Exception("Can not find video link")
283 284
             #return []
284 285
         video_link = m.group(1)
285
-        series = False if u"Фильм <a href=" in r.decode("utf8") else True
286
+        series = True if u"Сериал <a href=" in  r.decode("cp1251", "replace")  else False
286 287
         vid = plist[1]
287 288
         m = re.search(r"meta_key = \['(\w+)', '(\w+)', '(\w+)'\]", r, re.IGNORECASE)
288 289
         key = m.group(3) if m else ""