refactor: App::ParseArgs remove all unneeed arguments
This commit is contained in:
parent
5978694d95
commit
59d860874e
7 changed files with 8 additions and 46 deletions
|
|
@ -26,12 +26,7 @@
|
||||||
|
|
||||||
void showHelp(const CoreArgParser &parser)
|
void showHelp(const CoreArgParser &parser)
|
||||||
{
|
{
|
||||||
QTextStream(stdout) << parser.helpText() << "\n";
|
QTextStream(stdout) << parser.helpText();
|
||||||
ServerApp sApp(nullptr);
|
|
||||||
sApp.help();
|
|
||||||
|
|
||||||
ClientApp cApp(nullptr);
|
|
||||||
cApp.help();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
int main(int argc, char **argv)
|
int main(int argc, char **argv)
|
||||||
|
|
|
||||||
|
|
@ -160,10 +160,10 @@ void App::initApp(int argc, const char **argv)
|
||||||
if (!configFilename.empty()) {
|
if (!configFilename.empty()) {
|
||||||
Config config(configFilename, configSection());
|
Config config(configFilename, configSection());
|
||||||
if (config.load(argv[0])) {
|
if (config.load(argv[0])) {
|
||||||
parseArgs(config.argc(), config.argv());
|
parseArgs();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
parseArgs(argc, argv);
|
parseArgs();
|
||||||
}
|
}
|
||||||
|
|
||||||
// set log filter
|
// set log filter
|
||||||
|
|
|
||||||
|
|
@ -51,8 +51,7 @@ public:
|
||||||
App &operator=(App const &) = delete;
|
App &operator=(App const &) = delete;
|
||||||
App &operator=(App &&) = delete;
|
App &operator=(App &&) = delete;
|
||||||
|
|
||||||
virtual void help() = 0;
|
virtual void parseArgs() = 0;
|
||||||
virtual void parseArgs(int argc, const char *const *argv) = 0;
|
|
||||||
virtual void loadConfig() = 0;
|
virtual void loadConfig() = 0;
|
||||||
virtual bool loadConfig(const std::string &pathname) = 0;
|
virtual bool loadConfig(const std::string &pathname) = 0;
|
||||||
virtual const char *daemonInfo() const = 0;
|
virtual const char *daemonInfo() const = 0;
|
||||||
|
|
|
||||||
|
|
@ -65,7 +65,7 @@ ClientApp::ClientApp(IEventQueue *events, const QString &processName) : App(even
|
||||||
// do nothing
|
// do nothing
|
||||||
}
|
}
|
||||||
|
|
||||||
void ClientApp::parseArgs(int, const char *const *)
|
void ClientApp::parseArgs()
|
||||||
{
|
{
|
||||||
// save server address
|
// save server address
|
||||||
if (!Settings::value(Settings::Client::RemoteHost).isNull()) {
|
if (!Settings::value(Settings::Client::RemoteHost).isNull()) {
|
||||||
|
|
@ -87,31 +87,6 @@ void ClientApp::parseArgs(int, const char *const *)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ClientApp::help()
|
|
||||||
{
|
|
||||||
std::stringstream help;
|
|
||||||
help << "\n\nClient Mode:\n\n"
|
|
||||||
<< "Usage: " << kAppId << "-core client"
|
|
||||||
<< " [--sync-language]"
|
|
||||||
<< " [--invert-scroll]"
|
|
||||||
<< " <server-address>"
|
|
||||||
<< "\n\n"
|
|
||||||
<< "Connect to a " << kAppName << " mouse/keyboard sharing server.\n"
|
|
||||||
<< " --sync-language enable language synchronization.\n"
|
|
||||||
<< " --invert-scroll invert scroll direction on this\n"
|
|
||||||
<< " computer.\n"
|
|
||||||
<< s_helpVersionArgs << "\n"
|
|
||||||
|
|
||||||
<< s_helpNoWayland
|
|
||||||
|
|
||||||
<< "\n"
|
|
||||||
<< "The server address is of the form: [<hostname>][:<port>].\n"
|
|
||||||
<< "The hostname must be the address or hostname of the server.\n"
|
|
||||||
<< "The port overrides the default port, " << kDefaultPort << ".\n";
|
|
||||||
|
|
||||||
LOG_PRINT("%s", help.str().c_str());
|
|
||||||
}
|
|
||||||
|
|
||||||
const char *ClientApp::daemonName() const
|
const char *ClientApp::daemonName() const
|
||||||
{
|
{
|
||||||
#if SYSAPI_WIN32
|
#if SYSAPI_WIN32
|
||||||
|
|
|
||||||
|
|
@ -31,8 +31,7 @@ public:
|
||||||
// IApp overrides
|
// IApp overrides
|
||||||
//
|
//
|
||||||
|
|
||||||
void parseArgs(int, const char *const *) override;
|
void parseArgs() override;
|
||||||
void help() override;
|
|
||||||
const char *daemonName() const override;
|
const char *daemonName() const override;
|
||||||
const char *daemonInfo() const override;
|
const char *daemonInfo() const override;
|
||||||
void loadConfig() override
|
void loadConfig() override
|
||||||
|
|
|
||||||
|
|
@ -73,7 +73,7 @@ ServerApp::ServerApp(IEventQueue *events, const QString &processName) : App(even
|
||||||
// do nothing
|
// do nothing
|
||||||
}
|
}
|
||||||
|
|
||||||
void ServerApp::parseArgs(int, const char *const *)
|
void ServerApp::parseArgs()
|
||||||
{
|
{
|
||||||
if (const auto address = Settings::value(Settings::Core::Interface).toString(); !address.isEmpty()) {
|
if (const auto address = Settings::value(Settings::Core::Interface).toString(); !address.isEmpty()) {
|
||||||
try {
|
try {
|
||||||
|
|
@ -86,11 +86,6 @@ void ServerApp::parseArgs(int, const char *const *)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void ServerApp::help()
|
|
||||||
{
|
|
||||||
// do-nothing
|
|
||||||
}
|
|
||||||
|
|
||||||
void ServerApp::reloadSignalHandler(Arch::ThreadSignal, void *)
|
void ServerApp::reloadSignalHandler(Arch::ThreadSignal, void *)
|
||||||
{
|
{
|
||||||
IEventQueue *events = App::instance().getEvents();
|
IEventQueue *events = App::instance().getEvents();
|
||||||
|
|
|
||||||
|
|
@ -55,8 +55,7 @@ public:
|
||||||
// IApp overrides
|
// IApp overrides
|
||||||
//
|
//
|
||||||
|
|
||||||
void parseArgs(int, const char *const *) override;
|
void parseArgs() override;
|
||||||
void help() override;
|
|
||||||
const char *daemonName() const override;
|
const char *daemonName() const override;
|
||||||
const char *daemonInfo() const override;
|
const char *daemonInfo() const override;
|
||||||
void loadConfig() override;
|
void loadConfig() override;
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue