From dc1bf3d88f53bc7007a5872db3bb00449244ca36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Garc=C3=ADa=20Crespo?= Date: Sat, 10 Aug 2024 06:10:07 +0000 Subject: [PATCH] Remove unused config attribute --- src/MCPClient/install/README.md | 12 ------------ src/MCPClient/install/clientConfig.conf | 1 - src/MCPClient/lib/client/utils.py | 1 - src/MCPClient/lib/settings/common.py | 7 ------- 4 files changed, 21 deletions(-) diff --git a/src/MCPClient/install/README.md b/src/MCPClient/install/README.md index 5b36357397..f42f080578 100644 --- a/src/MCPClient/install/README.md +++ b/src/MCPClient/install/README.md @@ -125,24 +125,12 @@ This is the full list of variables supported by MCPClient: - **Type:** `string` - **Default:** `/var/archivematica/sharedDirectory/watchedDirectories/` -- **`ARCHIVEMATICA_MCPCLIENT_MCPCLIENT_CLIENTSCRIPTSDIRECTORY`**: - - **Description:** location of the client scripts directory. - - **Config file example:** `MCPClient.clientScriptsDirectory` - - **Type:** `string` - - **Default:** `/usr/lib/archivematica/MCPClient/clientScripts/` - - **`ARCHIVEMATICA_MCPCLIENT_MCPCLIENT_CLIENTASSETSDIRECTORY`**: - **Description:** location of the client assets directory. - **Config file example:** `MCPClient.clientAssetsDirectory` - **Type:** `string` - **Default:** `/usr/lib/archivematica/MCPClient/assets/` -- **`ARCHIVEMATICA_MCPCLIENT_MCPCLIENT_LOADSUPPORTEDCOMMANDSSPECIAL`**: - - **Description:** enables loading special modules. - - **Config file example:** `MCPClient.LoadSupportedCommandsSpecial` - - **Type:** `boolean` - - **Default:** `true` - - **`ARCHIVEMATICA_MCPCLIENT_MCPCLIENT_MCPARCHIVEMATICASERVER`**: - **Description:** address of the Gearman server. - **Config file example:** `MCPClient.MCPArchivematicaServer` diff --git a/src/MCPClient/install/clientConfig.conf b/src/MCPClient/install/clientConfig.conf index e2c88957db..92b9d4716f 100644 --- a/src/MCPClient/install/clientConfig.conf +++ b/src/MCPClient/install/clientConfig.conf @@ -5,7 +5,6 @@ watchDirectoryPath = /var/archivematica/sharedDirectory/watchedDirectories/ processingDirectory = /var/archivematica/sharedDirectory/currentlyProcessing/ rejectedDirectory = /var/archivematica/sharedDirectory/rejected/ archivematicaClientModules = /usr/lib/archivematica/MCPClient/archivematicaClientModules -clientScriptsDirectory = /usr/lib/archivematica/MCPClient/clientScripts/ clientAssetsDirectory = /usr/lib/archivematica/MCPClient/assets/ elasticsearchServer = localhost:9200 elasticsearchTimeout = 10 diff --git a/src/MCPClient/lib/client/utils.py b/src/MCPClient/lib/client/utils.py index 5258e2604c..fb2c9213fd 100644 --- a/src/MCPClient/lib/client/utils.py +++ b/src/MCPClient/lib/client/utils.py @@ -21,7 +21,6 @@ def replace_task_arguments( ) -> str: replacements = { r"%sharedPath%": settings.SHARED_DIRECTORY, - r"%clientScriptsDirectory%": settings.CLIENT_SCRIPTS_DIRECTORY, r"%clientAssetsDirectory%": settings.CLIENT_ASSETS_DIRECTORY, r"%date%": timezone.now().isoformat(), r"%taskUUID%": task_uuid, diff --git a/src/MCPClient/lib/settings/common.py b/src/MCPClient/lib/settings/common.py index ff14c59846..dab115af11 100644 --- a/src/MCPClient/lib/settings/common.py +++ b/src/MCPClient/lib/settings/common.py @@ -82,11 +82,6 @@ def workers(config, section): "option": "watchDirectoryPath", "type": "string", }, - "client_scripts_directory": { - "section": "MCPClient", - "option": "clientScriptsDirectory", - "type": "string", - }, "client_assets_directory": { "section": "MCPClient", "option": "clientAssetsDirectory", @@ -223,7 +218,6 @@ def workers(config, section): processingDirectory = /var/archivematica/sharedDirectory/currentlyProcessing/ rejectedDirectory = /var/archivematica/sharedDirectory/rejected/ archivematicaClientModules = /usr/lib/archivematica/MCPClient/archivematicaClientModules -clientScriptsDirectory = /usr/lib/archivematica/MCPClient/clientScripts/ clientAssetsDirectory = /usr/lib/archivematica/MCPClient/assets/ elasticsearchServer = localhost:9200 elasticsearchTimeout = 10 @@ -361,7 +355,6 @@ def workers(config, section): PROCESSING_DIRECTORY = config.get("processing_directory") REJECTED_DIRECTORY = config.get("rejected_directory") WATCH_DIRECTORY = config.get("watch_directory") -CLIENT_SCRIPTS_DIRECTORY = config.get("client_scripts_directory") CLIENT_ASSETS_DIRECTORY = config.get("client_assets_directory") GEARMAN_SERVER = config.get("gearman_server") CLIENT_MODULES_FILE = config.get("client_modules_file")