From 9825ee7f34f5d406c3ed0218d782d6d4480ac142 Mon Sep 17 00:00:00 2001 From: Peter Taylor Date: Sat, 18 Dec 2021 15:20:29 +0000 Subject: [PATCH] Was Calling the wrong login function --- pyproject.toml | 2 +- src/itchio/downloader/__main__.py | 2 +- src/itchio/game.py | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 54d5549..a461621 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "itchio" -version = "1.0.2" +version = "1.0.3" description = "Python Scripts for downloading / archiving your itchio library" authors = ["Peter Taylor "] license = "MIT" diff --git a/src/itchio/downloader/__main__.py b/src/itchio/downloader/__main__.py index 45f7b1c..e13457f 100644 --- a/src/itchio/downloader/__main__.py +++ b/src/itchio/downloader/__main__.py @@ -17,7 +17,7 @@ l = "" if not args.api_key: user = input("Username: ") password = getpass("Password: ") - l = itchio.LoginWeb(user, password) + l = itchio.LoginAPI(user, password) else: l = args.api_key diff --git a/src/itchio/game.py b/src/itchio/game.py index b5b79d7..b636649 100644 --- a/src/itchio/game.py +++ b/src/itchio/game.py @@ -48,17 +48,17 @@ class Game: }, f) for d in self.downloads: - # Get UUID - r = requests.post(f"https://api.itch.io/games/{self.game_id}/download-sessions", headers={"Authorization": token}) - j = r.json() - print(j) - - # Download file = d['filename'] or d['display_name'] or d['id'] outfile = f"{self.publisher_slug}/{self.game_slug}/{file}" if os.path.exists(outfile): print(f"Skipping {outfile}") continue + # Get UUID + r = requests.post(f"https://api.itch.io/games/{self.game_id}/download-sessions", headers={"Authorization": token}) + j = r.json() + + # Download + url = f"https://api.itch.io/uploads/{d['id']}/download?api_key={token}&download_key_id={self.id}&uuid={j['uuid']}" itchio.utils.download_url(url, outfile, self.name +" - "+file)