Ivars 5 years ago
parent
commit
11fcc93fb2
5 changed files with 245 additions and 234 deletions
  1. 36
    19
      Contents/Code/__init__.py
  2. 1
    1
      Contents/VERSION
  3. 9
    0
      changelog.md
  4. 198
    213
      project.wpr
  5. 1
    1
      restart.ps1

+ 36
- 19
Contents/Code/__init__.py View File

@@ -5,11 +5,12 @@ try:
5 5
 except:
6 6
     pass
7 7
 
8
-VERSION = "0.1.29"
8
+VERSION = "0.1.33"
9 9
 CHANNEL_NAME = "PlayStream"
10 10
 PREFIX   = '/video/playstream'
11 11
 DEV = True if Platform.MachineIdentifier == 'Unit testing' else False
12
-REPO_URL = "http://home.blue.lv/files/PlayStream.bundle/"
12
+REPO_URL = "http://files.blue.lv/PlayStream.bundle/?sort=time&order=asc"
13
+DOWNLOAD_URL = "http://files.blue.lv/PlayStream.bundle/"
13 14
 ART = "art-default.jpg"
14 15
 ICON = "icon-default.png"
15 16
 BACK = "back.png"
@@ -37,15 +38,25 @@ plugins_dir = Core.storage.join_path(Core.app_support_path, "Plug-ins", "")
37 38
 
38 39
 sources_directory = os.path.join(os.path.dirname(inspect.getsourcefile(content)), "sources")
39 40
 use_streams_file_remote = Prefs["general_use_streams_file_remote"]
40
-if Prefs["general_use_streams_file_remote"]:
41
-    try:
42
-        sources = ContentSources(sources_directory, Prefs["general_streams_file_remote"])
43
-    except:
44
-        Log("Can not open remote streams file, fallback to local")
45
-        sources = ContentSources(sources_directory, Prefs["general_streams_file"])
41
+streams_file = Prefs["general_streams_file"]
42
+streams_file_remote =  Prefs["general_streams_file_remote"]
43
+
44
+Log("[playstream] Create sources objects")
45
+if use_streams_file_remote:
46
+    cfg_file = streams_file_remote
47
+    cfg_file2 = streams_file
46 48
 else:
47
-    sources = ContentSources(sources_directory, Prefs["general_streams_file"])
49
+    cfg_file = streams_file
50
+    cfg_file2 = None
51
+try:
52
+    sources = ContentSources(sources_directory, cfg_file, cfg_file2)
53
+except Exception as e:
54
+    Log(traceback.format_exc())
55
+
48 56
 cfg = sources.plugins["config"]
57
+Log("[playstream] Using streams_file=%s"% cfg.streams_file)
58
+ObjectContainer(header="Info", message="Using streams_file %s, reload plugin" % cfg.streams_file)
59
+
49 60
 data0 = None
50 61
 title0 = None
51 62
 history = []
@@ -328,24 +339,30 @@ def UpdatePlugin(ver):
328 339
         ver = get_repo_version()
329 340
         #return ObjectContainer(header="Error", message="ver=" % ver)
330 341
     fname = "PlayStream.bundle-%s.zip" % ver
331
-    url = REPO_URL + fname
342
+    url = DOWNLOAD_URL + fname
332 343
     path = os.path.join(tmp_dir, fname)
333 344
     try:
334 345
         urllib.urlretrieve(url, path)
346
+        with zipfile.ZipFile(path,"r") as zip_ref:
347
+            zip_ref.extractall(plugins_dir)
335 348
     except:
336 349
         return ObjectContainer(header="Error", message="Can not download \n%s" % url)
337
-    with zipfile.ZipFile(path,"r") as zip_ref:
338
-        zip_ref.extractall(plugins_dir)
339 350
     return ObjectContainer(header="Info", message="Plugin version updated to %s, reload plugin" % ver)
340 351
 
341 352
 def get_repo_version():
342
-    r = requests.get(REPO_URL)
343
-    if r.status_code <> 200:
344
-        raise Exception("Can not reach repo")
345
-    vers = re.findall('href="PlayStream\.bundle-(\d+\.\d+\.\d+)\.zip"', r.content)
346
-    #vers.sort(reverse=True)
347
-    repo_version = vers[-1]
348
-    return repo_version
353
+    try:
354
+        r = requests.get(REPO_URL)
355
+        if r.status_code <> 200:
356
+            Log("[playstream] Can not reach repo")
357
+            return ""
358
+        vers = re.findall('href=".*PlayStream\.bundle-(\d+\.\d+\.\d+)\.zip"', r.content)
359
+        #vers.sort(reverse=True)
360
+        repo_version = vers[-1] if vers else 0
361
+        return repo_version
362
+    except:
363
+        Log("[playstream] Can not reach repo")
364
+        return ""
365
+
349 366
 
350 367
 def thumb_data(img, video=False):
351 368
     default =  R(VIDEO) if video else R(FOLDER)

+ 1
- 1
Contents/VERSION View File

@@ -1 +1 @@
1
-0.1.28
1
+0.1.33

+ 9
- 0
changelog.md View File

@@ -1,3 +1,12 @@
1
+**0.1.32** (26.01.2019  )
2
+- [fix] salabots pēc servera crasha
3
+
4
+**0.1.31** (23.12.2018)
5
+- [fix] salabots tvplay, filmix
6
+
7
+**0.1.30** (08.11.2018)
8
+- [bugfix] Papildināts lmt (delfi video)
9
+
1 10
 **0.1.28** (12.10.2018)
2 11
 - [bugfix] Salabots replay
3 12
 

+ 198
- 213
project.wpr View File

@@ -30,23 +30,23 @@ proj.launch-config = {loc('iub_db.py'): ('project',
30 30
                                        (u'config::home',
31 31
         ''))}
32 32
 [user attributes]
33
-debug.breakpoints = {loc('Contents/Code/__init__.py'): {176L: (0,
33
+debug.breakpoints = {loc('Contents/Code/__init__.py'): {187L: (0,
34 34
         None,
35 35
         1,
36 36
         0),
37
-        184L: (0,
37
+        195L: (0,
38 38
                None,
39 39
                1,
40 40
                0),
41
-        211L: (0,
41
+        222L: (0,
42 42
                None,
43 43
                1,
44 44
                0),
45
-        212L: (0,
45
+        223L: (0,
46 46
                None,
47 47
                1,
48 48
                0),
49
-        302L: (0,
49
+        313L: (0,
50 50
                None,
51 51
                1,
52 52
                0)},
@@ -194,7 +194,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
194 194
         'tree-states': {'deep': {'expanded-nodes': [(1,),
195 195
         (1,
196 196
          0),
197
-        (15,)],
197
+        (17,)],
198 198
                                  'selected-nodes': [(1,
199 199
         0,
200 200
         0)],
@@ -603,17 +603,17 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
603 603
         'top-node': [('generic attribute',
604 604
                       loc('../../../Python27/Lib/site-packages/win32com/client/dynamic.py'),
605 605
                       'ALL_INVOKE_TYPES')]},
606
-        loc('unknown:<untitled> #3'): {'column-widths': [1.0],
606
+        loc('unknown:<untitled> #6'): {'column-widths': [1.0],
607 607
                                        'expanded-nodes': [],
608 608
                                        'selected-nodes': [],
609 609
                                        'top-node': None},
610
-        loc('unknown:<untitled> #6'): {'expanded-nodes': [],
610
+        loc('unknown:<untitled> #5'): {'expanded-nodes': [],
611 611
                                        'selected-nodes': [],
612 612
                                        'top-node': None},
613 613
         loc('unknown:<untitled> #4'): {'expanded-nodes': [],
614 614
                                        'selected-nodes': [],
615 615
                                        'top-node': None},
616
-        loc('unknown:<untitled> #5'): {'column-widths': [1.0],
616
+        loc('unknown:<untitled> #3'): {'column-widths': [1.0],
617 617
                                        'expanded-nodes': [],
618 618
                                        'selected-nodes': [],
619 619
                                        'top-node': None}},
@@ -644,7 +644,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
644 644
         'current_pages': [3,
645 645
                           1],
646 646
         'notebook_display': 'normal',
647
-        'notebook_percent': 0.399519615692554,
647
+        'notebook_percent': 0.15852682145716568,
648 648
         'override_title': None,
649 649
         'pagelist': [('debug-breakpoints',
650 650
                       'wide',
@@ -673,7 +673,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
673 673
                                        'fRegexFlags': 42,
674 674
                                        'fReplaceText': u'REPO_URL',
675 675
                                        'fReverse': False,
676
-                                       'fSearchText': u'rais',
676
+                                       'fSearchText': u'repo',
677 677
                                        'fStartPos': 0,
678 678
                                        'fStyle': 'text',
679 679
                                        'fWholeWords': False,
@@ -768,9 +768,9 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
768 768
                        'history': {},
769 769
                        'launch-id': None,
770 770
                        'sel-line': 2L,
771
-                       'sel-line-start': 174L,
772
-                       'selection_end': 174L,
773
-                       'selection_start': 174L,
771
+                       'sel-line-start': 163L,
772
+                       'selection_end': 163L,
773
+                       'selection_start': 163L,
774 774
                        'zoom': 0L}),
775 775
                      ('debug-watch',
776 776
                       'wide',
@@ -788,246 +788,231 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
788 788
                                       'top-node': (0,)}})],
789 789
         'primary_view_state': {'editor_states': ('horizontal',
790 790
         1.0,
791
-        ({'bookmarks': ([[loc('Contents/Libraries/Shared/content/sources/enigma2.py'),
792
-                          {'attrib-starts': [('Source',
793
-        31),
794
-        ('Source.__init__',
795
-         33)],
796
-                           'first-line': 37L,
791
+        ({'bookmarks': ([[loc('Contents/Code/__init__.py'),
792
+                          {'attrib-starts': [('UpdatePlugin',
793
+        333)],
794
+                           'first-line': 315L,
797 795
                            'folded-linenos': [],
798
-                           'sel-line': 48L,
799
-                           'sel-line-start': 1665L,
800
-                           'selection_end': 1686L,
801
-                           'selection_start': 1673L,
796
+                           'sel-line': 337L,
797
+                           'sel-line-start': 12655L,
798
+                           'selection_end': 12685L,
799
+                           'selection_start': 12669L,
802 800
                            'zoom': 0L},
803
-                          1536084222.996],
804
-                         [loc('Contents/Libraries/Shared/content/sources/enigma2.py'),
805
-                          {'attrib-starts': [('Source',
806
-        31),
807
-        ('Source.get_content',
808
-         56)],
809
-                           'first-line': 46L,
801
+                          1548517999.489],
802
+                         [loc('Contents/Code/__init__.py'),
803
+                          {'attrib-starts': [('get_repo_version',
804
+        350)],
805
+                           'first-line': 337L,
810 806
                            'folded-linenos': [],
811
-                           'sel-line': 58L,
812
-                           'sel-line-start': 2048L,
813
-                           'selection_end': 2069L,
814
-                           'selection_start': 2056L,
807
+                           'sel-line': 358L,
808
+                           'sel-line-start': 13522L,
809
+                           'selection_end': 13568L,
810
+                           'selection_start': 13568L,
815 811
                            'zoom': 0L},
816
-                          1536084225.402],
817
-                         [loc('Contents/Libraries/Shared/content/sources/enigma2.py'),
818
-                          {'attrib-starts': [('Source',
819
-        31),
820
-        ('Source.__init__',
821
-         33)],
822
-                           'first-line': 37L,
812
+                          1548518146.443],
813
+                         [loc('Contents/Code/__init__.py'),
814
+                          {'attrib-starts': [],
815
+                           'first-line': 14L,
823 816
                            'folded-linenos': [],
824
-                           'sel-line': 48L,
825
-                           'sel-line-start': 1665L,
826
-                           'selection_end': 1686L,
827
-                           'selection_start': 1673L,
817
+                           'sel-line': 19L,
818
+                           'sel-line-start': 463L,
819
+                           'selection_end': 468L,
820
+                           'selection_start': 463L,
828 821
                            'zoom': 0L},
829
-                          1536084227.098],
830
-                         [loc('Contents/Libraries/Shared/content/sources/enigma2.py'),
831
-                          {'attrib-starts': [('Source',
832
-        31),
833
-        ('Source.get_content',
834
-         56)],
835
-                           'first-line': 46L,
822
+                          1548518147.164],
823
+                         [loc('Contents/Code/__init__.py'),
824
+                          {'attrib-starts': [],
825
+                           'first-line': 14L,
836 826
                            'folded-linenos': [],
837
-                           'sel-line': 58L,
838
-                           'sel-line-start': 2048L,
839
-                           'selection_end': 2069L,
840
-                           'selection_start': 2056L,
827
+                           'sel-line': 19L,
828
+                           'sel-line-start': 463L,
829
+                           'selection_end': 478L,
830
+                           'selection_start': 473L,
841 831
                            'zoom': 0L},
842
-                          1536084236.843],
832
+                          1548518147.555],
843 833
                          [loc('Contents/Code/__init__.py'),
844 834
                           {'attrib-starts': [('Menu',
845
-        134)],
846
-                           'first-line': 343L,
835
+        144)],
836
+                           'first-line': 279L,
847 837
                            'folded-linenos': [],
848
-                           'sel-line': 221L,
849
-                           'sel-line-start': 8453L,
850
-                           'selection_end': 8500L,
851
-                           'selection_start': 8500L,
838
+                           'sel-line': 301L,
839
+                           'sel-line-start': 11425L,
840
+                           'selection_end': 11455L,
841
+                           'selection_start': 11450L,
852 842
                            'zoom': 0L},
853
-                          1536084239.931],
843
+                          1548518148.255],
854 844
                          [loc('Contents/Code/__init__.py'),
855
-                          {'attrib-starts': [],
856
-                           'first-line': 31L,
845
+                          {'attrib-starts': [('Menu',
846
+        144)],
847
+                           'first-line': 286L,
857 848
                            'folded-linenos': [],
858
-                           'sel-line': 43L,
859
-                           'sel-line-start': 1333L,
860
-                           'selection_end': 1357L,
861
-                           'selection_start': 1354L,
849
+                           'sel-line': 308L,
850
+                           'sel-line-start': 11648L,
851
+                           'selection_end': 11672L,
852
+                           'selection_start': 11667L,
862 853
                            'zoom': 0L},
863
-                          1536084240.066],
854
+                          1548518149.319],
864 855
                          [loc('Contents/Code/__init__.py'),
865 856
                           {'attrib-starts': [('Menu',
866
-        134)],
867
-                           'first-line': 206L,
857
+        144)],
858
+                           'first-line': 298L,
868 859
                            'folded-linenos': [],
869
-                           'sel-line': 224L,
870
-                           'sel-line-start': 8591L,
871
-                           'selection_end': 8617L,
872
-                           'selection_start': 8615L,
860
+                           'sel-line': 312L,
861
+                           'sel-line-start': 11814L,
862
+                           'selection_end': 11844L,
863
+                           'selection_start': 11839L,
873 864
                            'zoom': 0L},
874
-                          1536084240.178],
865
+                          1548518150.293],
875 866
                          [loc('Contents/Code/__init__.py'),
876 867
                           {'attrib-starts': [('Menu',
877
-        134)],
878
-                           'first-line': 206L,
868
+        144)],
869
+                           'first-line': 298L,
879 870
                            'folded-linenos': [],
880
-                           'sel-line': 221L,
881
-                           'sel-line-start': 8453L,
882
-                           'selection_end': 8505L,
883
-                           'selection_start': 8504L,
871
+                           'sel-line': 314L,
872
+                           'sel-line-start': 11879L,
873
+                           'selection_end': 11906L,
874
+                           'selection_start': 11901L,
884 875
                            'zoom': 0L},
885
-                          1536084242.377],
876
+                          1548518150.958],
886 877
                          [loc('Contents/Code/__init__.py'),
887 878
                           {'attrib-starts': [('Menu',
888
-        134)],
889
-                           'first-line': 282L,
879
+        144)],
880
+                           'first-line': 298L,
890 881
                            'folded-linenos': [],
891
-                           'sel-line': 300L,
892
-                           'sel-line-start': 11687L,
893
-                           'selection_end': 11732L,
894
-                           'selection_start': 11725L,
882
+                           'sel-line': 315L,
883
+                           'sel-line-start': 11911L,
884
+                           'selection_end': 11952L,
885
+                           'selection_start': 11947L,
895 886
                            'zoom': 0L},
896
-                          1536084244.802],
887
+                          1548518151.379],
897 888
                          [loc('Contents/Code/__init__.py'),
898
-                          {'attrib-starts': [],
899
-                           'first-line': 50L,
889
+                          {'attrib-starts': [('Menu',
890
+        144)],
891
+                           'first-line': 298L,
900 892
                            'folded-linenos': [],
901
-                           'sel-line': 67L,
902
-                           'sel-line-start': 2333L,
903
-                           'selection_end': 2367L,
904
-                           'selection_start': 2359L,
893
+                           'sel-line': 315L,
894
+                           'sel-line-start': 11911L,
895
+                           'selection_end': 11978L,
896
+                           'selection_start': 11973L,
905 897
                            'zoom': 0L},
906
-                          1536084263.038],
898
+                          1548518151.776],
907 899
                          [loc('Contents/Code/__init__.py'),
908
-                          {'attrib-starts': [('ValidatePrefs',
909
-        89)],
910
-                           'first-line': 83L,
900
+                          {'attrib-starts': [('Menu',
901
+        144)],
902
+                           'first-line': 298L,
911 903
                            'folded-linenos': [],
912
-                           'sel-line': 101L,
913
-                           'sel-line-start': 3693L,
914
-                           'selection_end': 3750L,
915
-                           'selection_start': 3743L,
904
+                           'sel-line': 320L,
905
+                           'sel-line-start': 12013L,
906
+                           'selection_end': 12035L,
907
+                           'selection_start': 12030L,
916 908
                            'zoom': 0L},
917
-                          1536084324.408],
909
+                          1548518152.204],
918 910
                          [loc('Contents/Code/__init__.py'),
919 911
                           {'attrib-starts': [],
920
-                           'first-line': 62L,
912
+                           'first-line': 9L,
921 913
                            'folded-linenos': [],
922
-                           'sel-line': 67L,
923
-                           'sel-line-start': 2333L,
924
-                           'selection_end': 2367L,
925
-                           'selection_start': 2359L,
914
+                           'sel-line': 11L,
915
+                           'sel-line-start': 243L,
916
+                           'selection_end': 251L,
917
+                           'selection_start': 243L,
926 918
                            'zoom': 0L},
927
-                          1536084325.886],
919
+                          1548518724.538],
928 920
                          [loc('Contents/Code/__init__.py'),
929
-                          {'attrib-starts': [],
930
-                           'first-line': 75L,
921
+                          {'attrib-starts': [('UpdatePlugin',
922
+        333)],
923
+                           'first-line': 319L,
931 924
                            'folded-linenos': [],
932
-                           'sel-line': 10L,
933
-                           'sel-line-start': 172L,
934
-                           'selection_end': 182L,
935
-                           'selection_start': 178L,
925
+                           'sel-line': 340L,
926
+                           'sel-line-start': 12826L,
927
+                           'selection_end': 12844L,
928
+                           'selection_start': 12836L,
936 929
                            'zoom': 0L},
937
-                          1536084449.82],
930
+                          1548518725.725],
938 931
                          [loc('Contents/Code/__init__.py'),
939
-                          {'attrib-starts': [],
940
-                           'first-line': 62L,
932
+                          {'attrib-starts': [('get_repo_version',
933
+        350)],
934
+                           'first-line': 331L,
941 935
                            'folded-linenos': [],
942
-                           'sel-line': 67L,
943
-                           'sel-line-start': 2333L,
944
-                           'selection_end': 2367L,
945
-                           'selection_start': 2359L,
936
+                           'sel-line': 352L,
937
+                           'sel-line-start': 13274L,
938
+                           'selection_end': 13307L,
939
+                           'selection_start': 13299L,
946 940
                            'zoom': 0L},
947
-                          1536084451.309],
941
+                          1548518726.723],
948 942
                          [loc('Contents/Code/__init__.py'),
949
-                          {'attrib-starts': [('ValidatePrefs',
950
-        89)],
951
-                           'first-line': 83L,
943
+                          {'attrib-starts': [],
944
+                           'first-line': 6L,
952 945
                            'folded-linenos': [],
953
-                           'sel-line': 99L,
954
-                           'sel-line-start': 3635L,
955
-                           'selection_end': 3670L,
956
-                           'selection_start': 3665L,
946
+                           'sel-line': 11L,
947
+                           'sel-line-start': 243L,
948
+                           'selection_end': 251L,
949
+                           'selection_start': 243L,
957 950
                            'zoom': 0L},
958
-                          1536084482.223],
959
-                         [loc('Contents/Libraries/Shared/content/sources/enigma2.py'),
960
-                          {'attrib-starts': [('Source',
961
-        31),
962
-        ('Source.get_content',
963
-         56)],
964
-                           'first-line': 40L,
951
+                          1548518727.701],
952
+                         [loc('Contents/Code/__init__.py'),
953
+                          {'attrib-starts': [('UpdatePlugin',
954
+        333)],
955
+                           'first-line': 319L,
965 956
                            'folded-linenos': [],
966
-                           'sel-line': 68L,
967
-                           'sel-line-start': 2506L,
968
-                           'selection_end': 2545L,
969
-                           'selection_start': 2545L,
957
+                           'sel-line': 340L,
958
+                           'sel-line-start': 12826L,
959
+                           'selection_end': 12844L,
960
+                           'selection_start': 12836L,
970 961
                            'zoom': 0L},
971
-                          1536085986.221],
972
-                         [loc('Contents/Libraries/Shared/content/sources/enigma2.py'),
973
-                          {'attrib-starts': [('Source',
974
-        31),
975
-        ('Source.get_streams',
976
-         125)],
977
-                           'first-line': 133L,
962
+                          1548518734.23],
963
+                         [loc('Contents/Code/__init__.py'),
964
+                          {'attrib-starts': [('get_repo_version',
965
+        350)],
966
+                           'first-line': 337L,
978 967
                            'folded-linenos': [],
979
-                           'sel-line': 145L,
980
-                           'sel-line-start': 5620L,
981
-                           'selection_end': 5636L,
982
-                           'selection_start': 5632L,
968
+                           'sel-line': 352L,
969
+                           'sel-line-start': 13274L,
970
+                           'selection_end': 13307L,
971
+                           'selection_start': 13299L,
983 972
                            'zoom': 0L},
984
-                          1536085990.308],
973
+                          1548518737.533],
985 974
                          [loc('Contents/Code/__init__.py'),
986
-                          {'attrib-starts': [('ValidatePrefs',
987
-        89)],
988
-                           'first-line': 83L,
975
+                          {'attrib-starts': [],
976
+                           'first-line': 6L,
989 977
                            'folded-linenos': [],
990
-                           'sel-line': 99L,
991
-                           'sel-line-start': 3635L,
992
-                           'selection_end': 3670L,
993
-                           'selection_start': 3665L,
978
+                           'sel-line': 12L,
979
+                           'sel-line-start': 317L,
980
+                           'selection_end': 325L,
981
+                           'selection_start': 325L,
994 982
                            'zoom': 0L},
995
-                          1536086169.267],
996
-                         [loc('Contents/Libraries/Shared/content/sources/enigma2.py'),
997
-                          {'attrib-starts': [('Source',
998
-        31),
999
-        ('Source.get_content',
1000
-         56)],
1001
-                           'first-line': 52L,
983
+                          1548518753.289],
984
+                         [loc('Contents/Code/__init__.py'),
985
+                          {'attrib-starts': [('Menu',
986
+        145)],
987
+                           'first-line': 286L,
1002 988
                            'folded-linenos': [],
1003
-                           'sel-line': 62L,
1004
-                           'sel-line-start': 2248L,
1005
-                           'selection_end': 2248L,
1006
-                           'selection_start': 2248L,
989
+                           'sel-line': 307L,
990
+                           'sel-line-start': 11675L,
991
+                           'selection_end': 11702L,
992
+                           'selection_start': 11698L,
1007 993
                            'zoom': 0L},
1008
-                          1536121150.448],
1009
-                         [loc('Contents/Libraries/Shared/content/util.py'),
1010
-                          {'attrib-starts': [('item',
1011
-        362)],
1012
-                           'first-line': 359L,
994
+                          1548518756.743],
995
+                         [loc('Contents/Code/__init__.py'),
996
+                          {'attrib-starts': [('UpdateMenu',
997
+        322)],
998
+                           'first-line': 303L,
1013 999
                            'folded-linenos': [],
1014
-                           'sel-line': 364L,
1015
-                           'sel-line-start': 12687L,
1016
-                           'selection_end': 12702L,
1017
-                           'selection_start': 12702L,
1000
+                           'sel-line': 324L,
1001
+                           'sel-line-start': 12184L,
1002
+                           'selection_end': 12207L,
1003
+                           'selection_start': 12203L,
1018 1004
                            'zoom': 0L},
1019
-                          1536121152.447]],
1005
+                          1548518757.702]],
1020 1006
                         20),
1021
-          'current-loc': loc('Contents/Libraries/Shared/content/sources/enigma2.py'),
1007
+          'current-loc': loc('Contents/Code/__init__.py'),
1022 1008
           'editor-state-list': [(loc('Contents/Code/__init__.py'),
1023
-                                 {'attrib-starts': [('ValidatePrefs',
1024
-        89)],
1025
-                                  'first-line': 83L,
1009
+                                 {'attrib-starts': [],
1010
+                                  'first-line': 0L,
1026 1011
                                   'folded-linenos': [],
1027
-                                  'sel-line': 99L,
1028
-                                  'sel-line-start': 3635L,
1029
-                                  'selection_end': 3670L,
1030
-                                  'selection_start': 3665L,
1012
+                                  'sel-line': 14L,
1013
+                                  'sel-line-start': 369L,
1014
+                                  'selection_end': 372L,
1015
+                                  'selection_start': 372L,
1031 1016
                                   'zoom': 0L}),
1032 1017
                                 (loc('test.py'),
1033 1018
                                  {'attrib-starts': [],
@@ -1381,16 +1366,16 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1381 1366
           loc('syspath.py'),
1382 1367
           loc('../../../../Program Files (x86)/Plex/Plex Media Server/Resources/Plug-ins-313f93718/Framework.bundle/Contents/Resources/Versions/2/Python/Framework/components/runtime.py')])),
1383 1368
                                'open_files': [u'Contents/Code/DumbTools.py',
1369
+        u'Contents/Info.plist',
1370
+        u'Contents/Libraries/Shared/content/sources/enigma2.py',
1371
+        u'Contents/Libraries/Shared/content/util.py',
1384 1372
         u'plex_test_case/__init__.py',
1385 1373
         u'plex_test_case/bootstrap.py',
1386 1374
         u'plex_test_case/mock/mock/mock.py',
1375
+        u'plex_test_case/plex.py',
1387 1376
         u'syspath.py',
1388 1377
         u'test.py',
1389
-        u'plex_test_case/plex.py',
1390
-        u'Contents/Info.plist',
1391 1378
         u'Contents/Code/__init__.py',
1392
-        u'Contents/Libraries/Shared/content/util.py',
1393
-        u'Contents/Libraries/Shared/content/sources/enigma2.py',
1394 1379
         u'Contents/Code/__init__.py',
1395 1380
         u'plex_test_case/__init__.py',
1396 1381
         u'plex_test_case/bootstrap.py',
@@ -1413,14 +1398,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
1413 1398
                          0,
1414 1399
                          1541,
1415 1400
                          877)}]}
1416
-guimgr.recent-documents = [loc('Contents/Libraries/Shared/content/sources/enigma2.py'),
1417
-                           loc('Contents/Libraries/Shared/content/util.py'),
1401
+guimgr.recent-documents = [loc('test.py'),
1418 1402
                            loc('Contents/Code/__init__.py'),
1419
-                           loc('Contents/Info.plist'),
1420 1403
                            loc('plex_test_case/plex.py'),
1421
-                           loc('test.py'),
1422
-                           loc('plex_test_case/mock/mock/mock.py'),
1423 1404
                            loc('plex_test_case/__init__.py'),
1405
+                           loc('Contents/Libraries/Shared/content/sources/enigma2.py'),
1406
+                           loc('Contents/Libraries/Shared/content/util.py'),
1407
+                           loc('Contents/Info.plist'),
1408
+                           loc('plex_test_case/mock/mock/mock.py'),
1424 1409
                            loc('Contents/Code/DumbTools.py'),
1425 1410
                            loc('plex_test_case/bootstrap.py'),
1426 1411
                            loc('syspath.py')]
@@ -1927,7 +1912,15 @@ proj.vcs-system-config = ('prefs',
1927 1912
                                    'versioncontrol.svn.extra-global-args': '',
1928 1913
                                    'versioncontrol.svn.svnadmin-executable': u'svnadmin'}})
1929 1914
 search.replace-history = [u'REPO_URL']
1930
-search.search-history = [u'options_',
1915
+search.search-history = [u'repo',
1916
+                         u'REPO_URL',
1917
+                         u'updat',
1918
+                         u'get_repo_version',
1919
+                         u'version',
1920
+                         u'get_repo',
1921
+                         u'except',
1922
+                         u'started',
1923
+                         u'options_',
1931 1924
                          u'self.options_',
1932 1925
                          u'HTTPLiveStreamURL',
1933 1926
                          u'stream',
@@ -1938,15 +1931,7 @@ search.search-history = [u'options_',
1938 1931
                          u'except:',
1939 1932
                          u'"quality"',
1940 1933
                          u'"qu',
1941
-                         u'"qulity"',
1942
-                         u'bitrate',
1943
-                         u'item["',
1944
-                         u'item["qual',
1945
-                         u'(o',
1946
-                         u'CHANNEL_NAME',
1947
-                         u'title',
1948
-                         u'title2=',
1949
-                         u'title2']
1934
+                         u'"qulity"']
1950 1935
 testing.stored-results = (1,
1951 1936
                           [],
1952 1937
                           {})

+ 1
- 1
restart.ps1 View File

@@ -1,2 +1,2 @@
1
-Stop-Process -force -processname "Plex*"
1
+#Stop-Process -force -processname "Plex*"
2 2
 Start-Process -FilePath "C:\Program Files (x86)\Plex\Plex Media Server\Plex Media Server.exe"