diff options
Diffstat (limited to 'core/views/uploads.py')
| -rw-r--r-- | core/views/uploads.py | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/core/views/uploads.py b/core/views/uploads.py index 356158e..36ccd20 100644 --- a/core/views/uploads.py +++ b/core/views/uploads.py @@ -471,7 +471,7 @@ def scanupload(request, path=None): try: # crashes in Django os.chmod call if on WSL, but does save file! saved_filename = fs.save(f.name, content=f) except: - print(f'\n !! Permissions failure ?! on attempting to save file {f.name}') + print(f'\n !! Permissions failure ?! on attempting to save scanfile {f.name}') if 'saved_filename' in locals(): if saved_filename.is_file(): actual_saved.append(saved_filename) @@ -757,7 +757,13 @@ def photoupload(request, folder=None): formd = TextForm(request.POST) if formd.is_valid(): newphotographer = request.POST["photographer"] - (yearpath / newphotographer).mkdir(exist_ok=True) + try: + (yearpath / newphotographer).mkdir(exist_ok=True) + except: + message =f'\n !! Permissions failure ?! 0 attempting to mkdir "{(yearpath / newphotographer)}"' + print(message) + return render(request,'errors/generic.html', {'message': message}) + else: form = FilesRenameForm(request.POST,request.FILES) if form.is_valid(): @@ -775,7 +781,7 @@ def photoupload(request, folder=None): try: # crashes in Django os.chmod call if on WSL, but does save file! saved_filename = fs.save(renameto, content=f) except: - print(f'\n !! Permissions failure ?! on attempting to save file {f.name}') + print(f'\n !! Permissions failure ?! 1 attempting to save "{f.name}" in "{dirpath}" {renameto=}') if 'saved_filename' in locals(): if saved_filename.is_file(): actual_saved.append(saved_filename) @@ -784,17 +790,17 @@ def photoupload(request, folder=None): try: # crashes in Django os.chmod call if on WSL, but does save file! saved_filename = fs.save(f.name, content=f) except: - print(f'\n !! Permissions failure ?! on attempting to save file {f.name}') + print(f'\n !! Permissions failure ?! 2 attempting to save "{f.name}" in "{dirpath}" {renameto=}') if 'saved_filename' in locals(): if saved_filename.is_file(): actual_saved.append(saved_filename) filesaved = True - else: # multiole is a list of content + else: # multiple is a list of content for f in multiple: try: # crashes in Django os.chmod call if on WSL, but does save file! saved_filename = fs.save(f.name, content=f) except: - print(f'\n !! Permissions failure ?! on attempting to save file {f.name}') + print(f'\n !! Permissions failure ?! 3 attempting to save "{f.name}" in "{dirpath}" {renameto=}') if 'saved_filename' in locals(): if saved_filename.is_file(): actual_saved.append(saved_filename) @@ -872,7 +878,8 @@ def dwgupload(request, folder=None, gitdisable='no'): # print(f'! - FORM dwgupload - POST valid: "{request.FILES["uploadfiles"]}" ') f = request.FILES["uploadfiles"] multiple = request.FILES.getlist('uploadfiles') - fs = FileSystemStorage(os.path.join(settings.DRAWINGS_DATA, folder)) + savepath = Path(settings.DRAWINGS_DATA, folder) + fs = FileSystemStorage(savepath) actual_saved = [] refused = [] @@ -892,7 +899,7 @@ def dwgupload(request, folder=None, gitdisable='no'): try: # crashes in Django os.chmod call if on WSL without metadata drvfs, but does save file! saved_filename = fs.save(f.name, content=f) except: - print(f'! - FORM dwgupload - \n!! Permissions failure ?! on attempting to save file {f.name}. Attempting to continue..') + print(f'! - FORM dwgupload - \n!! Permissions failure ?! on attempting to save file "{f.name}" in "{savepath}". Attempting to continue..') if 'saved_filename' in locals(): if Path(dirpath, saved_filename).is_file(): actual_saved.append(saved_filename) @@ -912,7 +919,7 @@ def dwgupload(request, folder=None, gitdisable='no'): message = f'! - FORM dwgupload - NOT A FILE {Path(dirpath, saved_filename)=}. ' print(message) else: - message = f'! - FORM dwgupload - Save failure for {saved_filename}. Changes NOT saved.' + message = f'! - FORM dwgupload - Save failure for {f.name}. Changes NOT saved.' print(message) return render(request,'errors/generic.html', {'message': message}) |