Martchus
/
videodownloader
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use new argument parser API

This commit is contained in:
Martchus 2016-06-14 00:54:13 +02:00
parent f5a6c9a23b
commit 4c71054cfd
4 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -116,8 +116,12 @@ set(ICON_FILES
resources/icons/hicolor/scalable/apps/${META_PROJECT_NAME}.svg
)
set(DOC_FILES
README.md
)
# find c++utilities
find_package(c++utilities 3.3.0 REQUIRED)
find_package(c++utilities 4.0.0 REQUIRED)
use_cpp_utilities()
# find qtutilities

16
application/main.cpp
View File

@ -30,19 +30,21 @@ int main(int argc, char *argv[])
ArgumentParser parser;
QT_CONFIG_ARGUMENTS qtConfigArgs;
HelpArgument helpArg(parser);
Argument noConfirmArg("no-confirm", "n", "start downloading without confirmation");
Argument noConfirmArg("no-confirm", 'n', "start downloading without confirmation");
noConfirmArg.setCombinable(true);
Argument downloadArg("download", "d", "downloads the specified data");
downloadArg.setValueNames({"URL1", "URL2", "URL3"});
downloadArg.setRequiredValueCount(-1);
Argument urlsArg("urls", 'u', "specifies the URLs to download");
urlsArg.setRequiredValueCount(-1);
urlsArg.setValueNames({"URL1", "URL2", "URL3"});
urlsArg.setImplicit(true);
Argument downloadArg("download", 'd', "downloads the specified data");
downloadArg.setDenotesOperation(true);
downloadArg.setSecondaryArguments({&noConfirmArg});
downloadArg.setCallback(bind(Cli::download, argc, argv, _1, cref(noConfirmArg)));
downloadArg.setSubArguments({&urlsArg, &noConfirmArg});
downloadArg.setCallback(bind(Cli::download, argc, argv, _1, cref(urlsArg), cref(noConfirmArg)));
parser.setMainArguments({&qtConfigArgs.qtWidgetsGuiArg(), &downloadArg, &helpArg});
// parse arguments
try {
parser.parseArgs(argc, argv);
} catch (Failure &ex) {
} catch (const Failure &ex) {
CMD_UTILS_START_CONSOLE;
cout << "Unable to parse arguments. " << ex.what() << "\nSee --help for available commands." << endl;
}

6
cli/mainfeatures.cpp
View File

@ -21,7 +21,7 @@ using namespace Network;
namespace Cli {
void download(int argc, char *argv[], const StringVector &parameterValues, const Argument &noConfirmArg)
void download(int argc, char *argv[], const std::vector<const char *> &, const Argument &urlsArg, const Argument &noConfirmArg)
{
CMD_UTILS_START_CONSOLE;
// init Qt
@ -29,14 +29,14 @@ void download(int argc, char *argv[], const StringVector &parameterValues, const
QObject rootObj;
// instantiate downloads
QList<Download *> downloads;
downloads.reserve(parameterValues.size());
downloads.reserve(urlsArg.values().size());
QVariant currentTargetDirectory;
QVariant currentTargetName;
enum {
Auto, HttpUrl, YoutubeUrl, YoutubeId, GroovesharkId
} currentDownloadType = Auto;
size_t specifiedDownloads = 0;
for(const auto &val : parameterValues) {
for(const auto &val : urlsArg.values()) {
// check whether value denotes target directory or download type
auto parts = splitString<vector<string> >(val, "=", EmptyPartsTreat::Keep, 2);
if(parts.size() >= 2) {

6
cli/mainfeatures.h
View File

@ -2,18 +2,14 @@
#define CLI_MAINFEATURES_H
#include <vector>
#include <string>
namespace ApplicationUtilities {
typedef std::vector<std::string> StringVector;
class Argument;
}
namespace Cli {
void download(int argc, char *argv[], const ApplicationUtilities::StringVector &parameterValues, const ApplicationUtilities::Argument &noConfirmArg);
void download(int argc, char *argv[], const std::vector<const char *> &parameterValues, const ApplicationUtilities::Argument &urlsArg, const ApplicationUtilities::Argument &noConfirmArg);
}