moonlight-stream/moonlight-qt
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-qt.git synced 2026-06-17 14:11:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add AppModel and AppView for loading apps and modify BoxArtManager to return QUrls for QML

Browse Source
This commit is contained in:
Cameron Gutman
2018-07-05 20:07:05 -07:00
parent 95eebdbe66
commit b0151da455
8 changed files with 257 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/backend/boxartmanager.cpp
+16 -15
View File
@@ -7,8 +7,7 @@
BoxArtManager::BoxArtManager(QObject *parent) :
QObject(parent),
m_BoxArtDir(
QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/boxart"),
m_PlaceholderImage(":/res/no_app_image.png")
QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + "/boxart")
{
if (!m_BoxArtDir.exists()) {
m_BoxArtDir.mkpath(".");
@@ -32,16 +31,12 @@ BoxArtManager::getFilePathForBoxArt(NvComputer* computer, int appId)
return dir.filePath(QString::number(appId) + ".png");
}
QImage BoxArtManager::loadBoxArt(NvComputer* computer, NvApp& app)
QUrl BoxArtManager::loadBoxArt(NvComputer* computer, NvApp& app)
{
// Try to open the cached file
QFile cacheFile(getFilePathForBoxArt(computer, app.id));
if (cacheFile.open(QFile::ReadOnly)) {
// Return what we have if it's a valid image
QImage image = QImageReader(&cacheFile).read();
if (!image.isNull()) {
return image;
}
QString cacheFilePath = getFilePathForBoxArt(computer, app.id);
if (QFile::exists(cacheFilePath)) {
return QUrl::fromLocalFile(cacheFilePath);
}
// If we get here, we need to fetch asynchronously.
@@ -51,18 +46,22 @@ QImage BoxArtManager::loadBoxArt(NvComputer* computer, NvApp& app)
// Return the placeholder then we can notify the caller
// later when the real image is ready.
return m_PlaceholderImage;
return QUrl("qrc:/res/no_app_image.png");
}
void BoxArtManager::handleBoxArtLoadComplete(NvComputer* computer, NvApp app, QImage image)
void BoxArtManager::handleBoxArtLoadComplete(NvComputer* computer, NvApp app, QUrl image)
{
if (image.isEmpty()) {
image = QUrl("qrc:/res/no_app_image.png");
}
emit boxArtLoadComplete(computer, app, image);
}
QImage BoxArtManager::loadBoxArtFromNetwork(NvComputer* computer, int appId)
QUrl BoxArtManager::loadBoxArtFromNetwork(NvComputer* computer, int appId)
{
NvHTTP http(computer->activeAddress);
QString cachePath = getFilePathForBoxArt(computer, appId);
QImage image;
try {
image = http.getBoxArt(appId);
@@ -70,8 +69,10 @@ QImage BoxArtManager::loadBoxArtFromNetwork(NvComputer* computer, int appId)
// Cache the box art on disk if it loaded
if (!image.isNull()) {
image.save(getFilePathForBoxArt(computer, appId));
if (image.save(cachePath)) {
return QUrl::fromLocalFile(cachePath);
}
}
return image;
return QUrl();
}
app/backend/boxartmanager.h
+9 -10
View File
@@ -15,28 +15,27 @@ class BoxArtManager : public QObject
public:
explicit BoxArtManager(QObject *parent = nullptr);
QImage
QUrl
loadBoxArt(NvComputer* computer, NvApp& app);
signals:
void
boxArtLoadComplete(NvComputer* computer, NvApp app, QImage image);
boxArtLoadComplete(NvComputer* computer, NvApp app, QUrl image);
public slots:
private slots:
void
handleBoxArtLoadComplete(NvComputer* computer, NvApp app, QImage image);
handleBoxArtLoadComplete(NvComputer* computer, NvApp app, QUrl image);
private:
QImage
QUrl
loadBoxArtFromNetwork(NvComputer* computer, int appId);
QString
getFilePathForBoxArt(NvComputer* computer, int appId);
QDir m_BoxArtDir;
QImage m_PlaceholderImage;
};
class NetworkBoxArtLoadTask : public QObject, public QRunnable
@@ -49,18 +48,18 @@ public:
m_Computer(computer),
m_App(app)
{
connect(this, SIGNAL(boxArtFetchCompleted(NvComputer*,NvApp,QImage)),
boxArtManager, SLOT(handleBoxArtLoadComplete(NvComputer*,NvApp,QImage)));
connect(this, SIGNAL(boxArtFetchCompleted(NvComputer*,NvApp,QUrl)),
boxArtManager, SLOT(handleBoxArtLoadComplete(NvComputer*,NvApp,QUrl)));
}
signals:
void boxArtFetchCompleted(NvComputer* computer, NvApp app, QImage image);
void boxArtFetchCompleted(NvComputer* computer, NvApp app, QUrl image);
private:
void run()
{
QImage image = m_Bam->loadBoxArtFromNetwork(m_Computer, m_App.id);
if (image.isNull()) {
QUrl image = m_Bam->loadBoxArtFromNetwork(m_Computer, m_App.id);
if (image.isEmpty()) {
// Give it another shot if it fails once
image = m_Bam->loadBoxArtFromNetwork(m_Computer, m_App.id);
}