mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-06-04 01:28:55 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

YACReader: Port commandline to QCommandLineParser

Browse Source
This commit is contained in:
Felix Kauselmann 2018-02-16 15:31:32 +01:00
parent 9103ee0c0c
commit afab73cbc6
1 changed files with 56 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
YACReader/main.cpp
View File

@ -1,6 +1,7 @@
#include <QApplication> #include <QApplication>
#include <QDir> #include <QDir>
#include <QTranslator> #include <QTranslator>
#include <QCommandLineParser>
#include "main_window_viewer.h" #include "main_window_viewer.h"
#include "configuration.h" #include "configuration.h"
@ -53,7 +54,7 @@ class YACReaderApplication: public QApplication
int main(int argc, char * argv[]) int main(int argc, char * argv[])
{ {
#if defined(_MSC_VER) && defined(_DEBUG) #if defined(_MSC_VER) && defined(_DEBUG)
_CrtSetDbgFlag ( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF ); _CrtSetDbgFlag ( _CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF );
#endif #endif
@ -73,38 +74,21 @@ int main(int argc, char * argv[])
if (QIcon::hasThemeIcon("YACReader")) { if (QIcon::hasThemeIcon("YACReader")) {
app.setWindowIcon(QIcon::fromTheme("YACReader")); app.setWindowIcon(QIcon::fromTheme("YACReader"));
} }
//simple command line parser
//will be replaced by QCommandLineParser in the future
QStringList optlist;
QStringList arglist;
if (argc > 1) // simple commandline parser
{ QCommandLineParser parser;
//extract options and arguments parser.addHelpOption();
optlist = QCoreApplication::arguments().filter(QRegExp ("^-{1,2}")); //options starting with "-" parser.addVersionOption();
arglist = QCoreApplication::arguments().filter(QRegExp ("^(?!-{1,2})")); //positional arguments parser.addPositionalArgument("[File|Directory]", "File or directory to open.");
//deal with standard options QCommandLineOption comicId("comicId", "", "comicId");
if (!optlist.isEmpty()) QCommandLineOption libraryId("libraryId", "", "libraryId");
{ // hide comicId and libraryId from help
QTextStream parser(stdout); comicId.setFlags(QCommandLineOption::HiddenFromHelp);
if (optlist.contains("--version") || optlist.contains("-v")) libraryId.setFlags(QCommandLineOption::HiddenFromHelp);
{ // process
parser << app.applicationName() << " " << QString(VERSION) << endl << "Copyright 2014 by Luis Angel San Martin Rodriguez" << endl; parser.addOption(comicId);
return 0; parser.addOption(libraryId);
} parser.process(app);
if (optlist.contains("--help") || optlist.contains("-h"))
{
parser << endl << "Usage: YACReader [File|Directory|Option]" << endl << endl;
parser << "Options:" << endl;
parser << " -h, --help\t\tDisplay this text and exit." << endl;
parser << " -v, --version\t\tDisplay version information and exit." << endl << endl;
parser << "Arguments:" << endl;
parser << " file\t\t\tOpen comic file." <<endl;
parser << " directory\t\tOpen comic directory." << endl << endl;
return 0;
}
}
}
QString destLog = YACReader::getSettingsPath()+"/yacreader.log"; QString destLog = YACReader::getSettingsPath()+"/yacreader.log";
QDir().mkpath(YACReader::getSettingsPath()); QDir().mkpath(YACReader::getSettingsPath());
@ -128,23 +112,17 @@ int main(int argc, char * argv[])
app.installTranslator(&translator); app.installTranslator(&translator);
MainWindowViewer * mwv = new MainWindowViewer(); MainWindowViewer * mwv = new MainWindowViewer();
//parser code for comic loading needs to be processed after MainWindowViewer creation // some arguments need to be parsed after MainWindowViewer creation
//if we have a valid request, open it - if not, load normally QStringList arglist = parser.positionalArguments();
if (argc > 1) if (parser.isSet(comicId) && parser.isSet(libraryId) && arglist.count() >=1)
{ {
if (!optlist.filter("--comicId=").isEmpty() && !optlist.filter("--libraryId=").isEmpty()) mwv->open(arglist.at(0), parser.value(comicId).toULongLong(), parser.value(libraryId).toULongLong());
}
else if (arglist.count() >= 1)
{ {
if (arglist.count()>1) mwv->openComicFromPath(arglist.at(0));
{
mwv->open(arglist.at(1), optlist.filter("--comicId=").at(0).split("=").at(1).toULongLong(), optlist.filter("--libraryId=").at(0).split("=").at(1).toULongLong());
}
}
else if ((arglist.count()>1))
{
//open first positional argument, silently ignore all following positional arguments
mwv->openComicFromPath(arglist.at(1));
}
} }
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
app.setWindow(mwv); app.setWindow(mwv);
#endif #endif