xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues4 Pull Requests Projects1 Wiki Activity

bugfix in photo upload, untidy

Browse Source
This commit is contained in:
Philip Sargent 2022-08-11 23:35:53 +03:00
parent e35616a611
commit 1bbfd1e517
2 changed files with 24 additions and 15 deletions

6
core/TESTS/tests_logins.py

@ -206,12 +206,12 @@ class PostTests(TestCase):
with open('core/fixtures/test_upload_nosuffix','r') as testf: with open('core/fixtures/test_upload_nosuffix','r') as testf:
response = self.client.post('/dwguploadnogit/uploads', data={'name': 'test_upload_nosuffix', 'uploadfiles': testf }) response = self.client.post('/dwguploadnogit/uploads', data={'name': 'test_upload_nosuffix', 'uploadfiles': testf })
content = response.content.decode() content = response.content.decode()
with open('_test_response.html', 'w') as f: # with open('_test_response.html', 'w') as f:
f.write(content) # f.write(content)
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
for ph in [ r'test_upload_nosuffix', for ph in [ r'test_upload_nosuffix',
r'You cannot create folders here', r'You cannot create folders here',
r'Clicking on a filename only']: r'Creating a folder is done by a nerd']:
phmatch = re.search(ph, content) phmatch = re.search(ph, content)
self.assertIsNotNone(phmatch, "Expect no-suffix file to upload OK. Failed to find expected text: '" + ph +"'") self.assertIsNotNone(phmatch, "Expect no-suffix file to upload OK. Failed to find expected text: '" + ph +"'")

33
core/views/uploads.py

@ -62,7 +62,7 @@ class FilesForm(forms.Form): # not a model-form, just a form-form
class FilesRenameForm(forms.Form): # not a model-form, just a form-form class FilesRenameForm(forms.Form): # not a model-form, just a form-form
uploadfiles = forms.FileField() uploadfiles = forms.FileField()
renameto = forms.CharField(strip=True) renameto = forms.CharField(strip=True, required=False)
class TextForm(forms.Form): # not a model-form, just a form-form class TextForm(forms.Form): # not a model-form, just a form-form
photographer = forms.CharField(strip=True) photographer = forms.CharField(strip=True)
@ -503,18 +503,27 @@ def photoupload(request, folder=None):
renameto = request.POST["renameto"] renameto = request.POST["renameto"]
actual_saved = [] actual_saved = []
if multiple: if multiple:
if len(multiple) == 1: if len(multiple) == 1:
try: # crashes in Django os.chmod call if on WSL, but does save file! if renameto != "":
saved_filename = fs.save(renameto, content=f) try: # crashes in Django os.chmod call if on WSL, but does save file!
except: saved_filename = fs.save(renameto, content=f)
print(f'\n !! Permissions failure ?! on attempting to save file {f.name}') except:
if 'saved_filename' in locals(): print(f'\n !! Permissions failure ?! on attempting to save file {f.name}')
if saved_filename.is_file(): if 'saved_filename' in locals():
actual_saved.append(saved_filename) if saved_filename.is_file():
filesaved = True actual_saved.append(saved_filename)
filesaved = True
else: else: # multiple is the uploaded content
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}')
if 'saved_filename' in locals():
if saved_filename.is_file():
actual_saved.append(saved_filename)
filesaved = True
else: # multiole is a list of content
for f in multiple: for f in multiple:
try: # crashes in Django os.chmod call if on WSL, but does save file! try: # crashes in Django os.chmod call if on WSL, but does save file!
saved_filename = fs.save(f.name, content=f) saved_filename = fs.save(f.name, content=f)