moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2026-02-16 02:30:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid GUI display for App listing

Browse Source
This commit is contained in:
Anselm Busse
2021-04-04 10:43:21 +02:00
committed by Cameron Gutman
parent 0802609fd8
commit 4ee36fd405
7 changed files with 46 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/cli/commandlineparser.cpp
View File

@@ -546,7 +546,8 @@ void ListCommandLineParser::parse(const QStringList &args)
parser.addPositionalArgument("list", "list available apps");
parser.addPositionalArgument("host", "Host computer name, UUID, or IP address", "<host>");
parser.addFlagOption("csv", "Print as CSV with additional information");
parser.addFlagOption("csv", "Print as CSV with additional information");
parser.addFlagOption("verbose", "Displays additional information");
if (!parser.parse(args)) {
parser.showError(parser.errorText());
@@ -556,6 +557,7 @@ void ListCommandLineParser::parse(const QStringList &args)
m_PrintCSV = parser.isSet("csv");
m_Verbose = parser.isSet("verbose");
// This method will not return and terminates the process if --version or
// --help is specified
@@ -578,3 +580,8 @@ bool ListCommandLineParser::isPrintCSV() const
{
return m_PrintCSV;
}
bool ListCommandLineParser::isVerbose() const
{
return m_Verbose;
}

2
app/cli/commandlineparser.h
View File

@@ -84,8 +84,10 @@ public:
QString getHost() const;
bool isPrintCSV() const;
bool isVerbose() const;
private:
QString m_Host;
bool m_PrintCSV;
bool m_Verbose;
};

32
app/cli/listapps.cpp
View File

@@ -54,7 +54,7 @@ public:
NvApp app;
switch (event.type) {
// Occurs when CliListAppsSegue becomes visible and the UI calls launcher's execute()
// Occurs when CLI main calls execute
case Event::Executed:
if (m_State == StateInit) {
m_State = StateSeekComputer;
@@ -72,14 +72,17 @@ public:
m_BoxArtManager = new BoxArtManager(q);
emit q->searchingComputer();
if (m_Arguments.isVerbose()) {
fprintf(stdout, "Establishing connection to PC...\n");
}
}
break;
// Occurs when computer search timed out
case Event::ComputerSeekTimedout:
if (m_State == StateSeekComputer) {
m_State = StateFailure;
emit q->failed(QString("Failed to connect to %1").arg(m_ComputerName));
fprintf(stderr, "%s\n", qPrintable(QString("Failed to connect to %1").arg(m_ComputerName)));
QCoreApplication::exit(-1);
}
break;
// Occurs when searched computer is found
@@ -89,20 +92,23 @@ public:
m_State = StateSeekApp;
m_Computer = event.computer;
m_TimeoutTimer->start(APP_SEEK_TIMEOUT);
emit q->searchingApps();
if (m_Arguments.isVerbose()) {
fprintf(stdout, "Loading app list...\n");
}
} else {
m_State = StateFailure;
QString msg = QObject::tr("Computer %1 has not been paired. "
"Please open Moonlight to pair before retrieving games list.")
.arg(event.computer->name);
emit q->failed(msg);
fprintf(stderr, "%s\n", qPrintable(QObject::tr("Computer %1 has not been paired. "
"Please open Moonlight to pair before retrieving games list.")
.arg(event.computer->name)));
QCoreApplication::exit(-1);
}
}
break;
// Occurs when a computer is updated
case Event::ComputerUpdated:
if (m_State == StateSeekApp) {
m_PrintCSV ? printAppsCSV(m_Computer->appList) : printApps(m_Computer->appList);
m_Arguments.isPrintCSV() ? printAppsCSV(m_Computer->appList) : printApps(m_Computer->appList);
QCoreApplication::exit(0);
}
@@ -142,10 +148,10 @@ public:
NvComputer *m_Computer;
State m_State;
QTimer *m_TimeoutTimer;
bool m_PrintCSV;
ListCommandLineParser m_Arguments;
};
Launcher::Launcher(QString computer, bool printCSV, QObject *parent)
Launcher::Launcher(QString computer, ListCommandLineParser arguments, QObject *parent)
: QObject(parent),
m_DPtr(new LauncherPrivate(this))
{
@@ -154,7 +160,7 @@ Launcher::Launcher(QString computer, bool printCSV, QObject *parent)
d->m_State = StateInit;
d->m_TimeoutTimer = new QTimer(this);
d->m_TimeoutTimer->setSingleShot(true);
d->m_PrintCSV = printCSV;
d->m_Arguments = arguments;
connect(d->m_TimeoutTimer, &QTimer::timeout,
this, &Launcher::onComputerSeekTimeout);
}

11
app/cli/listapps.h
View File

@@ -1,5 +1,7 @@
#pragma once
#include "commandlineparser.h"
#include <QObject>
#include <QVariant>
@@ -17,17 +19,12 @@ class Launcher : public QObject
Q_DECLARE_PRIVATE_D(m_DPtr, Launcher)
public:
explicit Launcher(QString computer, bool printCSV, QObject *parent = nullptr);
explicit Launcher(QString computer, ListCommandLineParser arguments, QObject *parent = nullptr);
~Launcher();
Q_INVOKABLE void execute(ComputerManager *manager);
Q_INVOKABLE bool isExecuted() const;
signals:
void searchingComputer();
void searchingApps();
void failed(QString text);
private slots:
void onComputerFound(NvComputer *computer);
void onComputerUpdated(NvComputer *computer);
@@ -35,7 +32,7 @@ private slots:
private:
QScopedPointer<LauncherPrivate> m_DPtr;
bool m_Print_CSV;
ListCommandLineParser m_Arguments;
};
}