Cleanup unused assets

2026-08-13 15:17:42 -04:00
parent 3d0655edd1
commit 1826209521
14 changed files with 139 additions and 393 deletions
@@ -10,57 +10,52 @@ qt_add_qml_module(
    VERSION
        1.0
    SOURCES
-    settingsmanager.h
-        settingsmanager.cpp
-        installedpackmanager.h
-        installedpackmanager.cpp
-        common/wallpapercache.h
-        newestpacksmodel.h
-        newestpacksmodel.cpp
-        common/komplex_global.h
-        common/slidingcachecontroller.h
-        common/paginator.h
-        common/coreservices.h
-        common/coreservices.cpp
-        common/logging.h
-        common/fetchresult.h
-        paginators/newestpackspaginator.h
-        paginators/featuredpackspaginator.h
-        paginators/featuredimagespaginator.h
-        paginators/wallpaperpaginator.h
-        paginators/packsearchpaginator.h
-        paginators/imagesearchpaginator.h
-        paginators/newestshaderspaginator.h
-        paginators/newestcubemapspaginator.h
-        paginators/featuredshaderspaginator.h
-        paginators/featuredcubemapspaginator.h
-        paginators/searchshaderspaginator.h
-        paginators/searchcubemapspaginator.h
-        paginators/videosearchpaginator.h
-        featuredpacksmodel.h
-        featuredpacksmodel.cpp
-        featuredimagesmodel.h
-        featuredimagesmodel.cpp
-        featuredvideosmodel.h
-        featuredvideosmodel.cpp
-        paginators/featuredvideospaginator.h
-        common/imagecache.h
-        paginators/imagepaginator.h
-        common/videocache.h
-        paginators/videopaginator.h
-        imagesearchmodel.cpp
-        imagesearchmodel.h
-        videosearchmodel.h
-        videosearchmodel.cpp
-        packsearchmodel.cpp
-        packsearchmodel.h
-        videoitemmodel.h
-        videoitemmodel.cpp
-        downloadmanager.h downloadmanager.cpp
-        common/exceptions.h
-        common/shadertoymetadata.h
-        common/shaderpack.h
-        SOURCES packcompiler.h packcompiler.cpp
+      settingsmanager.h
+      settingsmanager.cpp
+      installedpackmanager.h
+      installedpackmanager.cpp
+      common/wallpapercache.h
+      newestpacksmodel.h
+      newestpacksmodel.cpp
+      common/komplex_global.h
+      common/slidingcachecontroller.h
+      common/coreservices.h
+      common/coreservices.cpp
+      common/logging.h
+      common/fetchresult.h
+      paginators/paginator.h
+      paginators/newestpackspaginator.h
+      paginators/featuredpackspaginator.h
+      paginators/featuredimagespaginator.h
+      paginators/wallpaperpaginator.h
+      paginators/packsearchpaginator.h
+      paginators/imagesearchpaginator.h
+      paginators/videosearchpaginator.h
+      featuredpacksmodel.h
+      featuredpacksmodel.cpp
+      featuredimagesmodel.h
+      featuredimagesmodel.cpp
+      featuredvideosmodel.h
+      featuredvideosmodel.cpp
+      paginators/featuredvideospaginator.h
+      common/imagecache.h
+      paginators/imagepaginator.h
+      common/videocache.h
+      paginators/videopaginator.h
+      imagesearchmodel.cpp
+      imagesearchmodel.h
+      videosearchmodel.h
+      videosearchmodel.cpp
+      packsearchmodel.cpp
+      packsearchmodel.h
+      videoitemmodel.h
+      videoitemmodel.cpp
+      downloadmanager.h downloadmanager.cpp
+      common/exceptions.h
+      common/shadertoymetadata.h
+      common/shaderpack.h
+      packcompiler.h
+      packcompiler.cpp
 )

 target_compile_definitions(
@@ -69,9 +64,12 @@ target_compile_definitions(
        KOMPLEX_PLUGIN
 )

+add_subdirectory(3rdparty/qtkeychain)
+
 target_link_libraries(KomplexHubPlugin PRIVATE
    Qt${QT_VERSION_MAJOR}::Core
    Qt${QT_VERSION_MAJOR}::Gui
+    qt6keychain
 )

 if(ENABLE_ASAN)
@@ -19,6 +19,7 @@
 #ifndef KOMPLEX_GLOBAL_H
 #define KOMPLEX_GLOBAL_H
 #include <QtTypes>
+#include <QString>
 #include <chrono>

 #ifdef KOMPLEX_PLUGIN
@@ -66,5 +67,14 @@

 inline static qsizetype nullsize = std::numeric_limits<qsizetype>::min();
 inline static std::chrono::milliseconds KOMPLEX_RATE_LIMIT(500);
+inline static QString KOMPLEX_KEYCHAIN_PASSWORD_KEY = QStringLiteral
+(
+    "com.digitalartifex.komplex.keychain.password"
+);
+
+inline static QString KOMPLEX_KEYCHAIN_TOKEN_KEY = QStringLiteral
+(
+    "com.digitalartifex.komplex.keychain.token"
+);

 #endif // KOMPLEX_GLOBAL_H
@@ -1,47 +0,0 @@
-/*
- *  Komplex Wallpaper Engine
- *  Copyright (C) 2026 @DigitalArtifex
- *  https://digitalartifex.dev - https://github.com/DigitalArtifex
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>
- */
-#ifndef FEATUREDCUBEMAPSPAGINATOR_H
-#define FEATUREDCUBEMAPSPAGINATOR_H
-
-#include <QObject>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QNetworkRequest>
-#include <QEventLoop>
-#include <QJsonDocument>
-#include <QJsonParseError>
-#include <QJsonArray>
-#include <QJsonObject>
-
-#include "wallpaperpaginator.h"
-
-class KOMPLEX_EXPORT FeaturedCubemapsPaginator : public WallpaperPaginator
-{
-public:
-    explicit FeaturedCubemapsPaginator(QObject *parent = nullptr) : WallpaperPaginator(parent)
-    {
-        setUri(
-            QString::fromUtf8(KOMPLEX_ENDPOINT_CUBEMAPS_FEATURED)
-        );
-
-        controller()->setWindowSize(20);
-    }
-};
-
-#endif // FEATUREDCUBEMAPSPAGINATOR_H
@@ -1,47 +0,0 @@
-/*
- *  Komplex Wallpaper Engine
- *  Copyright (C) 2026 @DigitalArtifex
- *  https://digitalartifex.dev - https://github.com/DigitalArtifex
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>
- */
-#ifndef FEATUREDSHADERSPAGINATOR_H
-#define FEATUREDSHADERSPAGINATOR_H
-
-#include <QObject>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QNetworkRequest>
-#include <QEventLoop>
-#include <QJsonDocument>
-#include <QJsonParseError>
-#include <QJsonArray>
-#include <QJsonObject>
-
-#include "wallpaperpaginator.h"
-
-class KOMPLEX_EXPORT FeaturedShadersPaginator : public WallpaperPaginator
-{
-public:
-    explicit FeaturedShadersPaginator(QObject *parent = nullptr) : WallpaperPaginator(parent)
-    {
-        setUri(
-            QString::fromUtf8(KOMPLEX_ENDPOINT_SHADERS_FEATURED)
-        );
-
-        controller()->setWindowSize(20);
-    }
-};
-
-#endif // FEATUREDSHADERSPAGINATOR_H
@@ -30,9 +30,9 @@
 #include <QJsonObject>

 #include "common/logging.h"
-#include "common/paginator.h"
 #include "common/imagecache.h"
 #include "common/coreservices.h"
+#include "paginator.h"

 /**
 * @brief The ImagePaginator class
@@ -1,45 +0,0 @@
-/*
- *  Komplex Wallpaper Engine
- *  Copyright (C) 2026 @DigitalArtifex
- *  https://digitalartifex.dev - https://github.com/DigitalArtifex
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>
- */
-#ifndef NEWESTCUBEMAPSPAGINATOR_H
-#define NEWESTCUBEMAPSPAGINATOR_H
-
-#include <QObject>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QNetworkRequest>
-#include <QEventLoop>
-#include <QJsonDocument>
-#include <QJsonParseError>
-#include <QJsonArray>
-#include <QJsonObject>
-
-#include "wallpaperpaginator.h"
-
-class KOMPLEX_EXPORT NewestCubemapsPaginator : public WallpaperPaginator
-{
-public:
-    explicit NewestCubemapsPaginator(QObject *parent = nullptr) : WallpaperPaginator(parent)
-    {
-        setUri(
-            QString::fromUtf8(KOMPLEX_ENDPOINT_CUBEMAPS_NEWEST)
-        );
-    }
-};
-
-#endif // NEWESTCUBEMAPSPAGINATOR_H
@@ -1,45 +0,0 @@
-/*
- *  Komplex Wallpaper Engine
- *  Copyright (C) 2026 @DigitalArtifex
- *  https://digitalartifex.dev - https://github.com/DigitalArtifex
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>
- */
-#ifndef NEWESTSHADERSPAGINATOR_H
-#define NEWESTSHADERSPAGINATOR_H
-
-#include <QObject>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QNetworkRequest>
-#include <QEventLoop>
-#include <QJsonDocument>
-#include <QJsonParseError>
-#include <QJsonArray>
-#include <QJsonObject>
-
-#include "wallpaperpaginator.h"
-
-class KOMPLEX_EXPORT NewestShadersPaginator : public WallpaperPaginator
-{
-public:
-    explicit NewestShadersPaginator(QObject *parent = nullptr) : WallpaperPaginator(parent)
-    {
-        setUri(
-            QString::fromUtf8(KOMPLEX_ENDPOINT_SHADERS_NEWEST)
-        );
-    }
-};
-
-#endif // NEWESTSHADERSPAGINATOR_H
@@ -27,8 +27,8 @@
 #include <QJsonDocument>
 #include <QJsonParseError>

-#include "komplex_global.h"
-#include "slidingcachecontroller.h"
+#include "common/komplex_global.h"
+#include "common/slidingcachecontroller.h"

 /**
 * @brief The PaginationNotifier class
@@ -1,45 +0,0 @@
-/*
- *  Komplex Wallpaper Engine
- *  Copyright (C) 2026 @DigitalArtifex
- *  https://digitalartifex.dev - https://github.com/DigitalArtifex
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>
- */
-#ifndef SEARCHCUBEMAPSPAGINATOR_H
-#define SEARCHCUBEMAPSPAGINATOR_H
-
-#include <QObject>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QNetworkRequest>
-#include <QEventLoop>
-#include <QJsonDocument>
-#include <QJsonParseError>
-#include <QJsonArray>
-#include <QJsonObject>
-
-#include "wallpaperpaginator.h"
-
-class KOMPLEX_EXPORT SearchCubemapsPaginator : public WallpaperPaginator
-{
-public:
-    explicit SearchCubemapsPaginator(QObject *parent = nullptr) : WallpaperPaginator(parent)
-    {
-        setUri(
-            QString::fromUtf8(KOMPLEX_ENDPOINT_CUBEMAPS_SEARCH)
-        );
-    }
-};
-
-#endif // SEARCHCUBEMAPSPAGINATOR_H
@@ -1,45 +0,0 @@
-/*
- *  Komplex Wallpaper Engine
- *  Copyright (C) 2026 @DigitalArtifex
- *  https://digitalartifex.dev - https://github.com/DigitalArtifex
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>
- */
-#ifndef SEARCHSHADERSPAGINATOR_H
-#define SEARCHSHADERSPAGINATOR_H
-
-#include <QObject>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QNetworkRequest>
-#include <QEventLoop>
-#include <QJsonDocument>
-#include <QJsonParseError>
-#include <QJsonArray>
-#include <QJsonObject>
-
-#include "wallpaperpaginator.h"
-
-class KOMPLEX_EXPORT SearchShadersPaginator : public WallpaperPaginator
-{
-public:
-    explicit SearchShadersPaginator(QObject *parent = nullptr) : WallpaperPaginator(parent)
-    {
-        setUri(
-            QString::fromUtf8(KOMPLEX_ENDPOINT_SHADERS_SEARCH)
-        );
-    }
-};
-
-#endif // SEARCHSHADERSPAGINATOR_H
@@ -30,9 +30,9 @@
 #include <QJsonObject>

 #include "common/logging.h"
-#include "common/paginator.h"
 #include "common/videocache.h"
 #include "common/coreservices.h"
+#include "paginator.h"

 /**
 * @brief The VideoPaginator class
@@ -30,9 +30,9 @@
 #include <QJsonObject>

 #include "common/logging.h"
-#include "common/paginator.h"
 #include "common/wallpapercache.h"
 #include "common/coreservices.h"
+#include "paginator.h"

 /**
 * @brief The WallpaperPaginator class