openlp
/
openlp
mirror of https://gitlab.com/openlp/openlp.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge branch 'delete_presentation_from_controller_when_permission_error' into 'master' 

When a permission error is raised during generation of the sha256 hash when deleting a presentation from the controller don't crash but continue.

See merge request openlp/openlp!646
This commit is contained in:
Raoul Snyman 2023-08-13 21:54:39 +00:00
parent 8a31048381 bbcea34498
commit 35e12309e5
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openlp/plugins/presentations/lib/presentationcontroller.py
View File

@ -157,7 +157,7 @@ class PresentationDocument(object):
else:
self._sha256_file_hash = sha256_file_hash(self.file_path)
# If the sha256_file_hash() function encounters an error, it will return None, so use the
# filename as the thumbnail folder if the result is None (or falsey)
# filename as the thumbnail folder if the result is None (or falsey).
folder = self._sha256_file_hash or self.file_path.name
else:
folder = self.file_path.name
@ -179,7 +179,9 @@ class PresentationDocument(object):
folder = self._sha256_file_hash
else:
self._sha256_file_hash = sha256_file_hash(self.file_path)
folder = self._sha256_file_hash
# If the sha256_file_hash() function encounters an error, it will return None, so use the
# filename as the temp folder if the result is None (or falsey).
folder = self._sha256_file_hash or self.file_path.name
else:
folder = self.file_path.name
return Path(self.controller.temp_folder, folder)