github/chiaki
1
0
Fork 0
mirror of https://git.sr.ht/~thestr4ng3r/chiaki synced 2025-07-15 01:23:37 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Integrate CLI in GUI

Browse source
This commit is contained in:
Florian Märkl 2019-08-11 20:19:55 +02:00
parent c7e4fd778b
commit 3148f1ea93
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
7 changed files with 136 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

49
gui/src/main.cpp
View file

@ -1,10 +1,11 @@
#include <streamwindow.h>
#include <videodecoder.h>
#include <discoverycmd.h>
#include <mainwindow.h>
#include <streamsession.h>
#include <chiaki-cli.h>
#include <chiaki/session.h>
#include <chiaki/base64.h>
@ -15,7 +16,16 @@
#include <QAudioOutput>
#include <QAudioFormat>
#include <QCommandLineParser>
#include <QMap>
struct CLICommand
{
int (*cmd)(ChiakiLog *log, int argc, char *argv[]);
};
static const QMap<QString, CLICommand> cli_commands = {
{ "discover", { chiaki_cli_cmd_discover } }
};
int RunStream(QApplication &app, const StreamSessionConnectInfo &connect_info);
int RunMain(QApplication &app);
@ -35,10 +45,15 @@ int main(int argc, char *argv[])
QApplication::setApplicationName("Chiaki");
QCommandLineParser parser;
parser.setOptionsAfterPositionalArgumentsMode(QCommandLineParser::ParseAsPositionalArguments);
parser.addHelpOption();
parser.addPositionalArgument("command", "stream or discover");
parser.addPositionalArgument("host", "Address to connect to");
QStringList cmds;
cmds.append("stream");
cmds.append(cli_commands.keys());
parser.addPositionalArgument("command", cmds.join(", "));
parser.addPositionalArgument("host", "Address to connect to (when using the stream command)");
QCommandLineOption regist_key_option("registkey", "", "registkey");
parser.addOption(regist_key_option);
@ -62,13 +77,13 @@ int main(int argc, char *argv[])
if(args.length() == 0)
return RunMain(app);
if(args.length() < 2)
parser.showHelp(1);
QString host = args[1];
if(args[0] == "stream")
{
if(args.length() < 2)
parser.showHelp(1);
QString host = args[1];
StreamSessionConnectInfo connect_info;
connect_info.log_level_mask = CHIAKI_LOG_ALL & ~CHIAKI_LOG_VERBOSE;
@ -87,11 +102,25 @@ int main(int argc, char *argv[])
if(connect_info.registkey.isEmpty() || connect_info.ostype.isEmpty() || connect_info.auth.isEmpty() || connect_info.morning.isEmpty() || connect_info.did.isEmpty())
parser.showHelp(1);
return RunStream(app, connect_info);
}
else if(args[0] == "discover")
else if(cli_commands.contains(args[0]))
{
return RunDiscoveryCmd(args[1]);
ChiakiLog log;
// TODO: add verbose arg
chiaki_log_init(&log, CHIAKI_LOG_ALL & ~CHIAKI_LOG_VERBOSE, chiaki_log_cb_print, nullptr);
const auto &cmd = cli_commands[args[0]];
int sub_argc = args.count();
QVector<QByteArray> sub_argv_b(sub_argc);
QVector<char *> sub_argv(sub_argc);
for(size_t i=0; i<sub_argc; i++)
{
sub_argv_b[i] = args[i].toLocal8Bit();
sub_argv[i] = sub_argv_b[i].data();
}
return cmd.cmd(&log, sub_argc, sub_argv.data());
}
else
{