Skip to content

Commit 89adb2a

Browse files
committed
Fix if additional_filename is an empty string
1 parent 32f7f61 commit 89adb2a

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

scan_to_paperless/process_utils.py

+10-4
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,12 @@ def _get_default_mask_file(self, default_file_name: str) -> str | None:
9696
if not self.root_folder:
9797
return None
9898
mask_file = self.root_folder / default_file_name
99-
if not mask_file.exists() or mask_file.is_dir():
99+
if not mask_file.exists():
100100
base_folder = self.root_folder.parent
101101
if base_folder is None:
102102
return None
103103
mask_file = base_folder / default_file_name
104-
if not mask_file.exists() or mask_file.is_dir():
104+
if not mask_file.exists():
105105
return None
106106
return str(mask_file)
107107

@@ -198,7 +198,10 @@ def init_mask(self) -> None:
198198
"additional_filename",
199199
self._get_default_mask_file("mask.png"),
200200
)
201-
additional_path = None if additional_filename is None else Path(additional_filename)
201+
additional_path = Path(additional_filename) if additional_filename else None
202+
if additional_path is not None and (not additional_path.exists() or additional_path.is_dir()):
203+
message = f"Mask file {additional_path} does not exist."
204+
raise scan_to_paperless.ScanToPaperlessError(message)
202205
self.mask = (
203206
self._get_mask(
204207
mask_config.setdefault("auto_mask", {}),
@@ -228,7 +231,10 @@ def do_initial_cut(self) -> None:
228231
"additional_filename",
229232
self._get_default_mask_file("cut.png"),
230233
)
231-
additional_path = None if additional_filename is None else Path(additional_filename)
234+
additional_path = Path(additional_filename) if additional_filename else None
235+
if additional_path is not None and (not additional_path.exists() or additional_path.is_dir()):
236+
message = f"Mask file {additional_path} does not exist."
237+
raise scan_to_paperless.ScanToPaperlessError(message)
232238
mask = self._get_mask(
233239
cut_config.setdefault("auto_mask", {}),
234240
"auto_cut",

0 commit comments

Comments
 (0)