xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

let exceptions bubble up

Browse Source
This commit is contained in:
Philip Sargent
2021-12-30 19:46:44 +00:00
parent 84e165b8fc
commit 0a3037f077
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/models/caves.py
View File

@@ -39,7 +39,9 @@ todo='''- Move utility function into utils.py
''' '''
def writetrogglefile(filepath, filecontent): def writetrogglefile(filepath, filecontent):
'''Set permissions to rw-rw-r-- and commit the new saved file to git''' '''Set permissions to rw-rw-r-- and commit the new saved file to git
Callers should handle exception PermissionsError explicitly
'''
filepath = Path(filepath) filepath = Path(filepath)
cwd = filepath.parent cwd = filepath.parent
filename = filepath.name filename = filepath.name

18
core/views/caves.py
View File

@@ -359,14 +359,16 @@ def edit_cave(request, slug=None):
for ceinst in ceinsts: for ceinst in ceinsts:
ceinst.cave = cave ceinst.cave = cave
ceinst.save() ceinst.save()
try: cave.writeDataFile()
cave.writeDataFile() # try:
except PermissionError: # cave.writeDataFile()
message = f'CANNOT save this file.\nPERMISSIONS incorrectly set on server for this file {cave.filename}. Ask a nerd to fix this.' # except PermissionError:
return render(request,'errors/generic.html', {'message': message}) # message = f'CANNOT save this file.\nPERMISSIONS incorrectly set on server for this file {cave.filename}. Ask a nerd to fix this.'
except: # return render(request,'errors/generic.html', {'message': message})
message = f'CANNOT git on server for this file {cave.filename}. Edits not saved.\nAsk a nerd to fix this.' # leave other exeptions unhandled so that they bubble up to userinterface
return render(request,'errors/generic.html', {'message': message}) # except:
# message = f'CANNOT git on server for this file {cave.filename}. Edits not saved.\nAsk a nerd to fix this.'
# return render(request,'errors/generic.html', {'message': message})
return HttpResponseRedirect("/" + cave.url) return HttpResponseRedirect("/" + cave.url)
else: else: