diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-07-25 06:18:18 +0200 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-07-25 06:18:18 +0200 |
commit | 832bc8c8e85c075edf559a32400d86183e985728 (patch) | |
tree | 80346180eb02de40c8342055bbd1f22055640d84 /raphodo/renameandmovefile.py | |
parent | 049849cac97ff5fa2e2b12503702fe52a115182c (diff) | |
parent | 77dd64c0757c0191b276e65c24ee9874959790c8 (diff) |
Updated version 0.9.1 from 'upstream/0.9.1'
with Debian dir df52fe78cbe3481a4d64083df8ec468669b4bd47
Diffstat (limited to 'raphodo/renameandmovefile.py')
-rwxr-xr-x | raphodo/renameandmovefile.py | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/raphodo/renameandmovefile.py b/raphodo/renameandmovefile.py index f123308..2da31cc 100755 --- a/raphodo/renameandmovefile.py +++ b/raphodo/renameandmovefile.py @@ -499,6 +499,42 @@ class RenameMoveFileWorker(DaemonProcess): logging.error("Failed to move file's associated XMP file %s", rpd_file.download_xmp_full_name) + def move_log_file(self, rpd_file: Union[Photo, Video]) -> None: + """ + Move (rename) the associate XMP file using the pre-generated + name + """ + + try: + if rpd_file.log_extension: + ext = rpd_file.log_extension + else: + ext = '.LOG' + except AttributeError: + ext = '.LOG' + + try: + rpd_file.download_log_full_name = self._move_associate_file( + extension=ext, + full_base_name=rpd_file.download_full_base_name, + temp_associate_file=rpd_file.temp_log_full_name + ) + except (OSError, FileNotFoundError) as e: + self.problems.append( + RenamingAssociateFileProblem( + source=make_href( + name=os.path.basename(rpd_file.download_log_full_name), + uri=get_uri( + full_file_name=rpd_file.download_log_full_name, + camera_details=rpd_file.camera_details + ) + ), + exception=e + ) + ) + logging.error("Failed to move file's associated LOG file %s", + rpd_file.download_log_full_name) + def check_for_fatal_name_generation_errors(self, rpd_file: Union[Photo, Video]) -> bool: """ :return False if either the download subfolder or filename are @@ -759,6 +795,9 @@ class RenameMoveFileWorker(DaemonProcess): if rpd_file.temp_xmp_full_name: self.move_xmp_file(rpd_file) + if rpd_file.temp_log_full_name: + self.move_log_file(rpd_file) + return move_succeeded def run(self) -> None: |