Fix custom path check logic

This commit is contained in:
kramo
2023-05-27 17:53:08 +02:00
parent c045ad1f53
commit 63951d76ac
5 changed files with 12 additions and 9 deletions

View File

@@ -34,6 +34,7 @@ def bottles_installed(path=None):
(path,)
if path
else (
Path(shared.schema.get_string(location_key)).expanduser(),
Path.home() / ".var/app/com.usebottles.bottles/data/bottles",
shared.data_dir / "bottles",
)

View File

@@ -35,6 +35,7 @@ def heroic_installed(path=None):
(path,)
if path
else (
Path(shared.schema.get_string(location_key)).expanduser(),
Path.home() / ".var/app/com.heroicgameslauncher.hgl/config/heroic",
shared.config_dir / "heroic",
)

View File

@@ -129,6 +129,7 @@ def itch_installed(path=None):
(path,)
if path
else (
Path(shared.schema.get_string(location_key)).expanduser(),
Path.home() / ".var/app/io.itch.itch/config/itch",
shared.config_dir / "itch",
)

View File

@@ -34,6 +34,7 @@ def lutris_installed(path=None):
(path,)
if path
else (
Path(shared.schema.get_string(location_key)).expanduser(),
Path.home() / ".var/app/net.lutris.Lutris/data/lutris",
shared.data_dir / "lutris",
)
@@ -52,6 +53,7 @@ def lutris_cache_exists(path=None):
(path,)
if path
else (
Path(shared.schema.get_string(cache_key)).expanduser(),
Path.home() / ".var" / "app" / "net.lutris.Lutris" / "cache" / "lutris",
shared.cache_dir / "lutris",
)

View File

@@ -126,7 +126,6 @@ def get_games_async(appmanifests, steam_dir, importer):
def steam_installed(path=None):
location_key = "steam-location"
steam_dir = Path(shared.schema.get_string(location_key)).expanduser()
check = "steamapps"
subdirs = ("steam", "Steam")
@@ -134,7 +133,7 @@ def steam_installed(path=None):
(path,)
if path
else (
steam_dir,
Path(shared.schema.get_string(location_key)).expanduser(),
Path.home() / ".steam",
shared.data_dir / "Steam",
Path.home() / ".var/app/com.valvesoftware.Steam/data/Steam",
@@ -165,13 +164,12 @@ def steam_importer():
steam_dirs = [steam_dir]
for directory in steam_dirs:
if not (directory / "steamapps").is_dir():
steam_dirs.remove(directory)
for directory in steam_dirs:
for open_file in (directory / "steamapps").iterdir():
if open_file.is_file() and "appmanifest" in open_file.name:
appmanifests.append(open_file)
try:
for open_file in (directory / "steamapps").iterdir():
if open_file.is_file() and "appmanifest" in open_file.name:
appmanifests.append(open_file)
except FileNotFoundError:
continue
importer = shared.importer
importer.total_queue += len(appmanifests)