diff --git a/src/MCPClient/lib/archivematicaClientModules b/src/MCPClient/lib/archivematicaClientModules index 4dff8ceab2..1a17491124 100644 --- a/src/MCPClient/lib/archivematicaClientModules +++ b/src/MCPClient/lib/archivematicaClientModules @@ -23,7 +23,7 @@ assignfileuuids_v0.0 = assign_file_uuids bindpid_v0.0 = bind_pid removeunneededfiles_v0.0 = remove_unneeded_files -archivematicaclamscan_v0.0 = archivematica_clamscan +antivirus_v0.0 = antivirus createevent_v0.0 = create_event examinecontents_v0.0 = examine_contents identifydspacefiles_v0.0 = identify_dspace_files diff --git a/src/MCPClient/lib/clientScripts/archivematica_clamscan.py b/src/MCPClient/lib/clientScripts/antivirus.py similarity index 100% rename from src/MCPClient/lib/clientScripts/archivematica_clamscan.py rename to src/MCPClient/lib/clientScripts/antivirus.py diff --git a/src/MCPServer/lib/assets/workflow.json b/src/MCPServer/lib/assets/workflow.json index 81e695582d..b8ffd22db6 100644 --- a/src/MCPServer/lib/assets/workflow.json +++ b/src/MCPServer/lib/assets/workflow.json @@ -2525,7 +2525,7 @@ "@manager": "linkTaskManagerFiles", "@model": "StandardTaskConfig", "arguments": "\"%fileUUID%\" \"%relativeLocation%\" \"%date%\"", - "execute": "archivematicaClamscan_v0.0", + "execute": "antivirus_v0.0", "filter_subdir": "objects/submissionDocumentation", "stderr_file": "%SIPLogsDirectory%clamAVScan.txt" }, @@ -2556,7 +2556,7 @@ "@manager": "linkTaskManagerFiles", "@model": "StandardTaskConfig", "arguments": "\"%fileUUID%\" \"%relativeLocation%\" \"%date%\"", - "execute": "archivematicaClamscan_v0.0", + "execute": "antivirus_v0.0", "stderr_file": "%SIPLogsDirectory%clamAVScan.txt" }, "description": { @@ -2885,7 +2885,7 @@ "@manager": "linkTaskManagerFiles", "@model": "StandardTaskConfig", "arguments": "\"%fileUUID%\" \"%relativeLocation%\" \"%date%\"", - "execute": "archivematicaClamscan_v0.0", + "execute": "antivirus_v0.0", "stderr_file": "%SIPLogsDirectory%clamAVScan.txt" }, "description": { @@ -6624,7 +6624,7 @@ "@manager": "linkTaskManagerFiles", "@model": "StandardTaskConfig", "arguments": "\"%fileUUID%\" \"%relativeLocation%\" \"%date%\"", - "execute": "archivematicaClamscan_v0.0", + "execute": "antivirus_v0.0", "filter_subdir": "objects/" }, "description": { @@ -7203,7 +7203,7 @@ "@manager": "linkTaskManagerFiles", "@model": "StandardTaskConfig", "arguments": "\"%fileUUID%\" \"%relativeLocation%\" \"%date%\"", - "execute": "archivematicaClamscan_v0.0", + "execute": "antivirus_v0.0", "filter_subdir": "objects/metadata", "stderr_file": "%SIPLogsDirectory%clamAVScan.txt" }, diff --git a/tests/MCPClient/test_antivirus.py b/tests/MCPClient/test_antivirus.py index b0be6ec55b..c470dd6144 100644 --- a/tests/MCPClient/test_antivirus.py +++ b/tests/MCPClient/test_antivirus.py @@ -5,7 +5,7 @@ from unittest import mock import pytest -from archivematica_clamscan import scan_file +from antivirus import scan_file from clamav_client.scanner import Scanner from clamav_client.scanner import ScanResult