From 05b8cc401a130de98887bb7a2d422922f36c285b Mon Sep 17 00:00:00 2001 From: bashrc Date: Thu, 7 May 2026 15:01:25 +0100 Subject: [PATCH] Debug for attached media --- daemon_post_image.py | 4 ++-- daemon_post_receive.py | 5 +++-- media.py | 14 ++++++++++++++ scripts/images | 2 +- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/daemon_post_image.py b/daemon_post_image.py index 4fb0d69e6..6b26af2aa 100644 --- a/daemon_post_image.py +++ b/daemon_post_image.py @@ -76,10 +76,10 @@ def receive_image_attachment(self, length: int, path: str, base_dir: str, if debug: if is_a_file(media_filename): file_size: int = os.path.getsize(media_filename) - print('DEBUG: image saved to ' + media_filename + ' ' + + print('DEBUG: uploaded image saved to ' + media_filename + ' ' + str(file_size) + ' bytes') else: - print('WARN: image not saved ' + media_filename) + print('WARN: uploaded image not saved ' + media_filename) self.send_response(201) self.end_headers() self.server.postreq_busy = False diff --git a/daemon_post_receive.py b/daemon_post_receive.py index f1b05592c..a8fa903e8 100644 --- a/daemon_post_receive.py +++ b/daemon_post_receive.py @@ -1911,7 +1911,8 @@ def _receive_new_post_process(self, post_type: str, path: str, headers: {}, if file_size_watermark < file_size_original / 2: # if the file size is too small then this indicates # that watermarking failed - print('WARN: watermark failed, restoring backup') + print('WARN: watermark failed, restoring backup ' + + filename) erase_file(filename, 'EX: failed to erase watermarked file ' + filename) @@ -1935,7 +1936,7 @@ def _receive_new_post_process(self, post_type: str, path: str, headers: {}, # if the file size is too small then this indicates # that metadata removal failed print('WARN: image metadata removal failed, ' + - 'restoring backup') + 'restoring backup ' + post_image_filename) erase_file(filename, 'EX: ' + 'failed to erase metadata processed image ' + post_image_filename) diff --git a/media.py b/media.py index f12610b58..146222739 100644 --- a/media.py +++ b/media.py @@ -754,9 +754,23 @@ def attach_media(base_dir: str, http_prefix: str, if low_bandwidth: convert_image_to_low_bandwidth(image_filename) exif_json: list[dict] = [] + file_size_original: int = os.path.getsize(image_filename) + # TODO add watermark? process_meta_data(base_dir, nickname, domain, image_filename, media_filename, city, content_license_url, exif_json, debug) + file_size_meta_data: int = os.path.getsize(media_filename) + if debug: + print('DEBUG: attach_media ' + + 'image size before metadata removal ' + + str(file_size_original) + ' and after ' + + str(file_size_meta_data)) + if file_size_meta_data < file_size_original / 2: + # if the file size is too small then this indicates + # that metadata removal failed + print('WARN: attach_media image metadata removal failed ' + + media_filename) + copyfile(image_filename, media_filename) if exif_json: # FEP-ee3a # https://codeberg.org/fediverse/fep/src/branch/main/ diff --git a/scripts/images b/scripts/images index cc07a1cc9..a0513b879 100755 --- a/scripts/images +++ b/scripts/images @@ -1,5 +1,5 @@ #!/bin/bash -journalctl -u epicyon | grep 'image binary\|favicon is not an image\|image size before\|watermark failed\|image metadata removal\|media saved to\|failed to restore backup image\|failed to rename image\|media could not be saved to\|failed to delete backup image\|post_message_to_outbox unable to rename\|rename image upload' > .image.txt +journalctl -u epicyon | grep 'image binary\|favicon is not an image\|image size before\|watermark failed\|image metadata removal\|media saved to\|failed to restore backup image\|failed to rename image\|media could not be saved to\|failed to delete backup image\|post_message_to_outbox unable to rename\|rename image upload\|uploaded image saved to\|uploaded image not saved' > .image.txt if [ ! -f .image.txt ]; then echo 'No image warnings' else