mirror of
https://github.com/basicswap/basicswap.git
synced 2026-05-07 06:52:12 +02:00
feat: add fallback urls to downloadRelease
This commit is contained in:
+44
-34
@@ -29,6 +29,7 @@ import urllib.parse
|
|||||||
import zipfile
|
import zipfile
|
||||||
import zmq
|
import zmq
|
||||||
|
|
||||||
|
from typing import List
|
||||||
from urllib.request import urlopen
|
from urllib.request import urlopen
|
||||||
|
|
||||||
import basicswap.config as cfg
|
import basicswap.config as cfg
|
||||||
@@ -460,33 +461,47 @@ def getRemoteFileLength(url: str) -> (int, bool):
|
|||||||
popConnectionParameters()
|
popConnectionParameters()
|
||||||
|
|
||||||
|
|
||||||
def downloadRelease(url: str, path: str, extra_opts, timeout: int = 10) -> None:
|
def downloadRelease(
|
||||||
"""If file exists at path compare it's size to the content length at the url
|
url_in: str | List[str], path: str, extra_opts, timeout: int = 10
|
||||||
and attempt to resume download if file size is below expected.
|
) -> None:
|
||||||
"""
|
# If file exists at path compare it's size to the content length at the url
|
||||||
resume_from: int = 0
|
# and attempt to resume download if file size is below expected.
|
||||||
|
|
||||||
if os.path.exists(path):
|
release_filename: str = os.path.basename(path)
|
||||||
if extra_opts.get("redownload_releases", False):
|
urls = (
|
||||||
logging.warning(f"Overwriting: {path}")
|
url_in
|
||||||
elif extra_opts.get("verify_release_file_size", True):
|
if isinstance(url_in, list)
|
||||||
file_size = os.stat(path).st_size
|
else [
|
||||||
remote_file_length, can_resume = getRemoteFileLength(url)
|
url_in,
|
||||||
if file_size < remote_file_length:
|
]
|
||||||
logger.warning(
|
)
|
||||||
f"{path} is an unexpected size, {file_size} < {remote_file_length}. Attempting to resume download."
|
for url in urls:
|
||||||
)
|
try:
|
||||||
if can_resume:
|
resume_from: int = 0
|
||||||
resume_from = file_size
|
if os.path.exists(path):
|
||||||
|
if extra_opts.get("redownload_releases", False):
|
||||||
|
logging.warning(f"Overwriting: {path}")
|
||||||
|
elif extra_opts.get("verify_release_file_size", True):
|
||||||
|
file_size = os.stat(path).st_size
|
||||||
|
remote_file_length, can_resume = getRemoteFileLength(url)
|
||||||
|
if file_size < remote_file_length:
|
||||||
|
logger.warning(
|
||||||
|
f"{path} is an unexpected size, {file_size} < {remote_file_length}. Attempting to resume download."
|
||||||
|
)
|
||||||
|
if can_resume:
|
||||||
|
resume_from = file_size
|
||||||
|
else:
|
||||||
|
logger.warning("Download can not be resumed, restarting.")
|
||||||
|
else:
|
||||||
|
return
|
||||||
else:
|
else:
|
||||||
logger.warning("Download can not be resumed, restarting.")
|
# File exists and size check is disabled
|
||||||
else:
|
return
|
||||||
return
|
return downloadFile(url, path, timeout, resume_from)
|
||||||
else:
|
except Exception as e:
|
||||||
# File exists and size check is disabled
|
logger.warning(f"Failed to download {release_filename} from {url}")
|
||||||
return
|
logger.debug(f"Download error {e}")
|
||||||
|
raise RuntimeError(f"Failed to download {release_filename}.")
|
||||||
return downloadFile(url, path, timeout, resume_from)
|
|
||||||
|
|
||||||
|
|
||||||
def downloadFile(url: str, path: str, timeout: int = 5, resume_from: int = 0) -> None:
|
def downloadFile(url: str, path: str, timeout: int = 5, resume_from: int = 0) -> None:
|
||||||
@@ -927,15 +942,10 @@ def prepareCore(coin, version_data, settings, data_dir, extra_opts={}):
|
|||||||
assert_filename,
|
assert_filename,
|
||||||
)
|
)
|
||||||
elif coin == "litecoin":
|
elif coin == "litecoin":
|
||||||
release_url: str = (
|
release_url = [
|
||||||
"https://github.com/litecoin-project/litecoin/releases/download/v{}/{}".format(
|
f"https://github.com/litecoin-project/litecoin/releases/download/v{version}{version_tag}/{release_filename}",
|
||||||
version + version_tag, release_filename
|
f"https://download.litecoin.org/litecoin-{version}{version_tag}/{release_filename}",
|
||||||
)
|
]
|
||||||
)
|
|
||||||
if os_name == "osx":
|
|
||||||
release_url: str = (
|
|
||||||
f"https://download.litecoin.org/litecoin-{version}{version_tag}/{release_filename}"
|
|
||||||
)
|
|
||||||
assert_filename = "{}-core-{}-{}-build.assert".format(
|
assert_filename = "{}-core-{}-{}-build.assert".format(
|
||||||
coin, os_name, ".".join(version.split(".")[:2])
|
coin, os_name, ".".join(version.split(".")[:2])
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user