paradizelost/paperless-ngx
1
0
Fork 0
mirror of https://github.com/paperless-ngx/paperless-ngx.git synced 2025-04-02 13:45:10 -05:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: consolidate original_file logic in wf handler

Browse Source
This commit is contained in:
shamoon 2025-01-15 22:13:40 -08:00
parent bd5ba97ee8
commit f68ee628d9
No known key found for this signature in database
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/documents/signals/handlers.py
View File

@ -981,11 +981,7 @@ def run_workflows(
# Something could be renaming the file concurrently so it can't be attached # Something could be renaming the file concurrently so it can't be attached
with FileLock(settings.MEDIA_LOCK): with FileLock(settings.MEDIA_LOCK):
document.refresh_from_db() document.refresh_from_db()
email.attach_file( email.attach_file(original_file)
original_file
if original_file is not None
else document.source_path,
)
n_messages = email.send() n_messages = email.send()
logger.debug( logger.debug(
f"Sent {n_messages} notification email(s) to {action.email.to}", f"Sent {n_messages} notification email(s) to {action.email.to}",
@ -1085,9 +1081,7 @@ def run_workflows(
files = None files = None
if action.webhook.include_document: if action.webhook.include_document:
with open( with open(
original_file original_file,
if original_file is not None
else document.source_path,
"rb", "rb",
) as f: ) as f:
files = { files = {
@ -1114,6 +1108,10 @@ def run_workflows(
) )
use_overrides = overrides is not None use_overrides = overrides is not None
if original_file is None:
original_file = (
document.source_path if not use_overrides else document.original_file
)
messages = [] messages = []
workflows = ( workflows = (