From a1d60304508a111ba81b69c806953de0ffba974f Mon Sep 17 00:00:00 2001 From: games647 Date: Wed, 18 Sep 2024 16:56:36 +0200 Subject: [PATCH] Fix formatting --- src/checkers/urlchecker.py | 8 ++++++-- src/lib/externaldata.py | 5 ++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/checkers/urlchecker.py b/src/checkers/urlchecker.py index 1ba0d6bd..1ae67616 100644 --- a/src/checkers/urlchecker.py +++ b/src/checkers/urlchecker.py @@ -60,12 +60,13 @@ def extract_version(checker_data, url): return m.group(1) + def is_same_version(checker_data, current_url, new_version): """ Check if the new application version is the same with the current one. If the version number could be extracted, those strings are compared with each other to be resilient against load-balanced urls pointing to the same file. """ - if new_version is None or new_version.version is None: + if new_version.version is None: # No pattern given or failed parsing the new version, so check only if the url is different return current_url == new_version.url @@ -77,6 +78,7 @@ def is_same_version(checker_data, current_url, new_version): return current_version_string == new_version.version + class URLChecker(Checker): PRIORITY = 99 CHECKER_DATA_TYPE = "rotating-url" @@ -154,7 +156,9 @@ async def check(self, external_data: ExternalBase): if not is_rotating: new_version = new_version._replace(url=url) # pylint: disable=no-member - same_version = is_same_version(external_data.checker_data, external_data.current_version.url, new_version) + same_version = is_same_version( + external_data.checker_data, external_data.current_version.url, new_version + ) external_data.set_new_version( new_version, is_update=is_rotating and not same_version, diff --git a/src/lib/externaldata.py b/src/lib/externaldata.py index b962aa6d..825d11fa 100644 --- a/src/lib/externaldata.py +++ b/src/lib/externaldata.py @@ -319,9 +319,8 @@ def json(self) -> t.Dict[str, t.Any]: def matches(self, other: ExternalFile): for i in (self, other): assert i.checksum is None or isinstance(i.checksum, MultiDigest), i.checksum - return ( - self.checksum == other.checksum - and (self.size is None or other.size is None or self.size == other.size) + return self.checksum == other.checksum and ( + self.size is None or other.size is None or self.size == other.size ) def is_same_version(self, other: ExternalFile):