addon.py

@@ -33,6 +33,7 @@ use_storage = plugin.get_setting("general_use_storage",bool) # TODO vajag noček
 storage_ttl = plugin.get_setting("general_ttl",int)
 use_proxy = plugin.get_setting("general_proxy_use",bool)
 proxy_url = plugin.get_setting("general_proxy_url",str)
+proxy_remote_key = plugin.get_setting("general_proxy_remote_key",str)
 playlist = plugin.get_setting("general_playlist",str)
 download_dir = plugin.get_setting("general_download_dir",str)
 view_mode = plugin.get_setting("general_view_mode",str)
@@ -235,12 +236,15 @@ def play_video(streams):
     subfiles = []
     #stream = util.stream_chamge(stream)
     if use_proxy:
-        if "resolver" in stream and stream["resolver"] in ("hqq","filmas") or \
-            "surl" in stream and re.search(r"http*://(hqq|goo\.gl)",stream["surl"]) or \
-            "lattelecom.tv/mobile-vod/" in stream["url"]: # TODO
-            #re.search(r"http*://.+?lattelecom\.tv/.+?auth_token=[^=]+=", stream["url"]):
-            stream["url"] = util.streamproxy_encode(stream["url"],stream["headers"],proxy_url)
-            stream["headers"] = {}
+        # if "resolver" in stream and stream["resolver"] in ("hqq","filmas") or \
+        #    "surl" in stream and re.search(r"http*://(hqq|goo\.gl)",stream["surl"]) or \
+        #    "lattelecom.tv/mobile-vod/" in stream["url"]: # TODO
+        3    #re.search(r"http*://.+?lattelecom\.tv/.+?auth_token=[^=]+=", stream["url"]):
+        #    stream["url"] = util.streamproxy_encode(stream["url"],stream["headers"],proxy_url)
+        #    stream["headers"] = {}
+        qs = {"key": proxy_remote_key} if proxy_remote_key else None
+        stream["url"] = util.streamproxy_encode3("playstream", stream["url"], proxy_url, stream["headers"] )
+        stream["headers"] = None
     if stream["headers"]:
         hh = []
         for k in stream["headers"]:

addon.xml

@@ -1,10 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon version="0.1.99" id="plugin.video.playstream" name="PlayStream" provider-name="ivars777"  >
+<addon version="0.2.15" id="plugin.video.playstream" name="PlayStream" provider-name="ivars777"  >
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
     <import addon="script.module.requests" />
     <import addon="script.module.simplejson" />
-    <import addon="script.module.twisted" optional="true"/>
+    <import addon="script.module.pytz" />
+    <!-- <import addon="script.module.twisted" optional="true"/> -->
+    pytz
   </requires>
   <extension point="xbmc.python.pluginsource" library="addon.py">
     <provides>video</provides>

changelog.md

@@ -1,5 +1,10 @@
-**0.1.98** (26.01.2019):
-- [feature] pielikts klāt XTV.lv
+**0.2.15** (06.10.2019):
+- [fix] salabots lmt.lv (Facebook video)
+- [fix] content autonomā git projektā
+
+**0.2.13** (24.02.2019):
+- [feature] playstreamproxy nodrošina m3u8
+- [fix] salabots TVDom
 
 **0.1.98** (23.12.2018):
 - [fix] salabots filmix, tvplay

get_version.py

@@ -1,2 +1,2 @@
 import re,sys
-print re.search('<addon version="([^"]+)',open(sys.argv[1]).read()).group(1)
+print re.search('<addon.+?%s="([^"]+)'%sys.argv[2],open(sys.argv[1]).read()).group(1)

kmake.bat

@@ -1,38 +1,37 @@
 @echo off
 
-:--- Pull content submodule ---
-pushd resources\lib\content
-git commit -a -m labojumi
-git checkout .
-git pull
-popd
-
 :=== Parameters ===
-python get_version.py addon.xml >version.txt
+python -c "import re,sys; print re.search('<addon.+?version=""([^""]+)""',open('addon.xml').read()).group(1)" >version.txt
 set /p ver=<version.txt
-echo %ver%
+python -c "import re,sys; print re.search('<addon.+?id=""([^""]+)""',open('addon.xml').read()).group(1)" >id.txt
+set /p pack_name=<id.txt
+echo %pack_name% %ver%
 pause
 
-set prog=PlayStream
-set pack_name=plugin.video.playstream
-set desc=Play online streams from various sources, mostly Latvian
-
-set ipk_dir=ipkg\
 set release_dir=release\
-set repo_dir=..\repo\
-set feed_dir=q:\web\repo\
+set repo_dir=q:\web\repo\
+:set feed_dir=q:\web\repo\
 
 set AR=\MinGW\bin\ar.exe
 set TAR=\MinGW\msys\1.0\bin\tar.exe
+set CP=\MinGW\msys\1.0\bin\cp.exe
+set ZIP=
 rem set ZIP=\Program Files (x86)\Gow\bin\zip.exe
 
-:=== data files ===
+
+:=== Pull content submodule ===
+pushd resources\lib\content
+:git commit -a -m labojumi
+git checkout .
+git pull
+popd
+
+
+:=== Create package zip file ===
 if exist "%pack_name%" rm -r -f "%pack_name%"
 mkdir "%pack_name%""
 if not exist %release_dir% mkdir %release_dir%
-if not exist %repo_dir% mkdir %repo_dir%
-if not exist  %repo_dir%%pack_name% mkdir  %repo_dir%%pack_name%
-
+echo Copying files to %pack_name%
 
 for %%f in (
 readme.md
@@ -71,7 +70,7 @@ resources\lib\content\sources\iplayer.py
 resources\lib\content\sources\movieplace.py
 resources\lib\content\sources\ltc.py
 resources\lib\content\sources\mtgplay.py
-resources\lib\content\sources\play24.py
+resources\lib\content\sources\xtv.py
 resources\lib\content\sources\replay.py
 resources\lib\content\sources\lmt.py
 resources\lib\content\sources\serialguru.py
@@ -98,29 +97,30 @@ resources\lib\content\resolvers\youtuberesolver.py
 
 xcopy /y /q resources\lib\content\picons\* %pack_name%\resources\picons\
 
-pause
-
+echo Creating %release_dir%%pack_name%-%ver%.zip
 if exist  %release_dir%%pack_name%-%ver%.zip rm %release_dir%%pack_name%-%ver%.zip
-rem zip  -r %release_dir%%pack_name%-%ver%.zip %pack_name%
-"C:\Program Files\WinRAR\winrar.exe" a -afzip -r %release_dir%%pack_name%-%ver%.zip %pack_name%
-copy  addon.xml  %repo_dir%%pack_name%\addon.xml /Y
-copy  %release_dir%%pack_name%-%ver%.zip  %repo_dir%%pack_name%\%pack_name%-%ver%.zip /Y
-python -c "import hashlib; print hashlib.md5(open(r'%repo_dir%%pack_name%\%pack_name%-%ver%.zip','r').read()).hexdigest()" >%repo_dir%%pack_name%\%pack_name%-%ver%.zip.md5
+7za a -r -tzip -bb0 -bsp1 -bso0 %release_dir%%pack_name%-%ver%.zip %pack_name%
+if exist %pack_name% rm -r -f %pack_name%
 
+if ()==(%1%) (
+    GOTO :EOF
+)
+:=== Add to git ===
+echo Adding to git
 git add %release_dir%%pack_name%-%ver%.zip
-rm -r -f "%pack_name%"
+git commit -m %ver%
+git tag -d %ver%
+git tag %ver%
+git push
 
-if not ()==(%1%) (
-    git commit -m %ver%
-    git tag -d %ver%
-    git tag %ver%
-    git push
 
-    pushd  %repo_dir%..
-    call update_repo.bat
-    rem xcopy /s /y /u repo %feed_dir%
-    robocopy repo %feed_dir%  addons.* /copy:dat
-    robocopy repo\%pack_name% q:\web\repo\%pack_name% /copy:DAT /xo
-    popd
+:=== Copy package to repo ===
+echo Copying  %release_dir%%pack_name%-%ver%.zip to %repo_dir%%pack_name%
+if not exist %repo_dir% mkdir %repo_dir%
+if not exist  %repo_dir%%pack_name% mkdir  %repo_dir%%pack_name%
+cp  addon.xml  %repo_dir%%pack_name%\addon.xml -fpv
+cp  %release_dir%%pack_name%-%ver%.zip  %repo_dir%%pack_name%\%pack_name%-%ver%.zip -fpv
+python -c "import hashlib; print hashlib.md5(open(r'%repo_dir%%pack_name%\%pack_name%-%ver%.zip','r').read()).hexdigest()" >%repo_dir%%pack_name%\%pack_name%-%ver%.zip.md5
+python ..\generate_repo.py %repo_dir%
 )
-pause
+

project.wpr

@@ -82,11 +82,7 @@ proj.launch-config = {loc('addon.py'): ('project',
          ''))}
 proj.main-file = loc('addon.py')
 [user attributes]
-debug.breakpoints = {loc('addon.py'): {225L: (0,
-        None,
-        1,
-        0)},
-                     loc('context_download.py'): {125L: (0,
+debug.breakpoints = {loc('context_download.py'): {125L: (0,
         None,
         1,
         0),
@@ -94,11 +90,11 @@ debug.breakpoints = {loc('addon.py'): {225L: (0,
                None,
                1,
                0)},
-                     loc('unknown:<untitled> #2'): {10: (0,
+                     loc('unknown:<untitled> #1'): {10: (0,
         None,
         1,
         0)},
-                     loc('unknown:<untitled> #1'): {2: (0,
+                     loc('unknown:<untitled> #2'): {2: (0,
         None,
         1,
         0)}}
@@ -205,7 +201,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                {'tree-state': {'file-sort-method': 'by name',
         'list-files-first': 0,
         'tree-states': {'deep': {'expanded-nodes': [],
-                                 'selected-nodes': [(24,)],
+                                 'selected-nodes': [(40,)],
                                  'top-node': (0,)}},
         'tree-style': 'deep'}}),
                               ('browser',
@@ -692,6 +688,9 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         loc('unknown:<untitled> #3'): {'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
+        loc('unknown:<untitled> #8'): {'expanded-nodes': [],
+                                       'selected-nodes': [],
+                                       'top-node': None},
         loc('unknown:<untitled> #6'): {'column-widths': [1.0],
                                        'expanded-nodes': [],
                                        'selected-nodes': [],
@@ -699,14 +698,11 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
         loc('unknown:<untitled> #7'): {'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #4'): {'expanded-nodes': [],
+        loc('unknown:<untitled> #5'): {'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None},
-        loc('unknown:<untitled> #5'): {'column-widths': [1.0],
+        loc('unknown:<untitled> #4'): {'column-widths': [1.0],
                                        'expanded-nodes': [],
-                                       'selected-nodes': [],
-                                       'top-node': None},
-        loc('unknown:<untitled> #8'): {'expanded-nodes': [],
                                        'selected-nodes': [],
                                        'top-node': None}},
                                 'browse_mode': u'Current Module',
@@ -778,7 +774,7 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                        'fRegexFlags': 42,
                                        'fReplaceText': u'item["posterUrl"]',
                                        'fReverse': False,
-                                       'fSearchText': u'ftpli',
+                                       'fSearchText': u'get_sett',
                                        'fStartPos': 0,
                                        'fStyle': 'text',
                                        'fWholeWords': False,
@@ -844,12 +840,12 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                        'attrib-starts': [],
                        'first-line': 0L,
                        'folded-linenos': [],
-                       'history': {None: ['p\n']},
+                       'history': {},
                        'launch-id': None,
-                       'sel-line': 8L,
-                       'sel-line-start': 183L,
-                       'selection_end': 183L,
-                       'selection_start': 183L,
+                       'sel-line': 0L,
+                       'sel-line-start': 0L,
+                       'selection_end': 0L,
+                       'selection_start': 0L,
                        'zoom': 0L}),
                      ('debug-watch',
                       'wide',
@@ -898,244 +894,231 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                       {})],
         'primary_view_state': {'editor_states': ('horizontal',
         1.0,
-        ({'bookmarks': ([[loc('context_download.py'),
-                          {'attrib-starts': [('download_hls',
-        237)],
-                           'first-line': 277L,
+        ({'bookmarks': ([[loc('resources/lib/content/playstreamproxy.py'),
+                          {'attrib-starts': [('start',
+        299)],
+                           'first-line': 78L,
                            'folded-linenos': [],
-                           'sel-line': 298L,
-                           'sel-line-start': 11543L,
-                           'selection_end': 11563L,
-                           'selection_start': 11558L,
+                           'sel-line': 305L,
+                           'sel-line-start': 10967L,
+                           'selection_end': 10967L,
+                           'selection_start': 10967L,
                            'zoom': 0L},
-                          1548527119.987],
-                         [loc('context_download.py'),
-                          {'attrib-starts': [('download_hls',
-        237)],
-                           'first-line': 287L,
+                          1553961342.06],
+                         [loc('service.py'),
+                          {'attrib-starts': [],
+                           'first-line': 28L,
                            'folded-linenos': [],
-                           'sel-line': 300L,
-                           'sel-line-start': 11584L,
-                           'selection_end': 11629L,
-                           'selection_start': 11619L,
+                           'sel-line': 40L,
+                           'sel-line-start': 1576L,
+                           'selection_end': 1630L,
+                           'selection_start': 1622L,
                            'zoom': 0L},
-                          1548527138.088],
-                         [loc('context_download.py'),
-                          {'attrib-starts': [('download_file',
-        371)],
-                           'first-line': 378L,
+                          1553961371.515],
+                         [loc('resources/lib/content/playstreamproxy.py'),
+                          {'attrib-starts': [('start',
+        299)],
+                           'first-line': 78L,
                            'folded-linenos': [],
-                           'sel-line': 396L,
-                           'sel-line-start': 15075L,
-                           'selection_end': 15094L,
-                           'selection_start': 15089L,
+                           'sel-line': 305L,
+                           'sel-line-start': 10967L,
+                           'selection_end': 10967L,
+                           'selection_start': 10967L,
                            'zoom': 0L},
-                          1548527145.504],
-                         [loc('context_download.py'),
-                          {'attrib-starts': [('download_sub',
-        428)],
-                           'first-line': 409L,
+                          1553961375.812],
+                         [loc('resources/lib/content/playstreamproxy.py'),
+                          {'attrib-starts': [('start2',
+        314)],
+                           'first-line': 305L,
                            'folded-linenos': [],
-                           'sel-line': 430L,
-                           'sel-line-start': 16204L,
-                           'selection_end': 16235L,
-                           'selection_start': 16230L,
+                           'sel-line': 314L,
+                           'sel-line-start': 11297L,
+                           'selection_end': 11307L,
+                           'selection_start': 11301L,
                            'zoom': 0L},
-                          1548527153.692],
-                         [loc('addon.py'),
-                          {'attrib-starts': [('play_video',
-        223)],
-                           'first-line': 219L,
-                           'folded-linenos': [44L,
-        87L],
-                           'sel-line': 234L,
-                           'sel-line-start': 10475L,
-                           'selection_end': 10475L,
-                           'selection_start': 10475L,
+                          1553961387.279],
+                         [loc('service.py'),
+                          {'attrib-starts': [],
+                           'first-line': 28L,
+                           'folded-linenos': [],
+                           'sel-line': 40L,
+                           'sel-line-start': 1576L,
+                           'selection_end': 1630L,
+                           'selection_start': 1622L,
                            'zoom': 0L},
-                          1548527189.976],
-                         [loc('context_download.py'),
-                          {'attrib-starts': [('download_sub',
-        428)],
-                           'first-line': 415L,
+                          1553961400.666],
+                         [loc('resources/lib/content/playstreamproxy.py'),
+                          {'attrib-starts': [('start',
+        299)],
+                           'first-line': 305L,
                            'folded-linenos': [],
-                           'sel-line': 430L,
-                           'sel-line-start': 16204L,
-                           'selection_end': 16235L,
-                           'selection_start': 16230L,
+                           'sel-line': 308L,
+                           'sel-line-start': 11116L,
+                           'selection_end': 11145L,
+                           'selection_start': 11145L,
                            'zoom': 0L},
-                          1548527207.874],
-                         [loc('context_download.py'),
-                          {'attrib-starts': [('download_sub',
-        428)],
-                           'first-line': 425L,
+                          1553961417.581],
+                         [loc('service.py'),
+                          {'attrib-starts': [],
+                           'first-line': 24L,
                            'folded-linenos': [],
-                           'sel-line': 446L,
-                           'sel-line-start': 16685L,
-                           'selection_end': 16705L,
-                           'selection_start': 16701L,
+                           'sel-line': 29L,
+                           'sel-line-start': 1092L,
+                           'selection_end': 1116L,
+                           'selection_start': 1116L,
                            'zoom': 0L},
-                          1548527221.502],
-                         [loc('context_download.py'),
-                          {'attrib-starts': [('download_sub',
-        428)],
-                           'first-line': 425L,
+                          1553961647.967],
+                         [loc('resources/lib/content/playstreamproxy.py'),
+                          {'attrib-starts': [('start',
+        299)],
+                           'first-line': 296L,
                            'folded-linenos': [],
-                           'sel-line': 446L,
-                           'sel-line-start': 16685L,
-                           'selection_end': 16711L,
-                           'selection_start': 16706L,
+                           'sel-line': 308L,
+                           'sel-line-start': 11116L,
+                           'selection_end': 11145L,
+                           'selection_start': 11145L,
                            'zoom': 0L},
-                          1548527222.414],
-                         [loc('context_download.py'),
-                          {'attrib-starts': [('download_image',
-        454)],
-                           'first-line': 439L,
+                          1553961697.976],
+                         [loc('service.py'),
+                          {'attrib-starts': [],
+                           'first-line': 28L,
                            'folded-linenos': [],
-                           'sel-line': 460L,
-                           'sel-line-start': 17124L,
-                           'selection_end': 17154L,
-                           'selection_start': 17149L,
+                           'sel-line': 40L,
+                           'sel-line-start': 1576L,
+                           'selection_end': 1576L,
+                           'selection_start': 1576L,
                            'zoom': 0L},
-                          1548527225.136],
-                         [loc('context_download.py'),
-                          {'attrib-starts': [('download_image',
-        454)],
-                           'first-line': 451L,
+                          1553961716.689],
+                         [loc('resources/lib/content/playstreamproxy.py'),
+                          {'attrib-starts': [('start',
+        299)],
+                           'first-line': 296L,
                            'folded-linenos': [],
-                           'sel-line': 464L,
-                           'sel-line-start': 17229L,
-                           'selection_end': 17251L,
-                           'selection_start': 17246L,
+                           'sel-line': 301L,
+                           'sel-line-start': 10888L,
+                           'selection_end': 10888L,
+                           'selection_start': 10888L,
                            'zoom': 0L},
-                          1548527226.448],
-                         [loc('context_download.py'),
-                          {'attrib-starts': [('Job',
-        501),
-        ('Job.read',
-         508)],
-                           'first-line': 489L,
+                          1553961732.748],
+                         [loc('service.py'),
+                          {'attrib-starts': [],
+                           'first-line': 28L,
                            'folded-linenos': [],
-                           'sel-line': 510L,
-                           'sel-line-start': 18653L,
-                           'selection_end': 18675L,
-                           'selection_start': 18670L,
+                           'sel-line': 38L,
+                           'sel-line-start': 1489L,
+                           'selection_end': 1550L,
+                           'selection_start': 1546L,
                            'zoom': 0L},
-                          1548527228.555],
-                         [loc('context_download.py'),
-                          {'attrib-starts': [('Job',
-        501),
-        ('Job.write',
-         517)],
-                           'first-line': 498L,
+                          1553961741.184],
+                         [loc('resources/lib/content/playstreamproxy.py'),
+                          {'attrib-starts': [('start2',
+        314)],
+                           'first-line': 293L,
                            'folded-linenos': [],
-                           'sel-line': 519L,
-                           'sel-line-start': 18897L,
-                           'selection_end': 18915L,
-                           'selection_start': 18910L,
+                           'sel-line': 314L,
+                           'sel-line-start': 11297L,
+                           'selection_end': 11373L,
+                           'selection_start': 11365L,
                            'zoom': 0L},
-                          1548527235.792],
-                         [loc('context_download.py'),
-                          {'attrib-starts': [('download_video',
-        104)],
-                           'first-line': 128L,
+                          1553961812.104],
+                         [loc('service.py'),
+                          {'attrib-starts': [],
+                           'first-line': 24L,
                            'folded-linenos': [],
-                           'sel-line': 133L,
-                           'sel-line-start': 5005L,
-                           'selection_end': 5020L,
-                           'selection_start': 5015L,
+                           'sel-line': 32L,
+                           'sel-line-start': 1281L,
+                           'selection_end': 1281L,
+                           'selection_start': 1281L,
                            'zoom': 0L},
-                          1548527237.569],
-                         [loc('context_download.py'),
-                          {'attrib-starts': [('download_stream',
-        149)],
-                           'first-line': 204L,
+                          1553961852.617],
+                         [loc('resources/lib/content/playstreamproxy.py'),
+                          {'attrib-starts': [('start2',
+        314)],
+                           'first-line': 293L,
                            'folded-linenos': [],
-                           'sel-line': 209L,
-                           'sel-line-start': 8350L,
-                           'selection_end': 8360L,
-                           'selection_start': 8358L,
+                           'sel-line': 314L,
+                           'sel-line-start': 11297L,
+                           'selection_end': 11373L,
+                           'selection_start': 11365L,
                            'zoom': 0L},
-                          1548527257.115],
-                         [loc('context_download.py'),
-                          {'attrib-starts': [('download_stream',
-        149)],
-                           'first-line': 181L,
+                          1553961856.675],
+                         [loc('service.py'),
+                          {'attrib-starts': [],
+                           'first-line': 24L,
                            'folded-linenos': [],
-                           'sel-line': 186L,
-                           'sel-line-start': 7336L,
-                           'selection_end': 7350L,
-                           'selection_start': 7349L,
+                           'sel-line': 32L,
+                           'sel-line-start': 1281L,
+                           'selection_end': 1281L,
+                           'selection_start': 1281L,
                            'zoom': 0L},
-                          1548527258.645],
-                         [loc('context_download.py'),
-                          {'attrib-starts': [('download_stream',
-        149)],
-                           'first-line': 0L,
+                          1553961868.934],
+                         [loc('resources/lib/content/playstreamproxy.py'),
+                          {'attrib-starts': [('StreamHandler',
+        90),
+        ('StreamHandler.do_GET',
+         107)],
+                           'first-line': 118L,
                            'folded-linenos': [],
-                           'sel-line': 186L,
-                           'sel-line-start': 7336L,
-                           'selection_end': 7352L,
-                           'selection_start': 7348L,
+                           'sel-line': 129L,
+                           'sel-line-start': 4408L,
+                           'selection_end': 4408L,
+                           'selection_start': 4408L,
                            'zoom': 0L},
-                          1548527280.832],
-                         [loc('resources/lib/content/file.py'),
-                          {'attrib-starts': [('FileObject',
-        20),
-        ('FileObject.__init__',
-         22)],
-                           'first-line': 18L,
-                           'folded-linenos': [83L,
-        86L,
-        102L],
-                           'sel-line': 25L,
-                           'sel-line-start': 803L,
-                           'selection_end': 835L,
-                           'selection_start': 827L,
+                          1553961933.719],
+                         [loc('resources/lib/content/ContentSources.py'),
+                          {'attrib-starts': [('ContentSources',
+        16),
+        ('ContentSources.get_content',
+         66)],
+                           'first-line': 85L,
+                           'folded-linenos': [],
+                           'sel-line': 96L,
+                           'sel-line-start': 4327L,
+                           'selection_end': 4327L,
+                           'selection_start': 4327L,
                            'zoom': 0L},
-                          1548527622.598],
-                         [loc('addon.py'),
-                          {'attrib-starts': [('play_video',
-        223)],
-                           'first-line': 219L,
-                           'folded-linenos': [44L,
-        87L],
-                           'sel-line': 234L,
-                           'sel-line-start': 10475L,
-                           'selection_end': 10475L,
-                           'selection_start': 10475L,
+                          1553961943.014],
+                         [loc('resources/lib/content/playstreamproxy.py'),
+                          {'attrib-starts': [('StreamHandler',
+        90),
+        ('StreamHandler.do_GET',
+         107)],
+                           'first-line': 118L,
+                           'folded-linenos': [],
+                           'sel-line': 129L,
+                           'sel-line-start': 4408L,
+                           'selection_end': 4408L,
+                           'selection_start': 4408L,
                            'zoom': 0L},
-                          1548527712.597],
-                         [loc('resources/lib/content/file.py'),
-                          {'attrib-starts': [('FileObject',
-        20),
-        ('FileObject.__init__',
-         22)],
-                           'first-line': 0L,
-                           'folded-linenos': [86L,
-        102L],
-                           'sel-line': 34L,
-                           'sel-line-start': 1129L,
-                           'selection_end': 1154L,
-                           'selection_start': 1150L,
+                          1553962003.692],
+                         [loc('resources/lib/content/ContentSources.py'),
+                          {'attrib-starts': [('ContentSources',
+        16),
+        ('ContentSources.get_content',
+         66)],
+                           'first-line': 74L,
+                           'folded-linenos': [],
+                           'sel-line': 83L,
+                           'sel-line-start': 3836L,
+                           'selection_end': 3836L,
+                           'selection_start': 3836L,
                            'zoom': 0L},
-                          1548527998.133],
-                         [loc('resources/lib/content/file.py'),
-                          {'attrib-starts': [('FileObject',
-        20),
-        ('FileObject.__init__',
-         22)],
-                           'first-line': 26L,
-                           'folded-linenos': [86L,
-        102L],
-                           'sel-line': 34L,
-                           'sel-line-start': 1129L,
-                           'selection_end': 1160L,
-                           'selection_start': 1157L,
+                          1553962031.709],
+                         [loc('resources/lib/content/playstreamproxy.py'),
+                          {'attrib-starts': [('StreamHandler',
+        90),
+        ('StreamHandler.do_GET',
+         107)],
+                           'first-line': 106L,
+                           'folded-linenos': [],
+                           'sel-line': 111L,
+                           'sel-line-start': 3644L,
+                           'selection_end': 3644L,
+                           'selection_start': 3644L,
                            'zoom': 0L},
-                          1548527999.634]],
+                          1553962875.617]],
                         20),
-          'current-loc': loc('resources/lib/content/file.py'),
+          'current-loc': loc('resources/lib/content/ContentSources.py'),
           'editor-state-list': [(loc('changelog.md'),
                                  {'attrib-starts': [],
                                   'first-line': 0L,
@@ -1149,10 +1132,10 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                  {'attrib-starts': [],
                                   'first-line': 0L,
                                   'folded-linenos': [],
-                                  'sel-line': 9L,
-                                  'sel-line-start': 461L,
-                                  'selection_end': 491L,
-                                  'selection_start': 491L,
+                                  'sel-line': 7L,
+                                  'sel-line-start': 361L,
+                                  'selection_end': 429L,
+                                  'selection_start': 429L,
                                   'zoom': 0L}),
                                 (loc('context_menu.py'),
                                  {'attrib-starts': [],
@@ -1173,15 +1156,14 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                   'selection_start': 111L,
                                   'zoom': 0L}),
                                 (loc('addon.py'),
-                                 {'attrib-starts': [('play_video',
-        223)],
-                                  'first-line': 219L,
+                                 {'attrib-starts': [],
+                                  'first-line': 22L,
                                   'folded-linenos': [44L,
         87L],
-                                  'sel-line': 234L,
-                                  'sel-line-start': 10475L,
-                                  'selection_end': 10475L,
-                                  'selection_start': 10475L,
+                                  'sel-line': 31L,
+                                  'sel-line-start': 1063L,
+                                  'selection_end': 1092L,
+                                  'selection_start': 1084L,
                                   'zoom': 0L}),
                                 (loc('context_download.py'),
                                  {'attrib-starts': [('download_stream',
@@ -1197,13 +1179,13 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                  {'attrib-starts': [('ContentSources',
         16),
         ('ContentSources.get_content',
-         64)],
-                                  'first-line': 62L,
+         66)],
+                                  'first-line': 74L,
                                   'folded-linenos': [],
-                                  'sel-line': 67L,
-                                  'sel-line-start': 2870L,
-                                  'selection_end': 2870L,
-                                  'selection_start': 2870L,
+                                  'sel-line': 83L,
+                                  'sel-line-start': 3836L,
+                                  'selection_end': 3836L,
+                                  'selection_start': 3836L,
                                   'zoom': 0L}),
                                 (loc('resources/lib/content/sources/config.py'),
                                  {'attrib-starts': [('Source',
@@ -1241,6 +1223,37 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                                   'sel-line-start': 2364L,
                                   'selection_end': 2364L,
                                   'selection_start': 2364L,
+                                  'zoom': 0L}),
+                                (loc('service.py'),
+                                 {'attrib-starts': [],
+                                  'first-line': 24L,
+                                  'folded-linenos': [],
+                                  'sel-line': 32L,
+                                  'sel-line-start': 1281L,
+                                  'selection_end': 1281L,
+                                  'selection_start': 1281L,
+                                  'zoom': 0L}),
+                                (loc('../../../../Program Files/Kodi/system/Python/Lib/traceback.py'),
+                                 {'attrib-starts': [('format_exception',
+        129)],
+                                  'first-line': 125L,
+                                  'folded-linenos': [],
+                                  'sel-line': 138L,
+                                  'sel-line-start': 5168L,
+                                  'selection_end': 5168L,
+                                  'selection_start': 5168L,
+                                  'zoom': 0L}),
+                                (loc('resources/lib/content/playstreamproxy.py'),
+                                 {'attrib-starts': [('StreamHandler',
+        90),
+        ('StreamHandler.do_GET',
+         107)],
+                                  'first-line': 106L,
+                                  'folded-linenos': [],
+                                  'sel-line': 111L,
+                                  'sel-line-start': 3644L,
+                                  'selection_end': 3644L,
+                                  'selection_start': 3644L,
                                   'zoom': 0L})],
           'has-focus': True,
           'locked': False},
@@ -1253,7 +1266,10 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
           loc('resources/lib/content/ContentSources.py'),
           loc('resources/lib/content/sources/config.py'),
           loc('resources/lib/content/sources/ltc.py'),
-          loc('resources/lib/content/file.py')]),
+          loc('resources/lib/content/file.py'),
+          loc('service.py'),
+          loc('../../../../Program Files/Kodi/system/Python/Lib/traceback.py'),
+          loc('resources/lib/content/playstreamproxy.py')]),
         ({'bookmarks': ([(loc('iubx.py'),
                           {'attrib-starts': [('main',
         42)],
@@ -1496,16 +1512,19 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
           loc('plugin.video.playstream/resources/settings.xml'),
           loc('que_management.py'),
           loc('plugin.video.playstream/resources/lib/util.py')])),
-                               'open_files': [u'addon.xml',
+                               'open_files': [u'addon.py',
+        u'addon.xml',
         u'changelog.md',
+        u'context_download.py',
         u'context_menu.py',
         u'kmake.bat',
-        u'resources/lib/content/ContentSources.py',
+        u'resources/lib/content/file.py',
         u'resources/lib/content/sources/config.py',
         u'resources/lib/content/sources/ltc.py',
-        u'context_download.py',
-        u'addon.py',
-        u'resources/lib/content/file.py',
+        u'../../../../Program Files/Kodi/system/Python/Lib/traceback.py',
+        u'service.py',
+        u'resources/lib/content/playstreamproxy.py',
+        u'resources/lib/content/ContentSources.py',
         u'addon.py',
         u'changelog.md',
         u'plugin.video.playstream/resources/lib/util.py',
@@ -1527,16 +1546,18 @@ guimgr.overall-gui-state = {'windowing-policy': 'combined-window',
                          0,
                          2459,
                          1462)}]}
-guimgr.recent-documents = [loc('resources/lib/content/file.py'),
-                           loc('addon.py'),
-                           loc('context_download.py'),
+guimgr.recent-documents = [loc('resources/lib/content/ContentSources.py'),
+                           loc('resources/lib/content/playstreamproxy.py'),
                            loc('service.py'),
-                           loc('resources/lib/content/sources/ltc.py'),
-                           loc('resources/lib/content/ContentSources.py'),
+                           loc('addon.py'),
+                           loc('../../../../Program Files/Kodi/system/Python/Lib/traceback.py'),
+                           loc('addon.xml'),
                            loc('resources/lib/content/sources/config.py'),
+                           loc('resources/lib/content/sources/ltc.py'),
+                           loc('resources/lib/content/file.py'),
+                           loc('context_download.py'),
                            loc('kmake.bat'),
                            loc('context_menu.py'),
-                           loc('addon.xml'),
                            loc('changelog.md')]
 guimgr.visual-state = {loc('addon.py'): {'attrib-starts': [],
         'first-line': 0L,
@@ -1997,6 +2018,16 @@ guimgr.visual-state = {loc('addon.py'): {'attrib-starts': [],
         'sel-line-start': 4655L,
         'selection_end': 4691L,
         'selection_start': 4691L,
+        'zoom': 0L},
+                       loc('resources/lib/content/playstreamproxy.py'): {'at'\
+        'trib-starts': [('start',
+                         275)],
+        'first-line': 21L,
+        'folded-linenos': [],
+        'sel-line': 275L,
+        'sel-line-start': 9738L,
+        'selection_end': 9747L,
+        'selection_start': 9742L,
         'zoom': 0L},
                        loc('resources/lib/content/run.py'): {'attrib-starts': [('p'\
         'layer',
@@ -2495,6 +2526,20 @@ guimgr.visual-state = {loc('addon.py'): {'attrib-starts': [],
         'sel-line-start': 12403,
         'selection_end': 12403,
         'selection_start': 12403},
+                       loc('../../../../Program Files/Kodi/system/Python/Lib/_weakrefset.py'): {'a'\
+        'ttrib-starts': [('WeakSet',
+                          34),
+                         ('WeakSet.__init__',
+                          35),
+                         ('WeakSet.__init__._remove',
+                          37)],
+        'first-line': 25L,
+        'folded-linenos': [],
+        'sel-line': 38L,
+        'sel-line-start': 1062L,
+        'selection_end': 1062L,
+        'selection_start': 1062L,
+        'zoom': 0L},
                        loc('../../../../Python27/Lib/site-packages/kodiswift/listitem.py'): {'a'\
         'ttrib-starts': [('ListItem',
                           20),
@@ -2777,7 +2822,9 @@ search.replace-history = [u'item["posterUrl"]+"/"',
                           u'#logger',
                           u'ustvnow',
                           u'unicode(e)']
-search.search-history = [u'open(',
+search.search-history = [u'sources',
+                         u' [playstream] play_video',
+                         u'open(',
                          u'channels',
                          u'"nfo"',
                          u'api_url',
@@ -2785,7 +2832,6 @@ search.search-history = [u'open(',
                          u'get_streams',
                          u'download_image',
                          u'sources_direco',
-                         u'sources',
                          u'countr',
                          u'overwrite',
                          u'Except',
@@ -2795,8 +2841,7 @@ search.search-history = [u'open(',
                          u'enigma',
                          u'UA',
                          u'm3u',
-                         u'kEmbedded',
-                         u'item["posterUrl"]']
+                         u'kEmbedded']
 testing.stored-results = (1,
                           [],
                           {})

resources/language/English/strings.xml

@@ -4,6 +4,7 @@
   <string id="30000">PlayStream</string>
 
   <string id="40000">General settings</string>
+  <string id="40021">Playstreamproxy</string>
   <string id="40001">Replay.lv</string>
   <string id="40002">Skaties.lv</string>
   <string id="40003">Shortcut.tv</string>
@@ -29,10 +30,18 @@
   <string id="50010">Save plugin status between call</string>
   <string id="50011">Time to live for status</string>
   <string id="50012">Download directory</string>
+
   <string id="50013">Start local proxy server</string>
   <string id="50014">Local proxy server port</string>
-  <string id="50017">Use proxy for problematic streams</string>
-  <string id="50015">Stream proxy url</string>
+  <string id="50027">Local proxy secret key</string>
+  <string id="50028">Redirect streams</string>
+  <string id="50029">User multithreading</string>
+  <string id="50030">Threads</string>
+
+  <string id="50017">Use playstreamproxy for content</string>
+  <string id="50015">Playstreamproxy url</string>
+  <string id="50031">Playstreamproxy secret key</string>
+
   <string id="50016">Playlist file (m3u)</string>
   <string id="50020">Autostart PlayStream</string>
   <string id="50021">View Mode</string>

resources/lib/content

@@ -1 +1 @@
-Subproject commit eb74cc0a47f8259ac534251008fc594f928f454b
+Subproject commit b1add8217bbb6c551559f91ed78b905d27281731

resources/settings.xml

@@ -9,13 +9,20 @@
         <setting id="general_download_dir" label="50012" type="folder" default="download" />
         <setting id="general_download_overwrite" label="50025" type="bool" default="false" />
         <setting id="general_playlist" label="50016" type="file" default="playstream.m3u" />
-        <setting id="general_proxy" label="50013" type="bool" default="false" />
-        <setting id="general_port" label="50014" type="number" default="8880" />
-        <setting id="general_proxy_use" label="50017" type="bool" default="false" />
-        <setting id="general_proxy_url" label="50015" type="text" default="http://localhost:8880/" />
         <setting id="general_streams_file" label="50022" type="file" default="streams.cfg" />
         <setting id="general_streams_file_remote" label="50023" type="file" default="ftp://user:password@hostname/hdd/streams.cfg" />
         <setting id="general_use_streams_file_remote" label="50024" type="bool" default="false" />
+        <setting id="general_proxy_use" label="50017" type="bool" default="false" />
+        <setting id="general_proxy_url" label="50015" type="text" default="http://localhost:8880/" />
+        <setting id="general_proxy_remote_key" label="50031" type="text" default="" />
+    </category>
+    <category label="40021">
+        <setting id="general_proxy" label="50013" type="bool" default="false" />
+        <setting id="general_port" label="50014" type="number" default="8880" />
+        <setting id="general_proxy_key" label="50027" type="text" default="" />
+        <setting id="general_proxy_redirect" label="50028" type="bool" default="true" />
+        <setting id="general_proxy_multithread" label="50029" type="bool" default="false" />
+        <setting id="general_proxy_workers" label="50030" type="number" default="10" />
     </category>
 
     <category label="40003">

service.py

@@ -27,11 +27,18 @@ if autostart:
 
 port = plugin.get_setting("general_port",int)
 start_proxy = plugin.get_setting("general_proxy",bool)
-host = "localhost"
+redirect = plugin.get_setting("general_proxy_redirect",bool)
+multithread = plugin.get_setting("general_proxy_multithread",bool)
+workers = plugin.get_setting("general_proxy_workers",int)
+key = plugin.get_setting("general_proxy_key",str)
+host = "0.0.0.0"
 if start_proxy:
     plugin.notify("Starting playstreamproxy","Info",10000, xbmcgui.NOTIFICATION_INFO)
     try:
-        playstreamproxy.start(host, port)
+        if multithread:
+            playstreamproxy.start2(host, port, redirect, key, workers)
+        else:
+            playstreamproxy.start(host, port, redirect, key)
     except Exception as e:
         xbmcgui.Dialog().ok("Error starting playstreamproxyserver",unicode(e))
         #plugin.notify(unicode(e), "Error", 10000, xbmcgui.NOTIFICATION_ERROR)

wingdbstub.py

@@ -23,6 +23,10 @@ For details, see Debugging Externally Launched Code in the manual.
 #########################################################################
 
 import sys
+orig_sys_modules = list(sys.modules.keys())
+orig_sys_path = list(sys.path)
+orig_meta_path = list(sys.meta_path)
+
 import os
 if sys.version_info >= (3, 7):
   import importlib
@@ -32,14 +36,14 @@ else:
 #------------------------------------------------------------------------
 # Required configuration values (some installers set this automatically)
 
-# This should be the full path to your Wing installation.  On OS X, use
-# the full path of the Wing application bundle, for example
-# /Applications/WingIDE.app.  When set to None, the environment variable
-# WINGHOME is used instead.
-WINGHOME = r"C:\Program Files (x86)\Wing IDE 6.1"
+# This should be the full path to your Wing installation.  On OS X, use 
+# the full path of the Wing application bundle, for example 
+# /Applications/WingPro.app.  When set to None, the environment variable 
+# WINGHOME is used instead.  
+WINGHOME = r"C:\Program Files (x86)\Wing Pro 7.0"
 
 #------------------------------------------------------------------------
-# Optional configuration values:  The named environment variables, if set,
+# Optional configuration values:  The named environment variables, if set, 
 # will override these settings.
 
 # Set this to 1 to disable all debugging; 0 to enable debugging
@@ -57,16 +61,16 @@ kWingHostPort = 'localhost:50005'
 # This is only used when the debug process is not attached to
 # an IDE or the IDE has dropped its connection. The configured
 # port can optionally be added to the IDE's Common Attach Hosts
-# preference. Note that a random port is used instead if the given
+# preference. Note that a random port is used instead if the given 
 # port is already in use.
 # (WINGDB_ATTACHPORT environment variable)
 kAttachPort = '50015'
 
 # Set this to a filename to log verbose information about the debugger
 # internals to a file.  If the file does not exist, it will be created
-# as long as its enclosing directory exists and is writeable.  Use
-# "<stderr>" or "<stdout>" to write to stderr or stdout.  Note that
-# "<stderr>" may cause problems on Windows if the debug process is not
+# as long as its enclosing directory exists and is writeable.  Use 
+# "<stderr>" or "<stdout>" to write to stderr or stdout.  Note that 
+# "<stderr>" may cause problems on Windows if the debug process is not 
 # running in a console.
 # (WINGDB_LOGFILE environment variable)
 kLogFile = None
@@ -78,7 +82,7 @@ kLogFile = None
 kLogVeryVerbose = 0
 
 # Set this to 1 when debugging embedded scripts in an environment that
-# creates and reuses a Python instance across multiple script invocations.
+# creates and reuses a Python instance across multiple script invocations.  
 # It turns off automatic detection of program quit so that the debug session
 # can span multiple script invocations.  When this is turned on, you may
 # need to call ProgramQuit() on the debugger object to shut down the
@@ -89,12 +93,12 @@ kLogVeryVerbose = 0
 # this module in the second or later Python instance.  See the Wing
 # manual for details.
 # (WINGDB_EMBEDDED environment variable)
-kEmbedded = 1
+kEmbedded = 0
 
 # Path to search for the debug password file and the name of the file
-# to use.  The password file contains a security token for all
-# connections to the IDE and must match the wingdebugpw file in the
-# User Settngs directory used by the IDE. '$<winguserprofile>'
+# to use.  The password file contains a security token for all 
+# connections to the IDE and must match the wingdebugpw file in the 
+# User Settngs directory used by the IDE. '$<winguserprofile>' 
 # is replaced by the User Settings directory for the user that
 # is running the process.
 # (WINGDB_PWFILEPATH environment variable)
@@ -110,94 +114,77 @@ kExitOnFailure = 0
 #------------------------------------------------------------------------
 # Find Wing debugger installation location
 
-if sys.hexversion >= 0x03000000:
-  def has_key(o, key):
-    return key in o
-else:
-  def has_key(o, key):
-    return o.has_key(key)
-
 # Check environment:  Must have WINGHOME defined if still == None
 if WINGHOME == None:
-  if has_key(os.environ, 'WINGHOME'):
+  if 'WINGHOME' in os.environ:
     WINGHOME=os.environ['WINGHOME']
   else:
-    msg = '\n'.join(["*******************************************************************",
-                     "Error: Could not find Wing installation!  You must set WINGHOME or edit",
-                     "wingdbstub.py where indicated to point it to the location where",
+    msg = '\n'.join(["*******************************************************************", 
+                     "Error: Could not find Wing installation!  You must set WINGHOME or edit", 
+                     "wingdbstub.py where indicated to point it to the location where", 
                      "Wing is installed.\n"])
     sys.stderr.write(msg)
     raise ImportError(msg)
-
+  
 WINGHOME = os.path.expanduser(WINGHOME)
-kPWFilePath.append(WINGHOME)
 
-# The user settings dir where per-user settings & patches are located.  Will be
-# set from environment if left as None
-kUserSettingsDir = None
-if kUserSettingsDir is None:
-  kUserSettingsDir = os.environ.get('WINGDB_USERSETTINGS')
-
-def _FindActualWingHome(winghome):
+def NP_FindActualWingHome(winghome):
   """ Find the actual directory to use for winghome.  Needed on OS X
   where the .app directory is the preferred dir to use for WINGHOME and
   .app/Contents/MacOS is accepted for backward compatibility. """
-
+  
   if sys.platform != 'darwin':
     return winghome
-
+  
   app_dir = None
   if os.path.isdir(winghome):
     if winghome.endswith('/'):
       wo_slash = winghome[:-1]
     else:
       wo_slash = winghome
-
+      
     if wo_slash.endswith('.app'):
       app_dir = wo_slash
     elif wo_slash.endswith('.app/Contents/MacOS'):
       app_dir = wo_slash[:-len('/Contents/MacOS')]
-
+    
   if app_dir and os.path.isdir(os.path.join(app_dir, 'Contents', 'Resources')):
     return os.path.join(app_dir, 'Contents', 'Resources')
-
+  
   return winghome
+  
+WINGHOME = NP_FindActualWingHome(WINGHOME)
+os.environ['WINGHOME'] = WINGHOME
 
-def _ImportWingdb(winghome, user_settings=None):
-  """ Find & import wingdb module. """
-
-  try:
-    exec_dict = {}
-    execfile(os.path.join(winghome, 'bin', '_patchsupport.py'), exec_dict)
-    find_matching = exec_dict['FindMatching']
-    dir_list = find_matching('bin', winghome, user_settings)
-  except Exception:
-    dir_list = []
-  dir_list.extend([os.path.join(winghome, 'bin'), os.path.join(winghome, 'src')])
-  for path in dir_list:
-    try:
-      if sys.version_info >= (3, 7):
-        import importlib.machinery
-        import importlib.util
-
-        spec = importlib.machinery.PathFinder.find_spec('wingdb', [path])
-        if spec is not None:
-          mod = importlib.util.module_from_spec(spec)
-          if mod is not None:
-            spec.loader.exec_module(mod)
-            return mod
-      else:
-        f, p, d = imp.find_module('wingdb', [path])
-        try:
-          return imp.load_module('wingdb', f, p, d)
-        finally:
-          if f is not None:
-            f.close()
-
-    except ImportError:
-      pass
+# Path used to find the wingdebugpw file
+kPWFilePath.append(WINGHOME)
 
-  return None
+#-----------------------------------------------------------------------
+def NP_LoadModuleFromBootstrap(winghome, modname):
+  """Load a module from the installation bootstrap directory.  Assumes that
+  imports don't change sys.path.  The modules are unloaded from sys.modules
+  so they can be loaded again later from an update."""
+  
+  # Limited to simple module loads
+  assert '.' not in modname
+  
+  orig_sys_path = sys.path[:]
+  orig_modules = set(sys.modules)
+  
+  dirname = winghome + '/bootstrap'
+  sys.path.insert(0, dirname)
+  
+  code = 'import %s' % modname
+  exec(code)
+  
+  new_modules = set(sys.modules)
+  new_modules.difference_update(orig_modules)
+  for mod in new_modules:
+    del sys.modules[mod]
+    
+  sys.path = orig_sys_path
+  
+  return locals()[modname]
 
 #------------------------------------------------------------------------
 # Set debugger if it hasn't been set -- this is to handle module reloading
@@ -206,24 +193,26 @@ try:
   debugger
 except NameError:
   debugger = None
-
+  
+#-----------------------------------------------------------------------
 # Unset WINGDB_ACTIVE env if it was inherited from another process
 # XXX Would be better to be able to call getpid() on dbgtracer but can't access it yet
 if 'WINGDB_ACTIVE' in os.environ and os.environ['WINGDB_ACTIVE'] != str(os.getpid()):
   del os.environ['WINGDB_ACTIVE']
 
+#-----------------------------------------------------------------------
 # Start debugging if not disabled and this module has never been imported
 # before
-if (not kWingDebugDisabled and debugger is None
-    and not has_key(os.environ, 'WINGDB_DISABLED') and
-    not has_key(os.environ, 'WINGDB_ACTIVE')):
+if (not kWingDebugDisabled and debugger is None and
+    'WINGDB_DISABLED' not in os.environ and 
+    'WINGDB_ACTIVE' not in os.environ):
 
   exit_on_fail = 0
-
+  
   try:
     # Obtain exit if fails value
     exit_on_fail = os.environ.get('WINGDB_EXITONFAILURE', kExitOnFailure)
-
+    
     # Obtain configuration for log file to use, if any
     logfile = os.environ.get('WINGDB_LOGFILE', kLogFile)
     if logfile == '-' or logfile == None or len(logfile.strip()) == 0:
@@ -232,76 +221,96 @@ if (not kWingDebugDisabled and debugger is None
     very_verbose_log = os.environ.get('WINGDB_LOGVERYVERBOSE', kLogVeryVerbose)
     if type(very_verbose_log) == type('') and very_verbose_log.strip() == '':
       very_verbose_log = 0
-
+      
     # Determine remote host/port where the IDE is running
     hostport = os.environ.get('WINGDB_HOSTPORT', kWingHostPort)
     colonpos = hostport.find(':')
     host = hostport[:colonpos]
     port = int(hostport[colonpos+1:])
-
+  
     # Determine port to listen on locally for attach requests
     attachport = int(os.environ.get('WINGDB_ATTACHPORT', kAttachPort))
-
+  
     # Check if running embedded script
     embedded = int(os.environ.get('WINGDB_EMBEDDED', kEmbedded))
-
+  
     # Obtain debug password file search path
-    if has_key(os.environ, 'WINGDB_PWFILEPATH'):
+    if 'WINGDB_PWFILEPATH' in os.environ:
       pwfile_path = os.environ['WINGDB_PWFILEPATH'].split(os.pathsep)
     else:
       pwfile_path = kPWFilePath
-
+    
     # Obtain debug password file name
-    if has_key(os.environ, 'WINGDB_PWFILENAME'):
+    if 'WINGDB_PWFILENAME' in os.environ:
       pwfile_name = os.environ['WINGDB_PWFILENAME']
     else:
       pwfile_name = kPWFileName
-
-    # Load wingdb.py
-    actual_winghome = _FindActualWingHome(WINGHOME)
-    wingdb = _ImportWingdb(actual_winghome, kUserSettingsDir)
-    if wingdb == None:
-      sys.stdout.write("*******************************************************************\n")
-      sys.stdout.write("Error: Cannot find wingdb.py in $(WINGHOME)/bin or $(WINGHOME)/src\n")
-      sys.stdout.write("Error: Please check the WINGHOME definition in wingdbstub.py\n")
-      sys.exit(2)
-
+    
+    # Set up temporary log for errors from merge importer Setup
+    class CTmpLog:
+      def __init__(self):
+        self.fErrors = []
+      def write(self, s):
+        self.fErrors.append(s)
+    tmp_log = CTmpLog()
+    
+    # Set up the meta importer; everything after this point can be update
+    bootstrap_utils = NP_LoadModuleFromBootstrap(WINGHOME, 'bootstrap_utils')
+    winghome, user_settings = bootstrap_utils.NP_SetupWingHomeModule(WINGHOME)
+    meta = bootstrap_utils.NP_CreateMetaImporter(WINGHOME, user_settings, 'dbg',
+                                                 tmp_log)
+    import _winghome
+    _winghome.kWingHome = winghome
+    _winghome.kUserSettings = user_settings
+    
     # Find the netserver module and create an error stream
-    netserver = wingdb.FindNetServerModule(actual_winghome, kUserSettingsDir)
-    err = wingdb.CreateErrStream(netserver, logfile, very_verbose_log)
-
-    # Start debugging
-    debugger = netserver.CNetworkServer(host, port, attachport, err,
+    from debug.tserver import startdebug
+    netserver = startdebug.FindNetServerModule(WINGHOME, user_settings)
+    err = startdebug.CreateErrStream(netserver, logfile, very_verbose_log)
+    
+    # Write any temporary log entries
+    for s in tmp_log.fErrors:
+      err.write(s)
+      
+    # Create debug server
+    debugger = netserver.CNetworkServer(host, port, attachport, err, 
                                         pwfile_path=pwfile_path,
                                         pwfile_name=pwfile_name,
                                         autoquit=not embedded)
+    
+    # Restore module and path environment
+    from debug.tserver import startdebug
+    startdebug.RestoreEnvironment(orig_sys_modules, orig_sys_path, orig_meta_path)
+    
+    # Start debugging
     debugger.StartDebug(stophere=0)
     os.environ['WINGDB_ACTIVE'] = str(os.getpid())
     if debugger.ChannelClosed():
       raise ValueError('Not connected')
-
+    
   except:
     if exit_on_fail:
       raise
     else:
       pass
 
+#-----------------------------------------------------------------------
 def Ensure(require_connection=1, require_debugger=1):
   """ Ensure the debugger is started and attempt to connect to the IDE if
   not already connected.  Will raise a ValueError if:
-
+  
   * the require_connection arg is true and the debugger is unable to connect
   * the require_debugger arg is true and the debugger cannot be loaded
-
+  
   If SuspendDebug() has been called through the low-level API, calling
   Ensure() resets the suspend count to zero and additional calls to
   ResumeDebug() will be ignored until SuspendDebug() is called again.
-
+  
   Note that a change to the host & port to connect to will only
   be use if a new connection is made.
-
+  
   """
-
+  
   if debugger is None:
     if require_debugger:
       raise ValueError("No debugger")
@@ -311,17 +320,18 @@ def Ensure(require_connection=1, require_debugger=1):
   colonpos = hostport.find(':')
   host = hostport[:colonpos]
   port = int(hostport[colonpos+1:])
-
+  
   resumed = debugger.ResumeDebug()
   while resumed > 0:
     resumed = debugger.ResumeDebug()
-
-  debugger.SetClientAddress((host, port))
-
+  
+  debugger.SetClientAddress((host, port))  
+  
   if not debugger.DebugActive():
     debugger.StartDebug()
   elif debugger.ChannelClosed():
     debugger.ConnectToClient()
-
+    
   if require_connection and debugger.ChannelClosed():
     raise ValueError('Not connected')
+