diff --git a/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py b/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py index 6fd3ad4..fb32852 100644 --- a/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py +++ b/TwitchChannelPointsMiner/TwitchChannelPointsMiner.py @@ -112,7 +112,11 @@ class TwitchChannelPointsMiner: # Check for the latest version of the script current_version, github_version = check_versions() - if current_version != github_version: + if github_version == "0.0.0": + logger.error( + "Unable to detect if you have the latest version of this script" + ) + elif current_version != github_version: logger.info(f"You are running the version {current_version} of this script") logger.info(f"The latest version on GitHub is: {github_version}") diff --git a/TwitchChannelPointsMiner/__init__.py b/TwitchChannelPointsMiner/__init__.py index 5be7dc1..cf775fa 100644 --- a/TwitchChannelPointsMiner/__init__.py +++ b/TwitchChannelPointsMiner/__init__.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -__version__ = "2.0.4" +__version__ = "2.0.5" from .TwitchChannelPointsMiner import TwitchChannelPointsMiner __all__ = [ diff --git a/TwitchChannelPointsMiner/utils.py b/TwitchChannelPointsMiner/utils.py index ef6d3d4..7f6dbda 100644 --- a/TwitchChannelPointsMiner/utils.py +++ b/TwitchChannelPointsMiner/utils.py @@ -159,11 +159,16 @@ def create_chunks(lst, n): def download_file(name, fpath): - r = requests.get(path.join(GITHUB_url, name), stream=True) - with open(fpath, "wb") as f: - for chunk in r.iter_content(chunk_size=1024): - if chunk: - f.write(chunk) + r = requests.get( + path.join(GITHUB_url, name), + headers={"User-Anget": get_user_agent("FIREFOX")}, + stream=True, + ) + if r.status_code == 200: + with open(fpath, "wb") as f: + for chunk in r.iter_content(chunk_size=1024): + if chunk: + f.write(chunk) return True @@ -176,7 +181,21 @@ def init2dict(content): def check_versions(): - current_version = init2dict(read("__init__.py"))["version"] - r = requests.get(path.join(GITHUB_url, "TwitchChannelPointsMiner", "__init__.py")) - github_version = init2dict(r.text)["version"] + try: + current_version = init2dict(read("__init__.py")) + current_version = ( + current_version["version"] if "version" in current_version else "0.0.0" + ) + except Exception: + current_version = "0.0.0" + try: + r = requests.get( + path.join(GITHUB_url, "TwitchChannelPointsMiner", "__init__.py") + ) + github_version = init2dict(r.text) + github_version = ( + github_version["version"] if "version" in github_version else "0.0.0" + ) + except Exception: + github_version = "0.0.0" return current_version, github_version