diff --git a/s3s.py b/s3s.py index af6d002..cdc43db 100644 --- a/s3s.py +++ b/s3s.py @@ -1020,7 +1020,7 @@ class SquidProgress: self.count = 0 def __del__(self): - sys.stdout.write(f"\r{' '*(os.get_terminal_size()[0] - 1)}\r") + sys.stdout.write(f"\r{' '*(shutil.get_terminal_size()[0] - 1)}\r") sys.stdout.flush() diff --git a/utils.py b/utils.py index 9f19c89..3107ed2 100644 --- a/utils.py +++ b/utils.py @@ -6,7 +6,7 @@ from bs4 import BeautifulSoup SPLATNET3_URL = "https://api.lp1.av5ja.srv.nintendo.net" GRAPHQL_URL = "https://api.lp1.av5ja.srv.nintendo.net/api/graphql" -WEB_VIEW_VERSION = "1.0.0-63bad6e1" # fallback +WEB_VIEW_VERSION = "1.0.0-216d0219" # fallback S3S_NAMESPACE = uuid.UUID('b3a2dbf5-2c09-4792-b78c-00b548b70aeb') # SHA256 hash database for SplatNet 3 GraphQL queries @@ -14,9 +14,9 @@ S3S_NAMESPACE = uuid.UUID('b3a2dbf5-2c09-4792-b78c-00b548b70aeb') translate_rid = { 'HomeQuery': 'dba47124d5ec3090c97ba17db5d2f4b3', # blank vars 'LatestBattleHistoriesQuery': '7d8b560e31617e981cf7c8aa1ca13a00', # INK / blank vars - query1 - 'RegularBattleHistoriesQuery': '819b680b0c7962b6f7dc2a777cd8c5e4', # INK / blank vars - query1 + 'RegularBattleHistoriesQuery': 'f6e7e0277e03ff14edfef3b41f70cd33', # INK / blank vars - query1 'BankaraBattleHistoriesQuery': 'c1553ac75de0a3ea497cdbafaa93e95b', # INK / blank vars - query1 - 'PrivateBattleHistoriesQuery': '51981299595060692440e0ca66c475a1', # INK / blank vars - query1 + 'PrivateBattleHistoriesQuery': '38e0529de8bc77189504d26c7a14e0b8', # INK / blank vars - query1 'VsHistoryDetailQuery': '2b085984f729cd51938fc069ceef784a', # INK / req "vsResultId" - query2 'CoopHistoryQuery': '817618ce39bcf5570f52a97d73301b30', # SR / blank vars - query1 'CoopHistoryDetailQuery': 'f3799a033f0a7ad4b1b396f9a3bafb1e', # SR / req "coopHistoryDetailId" - query2 @@ -35,11 +35,11 @@ def get_web_view_ver(): main_js_url = SPLATNET3_URL + main_js.attrs["src"] main_js_body = requests.get(main_js_url) - match = re.search(r"\b(\d+\.\d+\.\d+)\b-\".concat.*?\b([0-9a-f]{40})\b", main_js_body.text) + match = re.search(r"\b(?P[0-9a-f]{40})\b.*revision_info_not_set\"\),.*?=\"(?P\d+\.\d+\.\d+)", main_js_body.text) if not match: return WEB_VIEW_VERSION - version, revision = match.groups() + version, revision = match.group("version"), match.group("revision") return f"{version}-{revision[:8]}"