Browse Source

salabots filmix

Ivars 6 years ago
parent
commit
6d3f7320e8
2 changed files with 283 additions and 275 deletions
  1. 267
    258
      project.wpr
  2. 16
    17
      sources/filmix.py

+ 267
- 258
project.wpr View File

@@ -130,22 +130,6 @@ 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)},
149 133
                      loc('sources/filmon.py'): {49L: (0,
150 134
         None,
151 135
         1,
@@ -178,11 +162,11 @@ debug.breakpoints = {loc('Downloader.py'): {182L: (0,
178 162
             None,
179 163
             1,
180 164
             0)},
181
-                     loc('unknown:<untitled> #2'): {2: (0,
165
+                     loc('unknown:<untitled> #2'): {10: (0,
182 166
         None,
183 167
         1,
184 168
         0)},
185
-                     loc('unknown:<untitled> #1'): {10: (0,
169
+                     loc('unknown:<untitled> #1'): {2: (0,
186 170
         None,
187 171
         1,
188 172
         0)}}
@@ -291,7 +275,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
291 275
                                0,
292 276
                                {'tree-state': {'file-sort-method': 'by name',
293 277
         'list-files-first': 0,
294
-        'tree-states': {'deep': {'expanded-nodes': [(2,)],
278
+        'tree-states': {'deep': {'expanded-nodes': [(3,)],
295 279
                                  'selected-nodes': [],
296 280
                                  'top-node': (0,)}},
297 281
         'tree-style': 'deep'}}),
@@ -442,12 +426,6 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
442 426
         'top-node': [('generic attribute',
443 427
                       loc('../../../Python27/Lib/site-packages/win32com/client/dynamic.py'),
444 428
                       'ALL_INVOKE_TYPES')]},
445
-        loc('../../SplashData/remdup.py'): {'column-widths': [1.0],
446
-        'expanded-nodes': [],
447
-        'selected-nodes': [],
448
-        'top-node': [('generic attribute',
449
-                      loc('../../SplashData/remdup.py'),
450
-                      'f')]},
451 429
         loc('../$test/test2.py'): {'column-widths': [1.0],
452 430
                                    'expanded-nodes': [],
453 431
                                    'selected-nodes': [],
@@ -776,11 +754,17 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
776 754
                                       'top-node': [('generic attribute',
777 755
         loc('../vietas/vietas2.py'),
778 756
         'd_lat')]},
779
-        loc('../../../../../Python27/lib/lib-tk/Tkinter.py'): {'expanded-nod'\
757
+        loc('../../SplashData/remdup.py'): {'column-widths': [1.0],
758
+        'expanded-nodes': [],
759
+        'selected-nodes': [],
760
+        'top-node': [('generic attribute',
761
+                      loc('../../SplashData/remdup.py'),
762
+                      'f')]},
763
+        loc('../../../../../Python27/Lib/lib-tk/Tkinter.py'): {'expanded-nod'\
780 764
         'es': [],
781 765
         'selected-nodes': [],
782 766
         'top-node': [('function def',
783
-                      loc('../../../../../Python27/lib/lib-tk/Tkinter.py'),
767
+                      loc('../../../../../Python27/Lib/lib-tk/Tkinter.py'),
784 768
                       'At')]},
785 769
         loc('../../../../../Python27/lib/lib-tk/tkCommonDialog.py'): {'expan'\
786 770
         'ded-nodes': [],
@@ -811,18 +795,18 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
811 795
         'top-node': [('generic attribute',
812 796
                       loc('../../../../../Python27/lib/site-packages/PIL/Image.py'),
813 797
                       'ADAPTIVE')]},
814
-        loc('unknown:<untitled> #6'): {'column-widths': [1.0],
798
+        loc('unknown:<untitled> #3'): {'column-widths': [1.0],
815 799
                                        'expanded-nodes': [],
816 800
                                        'selected-nodes': [],
817 801
                                        'top-node': None},
818
-        loc('unknown:<untitled> #3'): {'column-widths': [1.0],
802
+        loc('unknown:<untitled> #4'): {'column-widths': [1.0],
819 803
                                        'expanded-nodes': [],
820 804
                                        'selected-nodes': [],
821 805
                                        'top-node': None},
822 806
         loc('unknown:<untitled> #5'): {'expanded-nodes': [],
823 807
                                        'selected-nodes': [],
824 808
                                        'top-node': None},
825
-        loc('unknown:<untitled> #4'): {'expanded-nodes': [],
809
+        loc('unknown:<untitled> #6'): {'expanded-nodes': [],
826 810
                                        'selected-nodes': [],
827 811
                                        'top-node': None}},
828 812
                                 'browse_mode': u'Current Module',
@@ -852,7 +836,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
852 836
         'current_pages': [2,
853 837
                           0],
854 838
         'notebook_display': 'normal',
855
-        'notebook_percent': 0.4761133603238866,
839
+        'notebook_percent': 0.4611689351481185,
856 840
         'override_title': None,
857 841
         'pagelist': [('debug-breakpoints',
858 842
                       'wide',
@@ -885,7 +869,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
885 869
                                        'fRegexFlags': 46,
886 870
                                        'fReplaceText': u'streams_file',
887 871
                                        'fReverse': False,
888
-                                       'fSearchText': u'cfg_file',
872
+                                       'fSearchText': u'get_movie_info',
889 873
                                        'fStartPos': 0,
890 874
                                        'fStyle': 'text',
891 875
                                        'fWholeWords': False,
@@ -959,14 +943,24 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
959 943
         -1,
960 944
         -1),
961 945
                        'attrib-starts': [],
962
-                       'first-line': 0L,
946
+                       'first-line': 24L,
963 947
                        'folded-linenos': [],
964
-                       'history': {},
948
+                       'history': {u'file:C:/Data/Programming/enigma2/PlayStream2/content/sources/filmix.py': ['p'\
949
+        'ath\n',
950
+        '"\xd0\xa1\xd0\xb5\xd1\x80\xd0\xb8\xd0\xb0\xd0\xbb <a href=" in r\n',
951
+        'js["message"]\n',
952
+        'js["message"]["translations"]\n',
953
+        'js["message"]["translations"]["pl"]\n',
954
+        'source.get_movie_info("124366")["message"]["translations"]["pl"]\n',
955
+        'source.get_movie_info("5430")["message"]["translations"]["pl"]\n',
956
+        'source.get_movie_info("123772")["message"]["translations"]["pl"]\n',
957
+        'source.get_movie_info("116239")["message"]["translations"]["pl"]\n',
958
+        'source.get_movie_info("116329")["message"]["translations"]["pl"]\n']},
965 959
                        'launch-id': None,
966
-                       'sel-line': 0L,
967
-                       'sel-line-start': 0L,
968
-                       'selection_end': 0L,
969
-                       'selection_start': 0L,
960
+                       'sel-line': 35L,
961
+                       'sel-line-start': 2325L,
962
+                       'selection_end': 2325L,
963
+                       'selection_start': 2325L,
970 964
                        'zoom': 0L}),
971 965
                      ('debug-watch',
972 966
                       'wide',
@@ -974,13 +968,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
974 968
                       {'node-states': [('eval',
975 969
         u'js'),
976 970
                                        ('eval',
977
-        u'title'),
971
+        u'js2'),
978 972
                                        ('eval',
979 973
         u'theme'),
980 974
                                        ('eval',
981 975
         u'item')],
982
-                       'tree-state': {'expanded-nodes': [(0,)],
983
-                                      'selected-nodes': [],
976
+                       'tree-state': {'expanded-nodes': [(0,),
977
+        (1,)],
978
+                                      'selected-nodes': [(2,)],
984 979
                                       'top-node': (0,)}}),
985 980
                      ('messages',
986 981
                       'wide',
@@ -1012,284 +1007,284 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1012 1007
                        'selection_end': 174L,
1013 1008
                        'selection_start': 174L,
1014 1009
                        'zoom': 0L})],
1015
-        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('run.py'),
1016
-        {'attrib-starts': [('Main',
1017
-                            22),
1018
-                           ('Main.list_action',
1019
-                            106)],
1020
-         'first-line': 134L,
1010
+        'primary_view_state': {'editor_states': ({'bookmarks': ([[loc('sources/filmix.py'),
1011
+        {'attrib-starts': [('Source',
1012
+                            31),
1013
+                           ('Source.is_video',
1014
+                            246)],
1015
+         'first-line': 244L,
1021 1016
          'folded-linenos': [],
1022
-         'sel-line': 144L,
1023
-         'sel-line-start': 5793L,
1024
-         'selection_end': 5809L,
1025
-         'selection_start': 5809L,
1017
+         'sel-line': 254L,
1018
+         'sel-line-start': 11245L,
1019
+         'selection_end': 11279L,
1020
+         'selection_start': 11279L,
1026 1021
          'zoom': 0L},
1027
-        1520722826.625],
1028
-        [loc('../../../../../Python27/Lib/ftplib.py'),
1029
-         {'attrib-starts': [],
1030
-          'first-line': 0L,
1031
-          'folded-linenos': [],
1032
-          'sel-line': 0L,
1033
-          'sel-line-start': 0L,
1034
-          'selection_end': 0L,
1035
-          'selection_start': 0L,
1036
-          'zoom': 0L},
1037
-         1520722827.225],
1038
-        [loc('run.py'),
1039
-         {'attrib-starts': [('Main',
1040
-                             22),
1041
-                            ('Main.list_action',
1042
-                             106)],
1043
-          'first-line': 134L,
1022
+        1520786827.402],
1023
+        [loc('sources/filmix.py'),
1024
+         {'attrib-starts': [('Source',
1025
+                             31),
1026
+                            ('Source.get_movie_info',
1027
+                             360)],
1028
+          'first-line': 360L,
1044 1029
           'folded-linenos': [],
1045
-          'sel-line': 144L,
1046
-          'sel-line-start': 5793L,
1047
-          'selection_end': 5809L,
1048
-          'selection_start': 5809L,
1030
+          'sel-line': 371L,
1031
+          'sel-line-start': 16487L,
1032
+          'selection_end': 16550L,
1033
+          'selection_start': 16539L,
1049 1034
           'zoom': 0L},
1050
-         1520722835.281],
1035
+         1520786863.457],
1051 1036
         [loc('sources/filmix.py'),
1052 1037
          {'attrib-starts': [('Source',
1053 1038
                              31),
1054
-                            ('Source.get_streams',
1055
-                             264)],
1056
-          'first-line': 302L,
1039
+                            ('Source.get_movie_info',
1040
+                             360)],
1041
+          'first-line': 360L,
1057 1042
           'folded-linenos': [],
1058
-          'sel-line': 321L,
1059
-          'sel-line-start': 14159L,
1060
-          'selection_end': 14159L,
1061
-          'selection_start': 14159L,
1043
+          'sel-line': 360L,
1044
+          'sel-line-start': 15987L,
1045
+          'selection_end': 16009L,
1046
+          'selection_start': 15995L,
1062 1047
           'zoom': 0L},
1063
-         1520722841.137],
1064
-        [loc('run.py'),
1065
-         {'attrib-starts': [('Main',
1066
-                             22),
1067
-                            ('Main.list_action',
1068
-                             106)],
1069
-          'first-line': 134L,
1048
+         1520786884.422],
1049
+        [loc('sources/filmix.py'),
1050
+         {'attrib-starts': [],
1051
+          'first-line': 438L,
1070 1052
           'folded-linenos': [],
1071
-          'sel-line': 144L,
1072
-          'sel-line-start': 5793L,
1073
-          'selection_end': 5809L,
1074
-          'selection_start': 5809L,
1053
+          'sel-line': 443L,
1054
+          'sel-line-start': 19537L,
1055
+          'selection_end': 19537L,
1056
+          'selection_start': 19537L,
1075 1057
           'zoom': 0L},
1076
-         1520722845.628],
1058
+         1520787558.989],
1077 1059
         [loc('sources/filmix.py'),
1078 1060
          {'attrib-starts': [('Source',
1079 1061
                              31),
1080
-                            ('Source.get_streams',
1081
-                             264)],
1082
-          'first-line': 302L,
1062
+                            ('Source.is_video',
1063
+                             246)],
1064
+          'first-line': 248L,
1083 1065
           'folded-linenos': [],
1084
-          'sel-line': 302L,
1085
-          'sel-line-start': 13427L,
1086
-          'selection_end': 13490L,
1087
-          'selection_start': 13446L,
1066
+          'sel-line': 253L,
1067
+          'sel-line-start': 11208L,
1068
+          'selection_end': 11390L,
1069
+          'selection_start': 11208L,
1088 1070
           'zoom': 0L},
1089
-         1520722848.545],
1090
-        [loc('run.py'),
1091
-         {'attrib-starts': [('Main',
1092
-                             22),
1093
-                            ('Main.list_action',
1094
-                             106)],
1095
-          'first-line': 134L,
1071
+         1520787695.878],
1072
+        [loc('sources/filmix.py'),
1073
+         {'attrib-starts': [('Source',
1074
+                             31),
1075
+                            ('Source.get_streams',
1076
+                             264)],
1077
+          'first-line': 278L,
1096 1078
           'folded-linenos': [],
1097
-          'sel-line': 144L,
1098
-          'sel-line-start': 5793L,
1099
-          'selection_end': 5809L,
1100
-          'selection_start': 5809L,
1079
+          'sel-line': 285L,
1080
+          'sel-line-start': 12584L,
1081
+          'selection_end': 12901L,
1082
+          'selection_start': 12584L,
1101 1083
           'zoom': 0L},
1102
-         1520722865.601],
1084
+         1520787921.989],
1103 1085
         [loc('sources/filmix.py'),
1104 1086
          {'attrib-starts': [('Source',
1105 1087
                              31),
1106 1088
                             ('Source.is_video',
1107 1089
                              246)],
1108
-          'first-line': 251L,
1090
+          'first-line': 249L,
1091
+          'folded-linenos': [],
1092
+          'sel-line': 254L,
1093
+          'sel-line-start': 11246L,
1094
+          'selection_end': 11246L,
1095
+          'selection_start': 11246L,
1096
+          'zoom': 0L},
1097
+         1520788014.592],
1098
+        [loc('run.py'),
1099
+         {'attrib-starts': [('Main',
1100
+                             22),
1101
+                            ('Main.initUI',
1102
+                             47)],
1103
+          'first-line': 63L,
1109 1104
           'folded-linenos': [],
1110
-          'sel-line': 259L,
1111
-          'sel-line-start': 11534L,
1112
-          'selection_end': 11534L,
1113
-          'selection_start': 11534L,
1105
+          'sel-line': 68L,
1106
+          'sel-line-start': 2618L,
1107
+          'selection_end': 2618L,
1108
+          'selection_start': 2618L,
1114 1109
           'zoom': 0L},
1115
-         1520722890.103],
1116
-        [loc('ContentSources.py'),
1117
-         {'attrib-starts': [('ContentSources',
1118
-                             16),
1119
-                            ('ContentSources.get_streams',
1120
-                             96)],
1121
-          'first-line': 106L,
1110
+         1520788018.139],
1111
+        [loc('../../../../../Python27/Lib/lib-tk/Tkinter.py'),
1112
+         {'attrib-starts': [('CallWrapper',
1113
+                             1528),
1114
+                            ('CallWrapper.__call__',
1115
+                             1536)],
1116
+          'first-line': 1537L,
1122 1117
           'folded-linenos': [],
1123
-          'sel-line': 113L,
1124
-          'sel-line-start': 4784L,
1125
-          'selection_end': 4784L,
1126
-          'selection_start': 4784L,
1118
+          'sel-line': 1542L,
1119
+          'sel-line-start': 60799L,
1120
+          'selection_end': 60799L,
1121
+          'selection_start': 60799L,
1127 1122
           'zoom': 0L},
1128
-         1520722901.997],
1123
+         1520788031.817],
1129 1124
         [loc('sources/filmix.py'),
1130 1125
          {'attrib-starts': [('Source',
1131 1126
                              31),
1132 1127
                             ('Source.is_video',
1133 1128
                              246)],
1134
-          'first-line': 251L,
1129
+          'first-line': 249L,
1135 1130
           'folded-linenos': [],
1136
-          'sel-line': 259L,
1137
-          'sel-line-start': 11534L,
1138
-          'selection_end': 11534L,
1139
-          'selection_start': 11534L,
1131
+          'sel-line': 254L,
1132
+          'sel-line-start': 11246L,
1133
+          'selection_end': 11283L,
1134
+          'selection_start': 11269L,
1140 1135
           'zoom': 0L},
1141
-         1520722947.201],
1142
-        [loc('ContentSources.py'),
1143
-         {'attrib-starts': [('ContentSources',
1144
-                             16),
1145
-                            ('ContentSources.is_video',
1146
-                             152)],
1147
-          'first-line': 147L,
1136
+         1520788068.755],
1137
+        [loc('sources/filmix.py'),
1138
+         {'attrib-starts': [('Source',
1139
+                             31),
1140
+                            ('Source.get_movie_info',
1141
+                             356)],
1142
+          'first-line': 346L,
1148 1143
           'folded-linenos': [],
1149
-          'sel-line': 157L,
1150
-          'sel-line-start': 6347L,
1151
-          'selection_end': 6347L,
1152
-          'selection_start': 6347L,
1144
+          'sel-line': 356L,
1145
+          'sel-line-start': 15820L,
1146
+          'selection_end': 15842L,
1147
+          'selection_start': 15828L,
1153 1148
           'zoom': 0L},
1154
-         1520722949.952],
1155
-        [loc('run.py'),
1156
-         {'attrib-starts': [('Main',
1157
-                             22),
1158
-                            ('Main.list_action',
1159
-                             106)],
1160
-          'first-line': 134L,
1149
+         1520788070.855],
1150
+        [loc('sources/filmix.py'),
1151
+         {'attrib-starts': [('Source',
1152
+                             31),
1153
+                            ('Source.get_content',
1154
+                             56)],
1155
+          'first-line': 127L,
1161 1156
           'folded-linenos': [],
1162
-          'sel-line': 144L,
1163
-          'sel-line-start': 5793L,
1164
-          'selection_end': 5793L,
1165
-          'selection_start': 5793L,
1157
+          'sel-line': 132L,
1158
+          'sel-line-start': 5356L,
1159
+          'selection_end': 5392L,
1160
+          'selection_start': 5378L,
1166 1161
           'zoom': 0L},
1167
-         1520722962.86],
1162
+         1520788071.94],
1168 1163
         [loc('sources/filmix.py'),
1169 1164
          {'attrib-starts': [('Source',
1170 1165
                              31),
1171 1166
                             ('Source.is_video',
1172 1167
                              246)],
1173
-          'first-line': 251L,
1174
-          'folded-linenos': [],
1175
-          'sel-line': 259L,
1176
-          'sel-line-start': 11534L,
1177
-          'selection_end': 11534L,
1178
-          'selection_start': 11534L,
1179
-          'zoom': 0L},
1180
-         1520722972.238],
1181
-        [loc('ContentSources.py'),
1182
-         {'attrib-starts': [('ContentSources',
1183
-                             16),
1184
-                            ('ContentSources.get_streams',
1185
-                             96)],
1186
-          'first-line': 103L,
1168
+          'first-line': 244L,
1187 1169
           'folded-linenos': [],
1188
-          'sel-line': 113L,
1189
-          'sel-line-start': 4784L,
1190
-          'selection_end': 4784L,
1191
-          'selection_start': 4784L,
1170
+          'sel-line': 254L,
1171
+          'sel-line-start': 11246L,
1172
+          'selection_end': 11283L,
1173
+          'selection_start': 11269L,
1192 1174
           'zoom': 0L},
1193
-         1520722995.991],
1175
+         1520788073.609],
1194 1176
         [loc('sources/filmix.py'),
1195 1177
          {'attrib-starts': [('Source',
1196 1178
                              31),
1197 1179
                             ('Source.get_streams',
1198
-                             264)],
1180
+                             263)],
1199 1181
           'first-line': 277L,
1200 1182
           'folded-linenos': [],
1201
-          'sel-line': 311L,
1202
-          'sel-line-start': 13738L,
1203
-          'selection_end': 13738L,
1204
-          'selection_start': 13738L,
1183
+          'sel-line': 288L,
1184
+          'sel-line-start': 12733L,
1185
+          'selection_end': 12733L,
1186
+          'selection_start': 12733L,
1205 1187
           'zoom': 0L},
1206
-         1520723031.659],
1188
+         1520788091.381],
1207 1189
         [loc('sources/filmix.py'),
1208 1190
          {'attrib-starts': [('Source',
1209 1191
                              31),
1210
-                            ('Source.get_streams',
1211
-                             264)],
1212
-          'first-line': 271L,
1192
+                            ('Source.get_movie_info',
1193
+                             355)],
1194
+          'first-line': 345L,
1213 1195
           'folded-linenos': [],
1214
-          'sel-line': 285L,
1215
-          'sel-line-start': 12648L,
1216
-          'selection_end': 12732L,
1217
-          'selection_start': 12732L,
1196
+          'sel-line': 355L,
1197
+          'sel-line-start': 15779L,
1198
+          'selection_end': 15801L,
1199
+          'selection_start': 15787L,
1218 1200
           'zoom': 0L},
1219
-         1520723090.872],
1220
-        [loc('run.py'),
1221
-         {'attrib-starts': [('Main',
1222
-                             22),
1223
-                            ('Main.list_action',
1224
-                             106)],
1225
-          'first-line': 134L,
1201
+         1520788092.31],
1202
+        [loc('sources/filmix.py'),
1203
+         {'attrib-starts': [('Source',
1204
+                             31),
1205
+                            ('Source.get_content',
1206
+                             56)],
1207
+          'first-line': 127L,
1208
+          'folded-linenos': [],
1209
+          'sel-line': 132L,
1210
+          'sel-line-start': 5356L,
1211
+          'selection_end': 5392L,
1212
+          'selection_start': 5378L,
1213
+          'zoom': 0L},
1214
+         1520788093.862],
1215
+        [loc('sources/filmix.py'),
1216
+         {'attrib-starts': [('Source',
1217
+                             31),
1218
+                            ('Source.is_video',
1219
+                             246)],
1220
+          'first-line': 244L,
1226 1221
           'folded-linenos': [],
1227
-          'sel-line': 144L,
1228
-          'sel-line-start': 5793L,
1229
-          'selection_end': 5793L,
1230
-          'selection_start': 5793L,
1222
+          'sel-line': 254L,
1223
+          'sel-line-start': 11246L,
1224
+          'selection_end': 11283L,
1225
+          'selection_start': 11269L,
1231 1226
           'zoom': 0L},
1232
-         1520723107.969],
1227
+         1520788095.392],
1233 1228
         [loc('sources/filmix.py'),
1234 1229
          {'attrib-starts': [('Source',
1235 1230
                              31),
1236 1231
                             ('Source.get_streams',
1237
-                             264)],
1232
+                             263)],
1238 1233
           'first-line': 277L,
1239 1234
           'folded-linenos': [],
1240
-          'sel-line': 285L,
1241
-          'sel-line-start': 12648L,
1242
-          'selection_end': 12731L,
1243
-          'selection_start': 12702L,
1235
+          'sel-line': 287L,
1236
+          'sel-line-start': 12688L,
1237
+          'selection_end': 12721L,
1238
+          'selection_start': 12707L,
1244 1239
           'zoom': 0L},
1245
-         1520723309.783],
1240
+         1520788096.234],
1246 1241
         [loc('sources/filmix.py'),
1247 1242
          {'attrib-starts': [('Source',
1248 1243
                              31),
1249
-                            ('Source.is_video',
1250
-                             246)],
1251
-          'first-line': 244L,
1244
+                            ('Source.get_streams',
1245
+                             263)],
1246
+          'first-line': 310L,
1252 1247
           'folded-linenos': [],
1253
-          'sel-line': 256L,
1254
-          'sel-line-start': 11420L,
1255
-          'selection_end': 11493L,
1256
-          'selection_start': 11493L,
1248
+          'sel-line': 320L,
1249
+          'sel-line-start': 14054L,
1250
+          'selection_end': 14054L,
1251
+          'selection_start': 14054L,
1257 1252
           'zoom': 0L},
1258
-         1520723337.649],
1259
-        [loc('run.py'),
1260
-         {'attrib-starts': [('Main',
1261
-                             22),
1262
-                            ('Main.list_action',
1263
-                             106)],
1264
-          'first-line': 134L,
1253
+         1520788277.433],
1254
+        [loc('sources/filmix.py'),
1255
+         {'attrib-starts': [('Source',
1256
+                             31),
1257
+                            ('Source.get_streams',
1258
+                             263)],
1259
+          'first-line': 280L,
1265 1260
           'folded-linenos': [],
1266
-          'sel-line': 144L,
1267
-          'sel-line-start': 5793L,
1268
-          'selection_end': 5793L,
1269
-          'selection_start': 5793L,
1261
+          'sel-line': 288L,
1262
+          'sel-line-start': 12733L,
1263
+          'selection_end': 12733L,
1264
+          'selection_start': 12733L,
1270 1265
           'zoom': 0L},
1271
-         1520725062.283]],
1266
+         1520788281.42]],
1272 1267
         20),
1273 1268
         'current-loc': loc('sources/filmix.py'),
1274 1269
         'editor-state-list': [(loc('run.py'),
1275 1270
                                {'attrib-starts': [('Main',
1276 1271
         22),
1277
-        ('Main.list_action',
1278
-         106)],
1279
-                                'first-line': 134L,
1272
+        ('Main.initUI',
1273
+         47)],
1274
+                                'first-line': 63L,
1280 1275
                                 'folded-linenos': [],
1281
-                                'sel-line': 144L,
1282
-                                'sel-line-start': 5793L,
1283
-                                'selection_end': 5793L,
1284
-                                'selection_start': 5793L,
1276
+                                'sel-line': 68L,
1277
+                                'sel-line-start': 2618L,
1278
+                                'selection_end': 2618L,
1279
+                                'selection_start': 2618L,
1285 1280
                                 'zoom': 0L}),
1286 1281
                               (loc('util.py'),
1287
-                               {'attrib-starts': [('_substitute_entity',
1288
-        506)],
1282
+                               {'attrib-starts': [('unescape',
1283
+        538)],
1289 1284
                                 'first-line': 537L,
1290 1285
                                 'folded-linenos': [],
1291
-                                'sel-line': 522L,
1292
-                                'sel-line-start': 16579L,
1286
+                                'sel-line': 540L,
1287
+                                'sel-line-start': 16550L,
1293 1288
                                 'selection_end': 16598L,
1294 1289
                                 'selection_start': 16598L,
1295 1290
                                 'zoom': 0L}),
@@ -1353,14 +1348,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1353 1348
                               (loc('sources/filmix.py'),
1354 1349
                                {'attrib-starts': [('Source',
1355 1350
         31),
1356
-        ('Source.is_video',
1357
-         246)],
1358
-                                'first-line': 244L,
1351
+        ('Source.get_streams',
1352
+         263)],
1353
+                                'first-line': 280L,
1359 1354
                                 'folded-linenos': [],
1360
-                                'sel-line': 256L,
1361
-                                'sel-line-start': 11420L,
1362
-                                'selection_end': 11493L,
1363
-                                'selection_start': 11493L,
1355
+                                'sel-line': 288L,
1356
+                                'sel-line-start': 12733L,
1357
+                                'selection_end': 12813L,
1358
+                                'selection_start': 12813L,
1364 1359
                                 'zoom': 0L}),
1365 1360
                               (loc('Downloader.py'),
1366 1361
                                {'attrib-starts': [('get_header',
@@ -1411,6 +1406,18 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1411 1406
                                 'sel-line-start': 4268L,
1412 1407
                                 'selection_end': 4268L,
1413 1408
                                 'selection_start': 4268L,
1409
+                                'zoom': 0L}),
1410
+                              (loc('../../../../../Python27/Lib/lib-tk/Tkinter.py'),
1411
+                               {'attrib-starts': [('CallWrapper',
1412
+        1528),
1413
+        ('CallWrapper.__call__',
1414
+         1536)],
1415
+                                'first-line': 1537L,
1416
+                                'folded-linenos': [],
1417
+                                'sel-line': 1542L,
1418
+                                'sel-line-start': 60799L,
1419
+                                'selection_end': 60799L,
1420
+                                'selection_start': 60799L,
1414 1421
                                 'zoom': 0L})],
1415 1422
         'has-focus': True,
1416 1423
         'locked': False},
@@ -1426,7 +1433,8 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1426 1433
          loc('sources/euronews.py'),
1427 1434
          loc('resolver.py'),
1428 1435
          loc('resolvers/cloudsany.py'),
1429
-         loc('sources/config.py')]),
1436
+         loc('sources/config.py'),
1437
+         loc('../../../../../Python27/Lib/lib-tk/Tkinter.py')]),
1430 1438
                                'open_files': [u'ContentSources.py',
1431 1439
         u'Downloader.py',
1432 1440
         u'resolver.py',
@@ -1455,6 +1463,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1455 1463
                          1858,
1456 1464
                          1080)}]}
1457 1465
 guimgr.recent-documents = [loc('sources/filmix.py'),
1466
+                           loc('../../../../../Python27/Lib/lib-tk/Tkinter.py'),
1458 1467
                            loc('run.py'),
1459 1468
                            loc('util.py'),
1460 1469
                            loc('ContentSources.py'),
@@ -1913,16 +1922,7 @@ guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
1913 1922
         'sel-line-start': 0,
1914 1923
         'selection_end': 1,
1915 1924
         'selection_start': 1},
1916
-                       loc('../../../../../Python27/Lib/ftplib.py'): {'attri'\
1917
-        'b-starts': [],
1918
-        'first-line': 0L,
1919
-        'folded-linenos': [],
1920
-        'sel-line': 0L,
1921
-        'sel-line-start': 0L,
1922
-        'selection_end': 0L,
1923
-        'selection_start': 0L,
1924
-        'zoom': 0L},
1925
-                       loc('../../../../../Python27/lib/lib-tk/Tkinter.py'): {'a'\
1925
+                       loc('../../../../../Python27/Lib/lib-tk/Tkinter.py'): {'a'\
1926 1926
         'ttrib-starts': [('Wm',
1927 1927
                           1590),
1928 1928
                          ('Wm.wm_geometry',
@@ -1933,6 +1933,15 @@ guimgr.visual-state = {loc('../../../Python25/Lib/BeautifulSoup.py'): {'attr'\
1933 1933
         'sel-line-start': 66037L,
1934 1934
         'selection_end': 66037L,
1935 1935
         'selection_start': 66037L,
1936
+        'zoom': 0L},
1937
+                       loc('../../../../../Python27/lib/ftplib.py'): {'attri'\
1938
+        'b-starts': [],
1939
+        'first-line': 0L,
1940
+        'folded-linenos': [],
1941
+        'sel-line': 0L,
1942
+        'sel-line-start': 0L,
1943
+        'selection_end': 0L,
1944
+        'selection_start': 0L,
1936 1945
         'zoom': 0L},
1937 1946
                        loc('../../../../../Python27/lib/lib-tk/tkCommonDialog.py'): {'a'\
1938 1947
         'ttrib-starts': [('Dialog',
@@ -1996,7 +2005,9 @@ proj.env-vars = {None: ('default',
1996 2005
                         [u''])}
1997 2006
 search.replace-history = [u'www.shortcut.lv',
1998 2007
                           u'shortcut.lv']
1999
-search.search-history = [u'cfg_file',
2008
+search.search-history = [u'get_movie_info',
2009
+                         u'player_data',
2010
+                         u'cfg_file',
2000 2011
                          u'read_streams',
2001 2012
                          u'read_stream',
2002 2013
                          u'confif_file',
@@ -2013,9 +2024,7 @@ search.search-history = [u'cfg_file',
2013 2024
                          u'order=',
2014 2025
                          u'API_URL',
2015 2026
                          u'thumbnail',
2016
-                         u'http:',
2017
-                         u'www.lattelecom.tv',
2018
-                         u'http://www']
2027
+                         u'http:']
2019 2028
 testing.stored-results = (1,
2020 2029
                           [],
2021 2030
                           {})

+ 16
- 17
sources/filmix.py View File

@@ -248,17 +248,16 @@ Cookie: FILMIXNET=%s;
248 248
         source,data,path,plist,clist,params,qs = self.parse_data(data)
249 249
         if clist == "play" and "e=" in data:
250 250
             return True
251
-        elif clist=="play" and not params:
252
-            r = self.call(path)
253
-            #r = r.decode("cp1251").encode("utf8")
254
-            #m = re.search('itemprop="contentUrl" content="(.+?)"', r, re.IGNORECASE | re.DOTALL)
255
-            #if not m:
256
-            #if u"Фильм <a href=" in r.decode("cp1251"):
257
-            if u"Сериал <a href=" in  r.decode("cp1251", "replace"):
258
-                return False
259
-            else:
251
+        elif clist == "play" and "s=" in data:
252
+            return False
253
+        elif clist=="play":
254
+            vid = path.split("/")[1]
255
+            js =  self.get_movie_info(vid)
256
+            pl =  js["message"]["translations"]["pl"]
257
+            if pl == "no":
260 258
                 return True
261
-
259
+            else:
260
+                return False
262 261
         else:
263 262
             return False
264 263
 
@@ -278,16 +277,16 @@ Cookie: FILMIXNET=%s;
278 277
         duration = "(%s)"%m.group(1) if m else ""
279 278
         m = re.search('<p itemprop="description"[^>]+>([^<]+)<', r, re.DOTALL)
280 279
         desc = desc0 =  util.unescape(m.group(1).strip()) if m else ""
281
-        m = re.search('itemprop="contentUrl" content="(.+?)"', r, re.IGNORECASE | re.DOTALL)
282
-        if not m:
283
-            raise Exception("Can not find video link")
284
-            #return []
285
-        video_link = m.group(1)
286
-        series = True if u"Сериал <a href=" in  r.decode("cp1251", "replace")  else False
280
+        #m = re.search('itemprop="contentUrl" content="(.+?)"', r, re.IGNORECASE | re.DOTALL)
281
+        #if not m:
282
+        #    raise Exception("Can not find video link")
283
+        #    #return []
284
+        #video_link = m.group(1)
287 285
         vid = plist[1]
288 286
         m = re.search(r"meta_key = \['(\w+)', '(\w+)', '(\w+)'\]", r, re.IGNORECASE)
289 287
         key = m.group(3) if m else ""
290
-        js = self.get_movie_info(vid,key)
288
+        js =  self.get_movie_info(vid, key)
289
+        series = True if js["message"]["translations"]["pl"] == "yes" else False
291 290
         translations = js["message"]["translations"]["html5"]
292 291
 
293 292
         if not series : # Filma