IT-Naturschutz/konova
7
0
Fork 0
Code Issues 6 Pull Requests 1 Actions Projects Releases 37 Wiki Activity

#18 File upload in certain folders

Browse Source 
* adds try-except for removing folders in case of non existence or changed folder names on the hard drive
This commit is contained in:
mipel 2021-09-17 09:43:03 +02:00
parent 1edc1edc98
commit 416d11d1ee
3 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
compensation/models.py
View File

@ -252,7 +252,11 @@ class CompensationDocument(AbstractDocument):
# If a folder path has been set, we need to delete the whole folder!
if folder_path is not None:
shutil.rmtree(folder_path)
try:
shutil.rmtree(folder_path)
except FileNotFoundError:
# Folder seems to be missing already...
pass
class EcoAccount(AbstractCompensation):
@ -408,7 +412,11 @@ class EcoAccountDocument(AbstractDocument):
# If a folder path has been set, we need to delete the whole folder!
if folder_path is not None:
shutil.rmtree(folder_path)
try:
shutil.rmtree(folder_path)
except FileNotFoundError:
# Folder seems to be missing already...
pass
class EcoAccountDeduction(BaseResource):

6
ema/models.py
View File

@ -142,4 +142,8 @@ class EmaDocument(AbstractDocument):
# If a folder path has been set, we need to delete the whole folder!
if folder_path is not None:
shutil.rmtree(folder_path)
try:
shutil.rmtree(folder_path)
except FileNotFoundError:
# Folder seems to be missing already...
pass

20
intervention/models.py
View File

@ -122,12 +122,19 @@ class RevocationDocument(AbstractDocument):
# Always remove 'revocation' folder
folder_path = self.file.path.split("/")
shutil.rmtree("/".join(folder_path[:-1]))
try:
shutil.rmtree("/".join(folder_path[:-1]))
except FileNotFoundError:
# Revocation subfolder seems to be missing already
pass
if other_intervention_docs.count() == 0:
# If there are no further documents for the intervention, we can simply remove the whole folder as well!
shutil.rmtree("/".join(folder_path[:-2]))
try:
shutil.rmtree("/".join(folder_path[:-2]))
except FileNotFoundError:
# Folder seems to be missing already
pass
class LegalData(UuidModel):
"""
@ -415,5 +422,8 @@ class InterventionDocument(AbstractDocument):
# If a folder path has been set, we need to delete the whole folder!
if folder_path is not None:
shutil.rmtree(folder_path)
try:
shutil.rmtree(folder_path)
except FileNotFoundError:
# Folder seems to be missing already...
pass