Improvements to opentimestamps enricher - make OTS file a sub-file of original media

src/auto_archiver/modules/gdrive_storage/__manifest__.py

@@ -19,7 +19,7 @@
         },
         "filename_generator": {
             "default": "static",
-            "help": "how to name stored files: 'random' creates a random string; 'static' uses a replicable strategy such as a hash.",
+            "help": "how to name stored files: 'random' creates a random string; 'static' uses a hash, with the settings of the 'hash_enricher' module (defaults to SHA256 if not enabled).",
             "choices": ["random", "static"],
         },
         "root_folder_id": {"required": True,

src/auto_archiver/modules/local_storage/__manifest__.py

@@ -13,7 +13,7 @@
         },
         "filename_generator": {
             "default": "static",
-            "help": "how to name stored files: 'random' creates a random string; 'static' uses a replicable strategy such as a hash.",
+            "help": "how to name stored files: 'random' creates a random string; 'static' uses a hash, with the settings of the 'hash_enricher' module (defaults to SHA256 if not enabled)",
             "choices": ["random", "static"],
         },
         "save_to": {"default": "./local_archive", "help": "folder where to save archived content"},

src/auto_archiver/modules/opentimestamps_enricher/__manifest__.py

@@ -52,5 +52,12 @@ https://opentimestamps.org/#calendars",
     - Can work offline to create timestamp proofs that can be upgraded later
     - Verification checks if timestamps have been confirmed in the Bitcoin blockchain
     - Should run after files have been archived and hashed
+
+    ### Verifying Timestamps Later
+    If you wish to verify a timestamp (ots) file later, you can install the opentimestamps-client command line tool and use the `ots verify` command.
+    Example: `ots verify my_file.ots`
+
+    Note: if you're using local storage with a filename_generator set to 'static' (a hash) or random, the files will be renamed when they are saved to the
+    final location meaning you will need to specify the original filename when verifying the timestamp with `ots verify -f original_filename my_file.ots`.
     """
 }

src/auto_archiver/modules/opentimestamps_enricher/opentimestamps_enricher.py

@@ -20,8 +20,7 @@ class OpentimestampsEnricher(Enricher):
         logger.debug(f"OpenTimestamps timestamping files for {url=}")
 
         # Get the media files to timestamp
-        media_files = [m for m in to_enrich.media if m.get("filename") and not m.get("opentimestamps")]
-
+        media_files = [m for m in to_enrich.media if m.filename and not m.get("opentimestamps")]
         if not media_files:
             logger.warning(f"No files found to timestamp in {url=}")
             return
@@ -30,7 +29,7 @@ class OpentimestampsEnricher(Enricher):
         for media in media_files:
             try:
                 # Get the file path from the media
-                file_path = media.get("filename")
+                file_path = media.filename
                 if not os.path.exists(file_path):
                     logger.warning(f"File not found: {file_path}")
                     continue
@@ -108,7 +107,8 @@ class OpentimestampsEnricher(Enricher):
                 
                 # Create media for the timestamp file
                 timestamp_media = Media(filename=timestamp_path)
-                timestamp_media.set("source_file", os.path.basename(file_path))
+                # explicitly set the mimetype, normally .ots files are 'application/vnd.oasis.opendocument.spreadsheet-template'
+                media.mimetype = "application/vnd.opentimestamps"
                 timestamp_media.set("opentimestamps_version", opentimestamps.__version__)
                 
                 # Verify the timestamp if needed
@@ -119,20 +119,16 @@ class OpentimestampsEnricher(Enricher):
                 else:
                     logger.warning(f"Not verifying the timestamp for media file {file_path}")
                 
-                timestamp_files.append(timestamp_media)
-                
+                media.set("opentimestamp_files", [timestamp_media])
+                timestamp_files.append(timestamp_media.filename)
                 # Update the original media to indicate it's been timestamped
                 media.set("opentimestamps", True)
-                media.set("opentimestamp_file", timestamp_path)
                 
             except Exception as e:
-                logger.warning(f"Error while timestamping {media.get('filename')}: {e}")
+                logger.warning(f"Error while timestamping {media.filename}: {e}")
         
         # Add timestamp files to the metadata
         if timestamp_files:
-            for ts_media in timestamp_files:
-                to_enrich.add_media(ts_media)
-            
             to_enrich.set("opentimestamped", True)
             to_enrich.set("opentimestamps_count", len(timestamp_files))
             logger.success(f"{len(timestamp_files)} OpenTimestamps proofs created for {url=}")
@@ -162,7 +158,7 @@ class OpentimestampsEnricher(Enricher):
                 
                 # Process different types of attestations
                 if isinstance(attestation, PendingAttestation):
-                    info["type"] = "pending"
+                    info["type"] = f"pending (as of {attestation.date})"
                     info["uri"] = attestation.uri
                 
                 elif isinstance(attestation, BitcoinBlockHeaderAttestation):

src/auto_archiver/modules/s3_storage/__manifest__.py

@@ -13,7 +13,7 @@
         },
         "filename_generator": {
             "default": "static",
-            "help": "how to name stored files: 'random' creates a random string; 'static' uses a replicable strategy such as a hash.",
+            "help": "how to name stored files: 'random' creates a random string; 'static' uses a hash, with the settings of the 'hash_enricher' module (defaults to SHA256 if not enabled).",
             "choices": ["random", "static"],
         },
         "bucket": {"default": None, "help": "S3 bucket name"},