From cf9d4059b3749cc5012c37765565da5afb93c437 Mon Sep 17 00:00:00 2001 From: GeoffreyCoulaud Date: Mon, 5 Jun 2023 00:34:47 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=93=9D=20Consistent=20typing=20in=20exsit?= =?UTF-8?q?ing=20sources?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/importer/sources/heroic_source.py | 4 ++-- src/importer/sources/lutris_source.py | 7 +++---- src/importer/sources/steam_source.py | 8 +++----- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/src/importer/sources/heroic_source.py b/src/importer/sources/heroic_source.py index 3ce0973..73d6d22 100644 --- a/src/importer/sources/heroic_source.py +++ b/src/importer/sources/heroic_source.py @@ -112,8 +112,8 @@ class HeroicSourceIterator(SourceIterator): continue yield game - def __init__(self, source: "HeroicSource") -> None: - self.source = source + def __init__(self, *args, **kwargs) -> None: + super().__init__(*args, **kwargs) self.generator = self.sub_sources_generator() def __next__(self) -> Optional[Game]: diff --git a/src/importer/sources/lutris_source.py b/src/importer/sources/lutris_source.py index 3d56db1..6ec7cf2 100644 --- a/src/importer/sources/lutris_source.py +++ b/src/importer/sources/lutris_source.py @@ -1,5 +1,6 @@ from sqlite3 import connect from time import time +from typing import Optional from src import shared from src.game import Game @@ -27,7 +28,7 @@ class LutrisSourceIterator(SourceIterator): """ db_request_params = None - def __init__(self, *args, **kwargs): + def __init__(self, *args, **kwargs) -> None: super().__init__(*args, **kwargs) self.import_steam = shared.schema.get_boolean("lutris-import-steam") self.db_location = self.source.location / "pga.db" @@ -37,9 +38,7 @@ class LutrisSourceIterator(SourceIterator): self.db_games_request, self.db_request_params ) - def __next__(self): - """Produce games""" - + def __next__(self) -> Optional[Game]: row = None try: row = self.db_cursor.__next__() diff --git a/src/importer/sources/steam_source.py b/src/importer/sources/steam_source.py index b77158c..be062cf 100644 --- a/src/importer/sources/steam_source.py +++ b/src/importer/sources/steam_source.py @@ -1,7 +1,7 @@ import re from pathlib import Path from time import time -from typing import Iterator +from typing import Iterator, Optional from src import shared from src.game import Game @@ -27,7 +27,7 @@ class SteamSourceIterator(SourceIterator): installed_state_mask: int = 4 appid_cache: set = None - def __init__(self, *args, **kwargs): + def __init__(self, *args, **kwargs) -> None: super().__init__(*args, **kwargs) self.appid_cache = set() @@ -56,9 +56,7 @@ class SteamSourceIterator(SourceIterator): self.manifests_iterator = iter(self.manifests) - def __next__(self): - """Produce games""" - + def __next__(self) -> Optional[Game]: # Get metadata from manifest manifest_path = next(self.manifests_iterator) steam = SteamHelper()