expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-12-16 05:37:14 +00:00
Code Issues 18 Projects 3 Activity

detecting empty wallets where we only have JSON and no files

Browse Source
This commit is contained in:
Philip Sargent
2022-08-16 20:02:28 +03:00
parent e94dc6eb6f
commit 41c68aef26
3 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/views/uploads.py
View File

@@ -1,4 +1,4 @@
import re, os
import re, os, socket
import subprocess
import json
import settings
@@ -270,7 +270,10 @@ def scanupload(request, path=None):
print(message)
return render(request,'errors/generic.html', {'message': message})
else:
dr_commit = subprocess.run([git, "commit", "-m", f'JSON update for wallet {wallet}'], cwd=destfolder, capture_output=True, text=True)
if socket.gethostname() != "expo":
comment = f"on dev machine '{socket.gethostname()}' "
dr_commit = subprocess.run([git, "commit", "-m", f'JSON update for wallet {wallet} {comment}'], cwd=destfolder, capture_output=True, text=True)
# This produces return code = 1 if it commits OK
if dr_commit.returncode != 0:
msgdata = 'Ask a nerd to fix this.\n\n' + dr_commit.stderr + '\n\n' + dr_commit.stdout + '\n\nreturn code: ' + str(dr_commit.returncode)
@@ -441,6 +444,7 @@ def scanupload(request, path=None):
chkpland = ""
svxfiles = []
checked = {}
context = {}
if waldata:
if not waldata["people"]:
waldata["people"]=["NOBODY"]