Update changelog, preparing to upload.

[youtubedl] / devscripts / buildserver.py

diff --git a/devscripts/buildserver.py b/devscripts/buildserver.py
index e0c3cc83ed5dd73544b383d983aca0281e86408f..1344b4d87b554b690fa8d5f0fab5462b7397aaea 100644 (file)
--- a/devscripts/buildserver.py
+++ b/devscripts/buildserver.py
@@ -1,17 +1,38 @@
 #!/usr/bin/python3
 
 #!/usr/bin/python3
 

-from http.server import HTTPServer, BaseHTTPRequestHandler
-from socketserver import ThreadingMixIn

 import argparse
 import ctypes
 import functools
 import argparse
 import ctypes
 import functools

+import shutil
+import subprocess

 import sys
 import sys

+import tempfile

 import threading
 import traceback
 import os.path
 
 import threading
 import traceback
 import os.path
 

+sys.path.insert(0, os.path.dirname(os.path.dirname((os.path.abspath(__file__)))))
+from youtube_dl.compat import (
+    compat_input,
+    compat_http_server,
+    compat_str,
+    compat_urlparse,
+)
+
+# These are not used outside of buildserver.py thus not in compat.py
+
+try:
+    import winreg as compat_winreg
+except ImportError:  # Python 2
+    import _winreg as compat_winreg
+
+try:
+    import socketserver as compat_socketserver
+except ImportError:  # Python 2
+    import SocketServer as compat_socketserver
+

 
 

-class BuildHTTPServer(ThreadingMixIn, HTTPServer):
+class BuildHTTPServer(compat_socketserver.ThreadingMixIn, compat_http_server.HTTPServer):

     allow_reuse_address = True
 
 
     allow_reuse_address = True
 
 


@@ -142,7 +163,7 @@ def win_service_set_status(handle, status_code):
 
 def win_service_main(service_name, real_main, argc, argv_raw):
     try:
 
 def win_service_main(service_name, real_main, argc, argv_raw):
     try:

-        #args = [argv_raw[i].value for i in range(argc)]
+        # args = [argv_raw[i].value for i in range(argc)]

         stop_event = threading.Event()
         handler = HandlerEx(functools.partial(stop_event, win_service_handler))
         h = advapi32.RegisterServiceCtrlHandlerExW(service_name, handler, None)
         stop_event = threading.Event()
         handler = HandlerEx(functools.partial(stop_event, win_service_handler))
         h = advapi32.RegisterServiceCtrlHandlerExW(service_name, handler, None)


@@ -191,7 +212,7 @@ def main(args=None):
                         action='store_const', dest='action', const='service',
                         help='Run as a Windows service')
     parser.add_argument('-b', '--bind', metavar='<host:port>',
                         action='store_const', dest='action', const='service',
                         help='Run as a Windows service')
     parser.add_argument('-b', '--bind', metavar='<host:port>',

-                        action='store', default='localhost:8142',
+                        action='store', default='0.0.0.0:8142',

                         help='Bind to host:port (default %default)')
     options = parser.parse_args(args=args)
 
                         help='Bind to host:port (default %default)')
     options = parser.parse_args(args=args)
 


@@ -216,7 +237,7 @@ def main(args=None):
     srv = BuildHTTPServer((host, port), BuildHTTPRequestHandler)
     thr = threading.Thread(target=srv.serve_forever)
     thr.start()
     srv = BuildHTTPServer((host, port), BuildHTTPRequestHandler)
     thr = threading.Thread(target=srv.serve_forever)
     thr.start()

-    input('Press ENTER to shut down')
+    compat_input('Press ENTER to shut down')

     srv.shutdown()
     thr.join()
 
     srv.shutdown()
     thr.join()
 


@@ -231,7 +252,6 @@ def rmtree(path):
             os.remove(fname)
     os.rmdir(path)
 
             os.remove(fname)
     os.rmdir(path)
 

-#==============================================================================

 
 class BuildError(Exception):
     def __init__(self, output, code=500):
 
 class BuildError(Exception):
     def __init__(self, output, code=500):


@@ -248,15 +268,25 @@ class HTTPError(BuildError):
 
 class PythonBuilder(object):
     def __init__(self, **kwargs):
 
 class PythonBuilder(object):
     def __init__(self, **kwargs):

-        pythonVersion = kwargs.pop('python', '2.7')
-        try:
-            key = _winreg.OpenKey(_winreg.HKEY_LOCAL_MACHINE, r'SOFTWARE\Python\PythonCore\%s\InstallPath' % pythonVersion)
+        python_version = kwargs.pop('python', '3.4')
+        python_path = None
+        for node in ('Wow6432Node\\', ''):

             try:
             try:

-                self.pythonPath, _ = _winreg.QueryValueEx(key, '')
-            finally:
-                _winreg.CloseKey(key)
-        except Exception:
-            raise BuildError('No such Python version: %s' % pythonVersion)
+                key = compat_winreg.OpenKey(
+                    compat_winreg.HKEY_LOCAL_MACHINE,
+                    r'SOFTWARE\%sPython\PythonCore\%s\InstallPath' % (node, python_version))
+                try:
+                    python_path, _ = compat_winreg.QueryValueEx(key, '')
+                finally:
+                    compat_winreg.CloseKey(key)
+                break
+            except Exception:
+                pass
+
+        if not python_path:
+            raise BuildError('No such Python version: %s' % python_version)
+
+        self.pythonPath = python_path

 
         super(PythonBuilder, self).__init__(**kwargs)
 
 
         super(PythonBuilder, self).__init__(**kwargs)
 


@@ -304,8 +334,10 @@ class YoutubeDLBuilder(object):
 
     def build(self):
         try:
 
     def build(self):
         try:

-            subprocess.check_output([os.path.join(self.pythonPath, 'python.exe'), 'setup.py', 'py2exe'],
-                                    cwd=self.buildPath)
+            proc = subprocess.Popen([os.path.join(self.pythonPath, 'python.exe'), 'setup.py', 'py2exe'], stdin=subprocess.PIPE, cwd=self.buildPath)
+            proc.wait()
+            #subprocess.check_output([os.path.join(self.pythonPath, 'python.exe'), 'setup.py', 'py2exe'],
+            #                        cwd=self.buildPath)

         except subprocess.CalledProcessError as e:
             raise BuildError(e.output)
 
         except subprocess.CalledProcessError as e:
             raise BuildError(e.output)
 


@@ -368,12 +400,12 @@ class Builder(PythonBuilder, GITBuilder, YoutubeDLBuilder, DownloadBuilder, Clea
     pass
 
 
     pass
 
 

-class BuildHTTPRequestHandler(BaseHTTPRequestHandler):
-    actionDict = { 'build': Builder, 'download': Builder } # They're the same, no more caching.
+class BuildHTTPRequestHandler(compat_http_server.BaseHTTPRequestHandler):
+    actionDict = {'build': Builder, 'download': Builder}  # They're the same, no more caching.

 
     def do_GET(self):
 
     def do_GET(self):

-        path = urlparse.urlparse(self.path)
-        paramDict = dict([(key, value[0]) for key, value in urlparse.parse_qs(path.query).items()])
+        path = compat_urlparse.urlparse(self.path)
+        paramDict = dict([(key, value[0]) for key, value in compat_urlparse.parse_qs(path.query).items()])

         action, _, path = path.path.strip('/').partition('/')
         if path:
             path = path.split('/')
         action, _, path = path.path.strip('/').partition('/')
         if path:
             path = path.split('/')


@@ -387,19 +419,15 @@ class BuildHTTPRequestHandler(BaseHTTPRequestHandler):
                         builder.close()
                 except BuildError as e:
                     self.send_response(e.code)
                         builder.close()
                 except BuildError as e:
                     self.send_response(e.code)

-                    msg = unicode(e).encode('UTF-8')
+                    msg = compat_str(e).encode('UTF-8')

                     self.send_header('Content-Type', 'text/plain; charset=UTF-8')
                     self.send_header('Content-Length', len(msg))
                     self.end_headers()
                     self.wfile.write(msg)
                     self.send_header('Content-Type', 'text/plain; charset=UTF-8')
                     self.send_header('Content-Length', len(msg))
                     self.end_headers()
                     self.wfile.write(msg)

-                except HTTPError as e:
-                    self.send_response(e.code, str(e))

             else:
                 self.send_response(500, 'Unknown build method "%s"' % action)
         else:
             self.send_response(500, 'Malformed URL')
 
             else:
                 self.send_response(500, 'Unknown build method "%s"' % action)
         else:
             self.send_response(500, 'Malformed URL')
 

-#==============================================================================
-

 if __name__ == '__main__':
     main()
 if __name__ == '__main__':
     main()