Fix #178: Change downlaod http to https

nwutils · Jan 7, 2017 · 08f6305 · 08f6305
1 parent 48cc908
commit 08f6305
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/command_line.py b/command_line.py
@@ -595,7 +595,8 @@ def extract_files(self):
             try:
                 if setting.value:
                     extract_path = get_data_path('files/'+setting.name)
-                    setting.extract(extract_path, version, sdk_build)
+                    setting.extract(extract_path, version, save_file_path,
+                                    sdk_build)
 
                     self.progress_text += '.'
 

diff --git a/files/settings.cfg b/files/settings.cfg
@@ -1,4 +1,4 @@
-base_url='http://dl.nwjs.io/v{}/'
+base_url='https://dl.nwjs.io/v{}/'
 win_32_dir_prefix = 'nwjs-v{}-win-ia32'
 mac_32_dir_prefix = 'nwjs-v{}-osx-ia32'
 linux_32_dir_prefix = 'nwjs-v{}-linux-ia32'

diff --git a/main.py b/main.py
@@ -763,7 +763,11 @@ def download_file(self, path, setting):
             return
 
         # Download in HTTP mode
-        mode = QHttp.ConnectionModeHttp
+        if path.startswith('https'):
+            mode = QHttp.ConnectionModeHttps
+        else:
+            mode = QHttp.ConnectionModeHttp
+
         port = url.port()
 
         if port == -1:

diff --git a/util_classes.py b/util_classes.py
@@ -449,11 +449,12 @@ def set_extra_attributes_from_keyword_args(self, **kwargs):
         for undefined_key, undefined_value in kwargs.items():
             setattr(self, undefined_key, undefined_value)
 
-    def extract(self, ex_path, version, sdk_build=False):
+    def extract(self, ex_path, version, location=None, sdk_build=False):
         if os.path.exists(ex_path):
             utils.rmtree(ex_path, ignore_errors=True)
 
-        path = self.save_file_path(version, sdk_build=sdk_build)
+        path = location or self.save_file_path(version,
+                                               sdk_build=sdk_build)
 
         file = self.extract_class(path,
                                   *self.extract_args)