Leahnaya/s3s
1
0
Fork 0
mirror of https://github.com/frozenpandaman/s3s.git synced 2026-08-01 15:42:37 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

check old & new uuids to prevent duplicate uploads with -r flag (#29)

Browse Source
This commit is contained in:
eli fessler 2022-09-27 03:40:53 -10:00
parent 3345a3157f
commit 8dcff70b46
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
s3s.py
View File

@ -391,8 +391,7 @@ def prepare_battle_result(battle, ismonitoring, overview_data=None):
## UUID ##
##########
full_id = utils.b64d(battle["id"])
s3s_namespace = uuid.UUID('b3a2dbf5-2c09-4792-b78c-00b548b70aeb')
payload["uuid"] = str(uuid.uuid5(s3s_namespace, full_id[-52:])) # input format: <YYYYMMDD>T<HHMMSS>_<uuid>
payload["uuid"] = str(uuid.uuid5(utils.S3S_NAMESPACE, full_id[-52:])) # input format: <YYYYMMDD>T<HHMMSS>_<uuid>
## MODE ##
##########
@ -846,16 +845,24 @@ def check_if_missing(which, ismonitoring, isblackout, istestrun):
sys.exit(1)
# ! fetch from online
splatnet_hashes = fetch_json(which, specific=True, numbers_only=True) # 'specific' - check ALL possible battles
splatnet_ids = fetch_json(which, specific=True, numbers_only=True) # 'specific' - check ALL possible battles
for hash in reversed(splatnet_hashes): # earliest to most recent
uuid = utils.b64d(hash)
if uuid not in statink_uploads: # one of the splatnet entries isn't on stat.ink (unuploaded)
if not printed:
printed = True
print(f"Previously-unuploaded {noun} detected. Uploading now...")
# same as code in -i section below...
for id in reversed(splatnet_ids):
full_id = utils.b64d(id)
old_uuid = full_id[-36:]
new_uuid = str(uuid.uuid5(utils.S3S_NAMESPACE, full_id[-52:]))
fetch_and_upload_single_result(hash, noun, ismonitoring, isblackout, istestrun)
if new_uuid in statink_uploads:
continue
if old_uuid in statink_uploads:
if not utils.custom_key_exists("force_uploads", CONFIG_DATA):
continue
if not printed:
printed = True
print(f"Previously-unuploaded {noun} detected. Uploading now...")
fetch_and_upload_single_result(id, noun, ismonitoring, isblackout, istestrun)
if not printed:
print(f"No previously-unuploaded {noun} found.")
@ -1126,8 +1133,7 @@ def main():
if battle["data"]["vsHistoryDetail"] != None:
full_id = utils.b64d(battle["data"]["vsHistoryDetail"]["id"])
old_uuid = full_id[-36:] # not unique because nintendo hates us
s3s_namespace = uuid.UUID('b3a2dbf5-2c09-4792-b78c-00b548b70aeb')
new_uuid = str(uuid.uuid5(s3s_namespace, full_id[-52:]))
new_uuid = str(uuid.uuid5(utils.S3S_NAMESPACE, full_id[-52:]))
if new_uuid in statink_uploads:
print("Skipping already-uploaded battle.")

4
utils.py
View File

@ -1,13 +1,13 @@
# (ↄ) 2017-2022 eli fessler (frozenpandaman), clovervidia
# https://github.com/frozenpandaman/s3s
# License: GPLv3
import base64, datetime, json, re, requests
import base64, datetime, json, re, requests, uuid
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
S3S_NAMESPACE = uuid.UUID('b3a2dbf5-2c09-4792-b78c-00b548b70aeb')
# SHA256 hash database for SplatNet 3 GraphQL queries
# full list: https://github.com/samuelthomas2774/nxapi/discussions/11#discussioncomment-3737698