diff --git a/dirmon/dirmon/dirmon.py b/dirmon/dirmon/dirmon.py index 4ff233f..4bc7099 100644 --- a/dirmon/dirmon/dirmon.py +++ b/dirmon/dirmon/dirmon.py @@ -26,7 +26,7 @@ from watchgod import awatch from typing import Dict, Optional -from stoq import Payload, PayloadMeta +from stoq import Payload, PayloadMeta, Request, RequestMeta from stoq.plugins import ProviderPlugin from stoq.helpers import StoqConfigParser from stoq.exceptions import StoqPluginException @@ -57,12 +57,17 @@ async def ingest(self, queue: Queue) -> None: # Only handle Change.added if event != 1: continue - meta = PayloadMeta( + payload_meta = PayloadMeta( + extra_data={ + 'filename': os.path.basename(src_path) + } + ) + request_meta = RequestMeta( extra_data={ - 'filename': os.path.basename(src_path), 'source_dir': os.path.dirname(src_path), } ) with open(src_path, 'rb') as f: - payload = Payload(f.read(), meta) - await queue.put(payload) + payload = Payload(f.read(), payload_meta) + request = Request([payload], request_meta) + await queue.put(request) diff --git a/dirmon/dirmon/dirmon.stoq b/dirmon/dirmon/dirmon.stoq index d6f99d9..0b3f437 100644 --- a/dirmon/dirmon/dirmon.stoq +++ b/dirmon/dirmon/dirmon.stoq @@ -18,7 +18,7 @@ Module = dirmon [Documentation] Author = Marcus LaFerrera -Version = 3.0.0 +Version = 3.1.0 Website = https://github.com/PUNCH-Cyber/stoq-plugins-public Description = Monitor a directory for newly created files for processing