Skip to content

Commit 08f6305

Browse files
committed
Fix #178: Change downlaod http to https
1 parent 48cc908 commit 08f6305

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

command_line.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,8 @@ def extract_files(self):
595595
try:
596596
if setting.value:
597597
extract_path = get_data_path('files/'+setting.name)
598-
setting.extract(extract_path, version, sdk_build)
598+
setting.extract(extract_path, version, save_file_path,
599+
sdk_build)
599600

600601
self.progress_text += '.'
601602

files/settings.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
base_url='http://dl.nwjs.io/v{}/'
1+
base_url='https://dl.nwjs.io/v{}/'
22
win_32_dir_prefix = 'nwjs-v{}-win-ia32'
33
mac_32_dir_prefix = 'nwjs-v{}-osx-ia32'
44
linux_32_dir_prefix = 'nwjs-v{}-linux-ia32'

main.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -763,7 +763,11 @@ def download_file(self, path, setting):
763763
return
764764

765765
# Download in HTTP mode
766-
mode = QHttp.ConnectionModeHttp
766+
if path.startswith('https'):
767+
mode = QHttp.ConnectionModeHttps
768+
else:
769+
mode = QHttp.ConnectionModeHttp
770+
767771
port = url.port()
768772

769773
if port == -1:

util_classes.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -449,11 +449,12 @@ def set_extra_attributes_from_keyword_args(self, **kwargs):
449449
for undefined_key, undefined_value in kwargs.items():
450450
setattr(self, undefined_key, undefined_value)
451451

452-
def extract(self, ex_path, version, sdk_build=False):
452+
def extract(self, ex_path, version, location=None, sdk_build=False):
453453
if os.path.exists(ex_path):
454454
utils.rmtree(ex_path, ignore_errors=True)
455455

456-
path = self.save_file_path(version, sdk_build=sdk_build)
456+
path = location or self.save_file_path(version,
457+
sdk_build=sdk_build)
457458

458459
file = self.extract_class(path,
459460
*self.extract_args)

0 commit comments

Comments
 (0)