Merge pull request #1655 from sbrunner/ghci/backport/1654-to-master

[Backport master] Fix extends config path

Author: sbrunner

scan_to_paperless/__init__.py

@@ -34,7 +34,7 @@ def get_config(config_filename: Path) -> schema.Configuration:
             config = cast("schema.Configuration", yaml.load(config_file))
             if "extends" in config:
                 base_config = get_config(
-                    config_filename.parent / Path(config["extends"]).expanduser().resolve(),
+                    (config_filename.parent / config["extends"]).expanduser().resolve(),
                 )
 
                 strategies_config = cast("schema.MergeStrategies", config.get("strategies", {}))

scan_to_paperless/scan.py

@@ -228,7 +228,7 @@ def main() -> None:
             continue
         images.append(Path("source") / img)
 
-    regex = re.compile(rf"^source\/image\-([0-9]+)\.{config.get('extension', schema.EXTENSION_DEFAULT)}$")
+    regex = re.compile(rf".*/source/image\-([0-9]+)\.{config.get('extension', schema.EXTENSION_DEFAULT)}$")
 
     def image_match(image_path: Path) -> int:
         match = regex.match(str(image_path))
@@ -238,7 +238,7 @@ def image_match(image_path: Path) -> int:
     images = sorted(images, key=image_match)
     if images:
         process_config = {
-            "images": images,
+            "images": [str(image) for image in images],
             "args": args_,
         }
         yaml = YAML()