fix: One char stream fix

Author: tmathern

src/c2pa/c2pa.py

@@ -828,38 +828,18 @@ def sign_file(
         # Create a builder from the manifest
         builder = Builder(manifest)
 
-        # Open source file and create BytesIO for destination
-        with open(source_path, 'rb') as source_file:
-            # Get the MIME type from the file extension
-            mime_type = mimetypes.guess_type(str(source_path))[0]
-            if not mime_type:
-                raise C2paError.NotSupported(
-                    f"Could not determine MIME type for file: {source_path}")
-
-            # Convert Python streams to Stream objects for internal signing
-            source_stream = Stream(source_file)
-            # In-memory buffer stream that will be flushed to file
-            dest_stream = Stream(io.BytesIO(bytearray()))
-
-            # Use the builder's internal signing logic to get manifest
-            # bytes
-            manifest_bytes = builder._sign_internal(
-                signer, mime_type, source_stream, dest_stream)
-
-            source_stream.close()
-
-            # Write the in-memory signed content
-            # from BytesIO to the destination file
-            with open(dest_path, 'wb') as dest_file:
-                dest_stream.write_to_target(dest_file)
-            dest_stream.close()
+        manifest_bytes = builder.sign_file(
+            source_path,
+            dest_path,
+            signer
+        )
 
-            if return_manifest_as_bytes:
-                return manifest_bytes
-            else:
-                # Read the signed manifest from the destination file
-                with Reader(dest_path) as reader:
-                    return reader.json()
+        if return_manifest_as_bytes:
+            return manifest_bytes
+        else:
+            # Read the signed manifest from the destination file
+            with Reader(dest_path) as reader:
+                return reader.json()
 
     except Exception as e:
         # Clean up destination file if it exists and there was an error
@@ -2276,7 +2256,7 @@ def sign_file(self,
             signer: The signer to use
 
         Returns:
-            A tuple of (size of C2PA data, manifest bytes)
+            Manifest bytes
 
         Raises:
             C2paError: If there was an error during signing
@@ -2288,28 +2268,9 @@ def sign_file(self,
                 f"Could not determine MIME type for file: {source_path}")
 
         try:
-            # Open source file and create BytesIO for destination
-            with open(source_path, 'rb') as source_file:
-                source_stream = Stream(source_file)
-
-                # In-memory buffer stream that will be flushed to target,
-                # to ensure proper in-memory processing and validatin
-                dest_stream = Stream(io.BytesIO(bytearray()))
-
-                # Use the internal stream-base signing logic to
-                # sign the content to the BytesIO stream
-                result = self._sign_internal(
-                    signer, mime_type, source_stream, dest_stream)
-
-                source_stream.close()
-
-                # Write the signed content from in-memory stream
-                # to the destination file
-                with open(dest_path, 'wb') as dest_file:
-                    dest_stream.write_to_target(dest_file)
-                dest_stream.close()
-
-                return result
+            # Open source file and destination file, then use the sign method
+            with open(source_path, 'rb') as source_file, open(dest_path, 'w+b') as dest_file:
+                return self.sign(signer, mime_type, source_file, dest_file)
         except Exception as e:
             raise C2paError(f"Error signing file: {str(e)}")
 

tests/test_unit_tests.py

@@ -506,6 +506,35 @@ def test_streams_sign_with_es256_alg_v1_manifest(self):
 
             output.close()
 
+    def test_streams_sign_with_es256_alg_v1_manifest_to_file(self):
+        test_file_name = os.path.join(self.data_dir, "temp_data", "temp_signing.jpg")
+        # Ensure tmp directory exists
+        os.makedirs(os.path.dirname(test_file_name), exist_ok=True)
+
+        # Ensure the target file exists before opening it in rb+ mode
+        with open(test_file_name, "wb") as f:
+            pass  # Create empty file
+
+        try:
+            with open(self.testPath, "rb") as source, open(test_file_name, "w+b") as target:
+                builder = Builder(self.manifestDefinition)
+                builder.sign(self.signer, "image/jpeg", source, target)
+                reader = Reader("image/jpeg", target)
+                json_data = reader.json()
+                self.assertIn("Python Test", json_data)
+                self.assertNotIn("validation_status", json_data)
+
+        finally:
+            # Clean up...
+
+            if os.path.exists(test_file_name):
+                os.remove(test_file_name)
+
+            # Also clean up the temp directory if it's empty
+            temp_dir = os.path.dirname(test_file_name)
+            if os.path.exists(temp_dir) and not os.listdir(temp_dir):
+                os.rmdir(temp_dir)
+
     def test_streams_sign_with_es256_alg(self):
         with open(self.testPath, "rb") as file:
             builder = Builder(self.manifestDefinitionV2)
@@ -1168,8 +1197,6 @@ def test_sign_file_tmn_wip(self):
         try:
             # Create a temporary output file path
             output_path = os.path.join(temp_dir, "signed_output.jpg")
-            print(f"## output_path: {output_path}")
-            print(f"## self.testPath: {self.testPath}")
 
             # Use the sign_file method
             builder = Builder(self.manifestDefinition)
@@ -1846,8 +1873,7 @@ def test_sign_file(self):
         manifest_json = json.dumps(manifest)
 
         try:
-            # Sign the file
-            result_json = sign_file(
+            sign_file(
                 self.testPath,
                 output_path,
                 manifest_json,