. b Fix DNG conversion hanging and double size issues

alexbigkid · alexbigkid · commit 7bf10bdc6655 · 2025-07-08T09:55:24.000-07:00
diff --git a/src/eir/build_constants.py b/src/eir/build_constants.py
@@ -1,6 +1,6 @@
 """Build-time constants generated by build script."""
 
-VERSION = "0.2.51"
+VERSION = "0.3.3"
 NAME = "eir"
 LICENSE = "MIT"
 KEYWORDS = ["exif", "images", "pictures", "rename", "convert"]
diff --git a/src/eir/cli.py b/src/eir/cli.py
@@ -40,7 +40,10 @@ def main():
     command_line_options.handle_options()
     asyncio.run(
         run_pipeline(
-            logger=command_line_options.logger, image_dir=command_line_options.options.dir
+            logger=command_line_options.logger,
+            image_dir=command_line_options.options.dir,
+            dng_compression=command_line_options.options.dng_compression,
+            dng_preview=command_line_options.options.dng_preview,
         )
     )
 
diff --git a/src/eir/clo.py b/src/eir/clo.py
@@ -66,6 +66,18 @@ def handle_options(self) -> None:
         parser.add_argument(
             "-v", "--version", action="store_true", help="Show version info and exit"
         )
+        parser.add_argument(
+            "--dng-compression",
+            choices=["lossless", "uncompressed"],
+            default="lossless",
+            help="DNG compression method: lossless (default) or uncompressed",
+        )
+        parser.add_argument(
+            "--dng-preview",
+            action="store_true",
+            default=False,
+            help="Embed JPEG preview in DNG files (increases file size)",
+        )
         self.options = parser.parse_args()
 
         if self.options.version:
diff --git a/src/eir/processor.py b/src/eir/processor.py
@@ -90,10 +90,18 @@ class ImageProcessor:
     EXIF_UNKNOWN = "unknown"
     EXIF_TAGS = [ExifTag.CREATE_DATE.value, ExifTag.MAKE.value, ExifTag.MODEL.value]
 
-    def __init__(self, logger: logging.Logger, op_dir: str):
+    def __init__(
+        self,
+        logger: logging.Logger,
+        op_dir: str,
+        dng_compression: str = "lossless",
+        dng_preview: bool = False,
+    ):
         """Initialize ImageProcessor."""
         self._logger = logger or logging.getLogger(__name__)
         self._op_dir = op_dir
+        self._dng_compression = dng_compression
+        self._dng_preview = dng_preview
         self._current_dir = None
         self._supported_raw_image_ext_list = list(
             set([ext for exts in self.SUPPORTED_RAW_IMAGE_EXT.values() for ext in exts])
@@ -196,11 +204,15 @@ async def patched_get_compat_path(path):
             # Also patch the convert_file method to add proper error handling
             from pydngconverter import main as pydng_main
 
+            # Capture our compression settings for the patch
+            dng_compression = self._dng_compression
+            dng_preview = self._dng_preview
+
             async def patched_convert_file(self, *, destination: str = None, job=None, log=None):
                 """Enhanced convert_file with better error handling and logging."""
                 from pydngconverter import compat
 
-                log = log or self._logger
+                log = log or logging.getLogger(__name__)
                 log.debug("starting conversion: %s", job.source.name)
                 source_path = await compat.get_compat_path(job.source)
                 log.debug("determined source path: %s", source_path)
@@ -219,10 +231,12 @@ async def patched_convert_file(self, *, destination: str = None, job=None, log=N
                     output_file = Path(destination) / f"{Path(source_path).stem}.dng"
                     dng_args = [
                         "convert",
-                        "--compression",
-                        "lossless",
+                        "-c",
+                        dng_compression,  # Use captured compression setting
                         "--dng-preview",
-                        "true",
+                        "true" if dng_preview else "false",
+                        "--embed-raw",
+                        "false",  # CRITICAL: Don't embed original RAW to prevent double size
                         str(source_path),
                         str(output_file),
                     ]
@@ -232,7 +246,7 @@ async def patched_convert_file(self, *, destination: str = None, job=None, log=N
 
                 # Log the full command being executed
                 full_command = f"{self.bin_exec} {' '.join(dng_args)}"
-                log.debug(
+                log.info(
                     "Executing %s command: %s",
                     "DNGLab" if is_dnglab else "Adobe DNG Converter",
                     full_command,
@@ -244,7 +258,9 @@ async def patched_convert_file(self, *, destination: str = None, job=None, log=N
                 log.debug("Destination directory exists: %s", Path(destination).exists())
                 log.debug("Current working directory: %s", Path.cwd())
 
-                log.debug("converting: %s => %s", job.source.name, job.destination_filename)
+                log.info(
+                    "Starting conversion: %s => %s", job.source.name, job.destination_filename
+                )
 
                 try:
                     proc = await asyncio.create_subprocess_exec(
@@ -254,6 +270,7 @@ async def patched_convert_file(self, *, destination: str = None, job=None, log=N
                         stderr=asyncio.subprocess.PIPE,
                     )
                     stdout, stderr = await proc.communicate()
+                    log.info("DNGLab process completed with return code: %d", proc.returncode)
 
                     # Check return code and log any errors
                     if proc.returncode != 0:
@@ -737,12 +754,21 @@ async def _handle_raw_conversion(self, value: dict[str, list[dict[str, Any]]]) -
 
 
 @function_trace
-async def run_pipeline(logger: logging.Logger, image_dir: str) -> None:
+async def run_pipeline(
+    logger: logging.Logger,
+    image_dir: str,
+    dng_compression: str = "lossless",
+    dng_preview: bool = False,
+) -> None:
     """Main entry point for reactive image processing pipeline.
 
     Args:
         logger: Logger instance
         image_dir: Directory containing images to process
+        dng_compression: DNG compression method ('lossless' or 'uncompressed')
+        dng_preview: Whether to embed JPEG preview in DNG files
     """
-    processor = ImageProcessor(logger=logger, op_dir=image_dir)
+    processor = ImageProcessor(
+        logger=logger, op_dir=image_dir, dng_compression=dng_compression, dng_preview=dng_preview
+    )
     await processor.process_images_reactive()

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,10 @@ def main():`
`40`	`40`	`command_line_options.handle_options()`
`41`	`41`	`asyncio.run(`
`42`	`42`	`run_pipeline(`
`43`		`- logger=command_line_options.logger, image_dir=command_line_options.options.dir`
	`43`	`+ logger=command_line_options.logger,`
	`44`	`+ image_dir=command_line_options.options.dir,`
	`45`	`+ dng_compression=command_line_options.options.dng_compression,`
	`46`	`+ dng_preview=command_line_options.options.dng_preview,`
`44`	`47`	`)`
`45`	`48`	`)`
`46`	`49`