Prevent exception during check_versions. Close #337

This commit is contained in:
Alessandro Maggio
2021-11-12 09:35:11 +01:00
parent 14ea85c40f
commit 5efbed68dc
3 changed files with 33 additions and 10 deletions

View File

@@ -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}")

View File

@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
__version__ = "2.0.4"
__version__ = "2.0.5"
from .TwitchChannelPointsMiner import TwitchChannelPointsMiner
__all__ = [

View File

@@ -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