chore: remove unused ARCH::setPluginDirectory Arch::getPluginDirectory

This commit is contained in:
sithlord48 2025-03-17 20:21:46 -04:00 committed by Nick Bolton
parent 6963c28219
commit b3ce7c41d3
7 changed files with 2 additions and 59 deletions

View file

@ -52,13 +52,6 @@ public:
*/ */
virtual std::string getLogDirectory() = 0; 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 //! Get user's profile directory
/*! /*!
Returns the user's profile directory. If no profile directory is set, Returns the user's profile directory. If no profile directory is set,
@ -82,11 +75,4 @@ public:
Returns the user's profile directory. Returns the user's profile directory.
*/ */
virtual void setProfileDirectory(const std::string &s) = 0; 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;
}; };

View file

@ -91,19 +91,6 @@ std::string ArchFileUnix::getLogDirectory()
return "/var/log"; 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() std::string ArchFileUnix::getProfileDirectory()
{ {
if (!m_profileDirectory.empty()) { if (!m_profileDirectory.empty()) {
@ -139,8 +126,3 @@ void ArchFileUnix::setProfileDirectory(const std::string &s)
{ {
m_profileDirectory = s; m_profileDirectory = s;
} }
void ArchFileUnix::setPluginDirectory(const std::string &s)
{
m_pluginDirectory = s;
}

View file

@ -24,13 +24,10 @@ public:
virtual std::string getSystemDirectory(); virtual std::string getSystemDirectory();
virtual std::string getInstalledDirectory(); virtual std::string getInstalledDirectory();
virtual std::string getLogDirectory(); virtual std::string getLogDirectory();
virtual std::string getPluginDirectory();
virtual std::string getProfileDirectory(); virtual std::string getProfileDirectory();
virtual std::string concatPath(const std::string &prefix, const std::string &suffix); virtual std::string concatPath(const std::string &prefix, const std::string &suffix);
virtual void setProfileDirectory(const std::string &s); virtual void setProfileDirectory(const std::string &s);
virtual void setPluginDirectory(const std::string &s);
private: private:
std::string m_profileDirectory; std::string m_profileDirectory;
std::string m_pluginDirectory;
}; };

View file

@ -119,17 +119,6 @@ std::string ArchFileWindows::getLogDirectory()
return getInstalledDirectory(); 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 ArchFileWindows::getProfileDirectory()
{ {
std::string dir; std::string dir;
@ -162,8 +151,3 @@ void ArchFileWindows::setProfileDirectory(const std::string &s)
{ {
m_profileDirectory = s; m_profileDirectory = s;
} }
void ArchFileWindows::setPluginDirectory(const std::string &s)
{
m_pluginDirectory = s;
}

View file

@ -24,13 +24,10 @@ public:
virtual std::string getSystemDirectory(); virtual std::string getSystemDirectory();
virtual std::string getInstalledDirectory(); virtual std::string getInstalledDirectory();
virtual std::string getLogDirectory(); virtual std::string getLogDirectory();
virtual std::string getPluginDirectory();
virtual std::string getProfileDirectory(); virtual std::string getProfileDirectory();
virtual std::string concatPath(const std::string &prefix, const std::string &suffix); virtual std::string concatPath(const std::string &prefix, const std::string &suffix);
virtual void setProfileDirectory(const std::string &s); virtual void setProfileDirectory(const std::string &s);
virtual void setPluginDirectory(const std::string &s);
private: private:
std::string m_profileDirectory; std::string m_profileDirectory;
std::string m_pluginDirectory;
}; };

View file

@ -176,7 +176,6 @@ void App::initApp(int argc, const char **argv)
} }
ARCH->setProfileDirectory(argsBase().m_profileDirectory); ARCH->setProfileDirectory(argsBase().m_profileDirectory);
ARCH->setPluginDirectory(argsBase().m_pluginDirectory);
// set log filter // set log filter
if (!CLOG->setFilter(argsBase().m_logFilter)) { if (!CLOG->setFilter(argsBase().m_logFilter)) {

View file

@ -73,16 +73,14 @@ TEST(ClientArgsParsingTests, parseClientArgs_setCommonArgs)
ON_CALL(argParser, checkUnexpectedArgs()).WillByDefault(Invoke(client_stubCheckUnexpectedArgs)); ON_CALL(argParser, checkUnexpectedArgs()).WillByDefault(Invoke(client_stubCheckUnexpectedArgs));
deskflow::ClientArgs clientArgs; deskflow::ClientArgs clientArgs;
clientArgs.m_enableLangSync = false; clientArgs.m_enableLangSync = false;
const int argc = 9; const int argc = 7;
std::array<const char *, argc> kLangCmd = {"stub", "--enable-crypto", "--profile-dir", std::array<const char *, argc> kLangCmd = {"stub", "--enable-crypto", "--profile-dir", "profileDir",
"profileDir", "--plugin-dir", "pluginDir",
"--tls-cert", "tlsCertPath", "--prevent-sleep"}; "--tls-cert", "tlsCertPath", "--prevent-sleep"};
argParser.parseClientArgs(clientArgs, argc, kLangCmd.data()); argParser.parseClientArgs(clientArgs, argc, kLangCmd.data());
EXPECT_TRUE(clientArgs.m_enableCrypto); EXPECT_TRUE(clientArgs.m_enableCrypto);
EXPECT_EQ(clientArgs.m_profileDirectory, "profileDir"); EXPECT_EQ(clientArgs.m_profileDirectory, "profileDir");
EXPECT_EQ(clientArgs.m_pluginDirectory, "pluginDir");
EXPECT_EQ(clientArgs.m_tlsCertFile, "tlsCertPath"); EXPECT_EQ(clientArgs.m_tlsCertFile, "tlsCertPath");
EXPECT_TRUE(clientArgs.m_preventSleep); EXPECT_TRUE(clientArgs.m_preventSleep);
} }