paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-11-03 03:16:10 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix: made try_delete_empty_directories and delete_all_empty_subdirectories staticmethods

Browse Source
This commit is contained in:
Wolf-Bastian Poettner
2020-04-13 13:31:29 +00:00
parent 282b2110d8
commit 001e40d633
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/documents/models.py
View File

@@ -311,7 +311,8 @@ class Document(models.Model):
self.filename = recovered_filename self.filename = recovered_filename
self.save() self.save()
delete_all_empty_subdirectories(Document.filename_to_path("")) Document.delete_all_empty_subdirectories(
Document.filename_to_path(""))
return self.filename return self.filename
@@ -427,7 +428,6 @@ class Document(models.Model):
if os.path.isfile(Document.filename_to_path(filename)): if os.path.isfile(Document.filename_to_path(filename)):
self.filename = filename self.filename = filename
@staticmethod @staticmethod
def try_delete_empty_directories(directory): def try_delete_empty_directories(directory):
# Go up in the directory hierarchy and try to delete all directories # Go up in the directory hierarchy and try to delete all directories
@@ -446,7 +446,6 @@ class Document(models.Model):
directory, _ = os.path.split(directory) directory, _ = os.path.split(directory)
directory = os.path.normpath(directory) directory = os.path.normpath(directory)
@staticmethod @staticmethod
def delete_all_empty_subdirectories(directory): def delete_all_empty_subdirectories(directory):
# Go through all folders and try to delete all directories # Go through all folders and try to delete all directories
@@ -459,7 +458,8 @@ class Document(models.Model):
continue continue
# Go into subdirectory to see, if there is more to delete # Go into subdirectory to see, if there is more to delete
Document.delete_all_empty_subdirectories(os.path.join(directory, filename)) Document.delete_all_empty_subdirectories(
os.path.join(directory, filename))
# Try to delete the directory # Try to delete the directory
try: try: