From b3ce7c41d3d184b39c2b36b9ed5e29eb0eb27d48 Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Mon, 17 Mar 2025 20:21:46 -0400 Subject: [PATCH] chore: remove unused ARCH::setPluginDirectory Arch::getPluginDirectory --- src/lib/arch/IArchFile.h | 14 -------------- src/lib/arch/unix/ArchFileUnix.cpp | 18 ------------------ src/lib/arch/unix/ArchFileUnix.h | 3 --- src/lib/arch/win32/ArchFileWindows.cpp | 16 ---------------- src/lib/arch/win32/ArchFileWindows.h | 3 --- src/lib/deskflow/App.cpp | 1 - .../deskflow/ClientArgsParsingTests.cpp | 6 ++---- 7 files changed, 2 insertions(+), 59 deletions(-) diff --git a/src/lib/arch/IArchFile.h b/src/lib/arch/IArchFile.h index 819746d4c..493fca12f 100644 --- a/src/lib/arch/IArchFile.h +++ b/src/lib/arch/IArchFile.h @@ -52,13 +52,6 @@ public: */ virtual std::string getLogDirectory() = 0; - //! Get plugins directory - /*! - Returns the plugin files directory. If no plugin directory is set, - this will return the plugin folder within the user's profile. - */ - virtual std::string getPluginDirectory() = 0; - //! Get user's profile directory /*! Returns the user's profile directory. If no profile directory is set, @@ -82,11 +75,4 @@ public: Returns the user's profile directory. */ virtual void setProfileDirectory(const std::string &s) = 0; - - //@} - //! Set the user's plugin directory - /* - Returns the user's plugin directory. - */ - virtual void setPluginDirectory(const std::string &s) = 0; }; diff --git a/src/lib/arch/unix/ArchFileUnix.cpp b/src/lib/arch/unix/ArchFileUnix.cpp index 4bb584b2b..3a1987602 100644 --- a/src/lib/arch/unix/ArchFileUnix.cpp +++ b/src/lib/arch/unix/ArchFileUnix.cpp @@ -91,19 +91,6 @@ std::string ArchFileUnix::getLogDirectory() return "/var/log"; } -std::string ArchFileUnix::getPluginDirectory() -{ - if (!m_pluginDirectory.empty()) { - return m_pluginDirectory; - } - -#if WINAPI_XWINDOWS - return getProfileDirectory().append("/plugins"); -#else - return getProfileDirectory().append("/Plugins"); -#endif -} - std::string ArchFileUnix::getProfileDirectory() { if (!m_profileDirectory.empty()) { @@ -139,8 +126,3 @@ void ArchFileUnix::setProfileDirectory(const std::string &s) { m_profileDirectory = s; } - -void ArchFileUnix::setPluginDirectory(const std::string &s) -{ - m_pluginDirectory = s; -} diff --git a/src/lib/arch/unix/ArchFileUnix.h b/src/lib/arch/unix/ArchFileUnix.h index a19656d8e..7120c2131 100644 --- a/src/lib/arch/unix/ArchFileUnix.h +++ b/src/lib/arch/unix/ArchFileUnix.h @@ -24,13 +24,10 @@ public: virtual std::string getSystemDirectory(); virtual std::string getInstalledDirectory(); virtual std::string getLogDirectory(); - virtual std::string getPluginDirectory(); virtual std::string getProfileDirectory(); virtual std::string concatPath(const std::string &prefix, const std::string &suffix); virtual void setProfileDirectory(const std::string &s); - virtual void setPluginDirectory(const std::string &s); private: std::string m_profileDirectory; - std::string m_pluginDirectory; }; diff --git a/src/lib/arch/win32/ArchFileWindows.cpp b/src/lib/arch/win32/ArchFileWindows.cpp index ce177042b..5803fcb70 100644 --- a/src/lib/arch/win32/ArchFileWindows.cpp +++ b/src/lib/arch/win32/ArchFileWindows.cpp @@ -119,17 +119,6 @@ std::string ArchFileWindows::getLogDirectory() return getInstalledDirectory(); } -std::string ArchFileWindows::getPluginDirectory() -{ - if (!m_pluginDirectory.empty()) { - return m_pluginDirectory; - } - - std::string dir = getProfileDirectory(); - dir.append("\\Plugins"); - return dir; -} - std::string ArchFileWindows::getProfileDirectory() { std::string dir; @@ -162,8 +151,3 @@ void ArchFileWindows::setProfileDirectory(const std::string &s) { m_profileDirectory = s; } - -void ArchFileWindows::setPluginDirectory(const std::string &s) -{ - m_pluginDirectory = s; -} diff --git a/src/lib/arch/win32/ArchFileWindows.h b/src/lib/arch/win32/ArchFileWindows.h index aaba96cea..2870a6fc0 100644 --- a/src/lib/arch/win32/ArchFileWindows.h +++ b/src/lib/arch/win32/ArchFileWindows.h @@ -24,13 +24,10 @@ public: virtual std::string getSystemDirectory(); virtual std::string getInstalledDirectory(); virtual std::string getLogDirectory(); - virtual std::string getPluginDirectory(); virtual std::string getProfileDirectory(); virtual std::string concatPath(const std::string &prefix, const std::string &suffix); virtual void setProfileDirectory(const std::string &s); - virtual void setPluginDirectory(const std::string &s); private: std::string m_profileDirectory; - std::string m_pluginDirectory; }; diff --git a/src/lib/deskflow/App.cpp b/src/lib/deskflow/App.cpp index 65d6727ee..8270ffd97 100644 --- a/src/lib/deskflow/App.cpp +++ b/src/lib/deskflow/App.cpp @@ -176,7 +176,6 @@ void App::initApp(int argc, const char **argv) } ARCH->setProfileDirectory(argsBase().m_profileDirectory); - ARCH->setPluginDirectory(argsBase().m_pluginDirectory); // set log filter if (!CLOG->setFilter(argsBase().m_logFilter)) { diff --git a/src/test/unittests/deskflow/ClientArgsParsingTests.cpp b/src/test/unittests/deskflow/ClientArgsParsingTests.cpp index fb75c998d..714adac16 100644 --- a/src/test/unittests/deskflow/ClientArgsParsingTests.cpp +++ b/src/test/unittests/deskflow/ClientArgsParsingTests.cpp @@ -73,16 +73,14 @@ TEST(ClientArgsParsingTests, parseClientArgs_setCommonArgs) ON_CALL(argParser, checkUnexpectedArgs()).WillByDefault(Invoke(client_stubCheckUnexpectedArgs)); deskflow::ClientArgs clientArgs; clientArgs.m_enableLangSync = false; - const int argc = 9; - std::array kLangCmd = {"stub", "--enable-crypto", "--profile-dir", - "profileDir", "--plugin-dir", "pluginDir", + const int argc = 7; + std::array kLangCmd = {"stub", "--enable-crypto", "--profile-dir", "profileDir", "--tls-cert", "tlsCertPath", "--prevent-sleep"}; argParser.parseClientArgs(clientArgs, argc, kLangCmd.data()); EXPECT_TRUE(clientArgs.m_enableCrypto); EXPECT_EQ(clientArgs.m_profileDirectory, "profileDir"); - EXPECT_EQ(clientArgs.m_pluginDirectory, "pluginDir"); EXPECT_EQ(clientArgs.m_tlsCertFile, "tlsCertPath"); EXPECT_TRUE(clientArgs.m_preventSleep); }