morgan/Grinch-AP
1
0
Fork 0
mirror of https://github.com/MarioSpore/Grinch-AP.git synced 2025-10-21 12:11:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

SC2: verify downloaded data is a zipfile

Browse Source
This commit is contained in:
Fabian Dill
2023-01-24 03:54:23 +01:00
parent 807f544b26
commit 53dd0d5a7d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Starcraft2Client.py
View File

@@ -10,6 +10,8 @@ import re
import sys import sys
import typing import typing
import queue import queue
import zipfile
import io
from pathlib import Path from pathlib import Path
# CommonClient import first to trigger ModuleUpdater # CommonClient import first to trigger ModuleUpdater
@@ -137,7 +139,6 @@ class StarcraftClientProcessor(ClientCommandProcessor):
if tempzip != '': if tempzip != '':
try: try:
import zipfile
zipfile.ZipFile(tempzip).extractall(path=os.environ["SC2PATH"]) zipfile.ZipFile(tempzip).extractall(path=os.environ["SC2PATH"])
sc2_logger.info(f"Download complete. Version {version} installed.") sc2_logger.info(f"Download complete. Version {version} installed.")
with open(os.environ["SC2PATH"]+"ArchipelagoSC2Version.txt", "w") as f: with open(os.environ["SC2PATH"]+"ArchipelagoSC2Version.txt", "w") as f:
@@ -1008,7 +1009,7 @@ def download_latest_release_zip(owner: str, repo: str, current_version: str = No
download_url = r1.json()["assets"][0]["browser_download_url"] download_url = r1.json()["assets"][0]["browser_download_url"]
r2 = requests.get(download_url, headers=headers) r2 = requests.get(download_url, headers=headers)
if r2.status_code == 200: if r2.status_code == 200 and zipfile.is_zipfile(io.BytesIO(r2.content)):
with open(f"{repo}.zip", "wb") as fh: with open(f"{repo}.zip", "wb") as fh:
fh.write(r2.content) fh.write(r2.content)
sc2_logger.info(f"Successfully downloaded {repo}.zip.") sc2_logger.info(f"Successfully downloaded {repo}.zip.")