Use original filename to export photos by default (#396)

* Use original filename to export photos by default, #176

* Fixed edited filename to also use original_filename if none provided.

* Rolled back previous change due to test failures

* Use original filename for edited file exports as well

Co-authored-by: Rhet Turnbull <rturnbull@gmail.com>
This commit is contained in:
Aaron van Geffen
2021-03-14 20:19:05 +01:00
committed by GitHub
parent 17ac5949e1
commit 6870ad0d8e
11 changed files with 40 additions and 40 deletions

View File

@@ -613,9 +613,9 @@ def export2(
)
edited_name = pathlib.Path(self.path_edited).name
edited_suffix = pathlib.Path(edited_name).suffix
fname = pathlib.Path(self.filename).stem + edited_identifier + edited_suffix
fname = pathlib.Path(self.original_filename).stem + edited_identifier + edited_suffix
else:
fname = self.filename
fname = self.original_filename
uti = self.uti if edited else self.uti_original
if convert_to_jpeg and self.isphoto and uti != "public.jpeg":