digitalartifex/komplex-hub
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Final alpha fixes. BETA1 release

Browse Source
This commit is contained in:
Digital Artifex
2026-08-21 07:11:31 -04:00
parent 1aaff0cd02
commit 7b25255126
5 changed files with 46 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
KomplexHubPlugin/downloadmanager.cpp
+26 -8
View File
@@ -105,6 +105,7 @@ auto DownloadManager::downloadImage(const QString &author, const QString &author
metadata.setDescription(description);
metadata.setName(QStringLiteral("Pexels Image (%1)").arg(id));
metadata.setSource(QStringLiteral("./images/%1").arg(result.fileName()));
metadata.setId(id);
QUrl packUri
(
@@ -187,18 +188,26 @@ auto DownloadManager::downloadImage(const QString &author, const QString &author
)
.onFailed
(
[this] (const NetworkException &e)
[this] (const std::filesystem::filesystem_error &e)
{
reset();
setError(QStringLiteral("Network Exception %1").arg(QString::number(e.errorCode)), e.message);
setError(QStringLiteral("Network Exception %1").arg(QString::number(e.code().value())), e.what());
}
)
.onFailed
(
[this] (const FileException &e)
[this] (const std::logic_error &e)
{
reset();
setError(QStringLiteral("File Exception %1").arg(QString::number(e.errorCode)), e.message);
setError(QStringLiteral("Logic Exception %1"), e.what());
}
)
.onFailed
(
[this] (const std::exception &e)
{
reset();
setError(QStringLiteral("Logic Exception %1"), e.what());
}
)
.onFailed
@@ -235,6 +244,7 @@ auto DownloadManager::downloadVideo(const QString &author, const QString &author
metadata.setType(ShaderPack::Video);
metadata.setName(QStringLiteral("Pexels Video (%1)").arg(id));
metadata.setSource(QStringLiteral("./videos/%1").arg(result.fileName()));
metadata.setId(id);
QUrl packUri
(
@@ -312,18 +322,26 @@ auto DownloadManager::downloadVideo(const QString &author, const QString &author
)
.onFailed
(
[this] (const NetworkException &e)
[this] (const std::filesystem::filesystem_error &e)
{
reset();
setError(QStringLiteral("Network Exception %1").arg(QString::number(e.errorCode)), e.message);
setError(QStringLiteral("Network Exception %1").arg(QString::number(e.code().value())), e.what());
}
)
.onFailed
(
[this] (const FileException &e)
[this] (const std::logic_error &e)
{
reset();
setError(QStringLiteral("File Exception %1").arg(QString::number(e.errorCode)), e.message);
setError(QStringLiteral("Logic Exception %1"), e.what());
}
)
.onFailed
(
[this] (const std::exception &e)
{
reset();
setError(QStringLiteral("Logic Exception %1"), e.what());
}
)
.onFailed
KomplexHubPlugin/packcompiler.cpp
+10 -23
View File
@@ -42,20 +42,7 @@ auto PackCompiler::process(const QUrl &uri) -> QFuture<QUrl>
(
[this, uri] () -> QUrl
{
if(!uri.isLocalFile())
{
setError
(
QStringLiteral("File Error"),
QStringLiteral("URI %1 is not a local file").arg
(
uri.toString()
)
);
return {};
}
validateUri(uri);
reset();
setStatus(QStringLiteral("Compiling %1").arg(uri.fileName()));
setState(Compiling);
@@ -295,7 +282,7 @@ auto PackCompiler::prepareShaders(const QUrl &uri) noexcept(false) -> void
auto PackCompiler::loadCommonFragmentData(const QUrl &uri) -> QByteArray
{
localCheck(uri);
validateUri(uri);
QDir sourceDirectory
(
@@ -358,7 +345,7 @@ auto PackCompiler::loadCommonFragmentData(const QUrl &uri) -> QByteArray
auto PackCompiler::loadCommonVertexData(const QUrl &uri) -> QByteArray
{
localCheck(uri);
validateUri(uri);
QDir sourceDirectory
(
@@ -421,7 +408,7 @@ auto PackCompiler::loadCommonVertexData(const QUrl &uri) -> QByteArray
auto PackCompiler::loadGlobalData(const QUrl &uri) -> QByteArray
{
localCheck(uri);
validateUri(uri);
QDir sourceDirectory
(
@@ -490,7 +477,7 @@ auto PackCompiler::validateDirectory(const QUrl &uri) -> bool
auto PackCompiler::createDirectory(const QUrl &uri) -> void
{
localCheck(uri);
validateUri(uri);
QStringList arguments =
{
@@ -573,7 +560,7 @@ auto PackCompiler::createDirectory(const QUrl &uri) -> void
}
}
auto PackCompiler::localCheck(const QUrl &uri) noexcept(false) -> void
auto PackCompiler::validateUri(const QUrl &uri) noexcept(false) -> void
{
if(!uri.isValid() || !uri.isLocalFile())
{
@@ -594,7 +581,7 @@ auto PackCompiler::localCheck(const QUrl &uri) noexcept(false) -> void
auto PackCompiler::extract(const QUrl &sourceUri) noexcept(false) -> QUrl
{
localCheck(sourceUri);
validateUri(sourceUri);
QFileInfo info(sourceUri.toLocalFile());
@@ -718,7 +705,7 @@ auto PackCompiler::copyFile(const QUrl &sourceUri, const QUrl &destinationUri) n
auto PackCompiler::compile(const QUrl &uri) noexcept(false) -> void
{
localCheck(uri);
validateUri(uri);
setState(Compiling);
@@ -869,7 +856,7 @@ auto PackCompiler::preprocess(const QUrl &uri) noexcept(false) -> void
auto PackCompiler::appendVersion(const QUrl &uri) noexcept(false) -> void
{
localCheck(uri);
validateUri(uri);
QFile file(uri.toLocalFile());
@@ -899,7 +886,7 @@ auto PackCompiler::appendVersion(const QUrl &uri) noexcept(false) -> void
auto PackCompiler::compileShader(const QUrl &uri) noexcept(false) -> void
{
localCheck(uri);
validateUri(uri);
QString qsb = QStringLiteral("/usr/lib/qt6/bin/qsb");
KomplexHubPlugin/packcompiler.h
+1 -1
View File
@@ -114,7 +114,7 @@ protected:
auto createDirectory(const QUrl &uri) -> void;
auto localCheck(const QUrl &uri) noexcept(false) -> void;
auto validateUri(const QUrl &uri) noexcept(false) -> void;
auto extract(const QUrl &sourceUri) noexcept(false) -> QUrl;
auto copyFile(const QUrl &sourceUri, const QUrl &destinationUri) noexcept(false) -> void;
auto compile(const QUrl &uri) noexcept(false) -> void;