Merge branch 'cherrypick-sillyerror' into 'master'

Cherrypick sillyerror

See merge request piotrex43/RcGcDw!104
This commit is contained in:
Frisk 2022-07-15 00:37:26 +00:00
commit c8b8f325e9
3 changed files with 3 additions and 4 deletions

View file

@ -2,7 +2,7 @@ from setuptools import setup
setup( setup(
name='RcGcDw', name='RcGcDw',
version='1.15.0.1', version='1.15.0.2',
url='https://gitlab.com/piotrex43/RcGcDw/', url='https://gitlab.com/piotrex43/RcGcDw/',
license='GNU GPLv3', license='GNU GPLv3',
author='Frisk', author='Frisk',

View file

@ -28,7 +28,7 @@ def load_settings():
if settings["limitrefetch"] < settings["limit"] and settings["limitrefetch"] != -1: if settings["limitrefetch"] < settings["limit"] and settings["limitrefetch"] != -1:
settings["limitrefetch"] = settings["limit"] settings["limitrefetch"] = settings["limit"]
if "user-agent" in settings["header"]: if "user-agent" in settings["header"]:
settings["header"]["user-agent"] = settings["header"]["user-agent"].format(version="1.15.0.1") # set the version in the useragent settings["header"]["user-agent"] = settings["header"]["user-agent"].format(version="1.15.0.2") # set the version in the useragent
except FileNotFoundError: except FileNotFoundError:
logging.critical("No config file could be found. Please make sure settings.json is in the directory.") logging.critical("No config file could be found. Please make sure settings.json is in the directory.")
sys.exit(1) sys.exit(1)

View file

@ -157,5 +157,4 @@ def safe_request(url) -> Optional[requests.Response]:
else: else:
if 499 < request.status_code < 600: if 499 < request.status_code < 600:
return None return None
return request return request