GonnaHetzMe/blitz-tools
0
0 Fork 0
mirror of https://github.com/Jylpah/blitz-tools.git synced 2026-10-21 10:17:05 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #33 from Jylpah/dev

Browse Source 
WoTinspecttor.post_replay(): update debug()
This commit is contained in:
Jylpah committed 2020-10-25 16:36:16 +02:00
2 parents 2a9964dbbb fc9aa8778a
commit 042ea65bba
1 file changed
+10 -11
Download Patch File Download Diff File Expand all files Collapse all files
blitzutils.py
+10 -11
View File
@@ -1641,7 +1641,6 @@ class WoTinspector:
async def post_replay(self, data, filename = 'Replay', account_id = 0, title = 'Replay', priv = False, N = None): async def post_replay(self, data, filename = 'Replay', account_id = 0, title = 'Replay', priv = False, N = None):
try: try:
N = N if N != None else self.REPLAY_N N = N if N != None else self.REPLAY_N
msg_str = 'Replay[' + str(N) + ']: '
self.REPLAY_N += 1 self.REPLAY_N += 1
hash = hashlib.md5() hash = hashlib.md5()
@@ -1651,7 +1650,7 @@ class WoTinspector:
## Testing if the replay has already been posted ## Testing if the replay has already been posted
json_resp = await self.get_replay_JSON(replay_id) json_resp = await self.get_replay_JSON(replay_id)
if json_resp != None: if json_resp != None:
debug(msg_str + 'Already uploaded: ' + title) debug('Already uploaded: ' + title, id=N)
return json_resp return json_resp
params = { params = {
@@ -1667,29 +1666,29 @@ class WoTinspector:
headers ={'Content-type': 'application/x-www-form-urlencoded'} headers ={'Content-type': 'application/x-www-form-urlencoded'}
payload = { 'file' : (filename, base64.b64encode(data)) } payload = { 'file' : (filename, base64.b64encode(data)) }
except Exception as err: except Exception as err:
error(msg_str + 'Unexpected Exception', err) error('Unexpected Exception', exception=err, id=N)
return None return None
json_resp = None json_resp = None
for retry in range(MAX_RETRIES): for retry in range(MAX_RETRIES):
debug(msg_str + 'Posting: ' + title + ' Try #: ' + str(retry + 1) + '/' + str(MAX_RETRIES) ) debug('Posting: ' + title + ' Try #: ' + str(retry + 1) + '/' + str(MAX_RETRIES), id=N )
try: try:
async with self.session.post(url, headers=headers, data=payload) as resp: async with self.session.post(url, headers=headers, data=payload) as resp:
debug(msg_str + 'HTTP response: '+ str(resp.status)) debug('HTTP response: '+ str(resp.status), id=N)
if resp.status == 200: if resp.status == 200:
debug(msg_str + 'HTTP POST 200 = Success. Reading response data') debug('HTTP POST 200 = Success. Reading response data', id=N)
json_resp = await resp.json() json_resp = await resp.json()
if self.chk_JSON_replay(json_resp): if self.chk_JSON_replay(json_resp):
debug(msg_str + 'Response data read. Status OK') debug('Response data read. Status OK', id=N)
return json_resp return json_resp
debug(msg_str +' : ' + title + ' : Receive invalid JSON') debug(title + ' : Receive invalid JSON', id=N)
else: else:
debug(msg_str + 'Got HTTP/' + str(resp.status)) debug('Got HTTP/' + str(resp.status), id=N)
except Exception as err: except Exception as err:
debug(msg_str, exception=err) debug(exception=err, id=N)
await asyncio.sleep(SLEEP) await asyncio.sleep(SLEEP)
debug(msg_str + ' Could not post replay: ' + title) debug(' Could not post replay: ' + title, id=N)
return json_resp return json_resp