Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
f7b5b78bd9
|
|||
|
896bb0d965
|
|||
|
d80c1ccd18
|
|||
|
836a77c11f
|
|||
|
7ae2ac34e8
|
|||
|
6a59a48a35
|
|||
|
2f41ad19dd
|
|||
|
a8c0b981e9
|
|||
|
68acb2a914
|
|||
|
236b4b6b0d
|
|||
|
e5627742d2
|
|||
|
5b2500c841
|
+2
-1
@@ -8,7 +8,8 @@ target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE
|
||||
Qt${QT_VERSION_MAJOR}::Gui
|
||||
Qt${QT_VERSION_MAJOR}::Widgets
|
||||
Qt${QT_VERSION_MAJOR}::Quick
|
||||
Qt${QT_VERSION_MAJOR}::Qml)
|
||||
Qt${QT_VERSION_MAJOR}::Qml
|
||||
)
|
||||
|
||||
if(ENABLE_ASAN)
|
||||
message(STATUS "Building with AddressSanitizer")
|
||||
|
||||
@@ -3,6 +3,9 @@
|
||||
|
||||
#include <QApplication>
|
||||
#include <QQmlApplicationEngine>
|
||||
#include <QQmlNetworkAccessManagerFactory>
|
||||
#include <QNetworkAccessManager>
|
||||
#include <QNetworkReply>
|
||||
#include <qobject.h>
|
||||
#include <qqml.h>
|
||||
#include <QPalette>
|
||||
@@ -15,7 +18,34 @@
|
||||
#include <QQuickWindow>
|
||||
#include <QSurfaceFormat>
|
||||
#include <QSGRendererInterface>
|
||||
#include <QScreen>
|
||||
#include "autogen/environment.h"
|
||||
#include "KomplexHubPlugin/common/komplex_global.h"
|
||||
|
||||
#ifdef KOMPLEX_LOCAL_DEV
|
||||
class DebugNetworkAccessManagerFactory : public QQmlNetworkAccessManagerFactory
|
||||
{
|
||||
public:
|
||||
QNetworkAccessManager *create(QObject *parent) override;
|
||||
};
|
||||
|
||||
QNetworkAccessManager *DebugNetworkAccessManagerFactory::create(QObject *parent)
|
||||
{
|
||||
QNetworkAccessManager *nam = new QNetworkAccessManager(parent);
|
||||
|
||||
QObject::connect
|
||||
(
|
||||
nam,
|
||||
&QNetworkAccessManager::sslErrors,
|
||||
nam,
|
||||
[] (QNetworkReply *reply, const QList<QSslError> &errors)
|
||||
{
|
||||
reply->ignoreSslErrors();
|
||||
}
|
||||
);
|
||||
return nam;
|
||||
}
|
||||
#endif
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
@@ -35,6 +65,10 @@ int main(int argc, char *argv[])
|
||||
QCoreApplication::exit(-1);
|
||||
}, Qt::QueuedConnection);
|
||||
|
||||
#ifdef KOMPLEX_LOCAL_DEV
|
||||
engine.setNetworkAccessManagerFactory(new DebugNetworkAccessManagerFactory);
|
||||
#endif
|
||||
|
||||
engine.addImportPath(QCoreApplication::applicationDirPath() + "/qml");
|
||||
engine.addImportPath(":/");
|
||||
engine.load(url);
|
||||
|
||||
+8
-2
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.21.1)
|
||||
|
||||
option(LINK_INSIGHT "Link Qt Insight Tracker library" ON)
|
||||
option(BUILD_QDS_COMPONENTS "Build design studio components" ON)
|
||||
|
||||
|
||||
project(KomplexHub LANGUAGES CXX)
|
||||
|
||||
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
|
||||
@@ -88,6 +88,12 @@ qt_add_resources(${CMAKE_PROJECT_NAME} "app_images"
|
||||
"images/kero/kero_warning.png"
|
||||
)
|
||||
|
||||
target_compile_definitions(
|
||||
${CMAKE_PROJECT_NAME}
|
||||
PUBLIC
|
||||
KOMPLEX_LOCAL_DEV
|
||||
)
|
||||
|
||||
include(qds)
|
||||
|
||||
option(ENABLE_ASAN "Enable AddressSanitizer" OFF)
|
||||
@@ -138,4 +144,4 @@ install(TARGETS ${CMAKE_PROJECT_NAME}
|
||||
BUNDLE DESTINATION .
|
||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
||||
)
|
||||
)
|
||||
@@ -67,10 +67,13 @@ Rectangle {
|
||||
}
|
||||
}
|
||||
|
||||
ColumnLayout {
|
||||
ColumnLayout
|
||||
{
|
||||
opacity: popup ? 0 : 1
|
||||
visible: opacity > 0.01
|
||||
id: windowMenuLayout
|
||||
Layout.fillHeight: true
|
||||
anchors.fill: parent
|
||||
|
||||
MenuButton {
|
||||
id: homeMenubutton
|
||||
@@ -84,7 +87,8 @@ Rectangle {
|
||||
icon.width: 32
|
||||
icon.url: "qrc:/images/icons/icons8-famous.svg"
|
||||
|
||||
onTriggered: () => {
|
||||
onTriggered: () =>
|
||||
{
|
||||
pageLoader.page = "pages/HomePage.qml"
|
||||
|
||||
if(currentMenuButton !== null)
|
||||
@@ -95,10 +99,12 @@ Rectangle {
|
||||
currentMenuButton = this
|
||||
|
||||
searchContainer.preferredHeight = 0
|
||||
searchContainer.reset()
|
||||
}
|
||||
}
|
||||
|
||||
MenuButton {
|
||||
MenuButton
|
||||
{
|
||||
Layout.alignment: Qt.AlignTop
|
||||
|
||||
height: 64
|
||||
@@ -116,10 +122,12 @@ Rectangle {
|
||||
currentMenuButton = this
|
||||
|
||||
searchContainer.preferredHeight = 50
|
||||
searchContainer.reset()
|
||||
}
|
||||
}
|
||||
|
||||
MenuButton {
|
||||
MenuButton
|
||||
{
|
||||
Layout.alignment: Qt.AlignTop
|
||||
|
||||
height: 64
|
||||
@@ -137,10 +145,12 @@ Rectangle {
|
||||
currentMenuButton = this
|
||||
|
||||
searchContainer.preferredHeight = 50
|
||||
searchContainer.reset()
|
||||
}
|
||||
}
|
||||
|
||||
MenuButton {
|
||||
MenuButton
|
||||
{
|
||||
Layout.alignment: Qt.AlignTop
|
||||
|
||||
height: 64
|
||||
@@ -158,11 +168,12 @@ Rectangle {
|
||||
currentMenuButton = this
|
||||
|
||||
searchContainer.preferredHeight = 50
|
||||
// searchContainer.searchTerm = pageLoader.page.query
|
||||
searchContainer.reset()
|
||||
}
|
||||
}
|
||||
|
||||
MenuButton {
|
||||
MenuButton
|
||||
{
|
||||
Layout.alignment: Qt.AlignTop
|
||||
|
||||
height: 64
|
||||
@@ -180,14 +191,18 @@ Rectangle {
|
||||
currentMenuButton = this
|
||||
|
||||
searchContainer.preferredHeight = 0
|
||||
searchContainer.reset()
|
||||
}
|
||||
}
|
||||
|
||||
Item {
|
||||
Item
|
||||
{
|
||||
Layout.fillHeight: true
|
||||
Layout.minimumHeight: 100
|
||||
}
|
||||
|
||||
MenuButton {
|
||||
MenuButton
|
||||
{
|
||||
Layout.alignment: Qt.AlignBottom
|
||||
|
||||
height: 64
|
||||
@@ -205,10 +220,12 @@ Rectangle {
|
||||
currentMenuButton = this
|
||||
|
||||
searchContainer.preferredHeight = 0
|
||||
searchContainer.reset()
|
||||
}
|
||||
}
|
||||
|
||||
Behavior on opacity {
|
||||
Behavior on opacity
|
||||
{
|
||||
NumberAnimation
|
||||
{
|
||||
duration: 250
|
||||
@@ -217,9 +234,8 @@ Rectangle {
|
||||
}
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
|
||||
//Kirigami.Theme.colorSet: Kirigami.Theme.View
|
||||
Rectangle
|
||||
{
|
||||
id: windowContainer
|
||||
|
||||
Layout.fillHeight: true
|
||||
@@ -227,12 +243,14 @@ Rectangle {
|
||||
|
||||
color: "transparent"
|
||||
|
||||
ColumnLayout {
|
||||
ColumnLayout
|
||||
{
|
||||
id: windowContainerLayout
|
||||
anchors.fill: parent
|
||||
spacing: 0
|
||||
|
||||
SearchBar {
|
||||
SearchBar
|
||||
{
|
||||
property int preferredHeight: 50
|
||||
id: searchContainer
|
||||
color: palette.base.lighter()
|
||||
@@ -243,7 +261,8 @@ Rectangle {
|
||||
|
||||
icon: "qrc:/images/icons/icons8-search.svg"
|
||||
|
||||
onSearchTermChanged: () => {
|
||||
onSearchTermChanged: () =>
|
||||
{
|
||||
pageLoader.setSearchTerm()
|
||||
}
|
||||
|
||||
@@ -252,7 +271,8 @@ Rectangle {
|
||||
}
|
||||
}
|
||||
|
||||
Rectangle {
|
||||
Rectangle
|
||||
{
|
||||
id: windowContent
|
||||
|
||||
Layout.fillHeight: true
|
||||
@@ -262,20 +282,23 @@ Rectangle {
|
||||
|
||||
color: palette.base.darker()
|
||||
|
||||
Loader {
|
||||
Loader
|
||||
{
|
||||
property bool loading: false
|
||||
property string page
|
||||
|
||||
anchors.fill: parent
|
||||
|
||||
onPageChanged: () => {
|
||||
onPageChanged: () =>
|
||||
{
|
||||
loading = true
|
||||
fadeOutPage()
|
||||
}
|
||||
|
||||
id: pageLoader
|
||||
|
||||
OpacityAnimator on opacity {
|
||||
OpacityAnimator on opacity
|
||||
{
|
||||
id: pageLoaderAnimation
|
||||
|
||||
target: pageLoader
|
||||
@@ -411,6 +434,15 @@ Rectangle {
|
||||
},
|
||||
State {
|
||||
name: "build_complete"
|
||||
},
|
||||
State
|
||||
{
|
||||
name: "popup"
|
||||
when: popup
|
||||
PropertyChanges {
|
||||
target: searchContainer
|
||||
preferredHeight: 0
|
||||
}
|
||||
}
|
||||
|
||||
]
|
||||
|
||||
@@ -15,6 +15,15 @@ Item
|
||||
property int resultWidth: 256
|
||||
property int resultHeight: 245
|
||||
property bool popup: false
|
||||
property bool loading: packsModel.state === NewestPacksModel.Loading ||
|
||||
imagesModel.state === FeaturedImagesModel.Loading ||
|
||||
videosModel.state === FeaturedVideosModel.Loading;
|
||||
|
||||
onWidthChanged:() => {
|
||||
packsModel.resultsPerPage = resultsPerRow
|
||||
imagesModel.resultsPerPage = resultsPerRow
|
||||
videosModel.resultsPerPage = resultsPerRow
|
||||
}
|
||||
|
||||
clip: true
|
||||
|
||||
@@ -23,19 +32,19 @@ Item
|
||||
NewestPacksModel
|
||||
{
|
||||
id: packsModel
|
||||
resultsPerPage: homePageRoot.resultsPerRow
|
||||
resultsPerPage: 0
|
||||
}
|
||||
|
||||
FeaturedImagesModel
|
||||
{
|
||||
id: imagesModel
|
||||
resultsPerPage: homePageRoot.resultsPerRow
|
||||
resultsPerPage: 0
|
||||
}
|
||||
|
||||
FeaturedVideosModel
|
||||
{
|
||||
id: videosModel
|
||||
resultsPerPage: homePageRoot.resultsPerRow
|
||||
resultsPerPage: 0
|
||||
}
|
||||
|
||||
Rectangle
|
||||
@@ -46,6 +55,7 @@ Item
|
||||
ColumnLayout
|
||||
{
|
||||
id: resultsLayout
|
||||
visible: opacity > 0.01
|
||||
anchors.fill: parent
|
||||
anchors.margins: Constants.mediumMargin
|
||||
|
||||
@@ -95,9 +105,14 @@ Item
|
||||
|
||||
onTriggered: () => packsPaginator.currentIndex = parent.index
|
||||
|
||||
function onViewMoreTriggered()
|
||||
onViewMoreTriggered: () =>
|
||||
{
|
||||
showWallpaperPopup(parent.index)
|
||||
}
|
||||
|
||||
onThumbnailChanged: () =>
|
||||
{
|
||||
console.log(index + " " + thumbnail + " " + parent.thumbnail)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -145,7 +160,7 @@ Item
|
||||
pexels: true
|
||||
selected: imagesPaginator.currentIndex === parent.index
|
||||
|
||||
onTriggered: () => packsPaginator.currentIndex = parent.index
|
||||
onTriggered: () => imagesPaginator.currentIndex = parent.index
|
||||
|
||||
onViewMoreTriggered: () =>
|
||||
{
|
||||
@@ -196,12 +211,8 @@ Item
|
||||
pexels: true
|
||||
selected: videosPaginator.currentIndex === parent.index
|
||||
|
||||
onTriggered: () => packsPaginator.currentIndex = parent.index
|
||||
|
||||
onViewMoreTriggered:() =>
|
||||
{
|
||||
viewMoreImagePopup.opacity = 1
|
||||
}
|
||||
onTriggered: () => videosPaginator.currentIndex = parent.index
|
||||
onViewMoreTriggered:() => showVideoPopup(parent.index)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -232,6 +243,7 @@ Item
|
||||
id: popupContainer
|
||||
anchors.fill: parent
|
||||
opacity: 0
|
||||
visible: opacity > 0.01
|
||||
color: palette.base
|
||||
|
||||
ImageView
|
||||
@@ -239,6 +251,39 @@ Item
|
||||
id: viewMoreImagePopup
|
||||
anchors.fill: parent
|
||||
opacity: 0
|
||||
visible: opacity > 0.01
|
||||
|
||||
Behavior on opacity {
|
||||
NumberAnimation
|
||||
{
|
||||
duration: 250
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
VideoView
|
||||
{
|
||||
id: viewMoreVideoPopup
|
||||
anchors.fill: parent
|
||||
opacity: 0
|
||||
visible: opacity > 0.01
|
||||
//model: videosModel.itemModel
|
||||
|
||||
Behavior on opacity {
|
||||
NumberAnimation
|
||||
{
|
||||
duration: 250
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
PackView
|
||||
{
|
||||
id: viewMoreWallpaperPopup
|
||||
anchors.fill: parent
|
||||
opacity: 0
|
||||
visible: opacity > 0.01
|
||||
//model: videosModel.itemModel
|
||||
|
||||
Behavior on opacity {
|
||||
NumberAnimation
|
||||
@@ -259,9 +304,7 @@ Item
|
||||
states: [
|
||||
State {
|
||||
name: "loading"
|
||||
when: packsModel.state === NewestPacksModel.Loading ||
|
||||
imagesModel.state === FeaturedImagesModel.Loading ||
|
||||
videosModel.state === FeaturedVideosModel.Loading;
|
||||
when: homePageRoot.loading
|
||||
|
||||
PropertyChanges
|
||||
{
|
||||
@@ -319,39 +362,64 @@ Item
|
||||
property: "opacity";
|
||||
}
|
||||
}
|
||||
|
||||
]
|
||||
|
||||
function showImagePopup(index)
|
||||
{
|
||||
viewMoreImagePopup.author = imagesModel.data(imagesModel.index(0,index), FeaturedImagesModel.AuthorRole)
|
||||
viewMoreImagePopup.authorUrl = imagesModel.data(imagesModel.index(0,index), FeaturedImagesModel.AuthorUrlRole)
|
||||
viewMoreImagePopup.description = imagesModel.data(imagesModel.index(0,index), FeaturedImagesModel.DescriptionRole)
|
||||
viewMoreImagePopup.uuid = imagesModel.data(imagesModel.index(0,index), FeaturedImagesModel.UuidRole)
|
||||
viewMoreImagePopup.thumbnail = imagesModel.data(imagesModel.index(0,index), FeaturedImagesModel.ThumbnailRole)
|
||||
viewMoreImagePopup.small = imagesModel.data(imagesModel.index(0,index), FeaturedImagesModel.SmallUrlRole)
|
||||
viewMoreImagePopup.medium = imagesModel.data(imagesModel.index(0,index), FeaturedImagesModel.MediumUrlRole)
|
||||
viewMoreImagePopup.large = imagesModel.data(imagesModel.index(0,index), FeaturedImagesModel.LargeUrlRole)
|
||||
viewMoreImagePopup.extraLarge = imagesModel.data(imagesModel.index(0,index), FeaturedImagesModel.ExtraLargeUrlRole)
|
||||
viewMoreImagePopup.original = imagesModel.data(imagesModel.index(0,index), FeaturedImagesModel.OriginalUrlRole)
|
||||
viewMoreImagePopup.portrait = imagesModel.data(imagesModel.index(0,index), FeaturedImagesModel.PortraitUrlRole)
|
||||
viewMoreImagePopup.landscape = imagesModel.data(imagesModel.index(0,index), FeaturedImagesModel.LandscapeUrlRole)
|
||||
viewMoreImagePopup.smallSize = imagesModel.data(imagesModel.index(0,index), FeaturedImagesModel.SmallSizeRole)
|
||||
viewMoreImagePopup.mediumSize = imagesModel.data(imagesModel.index(0,index), FeaturedImagesModel.MediumSizeRole)
|
||||
viewMoreImagePopup.largeSize = imagesModel.data(imagesModel.index(0,index), FeaturedImagesModel.LargeSizeRole)
|
||||
viewMoreImagePopup.extraLargeSize = imagesModel.data(imagesModel.index(0,index), FeaturedImagesModel.ExtraLargeSizeRole)
|
||||
viewMoreImagePopup.originalSize = imagesModel.data(imagesModel.index(0,index), FeaturedImagesModel.OriginalSizeRole)
|
||||
viewMoreImagePopup.portraitSize = imagesModel.data(imagesModel.index(0,index), FeaturedImagesModel.PortraitSizeRole)
|
||||
viewMoreImagePopup.landscapeSize = imagesModel.data(imagesModel.index(0,index), FeaturedImagesModel.LandscapeSizeRole)
|
||||
viewMoreImagePopup.author = imagesModel.data(imagesModel.index(index,0), FeaturedImagesModel.AuthorRole)
|
||||
viewMoreImagePopup.authorUrl = imagesModel.data(imagesModel.index(index,0), FeaturedImagesModel.AuthorUrlRole)
|
||||
viewMoreImagePopup.description = imagesModel.data(imagesModel.index(index,0), FeaturedImagesModel.DescriptionRole)
|
||||
viewMoreImagePopup.uuid = imagesModel.data(imagesModel.index(index,0), FeaturedImagesModel.UuidRole)
|
||||
viewMoreImagePopup.thumbnail = imagesModel.data(imagesModel.index(index,0), FeaturedImagesModel.LargeThumbnailRole)
|
||||
viewMoreImagePopup.original = imagesModel.data(imagesModel.index(index,0), FeaturedImagesModel.OriginalUrlRole)
|
||||
viewMoreImagePopup.portrait = imagesModel.data(imagesModel.index(index,0), FeaturedImagesModel.PortraitUrlRole)
|
||||
viewMoreImagePopup.landscape = imagesModel.data(imagesModel.index(index,0), FeaturedImagesModel.LandscapeUrlRole)
|
||||
viewMoreImagePopup.backgroundPortrait = imagesModel.data(imagesModel.index(index,0), FeaturedImagesModel.BackgroundPortraitRole)
|
||||
viewMoreImagePopup.backgroundLandscape = imagesModel.data(imagesModel.index(index,0), FeaturedImagesModel.BackgroundLandscapeRole)
|
||||
viewMoreImagePopup.fullScreen = imagesModel.data(imagesModel.index(index,0), FeaturedImagesModel.ScreenUrlRole)
|
||||
viewMoreImagePopup.portraitSize = imagesModel.data(imagesModel.index(index,0), FeaturedImagesModel.PortraitSizeRole)
|
||||
viewMoreImagePopup.landscapeSize = imagesModel.data(imagesModel.index(index,0), FeaturedImagesModel.LandscapeSizeRole)
|
||||
viewMoreImagePopup.fullScreenSize = imagesModel.data(imagesModel.index(index,0), FeaturedImagesModel.ScreenSizeRole)
|
||||
viewMoreImagePopup.opacity = 1
|
||||
popupContainer.opacity = 1
|
||||
resultsLayout.opacity = 0
|
||||
homePageRoot.popup = true
|
||||
}
|
||||
|
||||
function showVideoPopup(index)
|
||||
{
|
||||
videosModel.setItem(index)
|
||||
viewMoreVideoPopup.author = videosModel.data(videosModel.index(index,0), FeaturedVideosModel.AuthorRole)
|
||||
viewMoreVideoPopup.authorUrl = videosModel.data(videosModel.index(index,0), FeaturedVideosModel.AuthorUrlRole)
|
||||
viewMoreVideoPopup.uuid = videosModel.data(videosModel.index(index,0), FeaturedVideosModel.UuidRole)
|
||||
viewMoreVideoPopup.thumbnail = videosModel.data(videosModel.index(index,0), FeaturedVideosModel.ThumbnailRole)
|
||||
viewMoreVideoPopup.modelIndex = index
|
||||
viewMoreVideoPopup.model = videosModel.itemModel
|
||||
viewMoreVideoPopup.opacity = 1
|
||||
resultsLayout.opacity = 0
|
||||
popupContainer.opacity = 1
|
||||
homePageRoot.popup = true
|
||||
}
|
||||
|
||||
function showWallpaperPopup(index)
|
||||
{
|
||||
viewMoreWallpaperPopup.author = packsModel.data(packsModel.index(index,0), NewestPacksModel.AuthorRole)
|
||||
viewMoreWallpaperPopup.authorId = packsModel.data(packsModel.index(index,0), NewestPacksModel.AuthorIdRole)
|
||||
viewMoreWallpaperPopup.description = packsModel.data(packsModel.index(index,0), NewestPacksModel.DescriptionRole)
|
||||
viewMoreWallpaperPopup.thumbnail = packsModel.data(packsModel.index(index,0), NewestPacksModel.ThumbnailRole)
|
||||
viewMoreWallpaperPopup.opacity = 1
|
||||
popupContainer.opacity = 1
|
||||
resultsLayout.opacity = 0
|
||||
homePageRoot.popup = true
|
||||
}
|
||||
|
||||
function closePopup()
|
||||
{
|
||||
viewMoreImagePopup.opacity = 0
|
||||
viewMoreVideoPopup.opacity = 0
|
||||
viewMoreWallpaperPopup.opacity = 0
|
||||
popupContainer.opacity = 0
|
||||
resultsLayout.opacity = 1
|
||||
homePageRoot.popup = false
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,6 +13,9 @@ Item
|
||||
|
||||
property string query
|
||||
readonly property bool searchable: paginator.searchable
|
||||
property bool popup: false
|
||||
property int resultWidth: 256
|
||||
property int resultHeight: 245
|
||||
|
||||
ImageSearchModel
|
||||
{
|
||||
@@ -32,8 +35,8 @@ Item
|
||||
{
|
||||
id: resultDelegate
|
||||
|
||||
width: 256
|
||||
height: 245
|
||||
width: resultWidth
|
||||
height: resultHeight
|
||||
|
||||
required property string author
|
||||
required property string description
|
||||
@@ -49,15 +52,75 @@ Item
|
||||
description: parent.description
|
||||
thumbnail: parent.thumbnail
|
||||
uuid: parent.uuid
|
||||
pexels: true
|
||||
selected: paginator.currentIndex === parent.index
|
||||
|
||||
selected: resultDelegate.highlighted
|
||||
}
|
||||
onTriggered: () => paginator.currentIndex = parent.index
|
||||
|
||||
MouseArea
|
||||
{
|
||||
anchors.fill: parent
|
||||
onClicked: paginator.currentIndex = index
|
||||
onViewMoreTriggered: () =>
|
||||
{
|
||||
showImagePopup(parent.index)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Rectangle
|
||||
{
|
||||
id: popupContainer
|
||||
anchors.fill: parent
|
||||
opacity: 0
|
||||
color: palette.base
|
||||
|
||||
ImageView
|
||||
{
|
||||
id: viewMoreImagePopup
|
||||
anchors.fill: parent
|
||||
opacity: 0
|
||||
|
||||
Behavior on opacity {
|
||||
NumberAnimation
|
||||
{
|
||||
duration: 250
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Behavior on opacity {
|
||||
NumberAnimation
|
||||
{
|
||||
duration: 250
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function showImagePopup(index)
|
||||
{
|
||||
viewMoreImagePopup.author = searchModel.data(searchModel.index(index,0), ImageSearchModel.AuthorRole)
|
||||
viewMoreImagePopup.authorUrl = searchModel.data(searchModel.index(index,0), ImageSearchModel.AuthorUrlRole)
|
||||
viewMoreImagePopup.description = searchModel.data(searchModel.index(index,0), ImageSearchModel.DescriptionRole)
|
||||
viewMoreImagePopup.uuid = searchModel.data(searchModel.index(index,0), ImageSearchModel.UuidRole)
|
||||
viewMoreImagePopup.thumbnail = searchModel.data(searchModel.index(index,0), ImageSearchModel.LargeThumbnailRole)
|
||||
viewMoreImagePopup.original = searchModel.data(searchModel.index(index,0), ImageSearchModel.OriginalUrlRole)
|
||||
viewMoreImagePopup.portrait = searchModel.data(searchModel.index(index,0), ImageSearchModel.PortraitUrlRole)
|
||||
viewMoreImagePopup.landscape = searchModel.data(searchModel.index(index,0), ImageSearchModel.LandscapeUrlRole)
|
||||
viewMoreImagePopup.backgroundPortrait = searchModel.data(searchModel.index(index,0), ImageSearchModel.BackgroundPortraitRole)
|
||||
viewMoreImagePopup.backgroundLandscape = searchModel.data(searchModel.index(index,0), ImageSearchModel.BackgroundLandscapeRole)
|
||||
viewMoreImagePopup.fullScreen = searchModel.data(searchModel.index(index,0), ImageSearchModel.ScreenUrlRole)
|
||||
viewMoreImagePopup.portraitSize = searchModel.data(searchModel.index(index,0), ImageSearchModel.PortraitSizeRole)
|
||||
viewMoreImagePopup.landscapeSize = searchModel.data(searchModel.index(index,0), ImageSearchModel.LandscapeSizeRole)
|
||||
viewMoreImagePopup.fullScreenSize = searchModel.data(searchModel.index(index,0), ImageSearchModel.ScreenSizeRole)
|
||||
viewMoreImagePopup.opacity = 1
|
||||
popupContainer.opacity = 1
|
||||
paginator.opacity = 0
|
||||
rootItem.popup = true
|
||||
}
|
||||
|
||||
function closePopup()
|
||||
{
|
||||
viewMoreImagePopup.opacity = 0
|
||||
popupContainer.opacity = 0
|
||||
paginator.opacity = 1
|
||||
rootItem.popup = false
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,6 +11,9 @@ Item
|
||||
|
||||
property string query
|
||||
readonly property bool searchable: paginator.searchable
|
||||
property bool popup: false
|
||||
property int resultWidth: 256
|
||||
property int resultHeight: 245
|
||||
|
||||
PackSearchModel
|
||||
{
|
||||
@@ -39,6 +42,7 @@ Item
|
||||
required property string uuid
|
||||
required property string thumbnail
|
||||
required property string authorId
|
||||
required property int index
|
||||
|
||||
SearchResultItem
|
||||
{
|
||||
@@ -47,15 +51,66 @@ Item
|
||||
description: parent.description
|
||||
thumbnail: parent.thumbnail
|
||||
uuid: parent.uuid
|
||||
selected: paginator.currentIndex === parent.index
|
||||
|
||||
selected: resultDelegate.highlighted
|
||||
}
|
||||
onTriggered: () => paginator.currentIndex = parent.index
|
||||
|
||||
MouseArea
|
||||
{
|
||||
anchors.fill: parent
|
||||
onClicked: paginator.currentIndex = index
|
||||
onViewMoreTriggered: () =>
|
||||
{
|
||||
showWallpaperPopup(parent.index)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Rectangle
|
||||
{
|
||||
id: popupContainer
|
||||
anchors.fill: parent
|
||||
opacity: 0
|
||||
color: palette.base
|
||||
|
||||
PackView
|
||||
{
|
||||
id: viewMoreWallpaperPopup
|
||||
anchors.fill: parent
|
||||
opacity: 0
|
||||
visible: opacity > 0.01
|
||||
//model: videosModel.itemModel
|
||||
|
||||
Behavior on opacity {
|
||||
NumberAnimation
|
||||
{
|
||||
duration: 250
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Behavior on opacity {
|
||||
NumberAnimation
|
||||
{
|
||||
duration: 250
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function closePopup()
|
||||
{
|
||||
viewMoreWallpaperPopup.opacity = 0
|
||||
popupContainer.opacity = 0
|
||||
paginator.opacity = 1
|
||||
rootItem.popup = false
|
||||
}
|
||||
|
||||
function showWallpaperPopup(index)
|
||||
{
|
||||
viewMoreWallpaperPopup.author = searchModel.data(searchModel.index(index,0), PackSearchModel.AuthorRole)
|
||||
viewMoreWallpaperPopup.authorId = searchModel.data(searchModel.index(index,0), PackSearchModel.AuthorIdRole)
|
||||
viewMoreWallpaperPopup.description = searchModel.data(searchModel.index(index,0), PackSearchModel.DescriptionRole)
|
||||
viewMoreWallpaperPopup.thumbnail = searchModel.data(searchModel.index(index,0), PackSearchModel.ThumbnailRole)
|
||||
viewMoreWallpaperPopup.opacity = 1
|
||||
popupContainer.opacity = 1
|
||||
paginator.opacity = 0
|
||||
rootItem.popup = true
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13,6 +13,9 @@ Item
|
||||
|
||||
property string query
|
||||
readonly property bool searchable: paginator.searchable
|
||||
property bool popup: false
|
||||
property int resultWidth: 256
|
||||
property int resultHeight: 245
|
||||
|
||||
VideoSearchModel
|
||||
{
|
||||
@@ -27,37 +30,94 @@ Item
|
||||
anchors.fill: parent
|
||||
model: searchModel
|
||||
loading: model.state === VideoSearchModel.Loading
|
||||
visible: opacity > 0.01
|
||||
|
||||
delegate: ItemDelegate
|
||||
{
|
||||
id: resultDelegate
|
||||
|
||||
width: 256
|
||||
height: 245
|
||||
width: resultWidth
|
||||
height: resultHeight
|
||||
|
||||
required property string author
|
||||
required property string description
|
||||
required property string uuid
|
||||
required property string thumbnail
|
||||
required property string author
|
||||
required property string authorId
|
||||
required property string authorUrl
|
||||
required property string thumbnail
|
||||
required property int index
|
||||
|
||||
SearchResultItem
|
||||
{
|
||||
anchors.fill: parent
|
||||
title: parent.author
|
||||
description: parent.description
|
||||
author: parent.author
|
||||
description: qsTr("No description available")
|
||||
thumbnail: parent.thumbnail
|
||||
uuid: parent.uuid
|
||||
pexels: true
|
||||
selected: paginator.currentIndex === parent.index
|
||||
|
||||
selected: resultDelegate.highlighted
|
||||
}
|
||||
onTriggered: () => paginator.currentIndex = parent.index
|
||||
|
||||
MouseArea
|
||||
{
|
||||
anchors.fill: parent
|
||||
onClicked: paginator.currentIndex = index
|
||||
onViewMoreTriggered: () =>
|
||||
{
|
||||
showVideoPopup(parent.index)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Rectangle
|
||||
{
|
||||
id: popupContainer
|
||||
anchors.fill: parent
|
||||
opacity: 0
|
||||
visible: opacity > 0.01
|
||||
color: palette.base
|
||||
|
||||
VideoView
|
||||
{
|
||||
id: viewMoreVideoPopup
|
||||
anchors.fill: parent
|
||||
opacity: 0
|
||||
|
||||
Behavior on opacity
|
||||
{
|
||||
NumberAnimation
|
||||
{
|
||||
duration: 250
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Behavior on opacity
|
||||
{
|
||||
NumberAnimation
|
||||
{
|
||||
duration: 250
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function showVideoPopup(index)
|
||||
{
|
||||
searchModel.setItem(index)
|
||||
viewMoreVideoPopup.author = searchModel.data(searchModel.index(index,0), VideoSearchModel.AuthorRole)
|
||||
viewMoreVideoPopup.authorUrl = searchModel.data(searchModel.index(index,0), VideoSearchModel.AuthorUrlRole)
|
||||
viewMoreVideoPopup.uuid = searchModel.data(searchModel.index(index,0), VideoSearchModel.UuidRole)
|
||||
viewMoreVideoPopup.thumbnail = searchModel.data(searchModel.index(index,0), VideoSearchModel.ThumbnailRole)
|
||||
viewMoreVideoPopup.modelIndex = index
|
||||
viewMoreVideoPopup.model = searchModel.itemModel
|
||||
viewMoreVideoPopup.opacity = 1
|
||||
paginator.opacity = 0
|
||||
popupContainer.opacity = 1
|
||||
rootItem.popup = true
|
||||
}
|
||||
|
||||
function closePopup()
|
||||
{
|
||||
viewMoreVideoPopup.opacity = 0
|
||||
popupContainer.opacity = 0
|
||||
paginator.opacity = 1
|
||||
rootItem.popup = false
|
||||
}
|
||||
}
|
||||
|
||||
@@ -18,5 +18,8 @@ qt6_add_qml_module(KomplexHubModule_Controls
|
||||
QML_FILES PaginatorGrid.qml
|
||||
QML_FILES HorizontalPaginator.qml
|
||||
QML_FILES ImageView.qml
|
||||
QML_FILES
|
||||
QML_FILES VideoView.qml
|
||||
QML_FILES PackView.qml
|
||||
)
|
||||
|
||||
|
||||
@@ -17,18 +17,13 @@ Item
|
||||
property string thumbnail
|
||||
property string portrait
|
||||
property string landscape
|
||||
property string small
|
||||
property string original
|
||||
property string medium
|
||||
property string large
|
||||
property string extraLarge
|
||||
property string fullScreen
|
||||
property string portraitSize
|
||||
property string landscapeSize
|
||||
property string smallSize
|
||||
property string originalSize
|
||||
property string mediumSize
|
||||
property string largeSize
|
||||
property string extraLargeSize
|
||||
property string fullScreenSize
|
||||
property string backgroundPortrait
|
||||
property string backgroundLandscape
|
||||
|
||||
property int imageHeight
|
||||
property int imageWidth
|
||||
@@ -38,7 +33,27 @@ Item
|
||||
Rectangle
|
||||
{
|
||||
anchors.fill: parent
|
||||
color: palette.base.alpha(1)
|
||||
color: palette.base
|
||||
|
||||
Image
|
||||
{
|
||||
id: backgroundImage
|
||||
source: width > height ? backgroundLandscape : backgroundPortrait
|
||||
transform: Image.PreserveAspectCrop
|
||||
anchors.fill: parent
|
||||
visible: false
|
||||
}
|
||||
|
||||
MultiEffect
|
||||
{
|
||||
anchors.fill: backgroundImage
|
||||
source: backgroundImage
|
||||
blurEnabled: true
|
||||
blurMax: 64
|
||||
blur: 1.0
|
||||
opacity: 0.25
|
||||
saturation: -0.8
|
||||
}
|
||||
|
||||
ColumnLayout
|
||||
{
|
||||
@@ -50,20 +65,32 @@ Item
|
||||
{
|
||||
Layout.fillWidth: true
|
||||
Layout.alignment: Qt.AlignTop| Qt.AlignHCenter
|
||||
Layout.topMargin: 32
|
||||
|
||||
/** Spacer **/
|
||||
Item { Layout.fillWidth: true }
|
||||
|
||||
Image
|
||||
Rectangle
|
||||
{
|
||||
width: imageWidth
|
||||
height: imageHeight
|
||||
transform: Image.PreserveAspectFit
|
||||
source: rootItem.medium
|
||||
}
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: width / 1.77777777778
|
||||
Layout.maximumWidth: 800
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
color: palette.base.darker()
|
||||
|
||||
/** Spacer **/
|
||||
Item { Layout.fillWidth: true }
|
||||
Throbber
|
||||
{
|
||||
anchors.fill: parent
|
||||
id: loadingThrobber
|
||||
visible: viewImage.status === Image.Loading
|
||||
}
|
||||
|
||||
Image
|
||||
{
|
||||
id: viewImage
|
||||
anchors.fill: parent
|
||||
transform: Image.PreserveAspectCrop
|
||||
source: rootItem.thumbnail
|
||||
visible: !(status === Image.Loading)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Text
|
||||
@@ -91,7 +118,6 @@ Item
|
||||
Layout.fillWidth: true
|
||||
}
|
||||
|
||||
|
||||
/** Spacer **/
|
||||
Item
|
||||
{
|
||||
@@ -119,12 +145,9 @@ Item
|
||||
{
|
||||
id: downloadSelector
|
||||
model:[
|
||||
"Small: " + smallSize,
|
||||
"Medium: " + mediumSize,
|
||||
"Large: " + largeSize,
|
||||
"Extra Large: " + extraLargeSize,
|
||||
"Portrait: " + portraitSize,
|
||||
"Landscape: " + landscapeSize
|
||||
"Screen (" + fullScreenSize + ")",
|
||||
"Portrait (" + portraitSize + ")",
|
||||
"Landscape (" + landscapeSize + ")"
|
||||
]
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: 36
|
||||
@@ -138,21 +161,6 @@ Item
|
||||
}
|
||||
}
|
||||
|
||||
Text {
|
||||
property var texts: [
|
||||
small,
|
||||
medium,
|
||||
large,
|
||||
extraLarge,
|
||||
portrait,
|
||||
landscape
|
||||
]
|
||||
text: texts[downloadSelector.currentIndex]
|
||||
elide: Text.ElideLeft
|
||||
|
||||
Layout.fillWidth: true
|
||||
}
|
||||
|
||||
/** Spacer **/
|
||||
Item { Layout.fillWidth: true; Layout.fillHeight: true }
|
||||
|
||||
|
||||
@@ -62,10 +62,12 @@ Item {
|
||||
|
||||
id: lineEditRoot
|
||||
|
||||
ColumnLayout {
|
||||
ColumnLayout
|
||||
{
|
||||
anchors.fill: parent
|
||||
|
||||
Rectangle {
|
||||
Rectangle
|
||||
{
|
||||
id: lineEditBackground
|
||||
|
||||
border.color: lineEditRoot.border.color
|
||||
@@ -87,7 +89,8 @@ Item {
|
||||
topLeftRadius: lineEditRoot.radius.topLeft
|
||||
topRightRadius: lineEditRoot.radius.topRight
|
||||
|
||||
TextInput {
|
||||
TextInput
|
||||
{
|
||||
id: lineEditInput
|
||||
anchors.fill: parent
|
||||
color: lineEditRoot.color
|
||||
@@ -101,6 +104,14 @@ Item {
|
||||
onAccepted: () => lineEditRoot.accepted()
|
||||
onTextChanged: () => lineEditRoot.text = lineEditInput.text
|
||||
onEditingFinished: () => lineEditRoot.editingFinished()
|
||||
|
||||
MouseArea
|
||||
{
|
||||
anchors.fill: parent
|
||||
cursorShape: Qt.IBeamCursor
|
||||
|
||||
onClicked: () => lineEditInput.focus = true
|
||||
}
|
||||
}
|
||||
|
||||
states: [
|
||||
|
||||
@@ -0,0 +1,177 @@
|
||||
import QtQuick
|
||||
import QtQuick.Controls
|
||||
import QtQuick.Layouts
|
||||
import QtQuick.Effects
|
||||
|
||||
import KomplexHub
|
||||
import KomplexHub.Controls
|
||||
import KomplexHub.Kero
|
||||
import KomplexHubPlugin
|
||||
|
||||
Item
|
||||
{
|
||||
property string uuid
|
||||
property string author
|
||||
property string authorId
|
||||
property string description
|
||||
property string thumbnail
|
||||
|
||||
property int imageHeight
|
||||
property int imageWidth
|
||||
|
||||
id: rootItem
|
||||
|
||||
Rectangle
|
||||
{
|
||||
anchors.fill: parent
|
||||
color: palette.base
|
||||
|
||||
Image
|
||||
{
|
||||
id: backgroundImage
|
||||
source: thumbnail
|
||||
transform: Image.PreserveAspectCrop
|
||||
anchors.fill: parent
|
||||
visible: false
|
||||
}
|
||||
|
||||
MultiEffect
|
||||
{
|
||||
anchors.fill: backgroundImage
|
||||
source: backgroundImage
|
||||
blurEnabled: true
|
||||
blurMax: 64
|
||||
blur: 1.0
|
||||
opacity: 0.25
|
||||
saturation: -0.8
|
||||
}
|
||||
|
||||
ColumnLayout
|
||||
{
|
||||
anchors.fill: parent
|
||||
anchors.margins: Constants.largeMargin
|
||||
spacing: Constants.largeMargin
|
||||
|
||||
RowLayout
|
||||
{
|
||||
Layout.fillWidth: true
|
||||
Layout.alignment: Qt.AlignTop| Qt.AlignHCenter
|
||||
Layout.topMargin: 32
|
||||
|
||||
Rectangle
|
||||
{
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: width / 1.77777777778
|
||||
Layout.maximumWidth: 800
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
color: palette.base.darker()
|
||||
|
||||
Throbber
|
||||
{
|
||||
anchors.fill: parent
|
||||
id: loadingThrobber
|
||||
visible: viewImage.status === Image.Loading
|
||||
}
|
||||
|
||||
Image
|
||||
{
|
||||
id: viewImage
|
||||
anchors.fill: parent
|
||||
transform: Image.PreserveAspectCrop
|
||||
source: rootItem.thumbnail
|
||||
visible: !(status === Image.Loading)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Text
|
||||
{
|
||||
id: titleText
|
||||
text: rootItem.author
|
||||
color: palette.text
|
||||
font.bold: true
|
||||
font.pixelSize: Constants.h3Font.pixelSize
|
||||
elide: Text.ElideRight
|
||||
|
||||
Layout.fillWidth: true
|
||||
Layout.alignment: Qt.AlignTop| Qt.AlignLeft
|
||||
}
|
||||
|
||||
Text
|
||||
{
|
||||
id: descriptionText
|
||||
text: rootItem.description
|
||||
color: palette.text
|
||||
font.pointSize: Constants.h4Font.pixelSize
|
||||
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
|
||||
|
||||
Layout.alignment: Qt.AlignTop| Qt.AlignLeft
|
||||
Layout.fillWidth: true
|
||||
}
|
||||
|
||||
/** Spacer **/
|
||||
Item
|
||||
{
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: 32
|
||||
}
|
||||
|
||||
// Text
|
||||
// {
|
||||
// text: qsTr("Available Downloads")
|
||||
// color: palette.text
|
||||
// font.bold: true
|
||||
// font.pixelSize: Constants.h3Font.pixelSize
|
||||
// elide: Text.ElideRight
|
||||
|
||||
// Layout.fillWidth: true
|
||||
// Layout.alignment: Qt.AlignTop| Qt.AlignLeft
|
||||
// }
|
||||
|
||||
RowLayout
|
||||
{
|
||||
Layout.fillWidth: true
|
||||
|
||||
Item { Layout.fillWidth: true }
|
||||
|
||||
SquareButton
|
||||
{
|
||||
Layout.preferredHeight: 36
|
||||
Layout.preferredWidth: 128
|
||||
text: qsTr("Download")
|
||||
icon.source: "qrc:/images/icons/icons8-download.svg"
|
||||
}
|
||||
}
|
||||
|
||||
/** Spacer **/
|
||||
Item { Layout.fillWidth: true; Layout.fillHeight: true }
|
||||
|
||||
RowLayout
|
||||
{
|
||||
Layout.fillWidth: true
|
||||
Layout.alignment: Qt.AlignBottom
|
||||
|
||||
Text {
|
||||
text: qsTr("Shaders Provided Courtesy of ShaderToy and Their Respective Authors")
|
||||
elide: Text.ElideLeft
|
||||
color: palette.text
|
||||
font.bold: true
|
||||
font.pixelSize: Constants.h6Font.pixelSize
|
||||
|
||||
Layout.fillWidth: true
|
||||
Layout.alignment: Qt.AlignLeft
|
||||
}
|
||||
|
||||
Image
|
||||
{
|
||||
transform: Image.PreserveAspectFit
|
||||
source: "qrc:/images/icons/pexels-icon-filled-256.svg"
|
||||
|
||||
Layout.alignment: Qt.AlignRight
|
||||
Layout.preferredHeight: 32
|
||||
Layout.preferredWidth: 32
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -9,7 +9,8 @@ import QtQuick.Controls
|
||||
import QtQuick.Layouts
|
||||
import KomplexHub
|
||||
|
||||
Item {
|
||||
Item
|
||||
{
|
||||
property string searchTerm: ""
|
||||
property string icon: ""
|
||||
property color color: "transparent"
|
||||
@@ -17,15 +18,18 @@ Item {
|
||||
id: searchBarRootItem
|
||||
clip: true
|
||||
|
||||
Rectangle {
|
||||
Rectangle
|
||||
{
|
||||
color: searchBarRootItem.color
|
||||
anchors.fill: parent
|
||||
|
||||
RowLayout {
|
||||
RowLayout
|
||||
{
|
||||
id: searchContainerLayout
|
||||
anchors.fill: parent
|
||||
|
||||
LineEdit {
|
||||
LineEdit
|
||||
{
|
||||
id: searchEdit
|
||||
Layout.fillHeight: true
|
||||
Layout.fillWidth: true
|
||||
@@ -40,7 +44,8 @@ Item {
|
||||
onAccepted: () => searchBarRootItem.searchTerm = text
|
||||
}
|
||||
|
||||
SquareButton {
|
||||
SquareButton
|
||||
{
|
||||
id: searchButton
|
||||
|
||||
Layout.fillHeight: searchEdit.height
|
||||
@@ -67,4 +72,9 @@ Item {
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
function reset()
|
||||
{
|
||||
searchEdit.text = ""
|
||||
}
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@ Item {
|
||||
signal triggered
|
||||
signal viewMoreTriggered
|
||||
|
||||
id: searchResultItemRoot
|
||||
id: mainItem
|
||||
width: 256
|
||||
height: 256
|
||||
clip: true
|
||||
@@ -48,7 +48,7 @@ Item {
|
||||
onReleased: () => {
|
||||
if(!states.selected)
|
||||
{
|
||||
searchResultItemRoot.triggered()
|
||||
mainItem.triggered()
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -68,12 +68,35 @@ Item {
|
||||
|
||||
color: palette.base.lighter(1.25)
|
||||
|
||||
Image
|
||||
Throbber
|
||||
{
|
||||
anchors.fill: parent
|
||||
id: loadingThrobber
|
||||
visible: viewImage.status === Image.Loading
|
||||
}
|
||||
|
||||
Image
|
||||
{
|
||||
property int retries: 0
|
||||
id: viewImage
|
||||
anchors.fill: parent
|
||||
source: mainItem.thumbnail
|
||||
visible: !(status === Image.Loading)
|
||||
fillMode: Image.PreserveAspectCrop
|
||||
id: thumnailImage
|
||||
source: searchResultItemRoot.thumbnail
|
||||
|
||||
onStatusChanged: () =>
|
||||
{
|
||||
// if(status === Image.Error)
|
||||
// {
|
||||
// if(retries <= 3)
|
||||
// {
|
||||
// ++retries
|
||||
// let src = source
|
||||
// source = ""
|
||||
// source = src
|
||||
// }
|
||||
// }
|
||||
}
|
||||
}
|
||||
|
||||
Image
|
||||
@@ -89,14 +112,14 @@ Item {
|
||||
opacity: 0.5
|
||||
source: "qrc:/images/icons/pexels-icon-filled-256.svg"
|
||||
|
||||
visible: searchResultItemRoot.pexels
|
||||
visible: mainItem.pexels
|
||||
}
|
||||
}
|
||||
|
||||
Text
|
||||
{
|
||||
color: palette.text
|
||||
text: searchResultItemRoot.title
|
||||
text: mainItem.title
|
||||
|
||||
font.pixelSize: 16
|
||||
font.bold: true
|
||||
@@ -112,12 +135,12 @@ Item {
|
||||
{
|
||||
color: palette.text
|
||||
font.pixelSize: 12
|
||||
text: "By: " + searchResultItemRoot.author
|
||||
text: "By: " + mainItem.author
|
||||
leftPadding: 12
|
||||
|
||||
Layout.alignment: Qt.AlignLeft | Qt.AlignBottom
|
||||
Layout.preferredWidth: 250
|
||||
visible: !searchResultItemRoot.pexels
|
||||
visible: !mainItem.pexels
|
||||
}
|
||||
|
||||
Text
|
||||
@@ -126,7 +149,7 @@ Item {
|
||||
clip: true
|
||||
color: palette.text
|
||||
font.pixelSize: 12
|
||||
text: searchResultItemRoot.description
|
||||
text: mainItem.description
|
||||
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
|
||||
textFormat: Text.PlainText
|
||||
elide: Text.ElideRight
|
||||
@@ -153,7 +176,7 @@ Item {
|
||||
opacity: 0
|
||||
|
||||
onTriggered: () => {
|
||||
searchResultItemRoot.viewMoreTriggered()
|
||||
mainItem.viewMoreTriggered()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -166,7 +189,7 @@ Item {
|
||||
id: states
|
||||
property bool clicked: false
|
||||
property bool hovered: false
|
||||
property alias selected: searchResultItemRoot.selected
|
||||
property alias selected: mainItem.selected
|
||||
property bool idle: true
|
||||
|
||||
onIdleChanged: () =>
|
||||
|
||||
@@ -25,7 +25,7 @@ Item {
|
||||
component IconSettings: QtObject {
|
||||
property int width: 16
|
||||
property int height: 16
|
||||
property string source: "images/icons/icons8-next.svg"
|
||||
property string source: "qrc:/images/icons/icons8-next.svg"
|
||||
}
|
||||
|
||||
component BorderSettings: QtObject {
|
||||
|
||||
@@ -1,126 +1,159 @@
|
||||
import QtQuick
|
||||
import QtQuick.Shapes
|
||||
import QtQuick.Effects
|
||||
import QtQuick.Layouts
|
||||
|
||||
Item {
|
||||
id: throbberRoot
|
||||
|
||||
Rectangle {
|
||||
anchors.fill: parent
|
||||
color: "transparent"
|
||||
|
||||
Item
|
||||
onHeightChanged: () => {
|
||||
if(height > width)
|
||||
{
|
||||
id: outerRing
|
||||
anchors.fill: parent
|
||||
|
||||
Shape
|
||||
{
|
||||
anchors.fill: parent
|
||||
asynchronous: true
|
||||
|
||||
ShapePath
|
||||
{
|
||||
property double progress: 0
|
||||
property int dashSpaceLength: 15
|
||||
property int dashLength: 1
|
||||
|
||||
id: outerRingPath
|
||||
strokeColor: palette.accent.darker(1 + (progress - 0.25))
|
||||
fillColor: "transparent"
|
||||
strokeWidth: 3
|
||||
strokeStyle: ShapePath.DashLine
|
||||
|
||||
startX: 0
|
||||
startY: outerRing.height * 0.5
|
||||
|
||||
dashPattern: [
|
||||
dashSpaceLength - (dashSpaceLength * progress),
|
||||
dashSpaceLength * progress
|
||||
]
|
||||
|
||||
PathArc
|
||||
{
|
||||
x: outerRing.width
|
||||
y: outerRing.height * 0.5
|
||||
|
||||
radiusX: outerRing.width / 2
|
||||
radiusY: outerRing.height / 2
|
||||
|
||||
useLargeArc: false
|
||||
}
|
||||
|
||||
PathArc
|
||||
{
|
||||
x: 0
|
||||
y: outerRing.height * 0.5
|
||||
|
||||
radiusX: outerRing.width / 2
|
||||
radiusY: outerRing.height / 2
|
||||
|
||||
useLargeArc: false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
transform: Rotation {
|
||||
id: outerRingRotation
|
||||
origin.x: outerRing.width / 2
|
||||
origin.y: outerRing.height / 2
|
||||
}
|
||||
|
||||
NumberAnimation {
|
||||
property bool reverse: false
|
||||
|
||||
target: outerRingPath
|
||||
property: "progress"
|
||||
duration: 1600
|
||||
//easing.type: Easing.InOutQuad
|
||||
|
||||
from: 0
|
||||
to: 1
|
||||
loops: 1
|
||||
running: true
|
||||
|
||||
onFinished: () => {
|
||||
if(reverse)
|
||||
{
|
||||
from = 0
|
||||
to = 1
|
||||
start()
|
||||
}
|
||||
else
|
||||
{
|
||||
from = 1
|
||||
to = 0
|
||||
start()
|
||||
}
|
||||
|
||||
reverse = !reverse
|
||||
}
|
||||
}
|
||||
|
||||
NumberAnimation {
|
||||
target: outerRingRotation
|
||||
property: "angle"
|
||||
duration: 16000
|
||||
easing.type: Easing.InOutQuad
|
||||
|
||||
from: 0
|
||||
to: (360 * 4)
|
||||
loops: NumberAnimation.Infinite
|
||||
running: true
|
||||
}
|
||||
layout.throbberSize = width - 24
|
||||
}
|
||||
else
|
||||
{
|
||||
layout.throbberSize = height - 24
|
||||
}
|
||||
}
|
||||
|
||||
MultiEffect {
|
||||
source: outerRing
|
||||
anchors.fill: outerRing
|
||||
brightness: 0.4
|
||||
saturation: 0.2
|
||||
blurEnabled: true
|
||||
blurMax: 64
|
||||
blur: 1.0
|
||||
onWidthChanged: () => {
|
||||
if(height > width)
|
||||
{
|
||||
layout.throbberSize = width - 24
|
||||
}
|
||||
else
|
||||
{
|
||||
layout.throbberSize = height - 24
|
||||
}
|
||||
}
|
||||
|
||||
RowLayout
|
||||
{
|
||||
property int throbberSize
|
||||
id: layout
|
||||
anchors.fill: parent
|
||||
Rectangle
|
||||
{
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
Layout.preferredHeight: parent.throbberSize
|
||||
Layout.preferredWidth: parent.throbberSize
|
||||
|
||||
color: "transparent"
|
||||
|
||||
Item
|
||||
{
|
||||
id: outerRing
|
||||
anchors.fill: parent
|
||||
|
||||
Shape
|
||||
{
|
||||
anchors.fill: parent
|
||||
asynchronous: true
|
||||
|
||||
ShapePath
|
||||
{
|
||||
property double progress: 0
|
||||
property int dashSpaceLength: 15
|
||||
property int dashLength: 1
|
||||
|
||||
id: outerRingPath
|
||||
strokeColor: palette.accent.darker(1 + (progress - 0.25))
|
||||
fillColor: "transparent"
|
||||
strokeWidth: 3
|
||||
strokeStyle: ShapePath.DashLine
|
||||
|
||||
startX: 0
|
||||
startY: outerRing.height * 0.5
|
||||
|
||||
dashPattern: [
|
||||
dashSpaceLength - (dashSpaceLength * progress),
|
||||
dashSpaceLength * progress
|
||||
]
|
||||
|
||||
PathArc
|
||||
{
|
||||
x: outerRing.width
|
||||
y: outerRing.height * 0.5
|
||||
|
||||
radiusX: outerRing.width / 2
|
||||
radiusY: outerRing.height / 2
|
||||
|
||||
useLargeArc: false
|
||||
}
|
||||
|
||||
PathArc
|
||||
{
|
||||
x: 0
|
||||
y: outerRing.height * 0.5
|
||||
|
||||
radiusX: outerRing.width / 2
|
||||
radiusY: outerRing.height / 2
|
||||
|
||||
useLargeArc: false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
transform: Rotation {
|
||||
id: outerRingRotation
|
||||
origin.x: outerRing.width / 2
|
||||
origin.y: outerRing.height / 2
|
||||
}
|
||||
|
||||
NumberAnimation {
|
||||
property bool reverse: false
|
||||
|
||||
target: outerRingPath
|
||||
property: "progress"
|
||||
duration: 1600
|
||||
//easing.type: Easing.InOutQuad
|
||||
|
||||
from: 0
|
||||
to: 1
|
||||
loops: 1
|
||||
running: true
|
||||
|
||||
onFinished: () => {
|
||||
if(reverse)
|
||||
{
|
||||
from = 0
|
||||
to = 1
|
||||
start()
|
||||
}
|
||||
else
|
||||
{
|
||||
from = 1
|
||||
to = 0
|
||||
start()
|
||||
}
|
||||
|
||||
reverse = !reverse
|
||||
}
|
||||
}
|
||||
|
||||
NumberAnimation {
|
||||
target: outerRingRotation
|
||||
property: "angle"
|
||||
duration: 16000
|
||||
easing.type: Easing.InOutQuad
|
||||
|
||||
from: 0
|
||||
to: (360 * 4)
|
||||
loops: NumberAnimation.Infinite
|
||||
running: true
|
||||
}
|
||||
}
|
||||
|
||||
MultiEffect {
|
||||
source: outerRing
|
||||
anchors.fill: outerRing
|
||||
brightness: 0.4
|
||||
saturation: 0.2
|
||||
blurEnabled: true
|
||||
blurMax: 64
|
||||
blur: 1.0
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,191 @@
|
||||
import QtQuick
|
||||
import QtQuick.Controls
|
||||
import QtQuick.Layouts
|
||||
import QtQuick.Effects
|
||||
|
||||
import KomplexHub
|
||||
import KomplexHub.Controls
|
||||
import KomplexHub.Kero
|
||||
import KomplexHubPlugin
|
||||
|
||||
Item
|
||||
{
|
||||
property string uuid
|
||||
property string author
|
||||
property string authorUrl
|
||||
property string thumbnail
|
||||
property alias model: downloadSelector.model
|
||||
property int modelIndex
|
||||
|
||||
property int imageHeight
|
||||
property int imageWidth
|
||||
|
||||
visible: opacity > 0.01
|
||||
onVisibleChanged: () =>
|
||||
{
|
||||
if(!visible)
|
||||
{
|
||||
model = null
|
||||
}
|
||||
}
|
||||
|
||||
Connections
|
||||
{
|
||||
target: model
|
||||
|
||||
function onRowCountChanged()
|
||||
{
|
||||
downloadSelector.currentIndex = 0
|
||||
}
|
||||
}
|
||||
|
||||
id: rootItem
|
||||
|
||||
Rectangle
|
||||
{
|
||||
anchors.fill: parent
|
||||
color: palette.base
|
||||
|
||||
Image
|
||||
{
|
||||
id: backgroundImage
|
||||
source: thumbnail
|
||||
anchors.fill: parent
|
||||
visible: false
|
||||
fillMode: Image.PreserveAspectFit
|
||||
}
|
||||
|
||||
MultiEffect
|
||||
{
|
||||
anchors.fill: backgroundImage
|
||||
source: backgroundImage
|
||||
blurEnabled: true
|
||||
blurMax: 64
|
||||
blur: 1.0
|
||||
opacity: 0.25
|
||||
saturation: -0.8
|
||||
}
|
||||
|
||||
ColumnLayout
|
||||
{
|
||||
anchors.fill: parent
|
||||
anchors.margins: Constants.largeMargin
|
||||
spacing: Constants.largeMargin
|
||||
|
||||
RowLayout
|
||||
{
|
||||
Layout.fillWidth: true
|
||||
Layout.alignment: Qt.AlignTop| Qt.AlignHCenter
|
||||
Layout.topMargin: 32
|
||||
|
||||
Rectangle
|
||||
{
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: width / 1.77777777778
|
||||
Layout.maximumWidth: 800
|
||||
Layout.alignment: Qt.AlignHCenter
|
||||
color: palette.base.darker()
|
||||
|
||||
Throbber
|
||||
{
|
||||
anchors.fill: parent
|
||||
id: loadingThrobber
|
||||
visible: viewImage.status === Image.Loading
|
||||
}
|
||||
|
||||
Image
|
||||
{
|
||||
id: viewImage
|
||||
anchors.fill: parent
|
||||
source: rootItem.thumbnail
|
||||
visible: !(status === Image.Loading)
|
||||
fillMode: Image.PreserveAspectCrop
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Text
|
||||
{
|
||||
id: titleText
|
||||
text: rootItem.author
|
||||
color: palette.text
|
||||
font.bold: true
|
||||
font.pixelSize: Constants.h3Font.pixelSize
|
||||
elide: Text.ElideRight
|
||||
|
||||
Layout.fillWidth: true
|
||||
Layout.alignment: Qt.AlignTop| Qt.AlignLeft
|
||||
}
|
||||
|
||||
/** Spacer **/
|
||||
Item
|
||||
{
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: 32
|
||||
}
|
||||
|
||||
Text
|
||||
{
|
||||
text: qsTr("Available Downloads")
|
||||
color: palette.text
|
||||
font.bold: true
|
||||
font.pixelSize: Constants.h3Font.pixelSize
|
||||
elide: Text.ElideRight
|
||||
|
||||
Layout.fillWidth: true
|
||||
Layout.alignment: Qt.AlignTop| Qt.AlignLeft
|
||||
}
|
||||
|
||||
RowLayout
|
||||
{
|
||||
Layout.fillWidth: true
|
||||
|
||||
ComboBox
|
||||
{
|
||||
id: downloadSelector
|
||||
textRole: "text"
|
||||
valueRole: "url"
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: 36
|
||||
}
|
||||
SquareButton
|
||||
{
|
||||
Layout.preferredHeight: 36
|
||||
Layout.preferredWidth: 128
|
||||
text: qsTr("Download")
|
||||
icon.source: "qrc:/images/icons/icons8-download.svg"
|
||||
}
|
||||
}
|
||||
|
||||
/** Spacer **/
|
||||
Item { Layout.fillWidth: true; Layout.fillHeight: true }
|
||||
|
||||
RowLayout
|
||||
{
|
||||
Layout.fillWidth: true
|
||||
Layout.alignment: Qt.AlignBottom
|
||||
|
||||
Text {
|
||||
text: qsTr("Videos Provided Courtesy of Pexels and Their Respective Authors")
|
||||
elide: Text.ElideLeft
|
||||
color: palette.text
|
||||
font.bold: true
|
||||
font.pixelSize: Constants.h6Font.pixelSize
|
||||
|
||||
Layout.fillWidth: true
|
||||
Layout.alignment: Qt.AlignLeft
|
||||
}
|
||||
|
||||
Image
|
||||
{
|
||||
transform: Image.PreserveAspectFit
|
||||
source: "qrc:/images/icons/pexels-icon-filled-256.svg"
|
||||
|
||||
Layout.alignment: Qt.AlignRight
|
||||
Layout.preferredHeight: 32
|
||||
Layout.preferredWidth: 32
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -25,45 +25,53 @@ qt_add_qml_module(
|
||||
common/logging.h
|
||||
common/fetchresult.h
|
||||
paginators/newestpackspaginator.h
|
||||
SOURCES paginators/featuredpackspaginator.h
|
||||
SOURCES paginators/featuredimagespaginator.h
|
||||
SOURCES paginators/wallpaperpaginator.h
|
||||
SOURCES paginators/packsearchpaginator.h
|
||||
SOURCES paginators/imagesearchpaginator.h
|
||||
SOURCES paginators/newestshaderspaginator.h
|
||||
SOURCES paginators/newestcubemapspaginator.h
|
||||
SOURCES paginators/featuredshaderspaginator.h
|
||||
SOURCES paginators/featuredcubemapspaginator.h
|
||||
SOURCES paginators/searchshaderspaginator.h
|
||||
SOURCES paginators/searchcubemapspaginator.h
|
||||
SOURCES paginators/videosearchpaginator.h
|
||||
SOURCES featuredpacksmodel.h
|
||||
SOURCES featuredpacksmodel.cpp
|
||||
SOURCES featuredimagesmodel.h
|
||||
SOURCES featuredimagesmodel.cpp
|
||||
SOURCES featuredvideosmodel.h
|
||||
SOURCES featuredvideosmodel.cpp
|
||||
SOURCES paginators/featuredvideospaginator.h
|
||||
SOURCES common/imagecache.h
|
||||
SOURCES paginators/imagepaginator.h
|
||||
SOURCES common/videocache.h
|
||||
SOURCES paginators/videopaginator.h
|
||||
SOURCES imagesearchmodel.cpp
|
||||
SOURCES imagesearchmodel.h
|
||||
SOURCES videosearchmodel.h
|
||||
SOURCES videosearchmodel.cpp
|
||||
SOURCES
|
||||
SOURCES
|
||||
SOURCES packsearchmodel.cpp
|
||||
SOURCES packsearchmodel.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
|
||||
)
|
||||
|
||||
target_compile_definitions(
|
||||
KomplexHubPlugin
|
||||
PUBLIC
|
||||
KOMPLEX_PLUGIN
|
||||
KOMPLEX_LOCAL_DEV
|
||||
)
|
||||
|
||||
target_link_libraries(KomplexHubPlugin PRIVATE
|
||||
Qt${QT_VERSION_MAJOR}::Core
|
||||
Qt${QT_VERSION_MAJOR}::Gui
|
||||
)
|
||||
|
||||
if(ENABLE_ASAN)
|
||||
|
||||
@@ -12,6 +12,7 @@ auto CoreServices::networkAccessManager() -> QWeakPointer<QNetworkAccessManager>
|
||||
if(!s_networkAccessPointer)
|
||||
{
|
||||
s_networkAccessManager = new QNetworkAccessManager;
|
||||
s_networkAccessManager->setAutoDeleteReplies(true);
|
||||
|
||||
QObject::connect(
|
||||
s_networkAccessManager,
|
||||
@@ -50,3 +51,15 @@ auto CoreServices::sessionToken() -> QByteArray
|
||||
{}
|
||||
);
|
||||
}
|
||||
|
||||
auto CoreServices::screenSize() -> QSize
|
||||
{
|
||||
QScreen *screen = QGuiApplication::primaryScreen();
|
||||
|
||||
if(screen == nullptr)
|
||||
{
|
||||
return QSize(0,0);
|
||||
}
|
||||
|
||||
return screen->size();
|
||||
}
|
||||
|
||||
@@ -24,6 +24,7 @@
|
||||
#include <QNetworkReply>
|
||||
#include <QSharedPointer>
|
||||
#include <QWeakPointer>
|
||||
#include <QScreen>
|
||||
#include <QMutex>
|
||||
#include <QMutexLocker>
|
||||
|
||||
@@ -45,6 +46,8 @@ public:
|
||||
*/
|
||||
static auto sessionToken() -> QByteArray;
|
||||
|
||||
static auto screenSize() -> QSize;
|
||||
|
||||
private:
|
||||
|
||||
CoreServices() = default;
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
#ifndef EXCEPTIONS_H
|
||||
#define EXCEPTIONS_H
|
||||
#include <QString>
|
||||
#include <exception>
|
||||
#include "komplex_global.h"
|
||||
|
||||
struct KOMPLEX_EXPORT Exception : std::exception
|
||||
{
|
||||
explicit Exception(const QString &message, quint16 errorCode = 0)
|
||||
: std::exception(), message(message), errorCode(errorCode){}
|
||||
|
||||
const QString message;
|
||||
const quint16 errorCode;
|
||||
};
|
||||
|
||||
struct NetworkException : Exception
|
||||
{
|
||||
NetworkException(const QString &message, qsizetype errorCode = 0) : Exception(message, errorCode) {}
|
||||
};
|
||||
struct FileException : Exception
|
||||
{
|
||||
FileException(const QString &message, qsizetype errorCode = 0) : Exception(message, errorCode) {}
|
||||
};
|
||||
struct SqlException : Exception
|
||||
{
|
||||
SqlException(const QString &message, qsizetype errorCode = 0) : Exception(message, errorCode) {}
|
||||
};
|
||||
|
||||
|
||||
struct KOMPLEX_EXPORT ShaderCompilerException : Exception
|
||||
{
|
||||
ShaderCompilerException(const QString &message, qsizetype errorCode = 0) : Exception(message, errorCode) {}
|
||||
};
|
||||
#endif // EXCEPTIONS_H
|
||||
@@ -31,11 +31,12 @@
|
||||
#define SLIDING_CACHE_PREFETCH_THRESHOLD 20
|
||||
|
||||
#define NETWORK_TIMEOUT 10000
|
||||
#define NETWORK_RETRY_LIMIT 3
|
||||
|
||||
#ifdef KOMPLEX_LOCAL_DEV
|
||||
#define KOMPLEX_API_HOST "https://komplexapi.hlab"
|
||||
#else
|
||||
#define KOMPLEX_API_HOST "https://komplex.digitalartifex.dev"
|
||||
#define KOMPLEX_API_HOST "https://api.komplex.dev"
|
||||
#endif
|
||||
|
||||
#define KOMPLEX_API_VERSION "v2"
|
||||
|
||||
@@ -23,6 +23,9 @@
|
||||
#include <QMutex>
|
||||
#include <QMutexLocker>
|
||||
#include <qdebug.h>
|
||||
#include <QNetworkReply>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonParseError>
|
||||
|
||||
#include "komplex_global.h"
|
||||
#include "slidingcachecontroller.h"
|
||||
@@ -47,6 +50,7 @@ signals:
|
||||
auto pageChanged() -> void;
|
||||
auto countChanged() -> void;
|
||||
auto queryChanged() -> void;
|
||||
auto uriChanged() -> void;
|
||||
};
|
||||
|
||||
/**
|
||||
@@ -168,6 +172,34 @@ public:
|
||||
setOffset(0);
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief uri
|
||||
* URI of the API Endpoint. This is set by the child class
|
||||
* @return
|
||||
*/
|
||||
[[nodiscard]]
|
||||
auto uri() const -> QString
|
||||
{
|
||||
return m_uri;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief setUri
|
||||
* Sets the API Endpoint URI to fetch from
|
||||
* @param uri
|
||||
*/
|
||||
auto setUri(const QString &uri) -> void
|
||||
{
|
||||
if(uri == m_uri)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_uri = uri;
|
||||
|
||||
Q_EMIT uriChanged();
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief data
|
||||
* @return
|
||||
@@ -321,6 +353,31 @@ protected:
|
||||
controller()->reset();
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief getDocument
|
||||
* Extracts the JSON document from the server reply and deletes the reply
|
||||
* object.
|
||||
* @param reply
|
||||
* @return
|
||||
*/
|
||||
[[nodiscard]]
|
||||
auto getDocument(QNetworkReply *reply) const -> QJsonDocument
|
||||
{
|
||||
QByteArray data = reply->readAll();
|
||||
QJsonParseError documentError;
|
||||
QJsonDocument document = QJsonDocument::fromJson(data, &documentError);
|
||||
|
||||
reply->deleteLater();
|
||||
|
||||
LOG_ERROR_X(documentError.error != QJsonParseError::NoError,
|
||||
"NewestPacksPaginator::getDocument",
|
||||
documentError.errorString().toStdString().c_str(),
|
||||
{}
|
||||
);
|
||||
|
||||
return document;
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
/**
|
||||
@@ -377,6 +434,12 @@ private:
|
||||
* Controls the queryable state of the paginator
|
||||
*/
|
||||
bool m_queryable = false;
|
||||
|
||||
/**
|
||||
* @brief m_uri
|
||||
* API Endpoint URI
|
||||
*/
|
||||
QString m_uri;
|
||||
};
|
||||
|
||||
#endif // PAGINATOR_H
|
||||
|
||||
@@ -0,0 +1,612 @@
|
||||
#ifndef SHADERPACK_H
|
||||
#define SHADERPACK_H
|
||||
|
||||
#include <QObject>
|
||||
#include <QString>
|
||||
#include <QFile>
|
||||
#include <QFileInfo>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonParseError>
|
||||
#include <QStandardPaths>
|
||||
#include <QDir>
|
||||
#include <QMap>
|
||||
#include <QProcess>
|
||||
#include <QEventLoop>
|
||||
#include <QtQml/qqmlregistration.h>
|
||||
|
||||
#include "komplex_global.h"
|
||||
|
||||
class KOMPLEX_EXPORT ShaderChannel : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
QML_ELEMENT
|
||||
|
||||
public:
|
||||
enum Type
|
||||
{
|
||||
Image,
|
||||
Video,
|
||||
Shader,
|
||||
Cubemap,
|
||||
Audio,
|
||||
Scene,
|
||||
Model
|
||||
};
|
||||
Q_ENUM(Type)
|
||||
|
||||
enum MirrorMode
|
||||
{
|
||||
MirrorVertical,
|
||||
MirrorHorizontal,
|
||||
NoMirror
|
||||
};
|
||||
Q_ENUM(MirrorMode)
|
||||
|
||||
enum Format
|
||||
{
|
||||
RGB8A,
|
||||
RGB16F,
|
||||
RGB32F
|
||||
};
|
||||
Q_ENUM(Format)
|
||||
|
||||
enum TextureRepeat
|
||||
{
|
||||
ClampToEdge,
|
||||
RepeatVertically,
|
||||
RepeatHorizontally,
|
||||
Repeat
|
||||
};
|
||||
Q_ENUM(TextureRepeat)
|
||||
|
||||
inline auto source() const -> QString { return m_source; }
|
||||
inline auto setSource(const QString &source) -> void
|
||||
{
|
||||
if(source == this->source())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_source = source;
|
||||
Q_EMIT sourceChanged();
|
||||
}
|
||||
|
||||
inline auto type() const -> Type { return m_type; }
|
||||
inline auto setType(Type type) -> void
|
||||
{
|
||||
if(type == this->type())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_type = type;
|
||||
Q_EMIT typeChanged();
|
||||
}
|
||||
|
||||
inline auto mirrorMode() const -> MirrorMode { return m_mirrorMode; }
|
||||
inline auto setMirrorMode(MirrorMode mode)
|
||||
{
|
||||
if(mirrorMode() == mode)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_mirrorMode = mode;
|
||||
Q_EMIT mirrorModeChanged();
|
||||
}
|
||||
|
||||
inline auto textureRepeat() const -> TextureRepeat { return m_textureRepeat; }
|
||||
inline auto setTextureRepeat(TextureRepeat mode) -> void
|
||||
{
|
||||
if(textureRepeat() == mode)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_textureRepeat = mode;
|
||||
Q_EMIT textureRepeatChanged();
|
||||
}
|
||||
|
||||
inline auto resolutionY() const -> qsizetype { return m_resolutionY; }
|
||||
inline auto setResolutionY(qsizetype resolution)
|
||||
{
|
||||
if(resolutionY() == resolution)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_resolutionY = resolution;
|
||||
Q_EMIT resolutionYChanged();
|
||||
}
|
||||
|
||||
inline auto resolutionX() const -> qsizetype { return m_resolutionX; }
|
||||
inline auto setResolutionX(qsizetype resolution)
|
||||
{
|
||||
if(resolutionX() == resolution)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_resolutionX = resolution;
|
||||
Q_EMIT resolutionXChanged();
|
||||
}
|
||||
|
||||
inline auto resolutionScale() const -> qreal { return m_resolutionScale; }
|
||||
inline auto setResolutionScale(qreal scale)
|
||||
{
|
||||
if(qFuzzyCompare(resolutionScale(), scale))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_resolutionScale = scale;
|
||||
Q_EMIT resolutionScaledChanged();
|
||||
}
|
||||
|
||||
inline auto speed() const -> qreal { return m_speed; }
|
||||
inline auto setSpeed(qreal speed)
|
||||
{
|
||||
if(qFuzzyCompare(this->speed(), speed))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_speed = speed;
|
||||
Q_EMIT speedChanged();
|
||||
}
|
||||
|
||||
inline auto mouseSpeedBias() const -> qreal { return m_mouseSpeedBias; }
|
||||
inline auto setMouseSpeedBias(qreal bias)
|
||||
{
|
||||
if(qFuzzyCompare(mouseSpeedBias(), bias))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_mouseSpeedBias = bias;
|
||||
Q_EMIT mouseSpeedBiasChanged();
|
||||
}
|
||||
|
||||
inline auto bufferA() const -> ShaderChannel* { return m_bufferA; }
|
||||
inline auto setBufferA(ShaderChannel *buffer) -> void
|
||||
{
|
||||
if (m_bufferA == buffer)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_bufferA = buffer;
|
||||
Q_EMIT bufferAChanged();
|
||||
}
|
||||
|
||||
inline auto bufferB() const -> ShaderChannel* { return m_bufferB; }
|
||||
inline auto setBufferB(ShaderChannel *buffer) -> void
|
||||
{
|
||||
if (m_bufferB == buffer)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_bufferB = buffer;
|
||||
Q_EMIT bufferBChanged();
|
||||
}
|
||||
|
||||
inline auto bufferC() const -> ShaderChannel* { return m_bufferC; }
|
||||
inline auto setBufferC(ShaderChannel *buffer) -> void
|
||||
{
|
||||
if (m_bufferC == buffer)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_bufferC = buffer;
|
||||
Q_EMIT bufferCChanged();
|
||||
}
|
||||
|
||||
inline auto bufferD() const -> ShaderChannel* { return m_bufferD; }
|
||||
inline auto setBufferD(ShaderChannel *buffer) -> void
|
||||
{
|
||||
if (m_bufferD == buffer)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_bufferD = buffer;
|
||||
Q_EMIT bufferDChanged();
|
||||
}
|
||||
|
||||
inline auto channel0() const -> ShaderChannel* { return m_channel0; }
|
||||
inline auto setChannel0(ShaderChannel *channel) -> void
|
||||
{
|
||||
if (m_channel0 == channel)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_channel0 = channel;
|
||||
Q_EMIT channel0Changed();
|
||||
}
|
||||
|
||||
inline auto channel1() const -> ShaderChannel* { return m_channel1; }
|
||||
inline auto setChannel1(ShaderChannel *channel) -> void
|
||||
{
|
||||
if (m_channel1 == channel)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_channel1 = channel;
|
||||
Q_EMIT channel1Changed();
|
||||
}
|
||||
|
||||
inline auto channel2() const -> ShaderChannel* { return m_channel2; }
|
||||
inline auto setChannel2(ShaderChannel *channel) -> void
|
||||
{
|
||||
if (m_channel2 == channel)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_channel2 = channel;
|
||||
Q_EMIT channel2Changed();
|
||||
}
|
||||
|
||||
inline auto channel3() const -> ShaderChannel* { return m_channel3; }
|
||||
inline auto setChannel3(ShaderChannel *channel) -> void
|
||||
{
|
||||
if (m_channel3 == channel)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_channel3 = channel;
|
||||
Q_EMIT channel3Changed();
|
||||
}
|
||||
|
||||
inline auto frameBufferChannel() const -> qint8 { return m_frameBufferChannel; };
|
||||
inline auto setFrameBufferChannel(qint8 frameBufferChannel) -> void
|
||||
{
|
||||
if (m_frameBufferChannel == frameBufferChannel)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_frameBufferChannel = frameBufferChannel;
|
||||
Q_EMIT frameBufferChannelChanged();
|
||||
}
|
||||
|
||||
inline auto invert() const -> bool { return m_invert; }
|
||||
inline auto setInvert(bool invert) -> void
|
||||
{
|
||||
if (m_invert == invert)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_invert = invert;
|
||||
emit invertChanged();
|
||||
}
|
||||
|
||||
inline auto mipmap() const -> bool { return m_mipmap; }
|
||||
inline auto setMipmap(bool on)
|
||||
{
|
||||
if(on == mipmap())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_mipmap = on;
|
||||
Q_EMIT mipmapChanged();
|
||||
}
|
||||
|
||||
inline auto format() const -> Format { return m_format; }
|
||||
inline auto setFormat(Format format)
|
||||
{
|
||||
if(this->format() == format)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_format = format;
|
||||
Q_EMIT formatChanged();
|
||||
}
|
||||
|
||||
Q_SIGNALS:
|
||||
auto sourceChanged() -> void;
|
||||
auto typeChanged() -> void;
|
||||
auto mirrorModeChanged() -> void;
|
||||
auto textureRepeatChanged() -> void;
|
||||
auto resolutionXChanged() -> void;
|
||||
auto resolutionYChanged() -> void;
|
||||
auto resolutionScaledChanged() -> void;
|
||||
auto speedChanged() -> void;
|
||||
auto mouseSpeedBiasChanged() -> void;
|
||||
auto bufferAChanged() -> void;
|
||||
auto bufferBChanged() -> void;
|
||||
auto bufferCChanged() -> void;
|
||||
auto bufferDChanged() -> void;
|
||||
auto channel0Changed() -> void;
|
||||
auto channel1Changed() -> void;
|
||||
auto channel2Changed() -> void;
|
||||
auto channel3Changed() -> void;
|
||||
auto resolutionScaleChanged() -> void;
|
||||
auto frameBufferChannelChanged() -> void;
|
||||
auto invertChanged() -> void;
|
||||
auto mipmapChanged() -> void;
|
||||
auto formatChanged() -> void;
|
||||
|
||||
private:
|
||||
ShaderChannel *m_bufferA = nullptr;
|
||||
ShaderChannel *m_bufferB = nullptr;
|
||||
ShaderChannel *m_bufferC = nullptr;
|
||||
ShaderChannel *m_bufferD = nullptr;
|
||||
|
||||
ShaderChannel *m_channel0 = nullptr;
|
||||
ShaderChannel *m_channel1 = nullptr;
|
||||
ShaderChannel *m_channel2 = nullptr;
|
||||
ShaderChannel *m_channel3 = nullptr;
|
||||
|
||||
QString m_source;
|
||||
Type m_type = Image;
|
||||
MirrorMode m_mirrorMode = MirrorVertical;
|
||||
TextureRepeat m_textureRepeat = ClampToEdge;
|
||||
Format m_format = RGB8A;
|
||||
|
||||
qsizetype m_resolutionX = 0;
|
||||
qsizetype m_resolutionY = 0;
|
||||
qreal m_resolutionScale = 1.0;
|
||||
qreal m_speed = 1.0;
|
||||
qreal m_mouseSpeedBias = 1.0;
|
||||
|
||||
qint8 m_frameBufferChannel = -1;
|
||||
bool m_invert = false;
|
||||
bool m_mipmap = false;
|
||||
|
||||
Q_PROPERTY(ShaderChannel *bufferA READ bufferA WRITE setBufferA NOTIFY bufferAChanged FINAL)
|
||||
Q_PROPERTY(ShaderChannel *bufferB READ bufferB WRITE setBufferB NOTIFY bufferBChanged FINAL)
|
||||
Q_PROPERTY(ShaderChannel *bufferC READ bufferC WRITE setBufferC NOTIFY bufferCChanged FINAL)
|
||||
Q_PROPERTY(ShaderChannel *bufferD READ bufferD WRITE setBufferD NOTIFY bufferDChanged FINAL)
|
||||
Q_PROPERTY(ShaderChannel *channel0 READ channel0 WRITE setChannel0 NOTIFY channel0Changed FINAL)
|
||||
Q_PROPERTY(ShaderChannel *channel1 READ channel1 WRITE setChannel1 NOTIFY channel1Changed FINAL)
|
||||
Q_PROPERTY(ShaderChannel *channel2 READ channel2 WRITE setChannel2 NOTIFY channel2Changed FINAL)
|
||||
Q_PROPERTY(ShaderChannel *channel3 READ channel3 WRITE setChannel3 NOTIFY channel3Changed FINAL)
|
||||
Q_PROPERTY(QString source READ source WRITE setSource NOTIFY sourceChanged FINAL)
|
||||
Q_PROPERTY(Type type READ type WRITE setType NOTIFY typeChanged FINAL)
|
||||
Q_PROPERTY(MirrorMode mirrorMode READ mirrorMode WRITE setMirrorMode NOTIFY mirrorModeChanged FINAL)
|
||||
Q_PROPERTY(TextureRepeat textureRepeat READ textureRepeat WRITE setTextureRepeat NOTIFY textureRepeatChanged FINAL)
|
||||
Q_PROPERTY(qsizetype resolutionX READ resolutionX WRITE setResolutionX NOTIFY resolutionXChanged FINAL)
|
||||
Q_PROPERTY(qsizetype resolutionY READ resolutionY WRITE setResolutionY NOTIFY resolutionYChanged FINAL)
|
||||
Q_PROPERTY(qreal resolutionScale READ resolutionScale WRITE setResolutionScale NOTIFY resolutionScaleChanged FINAL)
|
||||
Q_PROPERTY(qreal speed READ speed WRITE setSpeed NOTIFY speedChanged FINAL)
|
||||
Q_PROPERTY(qreal mouseSpeedBias READ mouseSpeedBias WRITE setMouseSpeedBias NOTIFY mouseSpeedBiasChanged FINAL)
|
||||
Q_PROPERTY(qint8 frameBufferChannel READ frameBufferChannel WRITE setFrameBufferChannel NOTIFY frameBufferChannelChanged FINAL)
|
||||
Q_PROPERTY(bool invert READ invert WRITE setInvert NOTIFY invertChanged FINAL)
|
||||
Q_PROPERTY(bool mipmap READ mipmap WRITE setMipmap NOTIFY mipmapChanged FINAL)
|
||||
Q_PROPERTY(Format format READ format WRITE setFormat NOTIFY formatChanged FINAL)
|
||||
};
|
||||
|
||||
Q_DECLARE_METATYPE(ShaderChannel)
|
||||
|
||||
class KOMPLEX_EXPORT ShaderPack : public ShaderChannel
|
||||
{
|
||||
Q_OBJECT
|
||||
QML_ELEMENT
|
||||
|
||||
QString m_author;
|
||||
QString m_description;
|
||||
QString m_engine;
|
||||
QString m_file;
|
||||
QString m_id;
|
||||
QString m_license;
|
||||
QString m_name;
|
||||
QString m_version;
|
||||
|
||||
Q_PROPERTY(QString author READ author WRITE setAuthor NOTIFY authorChanged)
|
||||
Q_PROPERTY(QString description READ description WRITE setDescription NOTIFY descriptionChanged)
|
||||
Q_PROPERTY(QString engine READ engine WRITE setEngine NOTIFY engineChanged)
|
||||
Q_PROPERTY(QString file READ file WRITE setFile NOTIFY fileChanged)
|
||||
Q_PROPERTY(QString id READ id WRITE setId NOTIFY idChanged)
|
||||
Q_PROPERTY(QString license READ license WRITE setLicense NOTIFY licenseChanged)
|
||||
Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
|
||||
Q_PROPERTY(QString version READ version WRITE setVersion NOTIFY versionChanged)
|
||||
|
||||
Q_SIGNALS:
|
||||
void authorChanged();
|
||||
void descriptionChanged();
|
||||
void engineChanged();
|
||||
void idChanged();
|
||||
void licenseChanged();
|
||||
void nameChanged();
|
||||
void versionChanged();
|
||||
void fileChanged();
|
||||
|
||||
public:
|
||||
|
||||
QString author() const { return m_author; }
|
||||
void setAuthor(const QString& author)
|
||||
{
|
||||
if(author != m_author)
|
||||
{
|
||||
m_author = author;
|
||||
Q_EMIT authorChanged();
|
||||
}
|
||||
}
|
||||
|
||||
QString description() const { return m_description; }
|
||||
void setDescription(const QString& description)
|
||||
{
|
||||
if(description != m_description)
|
||||
{
|
||||
m_description = description;
|
||||
Q_EMIT descriptionChanged();
|
||||
}
|
||||
}
|
||||
|
||||
QString engine() const { return m_engine; }
|
||||
void setEngine(const QString& engine)
|
||||
{
|
||||
if(engine != m_engine)
|
||||
{
|
||||
m_engine = engine;
|
||||
Q_EMIT engineChanged();
|
||||
}
|
||||
}
|
||||
|
||||
QString file() const { return m_file; }
|
||||
void setFile(const QString& file)
|
||||
{
|
||||
if(file != m_file)
|
||||
{
|
||||
m_file = file;
|
||||
Q_EMIT fileChanged();
|
||||
}
|
||||
}
|
||||
|
||||
QString id() const { return m_id; }
|
||||
void setId(const QString& id)
|
||||
{
|
||||
if(id != m_id)
|
||||
{
|
||||
m_id = id;
|
||||
Q_EMIT idChanged();
|
||||
}
|
||||
}
|
||||
|
||||
QString license() const { return m_license; }
|
||||
void setLicense(const QString& license)
|
||||
{
|
||||
if(license != m_license)
|
||||
{
|
||||
m_license = license;
|
||||
Q_EMIT licenseChanged();
|
||||
}
|
||||
}
|
||||
|
||||
QString name() const { return m_name; }
|
||||
void setName(const QString& name)
|
||||
{
|
||||
if(name != m_name)
|
||||
{
|
||||
m_name = name;
|
||||
Q_EMIT nameChanged();
|
||||
}
|
||||
}
|
||||
|
||||
QString version() const { return m_version; }
|
||||
void setVersion(const QString& version)
|
||||
{
|
||||
if(version != m_version)
|
||||
{
|
||||
m_version = version;
|
||||
Q_EMIT versionChanged();
|
||||
}
|
||||
}
|
||||
|
||||
auto json() -> QJsonDocument
|
||||
{
|
||||
QJsonObject rootObject;
|
||||
|
||||
rootObject[QStringLiteral("author")] = author();
|
||||
rootObject[QStringLiteral("version")] = version();
|
||||
rootObject[QStringLiteral("name")] = name();
|
||||
rootObject[QStringLiteral("id")] = id();
|
||||
rootObject[QStringLiteral("engine")] = engine();
|
||||
rootObject[QStringLiteral("license")] = license();
|
||||
|
||||
QJsonObject bufferObject = bufferJson(this);
|
||||
const QStringList bufferKeys = bufferObject.keys();
|
||||
for(const QString &key : bufferKeys)
|
||||
{
|
||||
rootObject[key] = bufferObject[key];
|
||||
}
|
||||
|
||||
QJsonObject channelObject = channelJson(this);
|
||||
const QStringList channelKeys = channelObject.keys();
|
||||
for(const QString &key : channelKeys)
|
||||
{
|
||||
rootObject[key] = channelObject[key];
|
||||
}
|
||||
|
||||
return QJsonDocument
|
||||
{
|
||||
rootObject
|
||||
};
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
auto bufferJson(ShaderChannel *channel) -> QJsonObject
|
||||
{
|
||||
QJsonObject channelObject;
|
||||
|
||||
if(channel->bufferA())
|
||||
{
|
||||
channelObject[QStringLiteral("bufferA")] = channelJson(channel->bufferA());
|
||||
}
|
||||
if(channel->bufferB())
|
||||
{
|
||||
channelObject[QStringLiteral("bufferB")] = channelJson(channel->bufferB());
|
||||
}
|
||||
if(channel->bufferC())
|
||||
{
|
||||
channelObject[QStringLiteral("bufferC")] = channelJson(channel->bufferC());
|
||||
}
|
||||
if(channel->bufferD())
|
||||
{
|
||||
channelObject[QStringLiteral("bufferD")] = channelJson(channel->bufferD());
|
||||
}
|
||||
|
||||
return channelObject;
|
||||
}
|
||||
|
||||
auto channelJson(ShaderChannel *channel) -> QJsonObject
|
||||
{
|
||||
if(channel == nullptr)
|
||||
{
|
||||
return {};
|
||||
}
|
||||
|
||||
QJsonObject channelObject;
|
||||
|
||||
if(channel->channel0() != nullptr)
|
||||
{
|
||||
channelObject[QStringLiteral("channel0")] = channelJson(channel->channel0());
|
||||
}
|
||||
|
||||
if(channel->channel1() != nullptr)
|
||||
{
|
||||
channelObject[QStringLiteral("channel1")] = channelJson(channel->channel1());
|
||||
}
|
||||
|
||||
if(channel->channel2() != nullptr)
|
||||
{
|
||||
channelObject[QStringLiteral("channel2")] = channelJson(channel->channel2());
|
||||
}
|
||||
|
||||
if(channel->channel3() != nullptr)
|
||||
{
|
||||
channelObject[QStringLiteral("channel3")] = channelJson(channel->channel3());
|
||||
}
|
||||
|
||||
channelObject[QStringLiteral("source")] = channel->source();
|
||||
channelObject[QStringLiteral("type")] = channel->type();
|
||||
channelObject[QStringLiteral("texture_mirroring")] = channel->mirrorMode();
|
||||
channelObject[QStringLiteral("wrap_mode")] = channel->textureRepeat();
|
||||
channelObject[QStringLiteral("invert")] = channel->invert();
|
||||
channelObject[QStringLiteral("time_scale")] = channel->speed();
|
||||
channelObject[QStringLiteral("resolution_scale")] = channel->resolutionScale();
|
||||
channelObject[QStringLiteral("mouse_scale")] = channel->mouseSpeedBias();
|
||||
channelObject[QStringLiteral("resolution_x")] = channel->resolutionX();
|
||||
channelObject[QStringLiteral("resolution_y")] = channel->resolutionY();
|
||||
channelObject[QStringLiteral("frame_buffer_channel")] = channel->frameBufferChannel();
|
||||
channelObject[QStringLiteral("format")] = channel->format();
|
||||
channelObject[QStringLiteral("mipmap")] = channel->mipmap();
|
||||
|
||||
return channelObject;
|
||||
}
|
||||
};
|
||||
|
||||
Q_DECLARE_METATYPE(ShaderPack)
|
||||
#endif
|
||||
@@ -0,0 +1,108 @@
|
||||
#ifndef SHADERTOYMETADATA_H
|
||||
#define SHADERTOYMETADATA_H
|
||||
#include <QObject>
|
||||
#include <QDateTime>
|
||||
#include <QNetworkReply>
|
||||
#include <QNetworkRequest>
|
||||
#include <QStandardPaths>
|
||||
#include <QUuid>
|
||||
#include <QProcess>
|
||||
#include <QTimer>
|
||||
#include <QMutex>
|
||||
#include <QDir>
|
||||
#include <QEventLoop>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonParseError>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonArray>
|
||||
#include <QJsonValue>
|
||||
#include <QNetworkAccessManager>
|
||||
#include <QPixmap>
|
||||
#include <qqmlintegration.h>
|
||||
|
||||
#include "komplex_global.h"
|
||||
|
||||
struct KOMPLEX_EXPORT ShaderToyMetadata
|
||||
{
|
||||
QDateTime date;
|
||||
QString description;
|
||||
quint64 flags = 0;
|
||||
bool hasLiked = false;
|
||||
QString id;
|
||||
quint64 likes = 0;
|
||||
QString name;
|
||||
quint64 published = 0;
|
||||
QStringList tags;
|
||||
bool usePreview = false;
|
||||
QString username;
|
||||
QString version;
|
||||
quint64 views = 0;
|
||||
};
|
||||
|
||||
struct KOMPLEX_EXPORT ShaderToyRenderInput
|
||||
{
|
||||
quint8 channel = 0;
|
||||
QString ctype;
|
||||
QString filter;
|
||||
quint64 id = 0;
|
||||
QString internal;
|
||||
bool published = false;
|
||||
QString source;
|
||||
bool srgb = false;
|
||||
bool verticalFlip = false;
|
||||
QString wrap;
|
||||
};
|
||||
|
||||
struct KOMPLEX_EXPORT ShaderToyRenderOutput
|
||||
{
|
||||
const quint8 channel = 0;
|
||||
const quint64 id = 0;
|
||||
};
|
||||
|
||||
struct KOMPLEX_EXPORT ShaderToyRenderPass
|
||||
{
|
||||
QByteArray code;
|
||||
QString description;
|
||||
QList<ShaderToyRenderInput> inputs;
|
||||
QString name;
|
||||
QList<ShaderToyRenderOutput> outputs;
|
||||
QString type;
|
||||
};
|
||||
|
||||
enum KOMPLEX_EXPORT ShaderToyErrorCode
|
||||
{
|
||||
NoError = 0,
|
||||
NetworkError = (0x10 << 24),
|
||||
MediaError = (0x20 << 24),
|
||||
DiskError = (0x30 << 24),
|
||||
CompileError = (0x40 << 24)
|
||||
};
|
||||
|
||||
struct KOMPLEX_EXPORT ShaderToyError
|
||||
{
|
||||
QString message;
|
||||
ShaderToyErrorCode code;
|
||||
};
|
||||
|
||||
struct KOMPLEX_EXPORT ShaderToyEntry
|
||||
{
|
||||
enum Status
|
||||
{
|
||||
Idle,
|
||||
Loading,
|
||||
Compiling,
|
||||
Compiled,
|
||||
Error
|
||||
};
|
||||
|
||||
ShaderToyMetadata metadata;
|
||||
QList<ShaderToyRenderPass> renderPasses;
|
||||
QByteArray data;
|
||||
ShaderToyError error;
|
||||
QStringList videoSelections;
|
||||
Status status = Idle;
|
||||
};
|
||||
|
||||
Q_DECLARE_METATYPE(ShaderToyEntry)
|
||||
Q_DECLARE_METATYPE(ShaderToyError)
|
||||
#endif // SHADERTOYMETADATA_H
|
||||
@@ -96,7 +96,6 @@ public:
|
||||
auto at(qsizetype index) const -> const T&
|
||||
{
|
||||
QMutexLocker cacheLocker(&m_cacheMutex);
|
||||
T defaultValue;
|
||||
|
||||
if(!externalBoundaryCheck(index))
|
||||
{
|
||||
@@ -110,12 +109,12 @@ public:
|
||||
|
||||
qsizetype internalIndex = this->internalIndex(index);
|
||||
|
||||
if(!internalBoundaryCheck(index))
|
||||
if(!internalBoundaryCheck(internalIndex))
|
||||
{
|
||||
return defaultValue;
|
||||
}
|
||||
|
||||
return m_cache.at(index);
|
||||
return m_cache.at(internalIndex);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -143,17 +142,17 @@ public:
|
||||
|
||||
qsizetype internalIndex = this->internalIndex(index);
|
||||
|
||||
if(!internalBoundaryCheck(index))
|
||||
if(!internalBoundaryCheck(internalIndex))
|
||||
{
|
||||
return {};
|
||||
}
|
||||
|
||||
if(!internalBoundaryCheck(count - 1))
|
||||
{
|
||||
count = m_cache.count() - index;
|
||||
count = m_cache.count() - internalIndex;
|
||||
}
|
||||
|
||||
return m_cache.mid(index, count);
|
||||
return m_cache.mid(internalIndex, count);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -203,7 +202,7 @@ public:
|
||||
return;
|
||||
}
|
||||
|
||||
if(!externalBoundaryCheck(index + count))
|
||||
if(externalBoundaryCheck(index + count))
|
||||
{
|
||||
slideWindow(index);
|
||||
}
|
||||
@@ -236,7 +235,8 @@ public:
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
m_windowSize = windowSize;
|
||||
Q_EMIT windowSizeChanged();
|
||||
}
|
||||
|
||||
protected:
|
||||
@@ -319,7 +319,7 @@ private:
|
||||
);
|
||||
|
||||
bool safe = false;
|
||||
((safe = index >= 0 && index < m_cache.count()), ...);
|
||||
((safe = ((index >= 0) && (index < m_cache.count()))), ...);
|
||||
return safe;
|
||||
}
|
||||
|
||||
@@ -345,7 +345,7 @@ private:
|
||||
}
|
||||
}
|
||||
|
||||
while (index <= m_windowOffset - (SLIDING_CACHE_WINDOW_SIZE - SLIDING_CACHE_PREFETCH_THRESHOLD))
|
||||
while (index < m_windowOffset)
|
||||
{
|
||||
if(!slideBackward())
|
||||
{
|
||||
@@ -588,7 +588,9 @@ private:
|
||||
* @brief m_windowSize
|
||||
* Override for window size
|
||||
*/
|
||||
qsizetype m_windowSize = nullsize;
|
||||
qsizetype m_windowSize = SLIDING_CACHE_WINDOW_SIZE;
|
||||
|
||||
T defaultValue;
|
||||
};
|
||||
|
||||
#endif // SLIDINGCACHECONTROLLER_H
|
||||
|
||||
@@ -0,0 +1,736 @@
|
||||
#include "downloadmanager.h"
|
||||
#include "common/coreservices.h"
|
||||
#include "common/exceptions.h"
|
||||
#include "common/shaderpack.h"
|
||||
|
||||
DownloadManager::DownloadManager(QObject *parent)
|
||||
: QObject{parent}
|
||||
{
|
||||
m_compiler = new PackCompiler(this);
|
||||
|
||||
QObject::connect
|
||||
(
|
||||
m_compiler,
|
||||
&PackCompiler::progressChanged,
|
||||
this,
|
||||
&DownloadManager::compileProgressChanged
|
||||
);
|
||||
|
||||
QObject::connect
|
||||
(
|
||||
m_compiler,
|
||||
&PackCompiler::currentStepChanged,
|
||||
this,
|
||||
&DownloadManager::compileStepsCompletedChanged
|
||||
);
|
||||
|
||||
QObject::connect
|
||||
(
|
||||
m_compiler,
|
||||
&PackCompiler::totalStepsChanged,
|
||||
this,
|
||||
&DownloadManager::compileStepsChanged
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* [1] Download image from endpoint
|
||||
* [2] Apply generic single-media template, with an image source
|
||||
* [3] Optionally ask user if they would like to apply manipulative shader
|
||||
* [4] Install locally
|
||||
*/
|
||||
auto DownloadManager::downloadImage(const QString &author, const QString &authorId, const QString &description, const QUrl &url) noexcept(false) -> void
|
||||
{
|
||||
QFuture future = QtConcurrent::run
|
||||
(
|
||||
[this, url, author, authorId, description]()
|
||||
{
|
||||
QNetworkRequest request(url);
|
||||
QString id = QUuid::createUuidV7().toString(QUuid::WithoutBraces);
|
||||
|
||||
QFuture<QUrl> downloadUri = download(request, id);
|
||||
|
||||
downloadUri
|
||||
.then
|
||||
(
|
||||
[this, author, description, id](QUrl result) -> QUrl
|
||||
{
|
||||
ShaderPack metadata;
|
||||
metadata.setAuthor(author);
|
||||
metadata.setDescription(description);
|
||||
metadata.setName(QStringLiteral("Pexels Image (%1)").arg(id));
|
||||
|
||||
QUrl packUri
|
||||
(
|
||||
QStringLiteral("%1/%2").arg
|
||||
(
|
||||
QStandardPaths::writableLocation(QStandardPaths::TempLocation),
|
||||
id
|
||||
)
|
||||
);
|
||||
|
||||
QUrl packImageUri
|
||||
(
|
||||
QStringLiteral("%1/%2/images/%3").arg
|
||||
(
|
||||
QStandardPaths::writableLocation(QStandardPaths::TempLocation),
|
||||
id,
|
||||
result.fileName()
|
||||
)
|
||||
);
|
||||
|
||||
QDir packDirectory(packUri.toLocalFile());
|
||||
packDirectory.mkpath(packUri.toLocalFile());
|
||||
packDirectory.mkdir(QStringLiteral("images"));
|
||||
|
||||
QFile::rename(result.toLocalFile(), packImageUri.toLocalFile());
|
||||
|
||||
QFile packFile
|
||||
(
|
||||
packDirectory.absoluteFilePath
|
||||
(
|
||||
QStringLiteral("pack.json")
|
||||
)
|
||||
);
|
||||
|
||||
if(!packFile.open(QFile::ReadWrite))
|
||||
{
|
||||
setError(QStringLiteral("File Error"), packFile.errorString());
|
||||
throw FileException(packFile.errorString());
|
||||
}
|
||||
|
||||
QByteArray data = metadata.json().toJson(QJsonDocument::Compact);
|
||||
|
||||
if(packFile.write(data) != data.length())
|
||||
{
|
||||
setError(QStringLiteral("File Error"), packFile.errorString());
|
||||
throw FileException(packFile.errorString());
|
||||
}
|
||||
|
||||
packFile.close();
|
||||
|
||||
return packUri;
|
||||
}
|
||||
)
|
||||
.then
|
||||
(
|
||||
[this](QUrl result)
|
||||
{
|
||||
install(result);
|
||||
}
|
||||
)
|
||||
.onCanceled
|
||||
(
|
||||
[this]()
|
||||
{
|
||||
reset();
|
||||
}
|
||||
)
|
||||
.onFailed
|
||||
(
|
||||
[this] ()
|
||||
{
|
||||
reset();
|
||||
}
|
||||
);
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
auto DownloadManager::downloadVideo(const QString &author, const QString &authorId, const QString &description, const QUrl &url) noexcept(false) -> void
|
||||
{
|
||||
QFuture future = QtConcurrent::run
|
||||
(
|
||||
[this, url, author, authorId, description]()
|
||||
{
|
||||
QNetworkRequest request(url);
|
||||
QString id = QUuid::createUuidV7().toString(QUuid::WithoutBraces);
|
||||
|
||||
QFuture<QUrl> downloadUri = download(request, id);
|
||||
|
||||
downloadUri
|
||||
.then
|
||||
(
|
||||
[this, author, description, id](QUrl result) -> QUrl
|
||||
{
|
||||
ShaderPack metadata;
|
||||
metadata.setAuthor(author);
|
||||
metadata.setDescription(description);
|
||||
metadata.setName(QStringLiteral("Pexels Video (%1)").arg(id));
|
||||
metadata.setType(ShaderPack::Video);
|
||||
|
||||
QUrl packUri
|
||||
(
|
||||
QStringLiteral("%1/%2").arg
|
||||
(
|
||||
QStandardPaths::writableLocation(QStandardPaths::TempLocation),
|
||||
id
|
||||
)
|
||||
);
|
||||
|
||||
QUrl packImageUri
|
||||
(
|
||||
QStringLiteral("%1/%2/images/%3").arg
|
||||
(
|
||||
QStandardPaths::writableLocation(QStandardPaths::TempLocation),
|
||||
id,
|
||||
result.fileName()
|
||||
)
|
||||
);
|
||||
|
||||
QDir packDirectory(packUri.toLocalFile());
|
||||
packDirectory.mkpath(packUri.toLocalFile());
|
||||
packDirectory.mkdir(QStringLiteral("images"));
|
||||
|
||||
QFile::rename(result.toLocalFile(), packImageUri.toLocalFile());
|
||||
|
||||
QFile packFile
|
||||
(
|
||||
packDirectory.absoluteFilePath
|
||||
(
|
||||
QStringLiteral("pack.json")
|
||||
)
|
||||
);
|
||||
|
||||
if(!packFile.open(QFile::ReadWrite))
|
||||
{
|
||||
setError(QStringLiteral("File Error"), packFile.errorString());
|
||||
throw FileException(packFile.errorString());
|
||||
}
|
||||
|
||||
QByteArray data = metadata.json().toJson(QJsonDocument::Compact);
|
||||
|
||||
if(packFile.write(data) != data.length())
|
||||
{
|
||||
setError(QStringLiteral("File Error"), packFile.errorString());
|
||||
throw FileException(packFile.errorString());
|
||||
}
|
||||
|
||||
packFile.close();
|
||||
|
||||
return packUri;
|
||||
}
|
||||
)
|
||||
.then
|
||||
(
|
||||
[this](QUrl result)
|
||||
{
|
||||
install(result);
|
||||
}
|
||||
)
|
||||
.onCanceled
|
||||
(
|
||||
[this]()
|
||||
{
|
||||
reset();
|
||||
}
|
||||
)
|
||||
.onFailed
|
||||
(
|
||||
[this] ()
|
||||
{
|
||||
reset();
|
||||
}
|
||||
);
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
auto DownloadManager::downloadPack(const QString &id) noexcept(false) -> void
|
||||
{
|
||||
QFuture aether = QtConcurrent::run
|
||||
(
|
||||
[this, id]()
|
||||
{
|
||||
QUrl downloadUrl = QUrl
|
||||
(
|
||||
QStringLiteral("%1/%2/%3").arg
|
||||
(
|
||||
KOMPLEX_API_HOST,
|
||||
KOMPLEX_API_VERSION,
|
||||
KOMPLEX_ENDPOINT_PACKS_ITEM
|
||||
)
|
||||
);
|
||||
|
||||
QNetworkRequest request(downloadUrl);
|
||||
request.setRawHeader(QByteArray("uuid"), id.toUtf8());
|
||||
|
||||
QFuture<QUrl> downloadUri = download(request, id, Post);
|
||||
|
||||
downloadUri
|
||||
.then
|
||||
(
|
||||
[this](QUrl result) -> QUrl
|
||||
{
|
||||
return m_compiler->process(result).result();
|
||||
}
|
||||
)
|
||||
.then
|
||||
(
|
||||
[this](QUrl result)
|
||||
{
|
||||
install(result);
|
||||
}
|
||||
)
|
||||
.onFailed
|
||||
(
|
||||
[this]()
|
||||
{
|
||||
reset();
|
||||
setError(m_compiler->errorTitle(), m_compiler->errorMessage());
|
||||
}
|
||||
)
|
||||
.onCanceled
|
||||
(
|
||||
[this]()
|
||||
{
|
||||
reset();
|
||||
}
|
||||
);
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
auto DownloadManager::reset() -> void
|
||||
{
|
||||
setError(QString(), QString());
|
||||
setState(Idle);
|
||||
}
|
||||
|
||||
auto DownloadManager::compileProgress() -> qreal
|
||||
{
|
||||
if(m_compiler == nullptr)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
return m_compiler->progress();
|
||||
}
|
||||
|
||||
auto DownloadManager::compileSteps() -> qint64
|
||||
{
|
||||
if(m_compiler == nullptr)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
return m_compiler->totalSteps();
|
||||
}
|
||||
|
||||
auto DownloadManager::compileStepsCompleted() -> qint64
|
||||
{
|
||||
if(nullptr == m_compiler)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
return m_compiler->currentStep();
|
||||
}
|
||||
|
||||
auto DownloadManager::setError(const QString &title, const QString &message) -> void
|
||||
{
|
||||
if(title == m_errorTitle && message == m_errorMessage)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_errorMessage = std::move(message);
|
||||
m_errorTitle = std::move(title);
|
||||
Q_EMIT errorChanged();
|
||||
}
|
||||
|
||||
void DownloadManager::setCompilerOutput(const QString &compilerOutput)
|
||||
{
|
||||
if (m_compilerOutput == compilerOutput)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_compilerOutput = compilerOutput;
|
||||
emit compilerOutputChanged();
|
||||
}
|
||||
|
||||
auto DownloadManager::setState(State state) -> void
|
||||
{
|
||||
if(state == m_state)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_state = state;
|
||||
Q_EMIT stateChanged();
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
auto DownloadManager::setDownloadProgress(qreal progress) -> void
|
||||
{
|
||||
if(qFuzzyCompare(progress, m_downloadProgress))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_downloadProgress = progress;
|
||||
Q_EMIT downloadProgressChanged();
|
||||
}
|
||||
|
||||
auto DownloadManager::install(const QUrl &uri) noexcept(false) -> QUrl
|
||||
{
|
||||
if(!uri.isLocalFile())
|
||||
{
|
||||
throw FileException(QStringLiteral("URI is not a local file"));
|
||||
}
|
||||
|
||||
QDir tempDirectory(uri.toLocalFile());
|
||||
|
||||
QString installLocation = QStringLiteral("%1/.local/share/komplex/packs/%2").arg
|
||||
(
|
||||
QStandardPaths::writableLocation(QStandardPaths::HomeLocation),
|
||||
tempDirectory.dirName()
|
||||
);
|
||||
|
||||
QDir installDirectory(installLocation);
|
||||
|
||||
if(installDirectory.exists())
|
||||
installDirectory.removeRecursively();
|
||||
|
||||
QProcess process;
|
||||
|
||||
QObject::connect
|
||||
(
|
||||
&process,
|
||||
&QProcess::readyReadStandardOutput,
|
||||
this,
|
||||
[this, &process]()
|
||||
{
|
||||
QByteArray processData = process.readAllStandardOutput();
|
||||
|
||||
if(!processData.isValidUtf8())
|
||||
{
|
||||
qWarning() << QStringLiteral("Process output not valid UTF8 data");
|
||||
return;
|
||||
}
|
||||
|
||||
setCompilerOutput(m_compilerOutput + processData);
|
||||
}
|
||||
);
|
||||
|
||||
QObject::connect
|
||||
(
|
||||
&process,
|
||||
&QProcess::readyReadStandardError,
|
||||
this,
|
||||
[this, &process]()
|
||||
{
|
||||
QByteArray processData = process.readAllStandardError();
|
||||
|
||||
if(!processData.isValidUtf8())
|
||||
{
|
||||
qWarning() << QStringLiteral("Process output not valid UTF8 data");
|
||||
return;
|
||||
}
|
||||
|
||||
setCompilerOutput(m_compilerOutput + processData);
|
||||
}
|
||||
);
|
||||
|
||||
QStringList arguments = QStringList
|
||||
{
|
||||
QStringLiteral("-R"),
|
||||
uri.toLocalFile(),
|
||||
installLocation
|
||||
};
|
||||
|
||||
process.start(QStringLiteral("cp"), arguments);
|
||||
|
||||
if(!process.waitForStarted(3000))
|
||||
{
|
||||
qWarning() << QStringLiteral("Could not start copy process: %1").arg(process.readAllStandardError());
|
||||
throw FileException(QStringLiteral("Could not start install process"));
|
||||
}
|
||||
|
||||
if(!process.waitForFinished())
|
||||
{
|
||||
qWarning() << QStringLiteral("Copy process took longer than expected (>30s)");
|
||||
throw FileException(QStringLiteral("Install process took longer than expected (>30s)"));
|
||||
}
|
||||
|
||||
QUrl installUri(installLocation);
|
||||
installUri.setScheme(QStringLiteral("file://"));
|
||||
|
||||
return installUri;
|
||||
}
|
||||
|
||||
auto DownloadManager::download(const QNetworkRequest &request, const QString &id, RequestType type) -> QFuture<QUrl>
|
||||
{
|
||||
return QtConcurrent::run
|
||||
(
|
||||
[this, request, id]() -> QUrl
|
||||
{
|
||||
QEventLoop loop;
|
||||
QString filename = id;
|
||||
|
||||
if(filename.isEmpty())
|
||||
{
|
||||
filename = QUuid::createUuidV7().toString();
|
||||
}
|
||||
|
||||
QUrl downloadUri = QStringLiteral("%1/%2").arg
|
||||
(
|
||||
QStandardPaths::writableLocation(QStandardPaths::TempLocation),
|
||||
filename
|
||||
);
|
||||
|
||||
auto manager = CoreServices::networkAccessManager().toStrongRef();
|
||||
|
||||
if(manager == nullptr)
|
||||
{
|
||||
throw NetworkException
|
||||
{
|
||||
QStringLiteral("Network Manager reference has already been deleted")
|
||||
};
|
||||
}
|
||||
|
||||
QFile downloadFile(downloadUri.toLocalFile());
|
||||
|
||||
if(!downloadFile.open(QFile::ReadWrite))
|
||||
{
|
||||
throw FileException(QStringLiteral("Could not open temp file location"));
|
||||
}
|
||||
|
||||
QNetworkReply *reply = manager->post(request, nullptr);
|
||||
|
||||
QObject::connect
|
||||
(
|
||||
reply,
|
||||
&QNetworkReply::finished,
|
||||
&loop,
|
||||
&QEventLoop::quit
|
||||
);
|
||||
|
||||
QObject::connect
|
||||
(
|
||||
reply,
|
||||
&QNetworkReply::errorOccurred,
|
||||
&loop,
|
||||
[&loop](QNetworkReply::NetworkError error) -> void
|
||||
{
|
||||
loop.quit();
|
||||
|
||||
throw NetworkException
|
||||
(
|
||||
QStringLiteral("Network Error %1").arg
|
||||
(
|
||||
QString::number(static_cast<qint64>(error))
|
||||
)
|
||||
);
|
||||
}
|
||||
);
|
||||
|
||||
QObject::connect
|
||||
(
|
||||
reply,
|
||||
&QNetworkReply::downloadProgress,
|
||||
this,
|
||||
[this](qint64 bytesDownloaded, qint64 bytesTotal)
|
||||
{
|
||||
setDownloadSize(bytesTotal);
|
||||
setDownloadedBytes(bytesDownloaded);
|
||||
setDownloadProgress(static_cast<qreal>(bytesDownloaded) / bytesTotal);
|
||||
}
|
||||
);
|
||||
|
||||
QObject::connect
|
||||
(
|
||||
reply,
|
||||
&QNetworkReply::readyRead,
|
||||
this,
|
||||
[this, &downloadFile, &reply]()
|
||||
{
|
||||
if(!downloadFile.isOpen())
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
quint64 bytes = reply->bytesAvailable();
|
||||
quint64 bytesWritten = downloadFile.write(reply->read(bytes));
|
||||
|
||||
if(bytesWritten != bytes)
|
||||
{
|
||||
throw FileException(QStringLiteral("Could not write temp file data"));
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
if(!reply->isFinished())
|
||||
{
|
||||
loop.exec();
|
||||
}
|
||||
|
||||
if(reply->bytesAvailable() > 0)
|
||||
{
|
||||
quint64 bytes = reply->bytesAvailable();
|
||||
quint64 bytesWritten = downloadFile.write(reply->read(bytes));
|
||||
|
||||
if(bytesWritten != bytes)
|
||||
{
|
||||
throw FileException(QStringLiteral("Could not write temp file data"));
|
||||
}
|
||||
}
|
||||
|
||||
downloadFile.close();
|
||||
manager.clear();
|
||||
|
||||
return downloadUri;
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
auto DownloadManager::readShaderToyEntry(const QUrl &uri) noexcept(false) -> ShaderToyEntry
|
||||
{
|
||||
if(!uri.isLocalFile())
|
||||
{
|
||||
throw FileException(QStringLiteral("URI is not a local file"));
|
||||
}
|
||||
|
||||
QDir packDir(uri.toLocalFile());
|
||||
|
||||
if(!packDir.exists(QStringLiteral("pack.json")))
|
||||
{
|
||||
throw FileException(QStringLiteral("Pack file not found"));
|
||||
}
|
||||
|
||||
QFile packFile(packDir.absoluteFilePath(QStringLiteral("pack.json")));
|
||||
|
||||
if(!packFile.open(QFile::ReadOnly))
|
||||
{
|
||||
throw FileException
|
||||
(
|
||||
QStringLiteral("Could not open pack file: %1").arg
|
||||
(
|
||||
packFile.errorString()
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
QByteArray data = packFile.readAll();
|
||||
QJsonParseError jsonError;
|
||||
|
||||
QJsonDocument document = QJsonDocument::fromJson(data, &jsonError);
|
||||
|
||||
if(jsonError.error != QJsonParseError::NoError)
|
||||
{
|
||||
throw FileException
|
||||
(
|
||||
QStringLiteral("Could parse pack file: %1").arg
|
||||
(
|
||||
jsonError.errorString()
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
QJsonObject documentObject = document.object();
|
||||
QJsonObject rootObject = documentObject[QStringLiteral("Shader")].toObject();
|
||||
QJsonObject infoObject = rootObject[QStringLiteral("info")].toObject();
|
||||
QJsonArray tagsArray = infoObject[QStringLiteral("tags")].toArray();
|
||||
|
||||
QStringList tags;
|
||||
|
||||
for(const QJsonValue &tag : std::as_const(tagsArray))
|
||||
tags += tag.toString();
|
||||
|
||||
ShaderToyEntry entry;
|
||||
|
||||
entry.metadata = ShaderToyMetadata
|
||||
{
|
||||
QDateTime::fromSecsSinceEpoch(infoObject[QStringLiteral("date")].toInt()),
|
||||
infoObject[QStringLiteral("description")].toString(),
|
||||
static_cast<quint64>(infoObject[QStringLiteral("flags")].toInt()),
|
||||
static_cast<bool>(infoObject[QStringLiteral("hasLiked")].toInt()),
|
||||
infoObject[QStringLiteral("id")].toString(),
|
||||
static_cast<quint64>(infoObject[QStringLiteral("likes")].toInt()),
|
||||
infoObject[QStringLiteral("name")].toString(),
|
||||
static_cast<quint64>(infoObject[QStringLiteral("published")].toInt()),
|
||||
tags,
|
||||
static_cast<bool>(infoObject[QStringLiteral("usePreview")].toInt()),
|
||||
infoObject[QStringLiteral("username")].toString(),
|
||||
rootObject[QStringLiteral("ver")].toString(),
|
||||
static_cast<quint64>(infoObject[QStringLiteral("views")].toInt())
|
||||
};
|
||||
|
||||
QJsonArray ShaderToyRenderPassArray = rootObject[QStringLiteral("renderpass")].toArray();
|
||||
|
||||
for(const QJsonValue &ShaderToyRenderPassValue : std::as_const(ShaderToyRenderPassArray))
|
||||
{
|
||||
QJsonArray inputArray = ShaderToyRenderPassValue[QStringLiteral("inputs")].toArray();
|
||||
QJsonArray outputArray = ShaderToyRenderPassValue[QStringLiteral("outputs")].toArray();
|
||||
QList<ShaderToyRenderInput> inputs;
|
||||
QList<ShaderToyRenderOutput> outputs;
|
||||
|
||||
for(const QJsonValue &inputValue : std::as_const(inputArray))
|
||||
{
|
||||
QJsonObject samplerObject = inputValue[QStringLiteral("sampler")].toObject();
|
||||
inputs.append
|
||||
(
|
||||
ShaderToyRenderInput
|
||||
{
|
||||
static_cast<quint8>(inputValue[QStringLiteral("channel")].toInt()),
|
||||
inputValue[QStringLiteral("ctype")].toString(),
|
||||
samplerObject[QStringLiteral("filter")].toString(),
|
||||
static_cast<quint64>(inputValue[QStringLiteral("id")].toInt()),
|
||||
samplerObject[QStringLiteral("internal")].toString(),
|
||||
static_cast<bool>(inputValue[QStringLiteral("published")].toInt()),
|
||||
inputValue[QStringLiteral("src")].toString(),
|
||||
samplerObject[QStringLiteral("srgb")].toBool(),
|
||||
samplerObject[QStringLiteral("verticalFlip")].toBool(),
|
||||
samplerObject[QStringLiteral("wrap")].toString()
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
for(const QJsonValue &outputValue : std::as_const(outputArray))
|
||||
{
|
||||
outputs.append
|
||||
(
|
||||
ShaderToyRenderOutput
|
||||
{
|
||||
static_cast<quint8>(outputValue[QStringLiteral("channel")].toInt()),
|
||||
static_cast<quint64>(outputValue[QStringLiteral("id")].toInt())
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
entry.renderPasses.append
|
||||
(
|
||||
ShaderToyRenderPass
|
||||
{
|
||||
ShaderToyRenderPassValue[QStringLiteral("code")].toVariant().toByteArray(),
|
||||
ShaderToyRenderPassValue[QStringLiteral("description")].toString(),
|
||||
inputs,
|
||||
ShaderToyRenderPassValue[QStringLiteral("name")].toString(),
|
||||
outputs,
|
||||
ShaderToyRenderPassValue[QStringLiteral("type")].toString()
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
return std::move(entry);
|
||||
}
|
||||
|
||||
auto DownloadManager::setDownloadedBytes(qint64 downloadedBytes) -> void
|
||||
{
|
||||
if (m_downloadedBytes == downloadedBytes)
|
||||
return;
|
||||
|
||||
m_downloadedBytes = downloadedBytes;
|
||||
emit downloadedBytesChanged();
|
||||
}
|
||||
|
||||
auto DownloadManager::setDownloadSize(qint64 downloadSize) -> void
|
||||
{
|
||||
if (m_downloadSize == downloadSize)
|
||||
return;
|
||||
|
||||
m_downloadSize = downloadSize;
|
||||
emit downloadSizeChanged();
|
||||
}
|
||||
@@ -0,0 +1,154 @@
|
||||
#ifndef DOWNLOADMANAGER_H
|
||||
#define DOWNLOADMANAGER_H
|
||||
|
||||
#include <QObject>
|
||||
#include <QNetworkAccessManager>
|
||||
#include <QNetworkReply>
|
||||
#include <QNetworkRequest>
|
||||
#include <QFileInfo>
|
||||
#include <QUuid>
|
||||
#include <QQmlEngine>
|
||||
#include <QProcess>
|
||||
#include <QDir>
|
||||
#include <QStandardPaths>
|
||||
#include <QUuid>
|
||||
#include <QtConcurrent/QtConcurrentRun>
|
||||
|
||||
#include "common/komplex_global.h"
|
||||
#include "common/shadertoymetadata.h"
|
||||
#include "common/shaderpack.h"
|
||||
#include "packcompiler.h"
|
||||
|
||||
class KOMPLEX_EXPORT DownloadManager : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
QML_ELEMENT
|
||||
public:
|
||||
|
||||
enum State
|
||||
{
|
||||
Idle,
|
||||
Downloading,
|
||||
Compiling,
|
||||
Installing,
|
||||
Complete,
|
||||
Error
|
||||
};
|
||||
Q_ENUM(State)
|
||||
|
||||
enum RequestType
|
||||
{
|
||||
Get,
|
||||
Post
|
||||
};
|
||||
|
||||
explicit DownloadManager(QObject *parent = nullptr);
|
||||
|
||||
/**
|
||||
* @brief downloadImage
|
||||
* Downloads the image to tmp from the given url and generates a pack
|
||||
* out of it
|
||||
* @param url
|
||||
*/
|
||||
auto downloadImage
|
||||
(
|
||||
const QString &author,
|
||||
const QString &authorId,
|
||||
const QString &description,
|
||||
const QUrl &url
|
||||
) noexcept(false) -> void;
|
||||
|
||||
/**
|
||||
* @brief downloadVideo
|
||||
* Downloads the video to tmp from the given url and generates a pack
|
||||
* out of it
|
||||
* @param author
|
||||
* @param authorId
|
||||
* @param description
|
||||
* @param url
|
||||
*/
|
||||
auto downloadVideo
|
||||
(
|
||||
const QString &author,
|
||||
const QString &authorId,
|
||||
const QString &description,
|
||||
const QUrl &url
|
||||
) noexcept(false) -> void;
|
||||
|
||||
/**
|
||||
* @brief downloadPack
|
||||
* Attempts to download, compile and install the wallpaper
|
||||
* pack from the komplex endpoint.
|
||||
* @param id
|
||||
* @return File info of the installed pack
|
||||
*/
|
||||
auto downloadPack(const QString &id) noexcept(false) -> void;
|
||||
|
||||
auto compilerOutput() const -> const QString & { return m_compilerOutput; }
|
||||
auto errorTitle() const -> const QString & { return m_errorTitle; }
|
||||
auto errorMessage() const -> const QString & { return m_errorMessage; }
|
||||
auto state() const -> State { return m_state; }
|
||||
auto reset() -> void;
|
||||
auto downloadProgress() -> qreal { return m_downloadProgress; }
|
||||
auto compileProgress() -> qreal;
|
||||
auto compileSteps() -> qint64;
|
||||
auto compileStepsCompleted() -> qint64;
|
||||
|
||||
auto downloadSize() const -> qint64 { return m_downloadSize; }
|
||||
auto setDownloadSize(qint64 downloadSize) -> void;
|
||||
|
||||
auto downloadedBytes() const -> qint64 { return m_downloadedBytes; }
|
||||
auto setDownloadedBytes(qint64 downloadedBytes) -> void;
|
||||
|
||||
protected:
|
||||
auto setError(const QString &title, const QString &message) -> void;
|
||||
auto setCompilerOutput(const QString &compilerOutput) -> void;
|
||||
auto setState(State state) -> void;
|
||||
auto setDownloadProgress(qreal progress) -> void;
|
||||
|
||||
signals:
|
||||
auto compilerOutputChanged() -> void;
|
||||
auto errorChanged() -> void;
|
||||
auto stateChanged() -> void;
|
||||
auto downloadProgressChanged() -> void;
|
||||
auto compileProgressChanged() -> void;
|
||||
auto downloadComplete(const QString &uri) -> void;
|
||||
auto downloadSizeChanged() -> void;
|
||||
auto downloadedBytesChanged() -> void;
|
||||
auto compileStepsChanged() -> void;
|
||||
auto compileStepsCompletedChanged() -> void;
|
||||
|
||||
private:
|
||||
auto compile(const QUrl &uri) noexcept(false) -> QUrl;
|
||||
auto install(const QUrl &uri) noexcept(false) -> QUrl;
|
||||
auto download(const QNetworkRequest &request, const QString &id, RequestType type = Get) -> QFuture<QUrl>;
|
||||
auto readShaderToyEntry(const QUrl &uri) noexcept(false) -> ShaderToyEntry;
|
||||
|
||||
QString m_compilerOutput;
|
||||
QString m_errorTitle;
|
||||
QString m_errorMessage;
|
||||
|
||||
qreal m_downloadProgress = 0;
|
||||
qint64 m_downloadSize = 0;
|
||||
qint64 m_downloadedBytes = 0;
|
||||
qreal m_compileProgress = 0;
|
||||
State m_state;
|
||||
|
||||
QMutex m_downloadMutex;
|
||||
|
||||
PackCompiler *m_compiler = nullptr;
|
||||
|
||||
Q_PROPERTY(QString compilerOutput READ compilerOutput WRITE setCompilerOutput NOTIFY compilerOutputChanged FINAL)
|
||||
Q_PROPERTY(QString errorTitle READ errorTitle NOTIFY errorChanged FINAL)
|
||||
Q_PROPERTY(QString errorMessage READ errorMessage NOTIFY errorChanged FINAL)
|
||||
Q_PROPERTY(qreal downloadProgress READ downloadProgress NOTIFY downloadProgressChanged FINAL)
|
||||
Q_PROPERTY(qreal compileProgress READ compileProgress NOTIFY compileProgressChanged FINAL)
|
||||
Q_PROPERTY(State state READ state NOTIFY stateChanged FINAL)
|
||||
Q_PROPERTY(qint64 downloadSize READ downloadSize WRITE setDownloadSize NOTIFY downloadSizeChanged FINAL)
|
||||
Q_PROPERTY(qint64 downloadedBytes READ downloadedBytes WRITE setDownloadedBytes NOTIFY downloadedBytesChanged FINAL)
|
||||
Q_PROPERTY(qint64 compileSteps READ compileSteps NOTIFY compileStepsChanged FINAL)
|
||||
Q_PROPERTY(qint64 compileStepsCompleted READ compileStepsCompleted NOTIFY compileStepsCompletedChanged FINAL)
|
||||
};
|
||||
Q_DECLARE_METATYPE(DownloadManager)
|
||||
|
||||
#endif // DOWNLOADMANAGER_H
|
||||
@@ -55,6 +55,14 @@ FeaturedImagesModel::FeaturedImagesModel(QObject *parent) : QAbstractListModel{p
|
||||
);
|
||||
}
|
||||
|
||||
FeaturedImagesModel::~FeaturedImagesModel()
|
||||
{
|
||||
if(m_paginator)
|
||||
{
|
||||
delete m_paginator;
|
||||
}
|
||||
}
|
||||
|
||||
auto FeaturedImagesModel::rowCount(const QModelIndex &) const -> int
|
||||
{
|
||||
if(m_paginator != nullptr)
|
||||
@@ -94,49 +102,36 @@ auto FeaturedImagesModel::data(const QModelIndex &index, int role) const -> QVar
|
||||
data = dataPoint.altText;
|
||||
break;
|
||||
case ThumbnailRole:
|
||||
data = dataPoint.sources.value(QString::fromUtf8("tiny"));
|
||||
data = dataPoint.sources.value(QString::fromUtf8("thumbnail"));
|
||||
break;
|
||||
case LargeThumbnailRole:
|
||||
data = dataPoint.sources.value(QString::fromUtf8("largeThumbnail"));
|
||||
break;
|
||||
case PortraitUrlRole:
|
||||
data = dataPoint.sources.value(QString::fromUtf8("portrait"));
|
||||
break;
|
||||
case LandscapeUrlRole:
|
||||
data = dataPoint.sources.value(QString::fromUtf8("landscape"));
|
||||
case PortraitSizeRole:
|
||||
data = dataPoint.sourceSizes.value(QString::fromUtf8("portrait"));
|
||||
break;
|
||||
case SmallUrlRole:
|
||||
data = dataPoint.sources.value(QString::fromUtf8("small"));
|
||||
case ScreenUrlRole:
|
||||
data = dataPoint.sources.value(QString::fromUtf8("screen"));
|
||||
break;
|
||||
case ScreenSizeRole:
|
||||
data = dataPoint.sourceSizes.value(QString::fromUtf8("screen"));
|
||||
break;
|
||||
case OriginalUrlRole:
|
||||
data = dataPoint.sources.value(QString::fromUtf8("original"));
|
||||
break;
|
||||
case MediumUrlRole:
|
||||
data = dataPoint.sources.value(QString::fromUtf8("medium"));
|
||||
break;
|
||||
case LargeUrlRole:
|
||||
data = dataPoint.sources.value(QString::fromUtf8("large"));
|
||||
break;
|
||||
case ExtraLargeUrlRole:
|
||||
data = dataPoint.sources.value(QString::fromUtf8("large2x"));
|
||||
break;
|
||||
case PortraitSizeRole:
|
||||
data = dataPoint.sourceSizes.value(QString::fromUtf8("portrait"));
|
||||
case LandscapeUrlRole:
|
||||
data = dataPoint.sources.value(QString::fromUtf8("landscape"));
|
||||
break;
|
||||
case LandscapeSizeRole:
|
||||
data = dataPoint.sourceSizes.value(QString::fromUtf8("landscape"));
|
||||
break;
|
||||
case SmallSizeRole:
|
||||
data = dataPoint.sourceSizes.value(QString::fromUtf8("small"));
|
||||
break;
|
||||
case OriginalSizeRole:
|
||||
data = dataPoint.sourceSizes.value(QString::fromUtf8("original"));
|
||||
break;
|
||||
case MediumSizeRole:
|
||||
data = dataPoint.sourceSizes.value(QString::fromUtf8("medium"));
|
||||
break;
|
||||
case LargeSizeRole:
|
||||
data = dataPoint.sourceSizes.value(QString::fromUtf8("large"));
|
||||
break;
|
||||
case ExtraLargeSizeRole:
|
||||
data = dataPoint.sourceSizes.value(QString::fromUtf8("large2x"));
|
||||
case BackgroundPortraitRole:
|
||||
data = dataPoint.sources.value(QString::fromUtf8("backgroundPortrait"));
|
||||
case BackgroundLandscapeRole:
|
||||
data = dataPoint.sources.value(QString::fromUtf8("backgroundLandscape"));
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -250,13 +245,43 @@ auto FeaturedImagesModel::resultsPerPage() const -> qsizetype
|
||||
|
||||
auto FeaturedImagesModel::setResultsPerPage(qsizetype resultsPerPage) -> void
|
||||
{
|
||||
|
||||
if(m_paginator != nullptr)
|
||||
{
|
||||
QFuture<void> future = QtConcurrent::run
|
||||
(
|
||||
[this, resultsPerPage]
|
||||
{
|
||||
qsizetype difference = resultsPerPage - m_paginator->resultsPerPage();
|
||||
m_paginator->setResultsPerPage(resultsPerPage);
|
||||
|
||||
if(difference > 0)
|
||||
{
|
||||
qsizetype firstIndex = m_paginator->resultsPerPage() - difference;
|
||||
|
||||
beginInsertRows
|
||||
(
|
||||
QModelIndex(),
|
||||
firstIndex,
|
||||
m_paginator->count() - 1
|
||||
);
|
||||
|
||||
endInsertRows();
|
||||
}
|
||||
|
||||
else if(difference < 0)
|
||||
{
|
||||
qsizetype firstIndex = m_paginator->resultsPerPage();
|
||||
|
||||
beginRemoveRows
|
||||
(
|
||||
QModelIndex(),
|
||||
firstIndex,
|
||||
firstIndex - difference
|
||||
);
|
||||
|
||||
endRemoveRows();
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
@@ -69,24 +69,21 @@ public:
|
||||
AuthorUrlRole,
|
||||
DescriptionRole,
|
||||
ThumbnailRole,
|
||||
LargeThumbnailRole,
|
||||
OriginalUrlRole,
|
||||
ScreenUrlRole,
|
||||
PortraitUrlRole,
|
||||
LandscapeUrlRole,
|
||||
SmallUrlRole,
|
||||
OriginalUrlRole,
|
||||
MediumUrlRole,
|
||||
LargeUrlRole,
|
||||
ExtraLargeUrlRole,
|
||||
ScreenSizeRole,
|
||||
PortraitSizeRole,
|
||||
LandscapeSizeRole,
|
||||
SmallSizeRole,
|
||||
OriginalSizeRole,
|
||||
MediumSizeRole,
|
||||
LargeSizeRole,
|
||||
ExtraLargeSizeRole
|
||||
BackgroundPortraitRole,
|
||||
BackgroundLandscapeRole
|
||||
};
|
||||
Q_ENUM(DataRole)
|
||||
|
||||
explicit FeaturedImagesModel(QObject *parent = nullptr);
|
||||
~FeaturedImagesModel();
|
||||
|
||||
auto rowCount(const QModelIndex &parent = QModelIndex()) const -> int override;
|
||||
|
||||
@@ -295,6 +292,14 @@ private:
|
||||
static_cast<int>(ThumbnailRole),
|
||||
QByteArray("thumbnail")
|
||||
},
|
||||
{
|
||||
static_cast<int>(LargeThumbnailRole),
|
||||
QByteArray("largeThumbnail")
|
||||
},
|
||||
{
|
||||
static_cast<int>(OriginalUrlRole),
|
||||
QByteArray("original")
|
||||
},
|
||||
{
|
||||
static_cast<int>(PortraitUrlRole),
|
||||
QByteArray("portrait")
|
||||
@@ -304,24 +309,20 @@ private:
|
||||
QByteArray("landscape")
|
||||
},
|
||||
{
|
||||
static_cast<int>(SmallUrlRole),
|
||||
QByteArray("small")
|
||||
static_cast<int>(BackgroundPortraitRole),
|
||||
QByteArray("backgroundPortrait")
|
||||
},
|
||||
{
|
||||
static_cast<int>(OriginalUrlRole),
|
||||
QByteArray("original")
|
||||
static_cast<int>(BackgroundLandscapeRole),
|
||||
QByteArray("backgroundLandscape")
|
||||
},
|
||||
{
|
||||
static_cast<int>(MediumUrlRole),
|
||||
QByteArray("medium")
|
||||
static_cast<int>(ScreenUrlRole),
|
||||
QByteArray("fullScreen")
|
||||
},
|
||||
{
|
||||
static_cast<int>(LargeUrlRole),
|
||||
QByteArray("large")
|
||||
},
|
||||
{
|
||||
static_cast<int>(ExtraLargeUrlRole),
|
||||
QByteArray("extraLarge")
|
||||
static_cast<int>(ScreenSizeRole),
|
||||
QByteArray("fullScreenSize")
|
||||
},
|
||||
{
|
||||
static_cast<int>(PortraitSizeRole),
|
||||
@@ -330,26 +331,6 @@ private:
|
||||
{
|
||||
static_cast<int>(LandscapeSizeRole),
|
||||
QByteArray("landscapeSize")
|
||||
},
|
||||
{
|
||||
static_cast<int>(SmallSizeRole),
|
||||
QByteArray("smallSize")
|
||||
},
|
||||
{
|
||||
static_cast<int>(OriginalSizeRole),
|
||||
QByteArray("originalSize")
|
||||
},
|
||||
{
|
||||
static_cast<int>(MediumSizeRole),
|
||||
QByteArray("mediumSize")
|
||||
},
|
||||
{
|
||||
static_cast<int>(LargeSizeRole),
|
||||
QByteArray("largeSize")
|
||||
},
|
||||
{
|
||||
static_cast<int>(ExtraLargeSizeRole),
|
||||
QByteArray("extraLargeSize")
|
||||
}
|
||||
};
|
||||
State m_state = Idle;
|
||||
|
||||
@@ -56,6 +56,14 @@ FeaturedPacksModel::FeaturedPacksModel(QObject *parent) : QAbstractListModel{par
|
||||
);
|
||||
}
|
||||
|
||||
FeaturedPacksModel::~FeaturedPacksModel()
|
||||
{
|
||||
if(m_paginator)
|
||||
{
|
||||
delete m_paginator;
|
||||
}
|
||||
}
|
||||
|
||||
auto FeaturedPacksModel::rowCount(const QModelIndex &) const -> int
|
||||
{
|
||||
if(m_paginator != nullptr)
|
||||
@@ -181,6 +189,16 @@ auto FeaturedPacksModel::onPaginatorFetching() -> void
|
||||
setState(Loading);
|
||||
}
|
||||
|
||||
auto FeaturedPacksModel::boundaryCheck(qsizetype index) const -> bool
|
||||
{
|
||||
if(index < 0 || m_paginator == nullptr || index >= m_paginator->count())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
auto FeaturedPacksModel::roleNames() const -> QHash<int, QByteArray>
|
||||
{
|
||||
return m_dataRoles;
|
||||
@@ -220,7 +238,36 @@ auto FeaturedPacksModel::setResultsPerPage(qsizetype resultsPerPage) -> void
|
||||
(
|
||||
[this, resultsPerPage]
|
||||
{
|
||||
qsizetype difference = resultsPerPage - m_paginator->resultsPerPage();
|
||||
m_paginator->setResultsPerPage(resultsPerPage);
|
||||
|
||||
if(difference > 0)
|
||||
{
|
||||
qsizetype firstIndex = m_paginator->resultsPerPage() - difference;
|
||||
|
||||
beginInsertRows
|
||||
(
|
||||
QModelIndex(),
|
||||
firstIndex,
|
||||
m_paginator->count() - 1
|
||||
);
|
||||
|
||||
endInsertRows();
|
||||
}
|
||||
|
||||
else if(difference < 0)
|
||||
{
|
||||
qsizetype firstIndex = m_paginator->resultsPerPage();
|
||||
|
||||
beginRemoveRows
|
||||
(
|
||||
QModelIndex(),
|
||||
firstIndex,
|
||||
firstIndex - difference
|
||||
);
|
||||
|
||||
endRemoveRows();
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
@@ -78,6 +78,7 @@ public:
|
||||
Q_ENUM(DataRole)
|
||||
|
||||
explicit FeaturedPacksModel(QObject *parent = nullptr);
|
||||
~FeaturedPacksModel();
|
||||
|
||||
auto rowCount(const QModelIndex &parent = QModelIndex()) const -> int override;
|
||||
|
||||
@@ -239,6 +240,14 @@ signals:
|
||||
auto totalPagesChanged() -> void;
|
||||
|
||||
private:
|
||||
/**
|
||||
* @brief boundaryCheck
|
||||
* Helper function to check the requested index boundary
|
||||
* @param index
|
||||
* @return
|
||||
*/
|
||||
auto boundaryCheck(qsizetype index) const -> bool;
|
||||
|
||||
/**
|
||||
* @brief m_dataRoles
|
||||
* Data role map that connects ImageSearchModel::DataRole to it's QML accessor name
|
||||
|
||||
@@ -3,6 +3,8 @@
|
||||
|
||||
FeaturedVideosModel::FeaturedVideosModel(QObject *parent) : QAbstractListModel{parent}
|
||||
{
|
||||
m_itemModel = new VideoItemModel(this);
|
||||
|
||||
m_paginator = new FeaturedVideosPaginator(this);
|
||||
PaginationNotifier *notifier = static_cast<PaginationNotifier*>(m_paginator);
|
||||
|
||||
@@ -56,6 +58,19 @@ FeaturedVideosModel::FeaturedVideosModel(QObject *parent) : QAbstractListModel{p
|
||||
);
|
||||
}
|
||||
|
||||
FeaturedVideosModel::~FeaturedVideosModel()
|
||||
{
|
||||
if(m_paginator)
|
||||
{
|
||||
delete m_paginator;
|
||||
}
|
||||
|
||||
if(m_itemModel)
|
||||
{
|
||||
delete m_itemModel;
|
||||
}
|
||||
}
|
||||
|
||||
auto FeaturedVideosModel::rowCount(const QModelIndex &) const -> int
|
||||
{
|
||||
if(m_paginator != nullptr)
|
||||
@@ -68,7 +83,7 @@ auto FeaturedVideosModel::rowCount(const QModelIndex &) const -> int
|
||||
|
||||
auto FeaturedVideosModel::data(const QModelIndex &index, int role) const -> QVariant
|
||||
{
|
||||
if(index.row() < 0 || m_paginator == nullptr || index.row() >= m_paginator->count())
|
||||
if(!boundaryCheck(index.row()))
|
||||
{
|
||||
return {};
|
||||
}
|
||||
@@ -115,12 +130,7 @@ auto FeaturedVideosModel::index(int row, int column, const QModelIndex &parent)
|
||||
{
|
||||
Q_UNUSED(parent)
|
||||
|
||||
if(m_paginator == nullptr)
|
||||
{
|
||||
return {};
|
||||
}
|
||||
|
||||
if(row < 0 || row >= m_paginator->count())
|
||||
if(!boundaryCheck(row))
|
||||
{
|
||||
return {};
|
||||
}
|
||||
@@ -180,6 +190,21 @@ auto FeaturedVideosModel::onPaginatorFetching() -> void
|
||||
setState(Loading);
|
||||
}
|
||||
|
||||
auto FeaturedVideosModel::boundaryCheck(qsizetype index) const -> bool
|
||||
{
|
||||
if(index < 0 || m_paginator == nullptr || index >= m_paginator->count())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
auto FeaturedVideosModel::itemModel() const -> VideoItemModel*
|
||||
{
|
||||
return m_itemModel;
|
||||
}
|
||||
|
||||
auto FeaturedVideosModel::roleNames() const -> QHash<int, QByteArray>
|
||||
{
|
||||
return m_dataRoles;
|
||||
@@ -219,7 +244,36 @@ auto FeaturedVideosModel::setResultsPerPage(qsizetype resultsPerPage) -> void
|
||||
(
|
||||
[this, resultsPerPage]
|
||||
{
|
||||
qsizetype difference = resultsPerPage - m_paginator->resultsPerPage();
|
||||
m_paginator->setResultsPerPage(resultsPerPage);
|
||||
|
||||
if(difference > 0)
|
||||
{
|
||||
qsizetype firstIndex = m_paginator->resultsPerPage() - difference;
|
||||
|
||||
beginInsertRows
|
||||
(
|
||||
QModelIndex(),
|
||||
firstIndex,
|
||||
m_paginator->count() - 1
|
||||
);
|
||||
|
||||
endInsertRows();
|
||||
}
|
||||
|
||||
else if(difference < 0)
|
||||
{
|
||||
qsizetype firstIndex = m_paginator->resultsPerPage();
|
||||
|
||||
beginRemoveRows
|
||||
(
|
||||
QModelIndex(),
|
||||
firstIndex,
|
||||
firstIndex - difference
|
||||
);
|
||||
|
||||
endRemoveRows();
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
||||
@@ -263,6 +317,17 @@ auto FeaturedVideosModel::previousPage() -> void
|
||||
}
|
||||
}
|
||||
|
||||
auto FeaturedVideosModel::setItem(qint64 index) -> bool
|
||||
{
|
||||
if(!boundaryCheck(index))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
m_itemModel->setDataEntry(m_paginator->at(index));
|
||||
return true;
|
||||
}
|
||||
|
||||
qsizetype FeaturedVideosModel::page() const
|
||||
{
|
||||
if(m_paginator != nullptr)
|
||||
|
||||
@@ -38,6 +38,7 @@
|
||||
#include <QtConcurrent/QtConcurrentRun>
|
||||
|
||||
#include "paginators/featuredvideospaginator.h"
|
||||
#include "videoitemmodel.h"
|
||||
|
||||
/**
|
||||
* @brief The FeaturedVideosModel class
|
||||
@@ -76,6 +77,7 @@ public:
|
||||
Q_ENUM(DataRole)
|
||||
|
||||
explicit FeaturedVideosModel(QObject *parent = nullptr);
|
||||
~FeaturedVideosModel();
|
||||
|
||||
auto rowCount(const QModelIndex &parent = QModelIndex()) const -> int override;
|
||||
|
||||
@@ -205,6 +207,16 @@ public:
|
||||
*/
|
||||
Q_INVOKABLE auto previousPage() -> void;
|
||||
|
||||
/**
|
||||
* @brief setItem
|
||||
* Sets the current itemModel to the item at the specified index
|
||||
* @param index
|
||||
* @return
|
||||
*/
|
||||
Q_INVOKABLE auto setItem(qint64 index) -> bool;
|
||||
|
||||
VideoItemModel *itemModel() const;
|
||||
|
||||
protected:
|
||||
/**
|
||||
* @brief setErrorString
|
||||
@@ -237,6 +249,14 @@ signals:
|
||||
auto totalPagesChanged() -> void;
|
||||
|
||||
private:
|
||||
/**
|
||||
* @brief boundaryCheck
|
||||
* Helper function to check the requested index boundary
|
||||
* @param index
|
||||
* @return
|
||||
*/
|
||||
auto boundaryCheck(qsizetype index) const -> bool;
|
||||
|
||||
/**
|
||||
* @brief m_dataRoles
|
||||
* Data role map that connects ImageSearchModel::DataRole to it's QML accessor name
|
||||
@@ -285,6 +305,7 @@ private:
|
||||
QString m_errorString = QString();
|
||||
|
||||
FeaturedVideosPaginator *m_paginator = nullptr;
|
||||
VideoItemModel *m_itemModel = nullptr;
|
||||
|
||||
Q_PROPERTY(State state READ state WRITE setState RESET resetState NOTIFY stateChanged FINAL)
|
||||
Q_PROPERTY(QString errorString READ errorString WRITE setErrorString NOTIFY errorStringChanged FINAL)
|
||||
@@ -292,6 +313,7 @@ private:
|
||||
Q_PROPERTY(qsizetype totalResults READ totalResults NOTIFY totalResultsChanged FINAL)
|
||||
Q_PROPERTY(qsizetype totalPages READ totalPages NOTIFY totalPagesChanged FINAL)
|
||||
Q_PROPERTY(qsizetype page READ page NOTIFY pageChanged FINAL)
|
||||
Q_PROPERTY(VideoItemModel *itemModel READ itemModel CONSTANT FINAL)
|
||||
};
|
||||
Q_DECLARE_METATYPE(FeaturedVideosModel)
|
||||
|
||||
|
||||
@@ -109,49 +109,36 @@ auto ImageSearchModel::data(const QModelIndex &index, int role) const -> QVarian
|
||||
data = dataPoint.altText;
|
||||
break;
|
||||
case ThumbnailRole:
|
||||
data = dataPoint.sources.value(QString::fromUtf8("tiny"));
|
||||
data = dataPoint.sources.value(QString::fromUtf8("thumbnail"));
|
||||
break;
|
||||
case LargeThumbnailRole:
|
||||
data = dataPoint.sources.value(QString::fromUtf8("largeThumbnail"));
|
||||
break;
|
||||
case PortraitUrlRole:
|
||||
data = dataPoint.sources.value(QString::fromUtf8("portrait"));
|
||||
break;
|
||||
case LandscapeUrlRole:
|
||||
data = dataPoint.sources.value(QString::fromUtf8("landscape"));
|
||||
case PortraitSizeRole:
|
||||
data = dataPoint.sourceSizes.value(QString::fromUtf8("portrait"));
|
||||
break;
|
||||
case SmallUrlRole:
|
||||
data = dataPoint.sources.value(QString::fromUtf8("small"));
|
||||
case ScreenUrlRole:
|
||||
data = dataPoint.sources.value(QString::fromUtf8("screen"));
|
||||
break;
|
||||
case ScreenSizeRole:
|
||||
data = dataPoint.sourceSizes.value(QString::fromUtf8("screen"));
|
||||
break;
|
||||
case OriginalUrlRole:
|
||||
data = dataPoint.sources.value(QString::fromUtf8("original"));
|
||||
break;
|
||||
case MediumUrlRole:
|
||||
data = dataPoint.sources.value(QString::fromUtf8("medium"));
|
||||
break;
|
||||
case LargeUrlRole:
|
||||
data = dataPoint.sources.value(QString::fromUtf8("large"));
|
||||
break;
|
||||
case ExtraLargeUrlRole:
|
||||
data = dataPoint.sources.value(QString::fromUtf8("large2x"));
|
||||
break;
|
||||
case PortraitSizeRole:
|
||||
data = dataPoint.sourceSizes.value(QString::fromUtf8("portrait"));
|
||||
case LandscapeUrlRole:
|
||||
data = dataPoint.sources.value(QString::fromUtf8("landscape"));
|
||||
break;
|
||||
case LandscapeSizeRole:
|
||||
data = dataPoint.sourceSizes.value(QString::fromUtf8("landscape"));
|
||||
break;
|
||||
case SmallSizeRole:
|
||||
data = dataPoint.sourceSizes.value(QString::fromUtf8("small"));
|
||||
break;
|
||||
case OriginalSizeRole:
|
||||
data = dataPoint.sourceSizes.value(QString::fromUtf8("original"));
|
||||
break;
|
||||
case MediumSizeRole:
|
||||
data = dataPoint.sourceSizes.value(QString::fromUtf8("medium"));
|
||||
break;
|
||||
case LargeSizeRole:
|
||||
data = dataPoint.sourceSizes.value(QString::fromUtf8("large"));
|
||||
break;
|
||||
case ExtraLargeSizeRole:
|
||||
data = dataPoint.sourceSizes.value(QString::fromUtf8("large2x"));
|
||||
case BackgroundPortraitRole:
|
||||
data = dataPoint.sources.value(QString::fromUtf8("backgroundPortrait"));
|
||||
case BackgroundLandscapeRole:
|
||||
data = dataPoint.sources.value(QString::fromUtf8("backgroundLandscape"));
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -222,6 +209,16 @@ auto ImageSearchModel::onPaginatorFetching() -> void
|
||||
setState(Loading);
|
||||
}
|
||||
|
||||
auto ImageSearchModel::boundaryCheck(qsizetype index) const -> bool
|
||||
{
|
||||
if(index < 0 || m_paginator == nullptr || index >= m_paginator->count())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
auto ImageSearchModel::hasNextPage() const -> bool
|
||||
{
|
||||
return m_paginator->page() < m_paginator->totalPages();
|
||||
|
||||
@@ -69,20 +69,16 @@ public:
|
||||
AuthorUrlRole,
|
||||
DescriptionRole,
|
||||
ThumbnailRole,
|
||||
LargeThumbnailRole,
|
||||
OriginalUrlRole,
|
||||
ScreenUrlRole,
|
||||
PortraitUrlRole,
|
||||
LandscapeUrlRole,
|
||||
SmallUrlRole,
|
||||
OriginalUrlRole,
|
||||
MediumUrlRole,
|
||||
LargeUrlRole,
|
||||
ExtraLargeUrlRole,
|
||||
ScreenSizeRole,
|
||||
PortraitSizeRole,
|
||||
LandscapeSizeRole,
|
||||
SmallSizeRole,
|
||||
OriginalSizeRole,
|
||||
MediumSizeRole,
|
||||
LargeSizeRole,
|
||||
ExtraLargeSizeRole
|
||||
BackgroundPortraitRole,
|
||||
BackgroundLandscapeRole
|
||||
};
|
||||
Q_ENUM(DataRole)
|
||||
|
||||
@@ -322,93 +318,85 @@ signals:
|
||||
auto queryChanged() -> void;
|
||||
|
||||
private:
|
||||
/**
|
||||
* @brief boundaryCheck
|
||||
* Helper function to check the requested index boundary
|
||||
* @param index
|
||||
* @return
|
||||
*/
|
||||
auto boundaryCheck(qsizetype index) const -> bool;
|
||||
|
||||
/**
|
||||
* @brief m_dataRoles
|
||||
* Data role map that connects ImageSearchModel::DataRole to it's QML accessor name
|
||||
*/
|
||||
static inline const QHash<int, QByteArray> m_dataRoles =
|
||||
{
|
||||
{
|
||||
static_cast<int>(UuidRole),
|
||||
QByteArray("uuid")
|
||||
},
|
||||
{
|
||||
static_cast<int>(AuthorRole),
|
||||
QByteArray("author")
|
||||
},
|
||||
{
|
||||
static_cast<int>(AuthorIdRole),
|
||||
QByteArray("authorId")
|
||||
},
|
||||
{
|
||||
static_cast<int>(AuthorUrlRole),
|
||||
QByteArray("authorUrl")
|
||||
},
|
||||
{
|
||||
static_cast<int>(DescriptionRole),
|
||||
QByteArray("description")
|
||||
},
|
||||
{
|
||||
static_cast<int>(ThumbnailRole),
|
||||
QByteArray("thumbnail")
|
||||
},
|
||||
{
|
||||
static_cast<int>(PortraitUrlRole),
|
||||
QByteArray("portrait")
|
||||
},
|
||||
{
|
||||
static_cast<int>(LandscapeUrlRole),
|
||||
QByteArray("landscape")
|
||||
},
|
||||
{
|
||||
static_cast<int>(SmallUrlRole),
|
||||
QByteArray("small")
|
||||
},
|
||||
{
|
||||
static_cast<int>(OriginalUrlRole),
|
||||
QByteArray("original")
|
||||
},
|
||||
{
|
||||
static_cast<int>(MediumUrlRole),
|
||||
QByteArray("medium")
|
||||
},
|
||||
{
|
||||
static_cast<int>(LargeUrlRole),
|
||||
QByteArray("large")
|
||||
},
|
||||
{
|
||||
static_cast<int>(ExtraLargeUrlRole),
|
||||
QByteArray("extraLarge")
|
||||
},
|
||||
{
|
||||
static_cast<int>(PortraitSizeRole),
|
||||
QByteArray("portraitSize")
|
||||
},
|
||||
{
|
||||
static_cast<int>(LandscapeSizeRole),
|
||||
QByteArray("landscapeSize")
|
||||
},
|
||||
{
|
||||
static_cast<int>(SmallSizeRole),
|
||||
QByteArray("smallSize")
|
||||
},
|
||||
{
|
||||
static_cast<int>(OriginalSizeRole),
|
||||
QByteArray("originalSize")
|
||||
},
|
||||
{
|
||||
static_cast<int>(MediumSizeRole),
|
||||
QByteArray("mediumSize")
|
||||
},
|
||||
{
|
||||
static_cast<int>(LargeSizeRole),
|
||||
QByteArray("largeSize")
|
||||
},
|
||||
{
|
||||
static_cast<int>(ExtraLargeSizeRole),
|
||||
QByteArray("extraLargeSize")
|
||||
}
|
||||
};
|
||||
{
|
||||
static_cast<int>(UuidRole),
|
||||
QByteArray("uuid")
|
||||
},
|
||||
{
|
||||
static_cast<int>(AuthorRole),
|
||||
QByteArray("author")
|
||||
},
|
||||
{
|
||||
static_cast<int>(AuthorIdRole),
|
||||
QByteArray("authorId")
|
||||
},
|
||||
{
|
||||
static_cast<int>(AuthorUrlRole),
|
||||
QByteArray("authorUrl")
|
||||
},
|
||||
{
|
||||
static_cast<int>(DescriptionRole),
|
||||
QByteArray("description")
|
||||
},
|
||||
{
|
||||
static_cast<int>(ThumbnailRole),
|
||||
QByteArray("thumbnail")
|
||||
},
|
||||
{
|
||||
static_cast<int>(LargeThumbnailRole),
|
||||
QByteArray("largeThumbnail")
|
||||
},
|
||||
{
|
||||
static_cast<int>(OriginalUrlRole),
|
||||
QByteArray("original")
|
||||
},
|
||||
{
|
||||
static_cast<int>(PortraitUrlRole),
|
||||
QByteArray("portrait")
|
||||
},
|
||||
{
|
||||
static_cast<int>(LandscapeUrlRole),
|
||||
QByteArray("landscape")
|
||||
},
|
||||
{
|
||||
static_cast<int>(BackgroundPortraitRole),
|
||||
QByteArray("backgroundPortrait")
|
||||
},
|
||||
{
|
||||
static_cast<int>(BackgroundLandscapeRole),
|
||||
QByteArray("backgroundLandscape")
|
||||
},
|
||||
{
|
||||
static_cast<int>(ScreenUrlRole),
|
||||
QByteArray("fullScreen")
|
||||
},
|
||||
{
|
||||
static_cast<int>(ScreenSizeRole),
|
||||
QByteArray("fullScreenSize")
|
||||
},
|
||||
{
|
||||
static_cast<int>(PortraitSizeRole),
|
||||
QByteArray("portraitSize")
|
||||
},
|
||||
{
|
||||
static_cast<int>(LandscapeSizeRole),
|
||||
QByteArray("landscapeSize")
|
||||
}
|
||||
};
|
||||
State m_state = Idle;
|
||||
|
||||
QString m_errorString = QString();
|
||||
|
||||
@@ -58,6 +58,14 @@ NewestPacksModel::NewestPacksModel(QObject *parent) : QAbstractListModel{parent}
|
||||
);
|
||||
}
|
||||
|
||||
NewestPacksModel::~NewestPacksModel()
|
||||
{
|
||||
if(m_paginator)
|
||||
{
|
||||
delete m_paginator;
|
||||
}
|
||||
}
|
||||
|
||||
auto NewestPacksModel::rowCount(const QModelIndex &) const -> int
|
||||
{
|
||||
if(m_paginator != nullptr)
|
||||
@@ -216,7 +224,42 @@ auto NewestPacksModel::setResultsPerPage(qsizetype resultsPerPage) -> void
|
||||
{
|
||||
if(m_paginator != nullptr)
|
||||
{
|
||||
m_paginator->setResultsPerPage(resultsPerPage);
|
||||
QFuture<void> future = QtConcurrent::run
|
||||
(
|
||||
[this, resultsPerPage]
|
||||
{
|
||||
qsizetype difference = resultsPerPage - m_paginator->resultsPerPage();
|
||||
m_paginator->setResultsPerPage(resultsPerPage);
|
||||
|
||||
if(difference > 0)
|
||||
{
|
||||
qsizetype firstIndex = m_paginator->resultsPerPage() - difference;
|
||||
|
||||
beginInsertRows
|
||||
(
|
||||
QModelIndex(),
|
||||
firstIndex,
|
||||
m_paginator->count() - 1
|
||||
);
|
||||
|
||||
endInsertRows();
|
||||
}
|
||||
|
||||
else if(difference < 0)
|
||||
{
|
||||
qsizetype firstIndex = m_paginator->resultsPerPage();
|
||||
|
||||
beginRemoveRows
|
||||
(
|
||||
QModelIndex(),
|
||||
firstIndex,
|
||||
firstIndex - difference
|
||||
);
|
||||
|
||||
endRemoveRows();
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -78,6 +78,7 @@ public:
|
||||
Q_ENUM(DataRole)
|
||||
|
||||
explicit NewestPacksModel(QObject *parent = nullptr);
|
||||
~NewestPacksModel();
|
||||
|
||||
/**
|
||||
* @brief rowCount
|
||||
@@ -249,6 +250,18 @@ signals:
|
||||
auto totalPagesChanged() -> void;
|
||||
|
||||
private:
|
||||
/**
|
||||
* @brief boundaryCheck
|
||||
* Helper function to check the requested index boundary
|
||||
* @param index
|
||||
* @return
|
||||
*/
|
||||
auto boundaryCheck(qsizetype index) const -> bool;
|
||||
|
||||
/**
|
||||
* @brief m_dataRoles
|
||||
* Data role map that connects ImageSearchModel::DataRole to it's QML accessor name
|
||||
*/
|
||||
static inline const QHash<int, QByteArray> m_dataRoles =
|
||||
{
|
||||
{
|
||||
|
||||
@@ -0,0 +1,942 @@
|
||||
#include "packcompiler.h"
|
||||
#include "common/exceptions.h"
|
||||
#include <utility>
|
||||
|
||||
PackCompiler::PackCompiler(QObject *parent)
|
||||
: QObject(parent)
|
||||
{
|
||||
if(m_variableExpressions.isEmpty())
|
||||
{
|
||||
for(const QString &variable : m_updateVariables)
|
||||
{
|
||||
m_variableExpressions.append
|
||||
(
|
||||
QRegularExpression
|
||||
(
|
||||
QStringLiteral("\\b(?<!ubuf\\.)%1\\b").arg
|
||||
(
|
||||
variable
|
||||
)
|
||||
)
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
PackCompiler::~PackCompiler() = default;
|
||||
|
||||
auto PackCompiler::reset() -> void
|
||||
{
|
||||
setError({}, {});
|
||||
setProgress(std::numeric_limits<qreal>::infinity());
|
||||
setTotalSteps(0);
|
||||
setCurrentStep(0);
|
||||
setCompilerOutput({});
|
||||
setStatus({});
|
||||
setState(Idle);
|
||||
}
|
||||
|
||||
auto PackCompiler::process(const QUrl &uri) -> QFuture<QUrl>
|
||||
{
|
||||
return QtConcurrent::run
|
||||
(
|
||||
[this, uri] () -> QUrl
|
||||
{
|
||||
if(!uri.isLocalFile())
|
||||
{
|
||||
setError
|
||||
(
|
||||
QStringLiteral("File Error"),
|
||||
QStringLiteral("URI %1 is not a local file").arg
|
||||
(
|
||||
uri.toString()
|
||||
)
|
||||
);
|
||||
|
||||
return {};
|
||||
}
|
||||
|
||||
reset();
|
||||
setStatus(QStringLiteral("Compiling %1").arg(uri.fileName()));
|
||||
setState(Compiling);
|
||||
|
||||
if(!validateDirectory(uri))
|
||||
{
|
||||
throw FileException
|
||||
(
|
||||
QStringLiteral("Source directory is invalid")
|
||||
);
|
||||
}
|
||||
|
||||
QUrl buildUri
|
||||
(
|
||||
QStringLiteral("file://%1/komplex/build/%2").arg
|
||||
(
|
||||
QStandardPaths::writableLocation
|
||||
(
|
||||
QStandardPaths::TempLocation
|
||||
),
|
||||
uri.fileName()
|
||||
)
|
||||
);
|
||||
|
||||
try
|
||||
{
|
||||
extract(uri, buildUri);
|
||||
prepareShaders(buildUri);
|
||||
compile(buildUri);
|
||||
}
|
||||
catch (FileException e)
|
||||
{
|
||||
removeDirectory(buildUri);
|
||||
setError(QStringLiteral("File Error"), e.message);
|
||||
throw e;
|
||||
}
|
||||
catch (ShaderCompilerException e)
|
||||
{
|
||||
removeDirectory(buildUri);
|
||||
setError(QStringLiteral("Compiler Error"), e.message);
|
||||
throw e;
|
||||
}
|
||||
|
||||
return buildUri;
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
auto PackCompiler::prepareShaders(const QUrl &uri) noexcept(false) -> void
|
||||
{
|
||||
if(!uri.isLocalFile())
|
||||
{
|
||||
throw FileException
|
||||
(
|
||||
QStringLiteral("URI %1 is not a local file uri").arg
|
||||
(
|
||||
uri.toString()
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
QDir sourceDirectory(uri.toLocalFile());
|
||||
QDir shaderDirectory
|
||||
(
|
||||
sourceDirectory.absoluteFilePath
|
||||
(
|
||||
QStringLiteral("shaders")
|
||||
)
|
||||
);
|
||||
|
||||
QStringList entries = shaderDirectory.entryList
|
||||
(
|
||||
QDir::NoDotAndDotDot | QDir::Files
|
||||
);
|
||||
|
||||
setTotalSteps(entries.count() * 2);
|
||||
setProgress(0);
|
||||
|
||||
QByteArray commonFragmentData = loadCommonFragmentData(uri);
|
||||
|
||||
if(commonFragmentData.length() > 0)
|
||||
{
|
||||
setTotalSteps(m_totalSteps -= 1);
|
||||
incrementCompileStep();
|
||||
}
|
||||
|
||||
QByteArray commonVertexData = loadCommonVertexData(uri);
|
||||
|
||||
if(commonVertexData.length() > 0)
|
||||
{
|
||||
setTotalSteps(m_totalSteps -= 1);
|
||||
incrementCompileStep();
|
||||
}
|
||||
|
||||
QByteArray globalData = loadGlobalData(uri);
|
||||
|
||||
if(globalData.length() > 0)
|
||||
{
|
||||
setTotalSteps(m_totalSteps -= 1);
|
||||
incrementCompileStep();
|
||||
}
|
||||
|
||||
for(const QString &entry : std::as_const(entries))
|
||||
{
|
||||
auto commonFragMatch = m_commonFragmentExpression.match(entry);
|
||||
auto commonVertMatch = m_commonVertexExpression.match(entry);
|
||||
|
||||
if(commonFragMatch.hasMatch() || commonVertMatch.hasMatch())
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
auto fragMatch = m_fragmentExpression.match(entry);
|
||||
auto vertMatch = m_vertexExpression.match(entry);
|
||||
|
||||
QFile file(shaderDirectory.absoluteFilePath(entry));
|
||||
|
||||
if(!file.open(QFile::ReadWrite))
|
||||
{
|
||||
throw FileException
|
||||
(
|
||||
QStringLiteral("Could not open file %1 for preperation").arg
|
||||
(
|
||||
shaderDirectory.absoluteFilePath(entry)
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
QByteArray fileData = file.readAll();
|
||||
|
||||
if(fileData.length() != file.size())
|
||||
{
|
||||
throw FileException
|
||||
(
|
||||
QStringLiteral("Could not read file %1 for preperation").arg
|
||||
(
|
||||
shaderDirectory.absoluteFilePath(entry)
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
file.close();
|
||||
|
||||
QByteArray commonData;
|
||||
|
||||
if(fragMatch.hasMatch())
|
||||
{
|
||||
commonData = commonFragmentData;
|
||||
}
|
||||
else if(vertMatch.hasMatch())
|
||||
{
|
||||
commonData = commonVertexData;
|
||||
}
|
||||
else
|
||||
{
|
||||
throw FileException
|
||||
(
|
||||
QStringLiteral("File %1 is an unrecognized shader type (frag/vert)").arg
|
||||
(
|
||||
shaderDirectory.absoluteFilePath(entry)
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
QByteArray combinedData = QByteArray
|
||||
(
|
||||
globalData + QByteArray("\n") +
|
||||
commonData + QByteArray("\n") +
|
||||
fileData
|
||||
);
|
||||
|
||||
for(const QRegularExpression &expression : std::as_const(m_variableExpressions))
|
||||
{
|
||||
auto match = expression.match(combinedData);
|
||||
|
||||
if(match.hasMatch())
|
||||
{
|
||||
QByteArray replacement = QByteArray("ubuf.") + match.captured().toLocal8Bit();
|
||||
combinedData.replace(match.captured().toLocal8Bit(), replacement);
|
||||
}
|
||||
}
|
||||
|
||||
QByteArray preparedData = QByteArray
|
||||
(
|
||||
m_header.toLocal8Bit() + QByteArray("\n") +
|
||||
combinedData + QByteArray("\n") +
|
||||
m_footer.toLocal8Bit()
|
||||
);
|
||||
|
||||
if(!file.open(QFile::ReadWrite | QFile::Truncate))
|
||||
{
|
||||
throw FileException
|
||||
(
|
||||
QStringLiteral("Could not open file %1 for writing preperation").arg
|
||||
(
|
||||
shaderDirectory.absoluteFilePath(entry)
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
if(file.write(preparedData) != preparedData.length())
|
||||
{
|
||||
throw FileException
|
||||
(
|
||||
QStringLiteral("Could not write file %1 preperation").arg
|
||||
(
|
||||
shaderDirectory.absoluteFilePath(entry)
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
file.close();
|
||||
incrementCompileStep();
|
||||
}
|
||||
}
|
||||
|
||||
auto PackCompiler::loadCommonFragmentData(const QUrl &uri) -> QByteArray
|
||||
{
|
||||
if(!uri.isLocalFile())
|
||||
{
|
||||
throw FileException
|
||||
(
|
||||
QStringLiteral("URI %1 is not a local file uri").arg
|
||||
(
|
||||
uri.toString()
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
QDir sourceDirectory
|
||||
(
|
||||
QStringLiteral("%1/shaders/").arg
|
||||
(
|
||||
uri.toLocalFile()
|
||||
)
|
||||
);
|
||||
|
||||
const QStringList entries = sourceDirectory.entryList
|
||||
(
|
||||
QDir::NoDotAndDotDot | QDir::Files
|
||||
);
|
||||
|
||||
QByteArray data;
|
||||
|
||||
for(const QString &entry : entries)
|
||||
{
|
||||
if (entry.toLower() != QStringLiteral("common.frag"))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
QFile file(sourceDirectory.absoluteFilePath(entry));
|
||||
|
||||
if(!file.open(QFile::ReadWrite))
|
||||
{
|
||||
throw FileException(QStringLiteral("Could not open common shader data"));
|
||||
}
|
||||
|
||||
data = file.readAll();
|
||||
|
||||
if(data.length() != file.size())
|
||||
{
|
||||
throw FileException(QStringLiteral("Common fragment shader file read error"));
|
||||
}
|
||||
|
||||
file.close();
|
||||
break;
|
||||
}
|
||||
|
||||
return data;
|
||||
}
|
||||
|
||||
auto PackCompiler::loadCommonVertexData(const QUrl &uri) -> QByteArray
|
||||
{
|
||||
if(!uri.isLocalFile())
|
||||
{
|
||||
throw FileException
|
||||
(
|
||||
QStringLiteral("URI %1 is not a local file uri").arg
|
||||
(
|
||||
uri.toString()
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
QDir sourceDirectory
|
||||
(
|
||||
QStringLiteral("%1/shaders/").arg
|
||||
(
|
||||
uri.toLocalFile()
|
||||
)
|
||||
);
|
||||
|
||||
const QStringList entries = sourceDirectory.entryList
|
||||
(
|
||||
QDir::NoDotAndDotDot | QDir::Files
|
||||
);
|
||||
|
||||
QByteArray data;
|
||||
|
||||
for(const QString &entry : entries)
|
||||
{
|
||||
if (entry.toLower() != QStringLiteral("common.vert"))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
QFile file(sourceDirectory.absoluteFilePath(entry));
|
||||
|
||||
if(!file.open(QFile::ReadWrite))
|
||||
{
|
||||
throw FileException(QStringLiteral("Could not open common vertex shader data"));
|
||||
}
|
||||
|
||||
data = file.readAll();
|
||||
|
||||
if(data.length() != file.size())
|
||||
{
|
||||
throw FileException(QStringLiteral("Common vertex shader file read error"));
|
||||
}
|
||||
|
||||
file.close();
|
||||
break;
|
||||
}
|
||||
|
||||
return data;
|
||||
}
|
||||
|
||||
auto PackCompiler::loadGlobalData(const QUrl &uri) -> QByteArray
|
||||
{
|
||||
if(!uri.isLocalFile())
|
||||
{
|
||||
throw FileException
|
||||
(
|
||||
QStringLiteral("URI %1 is not a local file uri").arg
|
||||
(
|
||||
uri.toString()
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
QDir sourceDirectory
|
||||
(
|
||||
QStringLiteral("%1/shaders/").arg
|
||||
(
|
||||
uri.toLocalFile()
|
||||
)
|
||||
);
|
||||
|
||||
const QStringList entries = sourceDirectory.entryList
|
||||
(
|
||||
QDir::NoDotAndDotDot | QDir::Files
|
||||
);
|
||||
|
||||
QByteArray data;
|
||||
|
||||
for(const QString &entry : entries)
|
||||
{
|
||||
if (entry.toLower() != QStringLiteral("global.glsl"))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
QFile file(sourceDirectory.absoluteFilePath(entry));
|
||||
|
||||
if(!file.open(QFile::ReadWrite))
|
||||
{
|
||||
throw FileException
|
||||
(
|
||||
QStringLiteral("Could not open global shader data")
|
||||
);
|
||||
}
|
||||
|
||||
data = file.readAll();
|
||||
|
||||
if(data.length() != file.size())
|
||||
{
|
||||
throw FileException
|
||||
(
|
||||
QStringLiteral("Global shader file read error")
|
||||
);
|
||||
}
|
||||
|
||||
file.close();
|
||||
break;
|
||||
}
|
||||
|
||||
return data;
|
||||
}
|
||||
|
||||
auto PackCompiler::validateDirectory(const QUrl &uri) -> bool
|
||||
{
|
||||
QDir directory(uri.toLocalFile());
|
||||
|
||||
return
|
||||
(
|
||||
directory.exists(QStringLiteral("shaders")) &&
|
||||
directory.exists(QStringLiteral("pack.json"))
|
||||
);
|
||||
}
|
||||
|
||||
auto PackCompiler::extract(const QUrl &sourceUri, const QUrl &destinationUri) noexcept(false) -> void
|
||||
{
|
||||
if(!sourceUri.isLocalFile() || !sourceUri.isValid())
|
||||
{
|
||||
throw FileException(QStringLiteral("Uri needs to be a local file"), 0);
|
||||
}
|
||||
|
||||
QUrl outputUri
|
||||
(
|
||||
QStringLiteral("file://%1_proc").arg
|
||||
(
|
||||
sourceUri.toLocalFile()
|
||||
)
|
||||
);
|
||||
|
||||
QStringList arguments =
|
||||
{
|
||||
QStringLiteral("-xzf"),
|
||||
sourceUri.toLocalFile(),
|
||||
QStringLiteral("-C"),
|
||||
outputUri.toLocalFile()
|
||||
};
|
||||
|
||||
QProcess *process = new QProcess(this);
|
||||
|
||||
QObject::connect
|
||||
(
|
||||
process,
|
||||
&QProcess::readyReadStandardOutput,
|
||||
this,
|
||||
[this, process]()
|
||||
{
|
||||
QByteArray processData = process->readAllStandardOutput();
|
||||
setCompilerOutput(m_compilerOutput + processData);
|
||||
}
|
||||
);
|
||||
|
||||
QObject::connect
|
||||
(
|
||||
process,
|
||||
&QProcess::readyReadStandardError,
|
||||
this,
|
||||
[this, process]()
|
||||
{
|
||||
QByteArray processData = process->readAllStandardError();
|
||||
|
||||
if(!processData.isValidUtf8())
|
||||
{
|
||||
qWarning() << QStringLiteral("Process output not valid UTF8 data");
|
||||
return;
|
||||
}
|
||||
|
||||
setCompilerOutput(m_compilerOutput + processData);
|
||||
}
|
||||
);
|
||||
|
||||
process->start(QStringLiteral("tar"), arguments);
|
||||
|
||||
if(!process->waitForStarted(3000))
|
||||
{
|
||||
process->deleteLater();
|
||||
throw FileException(QStringLiteral("Could not start preprocessor"));
|
||||
}
|
||||
|
||||
if(!process->waitForFinished())
|
||||
{
|
||||
process->deleteLater();
|
||||
throw FileException(QStringLiteral("Preprocessor timeout"));
|
||||
}
|
||||
|
||||
if(process->exitCode() != 0)
|
||||
{
|
||||
process->deleteLater();
|
||||
throw ShaderCompilerException(m_compilerOutput);
|
||||
}
|
||||
|
||||
process->deleteLater();
|
||||
}
|
||||
|
||||
auto PackCompiler::copyFile(const QUrl &sourceUri, const QUrl &destinationUri) noexcept(false) -> void
|
||||
{
|
||||
if(!QFile::exists(sourceUri.toLocalFile()))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
if(!QFile::copy(sourceUri.toLocalFile(), destinationUri.toLocalFile()))
|
||||
{
|
||||
throw FileException(QStringLiteral("Could not copy file"));
|
||||
}
|
||||
}
|
||||
|
||||
auto PackCompiler::compile(const QUrl &uri) noexcept(false) -> void
|
||||
{
|
||||
if(!uri.isLocalFile() || !uri.isValid())
|
||||
{
|
||||
throw FileException(QStringLiteral("Uri needs to be a local file"), 0);
|
||||
}
|
||||
|
||||
setState(Compiling);
|
||||
|
||||
QDir packDirectory(uri.toLocalFile());
|
||||
QDir shaderDirectory
|
||||
(
|
||||
packDirectory.absoluteFilePath
|
||||
(
|
||||
QStringLiteral("shaders")
|
||||
)
|
||||
);
|
||||
|
||||
shaderDirectory.setNameFilters
|
||||
(
|
||||
{
|
||||
QStringLiteral("*.frag"),
|
||||
QStringLiteral("*.vert")
|
||||
}
|
||||
);
|
||||
|
||||
const QStringList shaders = shaderDirectory.entryList
|
||||
(
|
||||
QDir::Files | QDir::NoDotAndDotDot
|
||||
);
|
||||
|
||||
for(const QString &shader : shaders)
|
||||
{
|
||||
if(shader.startsWith(QStringLiteral("common."), Qt::CaseInsensitive))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
QUrl shaderUri
|
||||
(
|
||||
QStringLiteral("file://%1").arg
|
||||
(
|
||||
shaderDirectory.absoluteFilePath(shader)
|
||||
)
|
||||
);
|
||||
|
||||
preprocess(shaderUri);
|
||||
appendVersion(shaderUri);
|
||||
compileShader(shaderUri);
|
||||
|
||||
incrementCompileStep();
|
||||
}
|
||||
}
|
||||
|
||||
auto PackCompiler::preprocess(const QUrl &uri) noexcept(false) -> void
|
||||
{
|
||||
if(!uri.isLocalFile() || !uri.isValid())
|
||||
{
|
||||
throw FileException(QStringLiteral("Uri needs to be a local file"), 0);
|
||||
}
|
||||
|
||||
QUrl outputUri
|
||||
(
|
||||
QStringLiteral("file://%1_proc").arg
|
||||
(
|
||||
uri.toLocalFile()
|
||||
)
|
||||
);
|
||||
|
||||
QStringList arguments =
|
||||
{
|
||||
QStringLiteral("-P"),
|
||||
uri.toLocalFile(),
|
||||
outputUri.toLocalFile()
|
||||
};
|
||||
|
||||
QProcess *process = new QProcess(this);
|
||||
|
||||
QObject::connect
|
||||
(
|
||||
process,
|
||||
&QProcess::readyReadStandardOutput,
|
||||
this,
|
||||
[this, process]()
|
||||
{
|
||||
QByteArray processData = process->readAllStandardOutput();
|
||||
setCompilerOutput(m_compilerOutput + processData);
|
||||
}
|
||||
);
|
||||
|
||||
QObject::connect
|
||||
(
|
||||
process,
|
||||
&QProcess::readyReadStandardError,
|
||||
this,
|
||||
[this, process]()
|
||||
{
|
||||
QByteArray processData = process->readAllStandardError();
|
||||
|
||||
if(!processData.isValidUtf8())
|
||||
{
|
||||
qWarning() << QStringLiteral("Process output not valid UTF8 data");
|
||||
return;
|
||||
}
|
||||
|
||||
setCompilerOutput(m_compilerOutput + processData);
|
||||
}
|
||||
);
|
||||
|
||||
process->start(QStringLiteral("cpp"), arguments);
|
||||
|
||||
if(!process->waitForStarted(3000))
|
||||
{
|
||||
process->deleteLater();
|
||||
throw FileException(QStringLiteral("Could not start preprocessor"));
|
||||
}
|
||||
|
||||
if(!process->waitForFinished())
|
||||
{
|
||||
process->deleteLater();
|
||||
throw FileException(QStringLiteral("Preprocessor timeout"));
|
||||
}
|
||||
|
||||
if(process->exitCode() != 0)
|
||||
{
|
||||
process->deleteLater();
|
||||
throw ShaderCompilerException(m_compilerOutput);
|
||||
}
|
||||
|
||||
process->deleteLater();
|
||||
|
||||
QFile::remove(uri.toLocalFile());
|
||||
QFile::rename(outputUri.toLocalFile(), uri.toLocalFile());
|
||||
}
|
||||
|
||||
auto PackCompiler::appendVersion(const QUrl &uri) noexcept(false) -> void
|
||||
{
|
||||
if(!uri.isValid() || !uri.isLocalFile())
|
||||
{
|
||||
throw FileException(QStringLiteral("File is not a valid local file"));
|
||||
}
|
||||
|
||||
QFile file(uri.toLocalFile());
|
||||
|
||||
if(!file.open(QFile::ReadWrite))
|
||||
{
|
||||
throw FileException(QStringLiteral("Could not open file for appending"));
|
||||
}
|
||||
|
||||
QByteArray data = file.readAll();
|
||||
|
||||
file.seek(0);
|
||||
|
||||
file.write(m_version);
|
||||
file.write(QByteArray("\n\n"));
|
||||
file.write(data);
|
||||
|
||||
file.close();
|
||||
}
|
||||
|
||||
auto PackCompiler::compileShader(const QUrl &uri) noexcept(false) -> void
|
||||
{
|
||||
if(!uri.isLocalFile())
|
||||
{
|
||||
throw FileException
|
||||
(
|
||||
QStringLiteral("Uri needs to be a local file")
|
||||
);
|
||||
}
|
||||
|
||||
QString qsb = QStringLiteral("/usr/lib/qt6/bin/qsb");
|
||||
|
||||
if(!QFile::exists(qsb))
|
||||
{
|
||||
throw FileException(QStringLiteral("QSB missing"));
|
||||
}
|
||||
|
||||
QUrl outputUri
|
||||
(
|
||||
QStringLiteral("file://%1.qsb").arg
|
||||
(
|
||||
uri.toLocalFile()
|
||||
)
|
||||
);
|
||||
|
||||
QStringList arguments =
|
||||
{
|
||||
QStringLiteral("--glsl"),
|
||||
QStringLiteral("330es, 330, 440"),
|
||||
QStringLiteral("-o"),
|
||||
outputUri.toLocalFile(),
|
||||
uri.toLocalFile()
|
||||
};
|
||||
|
||||
QProcess *process = new QProcess(this);
|
||||
QString path = uri.toDisplayString(QUrl::RemoveFilename | QUrl::RemoveScheme).remove(QStringLiteral("//"));
|
||||
process->setWorkingDirectory(path);
|
||||
|
||||
QObject::connect
|
||||
(
|
||||
process,
|
||||
&QProcess::readyReadStandardOutput,
|
||||
this,
|
||||
[this, process]()
|
||||
{
|
||||
QByteArray processData = process->readAllStandardOutput();
|
||||
setCompilerOutput(m_compilerOutput + processData);
|
||||
}
|
||||
);
|
||||
|
||||
QObject::connect
|
||||
(
|
||||
process,
|
||||
&QProcess::readyReadStandardError,
|
||||
this,
|
||||
[this, process]()
|
||||
{
|
||||
QByteArray processData = process->readAllStandardError();
|
||||
|
||||
if(!processData.isValidUtf8())
|
||||
{
|
||||
qWarning() << QStringLiteral("Process output not valid UTF8 data");
|
||||
return;
|
||||
}
|
||||
|
||||
setCompilerOutput(m_compilerOutput + processData);
|
||||
}
|
||||
);
|
||||
|
||||
process->start(qsb, arguments);
|
||||
|
||||
if(!process->waitForStarted(3000))
|
||||
{
|
||||
process->deleteLater();
|
||||
throw FileException(QStringLiteral("Could not start shader compiler"));
|
||||
}
|
||||
|
||||
if(!process->waitForFinished())
|
||||
{
|
||||
process->deleteLater();
|
||||
throw FileException(QStringLiteral("Shader compiler timeout"));
|
||||
}
|
||||
|
||||
if(process->exitCode() != 0)
|
||||
{
|
||||
process->deleteLater();
|
||||
throw ShaderCompilerException(m_compilerOutput);
|
||||
}
|
||||
|
||||
process->deleteLater();
|
||||
|
||||
if(!QFile::remove(uri.toLocalFile()))
|
||||
{
|
||||
throw FileException(QStringLiteral("Could not clean up"));
|
||||
}
|
||||
}
|
||||
|
||||
auto PackCompiler::removeDirectory(const QUrl &uri) -> bool
|
||||
{
|
||||
QStringList arguments =
|
||||
{
|
||||
QStringLiteral("-rf"),
|
||||
uri.toLocalFile()
|
||||
};
|
||||
|
||||
QProcess *process = new QProcess(this);
|
||||
|
||||
process->start(QStringLiteral("rm"), arguments);
|
||||
|
||||
if(!process->waitForStarted(3000))
|
||||
{
|
||||
process->deleteLater();
|
||||
return false;
|
||||
}
|
||||
|
||||
if(!process->waitForFinished())
|
||||
{
|
||||
process->deleteLater();
|
||||
return false;
|
||||
}
|
||||
|
||||
if(process->exitCode() != 0)
|
||||
{
|
||||
process->deleteLater();
|
||||
return false;
|
||||
}
|
||||
|
||||
process->deleteLater();
|
||||
return true;
|
||||
}
|
||||
|
||||
auto PackCompiler::setProgress(qreal progress) -> void
|
||||
{
|
||||
if(qFuzzyCompare(progress, m_progress))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_progress = progress;
|
||||
Q_EMIT progressChanged();
|
||||
}
|
||||
|
||||
void PackCompiler::setCompilerOutput(const QString &compilerOutput)
|
||||
{
|
||||
if (m_compilerOutput == compilerOutput)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_compilerOutput = compilerOutput;
|
||||
emit compilerOutputChanged();
|
||||
}
|
||||
|
||||
auto PackCompiler::setError(const QString &title, const QString &message, const QUrl &uri) -> void
|
||||
{
|
||||
if(title == m_errorTitle && message == m_errorMessage)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_errorMessage = std::move(message);
|
||||
m_errorTitle = std::move(title);
|
||||
|
||||
if(uri.isValid() && uri.isLocalFile())
|
||||
{
|
||||
QFile errorFile(uri.toLocalFile());
|
||||
|
||||
if(errorFile.open(QFile::ReadWrite | QFile::Append))
|
||||
{
|
||||
errorFile.write(message.toLocal8Bit() + QByteArray("\n"));
|
||||
}
|
||||
}
|
||||
|
||||
Q_EMIT errorTitleChanged();
|
||||
Q_EMIT errorMessageChanged();
|
||||
Q_EMIT errorOcurred();
|
||||
}
|
||||
|
||||
auto PackCompiler::setState(State state) -> void
|
||||
{
|
||||
if(state == m_state)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_state = state;
|
||||
Q_EMIT stateChanged();
|
||||
}
|
||||
|
||||
auto PackCompiler::setStatus(const QString &status) -> void
|
||||
{
|
||||
if (m_status == status)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_status = status;
|
||||
Q_EMIT statusChanged();
|
||||
}
|
||||
|
||||
auto PackCompiler::setTotalSteps(qint64 steps) -> void
|
||||
{
|
||||
if(steps == m_totalSteps)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_totalSteps = steps;
|
||||
Q_EMIT totalStepsChanged();
|
||||
}
|
||||
|
||||
auto PackCompiler::setCurrentStep(qint64 step) -> void
|
||||
{
|
||||
if(step == m_currentStep)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_currentStep = step;
|
||||
Q_EMIT currentStepChanged();
|
||||
}
|
||||
|
||||
auto PackCompiler::incrementCompileStep() -> void
|
||||
{
|
||||
setCurrentStep(m_currentStep + 1);
|
||||
|
||||
setProgress
|
||||
(
|
||||
static_cast<qreal>(m_currentStep) / m_totalSteps
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,248 @@
|
||||
#ifndef PACKCOMPILER_H
|
||||
#define PACKCOMPILER_H
|
||||
|
||||
#include <QDir>
|
||||
#include <QFile>
|
||||
#include <QFuture>
|
||||
#include <QtConcurrent/QtConcurrentRun>
|
||||
#include <QStandardPaths>
|
||||
#include <QProcess>
|
||||
#include <QRegularExpression>
|
||||
#include <QMutex>
|
||||
#include <QMutexLocker>
|
||||
#include <QImage>
|
||||
#include <QRgb>
|
||||
#include <QColor>
|
||||
#include <QtQuick/QQuickItem>
|
||||
#include <qdir.h>
|
||||
#include <qobject.h>
|
||||
#include <qtmetamacros.h>
|
||||
#include <QPainter>
|
||||
#include <QtConcurrent/qtconcurrentrun.h>
|
||||
#include <qcontainerfwd.h>
|
||||
#include <qmargins.h>
|
||||
#include <qstandardpaths.h>
|
||||
#include <qtmetamacros.h>
|
||||
#include <qurl.h>
|
||||
#include "common/komplex_global.h"
|
||||
/**
|
||||
* @brief The PackCompiler class
|
||||
* [1] Extract Pack (GZip)
|
||||
* [2] Verify directory is a pack and has shaders
|
||||
* [3] Load shader code
|
||||
* [4] Append Common and Global files, if they exist
|
||||
* [5] Add uniform and replace variable use
|
||||
* [6] Run C Preprocessor (cpp -P) to process macros
|
||||
* [7] Append version macro
|
||||
* [8] Compile with Qt Shader Baker
|
||||
*/
|
||||
class KOMPLEX_EXPORT PackCompiler : public QObject
|
||||
{
|
||||
Q_OBJECT
|
||||
QML_ELEMENT
|
||||
public:
|
||||
|
||||
enum State
|
||||
{
|
||||
Idle,
|
||||
Compiling,
|
||||
Complete,
|
||||
Error
|
||||
};
|
||||
Q_ENUM(State)
|
||||
|
||||
explicit PackCompiler(QObject *parent = nullptr);
|
||||
~PackCompiler() override;
|
||||
|
||||
auto compilerOutput() const -> const QString & { return m_compilerOutput; }
|
||||
auto progress() -> qreal { return m_progress; }
|
||||
auto currentStep() -> qint64 { return m_currentStep; }
|
||||
auto totalSteps() -> qint64 { return m_totalSteps; }
|
||||
auto errorTitle() const -> const QString & { return m_errorTitle; }
|
||||
auto errorMessage() const -> const QString & { return m_errorMessage; }
|
||||
auto reset() -> void;
|
||||
|
||||
auto process(const QUrl &uri) -> QFuture<QUrl>;
|
||||
|
||||
auto status() const -> const QString & { return m_status; }
|
||||
auto state() const -> State { return m_state; }
|
||||
|
||||
protected:
|
||||
/**
|
||||
* @brief prepareShaders
|
||||
* Scans the pack's shader directory and sends each file to
|
||||
* prepareFile()
|
||||
* @param uri
|
||||
* Directory to prepare
|
||||
*/
|
||||
auto prepareShaders(const QUrl &uri) noexcept(false) -> void;
|
||||
|
||||
/**
|
||||
* @brief prepareFile
|
||||
* Prepares the individual file by appending the header, footer,
|
||||
* common files and replacing standard variable names
|
||||
* @param uri
|
||||
*/
|
||||
auto prepareFile(const QUrl &uri) noexcept(false) -> void;
|
||||
|
||||
/**
|
||||
* @brief validateDirectory
|
||||
*
|
||||
* @param uri
|
||||
* @return true
|
||||
* @return false
|
||||
*/
|
||||
auto validateDirectory(const QUrl &uri) -> bool;
|
||||
|
||||
auto extract(const QUrl &sourceUri, const QUrl &destinationUri) noexcept(false) -> void;
|
||||
auto copyFile(const QUrl &sourceUri, const QUrl &destinationUri) noexcept(false) -> void;
|
||||
auto compile(const QUrl &uri) noexcept(false) -> void;
|
||||
auto preprocess(const QUrl &uri) noexcept(false) -> void;
|
||||
auto appendVersion(const QUrl &uri) noexcept(false) -> void;
|
||||
auto compileShader(const QUrl &uri) noexcept(false) -> void;
|
||||
auto loadCommonFragmentData(const QUrl &uri) -> QByteArray;
|
||||
auto loadCommonVertexData(const QUrl &uri) -> QByteArray;
|
||||
auto loadGlobalData(const QUrl &uri) -> QByteArray;
|
||||
|
||||
auto setError(const QString &title, const QString &message, const QUrl &uri = {}) -> void;
|
||||
auto setCompilerOutput(const QString &compilerOutput) -> void;
|
||||
auto setState(State state) -> void;
|
||||
auto setProgress(qreal progress) -> void;
|
||||
auto setTotalSteps(qint64 steps) -> void;
|
||||
auto setCurrentStep(qint64 step) -> void;
|
||||
|
||||
auto setStatus(const QString &status) -> void;
|
||||
|
||||
auto incrementCompileStep() -> void;
|
||||
|
||||
auto removeDirectory(const QUrl &uri) -> bool;
|
||||
|
||||
signals:
|
||||
auto compilerOutputChanged() -> void;
|
||||
auto errorOcurred() -> void;
|
||||
auto errorTitleChanged() -> void;
|
||||
auto errorMessageChanged() -> void;
|
||||
auto stateChanged() -> void;
|
||||
auto progressChanged() -> void;
|
||||
auto currentStepChanged() -> void;
|
||||
auto totalStepsChanged() -> void;
|
||||
|
||||
auto compileComplete(const QUrl &uri) -> void;
|
||||
|
||||
auto statusChanged() -> void;
|
||||
auto packReady(const QString &) -> void;
|
||||
auto errorStepChanged() -> void;
|
||||
auto errorRatingChanged() -> void;
|
||||
|
||||
private:
|
||||
static inline const QStringList m_updateVariables
|
||||
{
|
||||
QStringLiteral("iTime"),
|
||||
QStringLiteral("iTimeDelta"),
|
||||
QStringLiteral("iFrameRate"),
|
||||
QStringLiteral("iSampleRate"),
|
||||
QStringLiteral("iFrame"),
|
||||
QStringLiteral("iDate"),
|
||||
QStringLiteral("iMouse"),
|
||||
QStringLiteral("iResolution"),
|
||||
QStringLiteral("iColorTheme"),
|
||||
QStringLiteral("iChannelTime"),
|
||||
QStringLiteral("iChannelResolution")
|
||||
};
|
||||
|
||||
static inline const QByteArray m_version
|
||||
{
|
||||
R"(#version 450)"
|
||||
};
|
||||
|
||||
static inline const QString m_header
|
||||
{
|
||||
R"(layout(location = 0) in vec2 qt_TexCoord0;
|
||||
layout(location = 0) out vec4 fragColor;
|
||||
|
||||
layout(std140, binding = 0) uniform buf {
|
||||
mat4 qt_Matrix;
|
||||
float qt_Opacity;
|
||||
float iTime;
|
||||
float iTimeDelta;
|
||||
float iFrameRate;
|
||||
float iSampleRate;
|
||||
int iFrame;
|
||||
vec4 iDate;
|
||||
vec4 iMouse;
|
||||
vec3 iResolution;
|
||||
float iChannelTime[4];
|
||||
vec3 iChannelResolution[4];
|
||||
vec4 iColorTheme[4];
|
||||
} ubuf;
|
||||
|
||||
layout(binding = 1) uniform sampler2D iChannel0;
|
||||
layout(binding = 2) uniform sampler2D iChannel1;
|
||||
layout(binding = 3) uniform sampler2D iChannel2;
|
||||
layout(binding = 4) uniform sampler2D iChannel3;
|
||||
|
||||
vec2 fragCoord = vec2(qt_TexCoord0.x, 1.0 - qt_TexCoord0.y) * ubuf.iResolution.xy;)"
|
||||
};
|
||||
|
||||
static inline const QString m_footer
|
||||
{
|
||||
R"(void main() {
|
||||
vec4 color = vec4(0.0);
|
||||
mainImage(color, fragCoord);
|
||||
fragColor = color;
|
||||
})"
|
||||
};
|
||||
|
||||
QString m_compilerOutput;
|
||||
QString m_errorMessage;
|
||||
QString m_errorTitle;
|
||||
QString m_status;
|
||||
|
||||
State m_state;
|
||||
|
||||
qreal m_currentStep = 0;
|
||||
qreal m_progress = 0;
|
||||
qreal m_totalSteps = 0;
|
||||
|
||||
QMutex m_downloadMutex;
|
||||
|
||||
static inline QList<QRegularExpression> m_variableExpressions;
|
||||
|
||||
static inline const QRegularExpression m_commonFragmentExpression = QRegularExpression
|
||||
(
|
||||
QString("^common\\.frag$"),
|
||||
QRegularExpression::CaseInsensitiveOption
|
||||
);
|
||||
|
||||
static inline const QRegularExpression m_commonVertexExpression = QRegularExpression
|
||||
(
|
||||
QString("^common\\.vert$"),
|
||||
QRegularExpression::CaseInsensitiveOption
|
||||
);
|
||||
|
||||
static inline const QRegularExpression m_fragmentExpression = QRegularExpression
|
||||
(
|
||||
QString("^.{1,}\\.frag$"),
|
||||
QRegularExpression::CaseInsensitiveOption |
|
||||
QRegularExpression::DotMatchesEverythingOption
|
||||
);
|
||||
|
||||
static inline const QRegularExpression m_vertexExpression = QRegularExpression
|
||||
(
|
||||
QString("^.{1,}\\.vert$"),
|
||||
QRegularExpression::CaseInsensitiveOption |
|
||||
QRegularExpression::DotMatchesEverythingOption
|
||||
);
|
||||
|
||||
Q_PROPERTY(QString compilerOutput READ compilerOutput WRITE setCompilerOutput NOTIFY compilerOutputChanged FINAL)
|
||||
Q_PROPERTY(QString errorTitle READ errorTitle NOTIFY errorTitleChanged FINAL)
|
||||
Q_PROPERTY(QString errorMessage READ errorMessage NOTIFY errorMessageChanged FINAL)
|
||||
Q_PROPERTY(qreal progress READ progress NOTIFY progressChanged FINAL)
|
||||
Q_PROPERTY(qint64 totalSteps READ totalSteps NOTIFY totalStepsChanged FINAL)
|
||||
Q_PROPERTY(qint64 currentStep READ currentStep NOTIFY currentStepChanged FINAL)
|
||||
Q_PROPERTY(QString status READ status WRITE setStatus NOTIFY statusChanged FINAL)
|
||||
Q_PROPERTY(State state READ state NOTIFY stateChanged FINAL)
|
||||
};
|
||||
|
||||
Q_DECLARE_METATYPE(PackCompiler)
|
||||
#endif // PackCompiler_H
|
||||
@@ -62,6 +62,14 @@ PackSearchModel::PackSearchModel(QObject *parent) : QAbstractListModel{parent}
|
||||
);
|
||||
}
|
||||
|
||||
PackSearchModel::~PackSearchModel()
|
||||
{
|
||||
if(m_paginator)
|
||||
{
|
||||
delete m_paginator;
|
||||
}
|
||||
}
|
||||
|
||||
auto PackSearchModel::rowCount(const QModelIndex &) const -> int
|
||||
{
|
||||
if(m_paginator != nullptr)
|
||||
@@ -185,6 +193,16 @@ auto PackSearchModel::resetDataModel() -> void
|
||||
endInsertRows();
|
||||
}
|
||||
|
||||
auto PackSearchModel::boundaryCheck(qsizetype index) const -> bool
|
||||
{
|
||||
if(index < 0 || m_paginator == nullptr || index >= m_paginator->count())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
auto PackSearchModel::hasNextPage() const -> bool
|
||||
{
|
||||
return m_paginator->page() < m_paginator->totalPages();
|
||||
@@ -239,7 +257,36 @@ auto PackSearchModel::setResultsPerPage(qsizetype resultsPerPage) -> void
|
||||
(
|
||||
[this, resultsPerPage]
|
||||
{
|
||||
qsizetype difference = resultsPerPage - m_paginator->resultsPerPage();
|
||||
m_paginator->setResultsPerPage(resultsPerPage);
|
||||
|
||||
if(difference > 0)
|
||||
{
|
||||
qsizetype firstIndex = m_paginator->resultsPerPage() - difference;
|
||||
|
||||
beginInsertRows
|
||||
(
|
||||
QModelIndex(),
|
||||
firstIndex,
|
||||
m_paginator->count() - 1
|
||||
);
|
||||
|
||||
endInsertRows();
|
||||
}
|
||||
|
||||
else if(difference < 0)
|
||||
{
|
||||
qsizetype firstIndex = m_paginator->resultsPerPage();
|
||||
|
||||
beginRemoveRows
|
||||
(
|
||||
QModelIndex(),
|
||||
firstIndex,
|
||||
firstIndex - difference
|
||||
);
|
||||
|
||||
endRemoveRows();
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
@@ -78,6 +78,7 @@ public:
|
||||
Q_ENUM(DataRole)
|
||||
|
||||
explicit PackSearchModel(QObject *parent = nullptr);
|
||||
~PackSearchModel();
|
||||
|
||||
auto rowCount(const QModelIndex &parent = QModelIndex()) const -> int override;
|
||||
|
||||
@@ -311,6 +312,14 @@ signals:
|
||||
auto queryChanged() -> void;
|
||||
|
||||
private:
|
||||
/**
|
||||
* @brief boundaryCheck
|
||||
* Helper function to check the requested index boundary
|
||||
* @param index
|
||||
* @return
|
||||
*/
|
||||
auto boundaryCheck(qsizetype index) const -> bool;
|
||||
|
||||
/**
|
||||
* Data role map that connects PackSearchModel::DataRole to it's QML accessor name
|
||||
*/
|
||||
|
||||
@@ -40,7 +40,7 @@ public:
|
||||
QString::fromUtf8(KOMPLEX_ENDPOINT_PACKS_FEATURED)
|
||||
);
|
||||
|
||||
controller()->setWindowSize(20);
|
||||
controller()->setWindowSize(32);
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -152,30 +152,121 @@ protected:
|
||||
|
||||
const QVariantMap sources = resultObject.value(QString::fromUtf8("src")).toObject().toVariantMap();
|
||||
QMap<QString, QString> sourceMap;
|
||||
QMap<QString, QString> sizeMap;
|
||||
|
||||
QMapIterator<QString,QVariant> sourceIterator(sources);
|
||||
QString original;
|
||||
|
||||
while(sourceIterator.hasNext())
|
||||
{
|
||||
sourceIterator.next();
|
||||
|
||||
QString url = sourceIterator.value().toString();
|
||||
sourceMap.insert(sourceIterator.key(), url);
|
||||
|
||||
auto matches = s_sizeExpression.match(url);
|
||||
|
||||
if(matches.hasMatch())
|
||||
if(sourceIterator.key().toLower() == QString::fromUtf8("original"))
|
||||
{
|
||||
QString size = matches.captured();
|
||||
size.remove(QString::fromUtf8("w="));
|
||||
size.remove(QString::fromUtf8("h="));
|
||||
size.replace(QLatin1Char('&'), QLatin1Char('x'));
|
||||
|
||||
sizeMap.insert(sourceIterator.key(), std::move(size));
|
||||
original = sourceIterator.value().toString();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
QSize screenSize = CoreServices::screenSize();
|
||||
QSize portraitSize(screenSize.height(),screenSize.width());
|
||||
QSize landscapeSize(screenSize.width(),screenSize.height());
|
||||
|
||||
if(screenSize.height() > screenSize.width())
|
||||
{
|
||||
portraitSize = screenSize;
|
||||
landscapeSize = QSize(screenSize.height(),screenSize.width());
|
||||
}
|
||||
|
||||
sourceMap.clear();
|
||||
sourceMap = QMap<QString,QString>
|
||||
{
|
||||
{
|
||||
QString::fromUtf8("original"),
|
||||
original
|
||||
},
|
||||
{
|
||||
QString::fromUtf8("screen"),
|
||||
QString::fromUtf8("%1?auto=compress&cs=tinysrgb&fit=crop&h=%2&w=%3").arg(
|
||||
original,
|
||||
QString::number(screenSize.height()),
|
||||
QString::number(screenSize.width())
|
||||
)
|
||||
},
|
||||
{
|
||||
QString::fromUtf8("portrait"),
|
||||
QString::fromUtf8("%1?auto=compress&cs=tinysrgb&fit=crop&h=%2&w=%3").arg(
|
||||
original,
|
||||
QString::number(portraitSize.height()),
|
||||
QString::number(portraitSize.width())
|
||||
)
|
||||
},
|
||||
{
|
||||
QString::fromUtf8("landscape"),
|
||||
QString::fromUtf8("%1?auto=compress&cs=tinysrgb&fit=crop&h=%2&w=%3").arg(
|
||||
original,
|
||||
QString::number(landscapeSize.height()),
|
||||
QString::number(landscapeSize.width())
|
||||
)
|
||||
},
|
||||
{
|
||||
QString::fromUtf8("backgroundPortrait"),
|
||||
QString::fromUtf8("%1?auto=compress&cs=tinysrgb&fit=crop&h=%2&w=%3").arg(
|
||||
original,
|
||||
QString::number(portraitSize.height() / 2),
|
||||
QString::number(portraitSize.width() / 2)
|
||||
)
|
||||
},
|
||||
{
|
||||
QString::fromUtf8("backgroundLandscape"),
|
||||
QString::fromUtf8("%1?auto=compress&cs=tinysrgb&fit=crop&h=%2&w=%3").arg(
|
||||
original,
|
||||
QString::number(landscapeSize.height() / 2),
|
||||
QString::number(landscapeSize.width() / 2)
|
||||
)
|
||||
},
|
||||
{
|
||||
QString::fromUtf8("thumbnail"),
|
||||
QString::fromUtf8("%1?auto=compress&cs=tinysrgb&fit=crop&h=144&w=256%3").arg(
|
||||
original
|
||||
)
|
||||
},
|
||||
{
|
||||
QString::fromUtf8("largeThumbnail"),
|
||||
QString::fromUtf8("%1?auto=compress&cs=tinysrgb&fit=crop&h=450&w=800%3").arg(
|
||||
original
|
||||
)
|
||||
}
|
||||
};
|
||||
|
||||
QMap<QString, QString> sizeMap =
|
||||
{
|
||||
{
|
||||
QString::fromUtf8("original"),
|
||||
QString()
|
||||
},
|
||||
{
|
||||
QString::fromUtf8("screen"),
|
||||
QString::fromUtf8("%1x%2").arg(
|
||||
QString::number(screenSize.width()),
|
||||
QString::number(screenSize.height())
|
||||
)
|
||||
},
|
||||
{
|
||||
QString::fromUtf8("portrait"),
|
||||
QString::fromUtf8("%1x%2").arg(
|
||||
QString::number(portraitSize.width()),
|
||||
QString::number(portraitSize.height())
|
||||
)
|
||||
},
|
||||
{
|
||||
QString::fromUtf8("landscape"),
|
||||
QString::fromUtf8("%1x%2").arg(
|
||||
QString::number(landscapeSize.width()),
|
||||
QString::number(landscapeSize.height())
|
||||
)
|
||||
}
|
||||
};
|
||||
|
||||
fetchedResults.append(
|
||||
{
|
||||
resultObject.value(QString::fromUtf8("alt")).toString(),
|
||||
@@ -214,8 +305,8 @@ protected:
|
||||
auto getNetworkReply(const QNetworkRequest &request) const -> QNetworkReply*
|
||||
{
|
||||
QEventLoop loop;
|
||||
QWeakPointer<QNetworkAccessManager> managerReference = CoreServices::networkAccessManager();
|
||||
|
||||
QWeakPointer<QNetworkAccessManager> managerReference = CoreServices::networkAccessManager();
|
||||
QSharedPointer<QNetworkAccessManager> manager = managerReference.toStrongRef();
|
||||
|
||||
LOG_ERROR_X(!manager,
|
||||
@@ -238,6 +329,8 @@ protected:
|
||||
loop.exec();
|
||||
}
|
||||
|
||||
manager.clear();
|
||||
|
||||
LOG_ERROR_X(reply->error() != QNetworkReply::NoError,
|
||||
"NewestPacksPaginator::getNetworkReply",
|
||||
reply->errorString().toStdString().c_str(),
|
||||
@@ -247,28 +340,6 @@ protected:
|
||||
return reply;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief getDocument
|
||||
* Extracts the JSON document from the server reply
|
||||
* @param reply
|
||||
* @return
|
||||
*/
|
||||
[[nodiscard]]
|
||||
auto getDocument(QNetworkReply *reply) const -> QJsonDocument
|
||||
{
|
||||
QByteArray data = reply->readAll();
|
||||
QJsonParseError documentError;
|
||||
QJsonDocument document = QJsonDocument::fromJson(data, &documentError);
|
||||
|
||||
LOG_ERROR_X(documentError.error != QJsonParseError::NoError,
|
||||
"NewestPacksPaginator::getDocument",
|
||||
documentError.errorString().toStdString().c_str(),
|
||||
{}
|
||||
);
|
||||
|
||||
return document;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief setUri
|
||||
* Sets the API Endpoint URI to fetch from
|
||||
|
||||
@@ -254,28 +254,6 @@ protected:
|
||||
return reply;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief getDocument
|
||||
* Extracts the JSON document from the server reply
|
||||
* @param reply
|
||||
* @return
|
||||
*/
|
||||
[[nodiscard]]
|
||||
auto getDocument(QNetworkReply *reply) const -> QJsonDocument
|
||||
{
|
||||
QByteArray data = reply->readAll();
|
||||
QJsonParseError documentError;
|
||||
QJsonDocument document = QJsonDocument::fromJson(data, &documentError);
|
||||
|
||||
LOG_ERROR_X(documentError.error != QJsonParseError::NoError,
|
||||
"NewestPacksPaginator::getDocument",
|
||||
documentError.errorString().toStdString().c_str(),
|
||||
{}
|
||||
);
|
||||
|
||||
return document;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief setUri
|
||||
* Sets the API Endpoint URI to fetch from
|
||||
|
||||
@@ -62,35 +62,35 @@ public:
|
||||
return m_uri;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief query
|
||||
* Current query string, if the API Endpoint supports queries
|
||||
* @return
|
||||
*/
|
||||
[[nodiscard]]
|
||||
auto query() const -> QString
|
||||
{
|
||||
return m_query;
|
||||
}
|
||||
// /**
|
||||
// * @brief query
|
||||
// * Current query string, if the API Endpoint supports queries
|
||||
// * @return
|
||||
// */
|
||||
// [[nodiscard]]
|
||||
// auto query() const -> QString
|
||||
// {
|
||||
// return m_query;
|
||||
// }
|
||||
|
||||
/**
|
||||
* @brief setQuery
|
||||
* Sets the new query string and updates the controller
|
||||
* @param query
|
||||
*/
|
||||
auto setQuery(const QString &query) -> void
|
||||
{
|
||||
if(query == m_query)
|
||||
{
|
||||
return;
|
||||
}
|
||||
// /**
|
||||
// * @brief setQuery
|
||||
// * Sets the new query string and updates the controller
|
||||
// * @param query
|
||||
// */
|
||||
// auto setQuery(const QString &query) -> void
|
||||
// {
|
||||
// if(query == m_query)
|
||||
// {
|
||||
// return;
|
||||
// }
|
||||
|
||||
m_query = query;
|
||||
Q_EMIT queryChanged();
|
||||
// m_query = query;
|
||||
// Q_EMIT queryChanged();
|
||||
|
||||
reset();
|
||||
setOffset(0);
|
||||
}
|
||||
// reset();
|
||||
// setOffset(0);
|
||||
// }
|
||||
|
||||
signals:
|
||||
/**
|
||||
@@ -120,7 +120,7 @@ protected:
|
||||
{}
|
||||
);
|
||||
|
||||
if(queryable() && query().isEmpty())
|
||||
if(queryable() && query().isEmpty())
|
||||
{
|
||||
return {};
|
||||
}
|
||||
@@ -139,7 +139,7 @@ protected:
|
||||
{
|
||||
{
|
||||
QByteArray("query"),
|
||||
m_query.toUtf8()
|
||||
query().toUtf8()
|
||||
},
|
||||
{
|
||||
QByteArray("offset"),
|
||||
@@ -303,11 +303,11 @@ private:
|
||||
*/
|
||||
QString m_uri;
|
||||
|
||||
/**
|
||||
* @brief m_query
|
||||
* The query string used in fetch operations
|
||||
*/
|
||||
QString m_query;
|
||||
// /**
|
||||
// * @brief m_query
|
||||
// * The query string used in fetch operations
|
||||
// */
|
||||
// QString m_query;
|
||||
};
|
||||
|
||||
#endif // WALLPAPERPAGINATOR_H
|
||||
|
||||
@@ -0,0 +1,203 @@
|
||||
#include "videoitemmodel.h"
|
||||
|
||||
VideoItemModel::VideoItemModel(QObject *parent) : QAbstractListModel{parent}
|
||||
{
|
||||
QObject::connect(
|
||||
this,
|
||||
&VideoItemModel::dataEntryChanged,
|
||||
this,
|
||||
&VideoItemModel::resetDataModel
|
||||
);
|
||||
}
|
||||
|
||||
auto VideoItemModel::rowCount(const QModelIndex &) const -> int
|
||||
{
|
||||
return m_dataEntry.files.count();
|
||||
}
|
||||
|
||||
auto VideoItemModel::data(const QModelIndex &index, int role) const -> QVariant
|
||||
{
|
||||
if(!boundaryCheck(index.row()))
|
||||
{
|
||||
return {};
|
||||
}
|
||||
|
||||
VideoEntry dataPoint = m_dataEntry.files.at(index.row());
|
||||
|
||||
QVariant data;
|
||||
|
||||
switch(static_cast<DataRole>(role))
|
||||
{
|
||||
case UuidRole:
|
||||
data = dataPoint.id;
|
||||
break;
|
||||
case UrlRole:
|
||||
data = dataPoint.url;
|
||||
break;
|
||||
case HeightRole:
|
||||
data = dataPoint.height;
|
||||
break;
|
||||
case WidthRole:
|
||||
data = dataPoint.width;
|
||||
break;
|
||||
case FileTypeRole:
|
||||
data = dataPoint.type;
|
||||
break;
|
||||
case FpsRole:
|
||||
data = dataPoint.fps;
|
||||
break;
|
||||
case SizeRole:
|
||||
data = dataPoint.size;
|
||||
break;
|
||||
case QualityRole:
|
||||
data = dataPoint.quality;
|
||||
break;
|
||||
case TextRole:
|
||||
data = friendlyText(dataPoint);
|
||||
break;
|
||||
}
|
||||
|
||||
return data;
|
||||
}
|
||||
|
||||
auto VideoItemModel::index(int row, int column, const QModelIndex &parent) const -> QModelIndex
|
||||
{
|
||||
Q_UNUSED(parent)
|
||||
|
||||
if(!boundaryCheck(row))
|
||||
{
|
||||
return {};
|
||||
}
|
||||
|
||||
return createIndex(row, column, &m_dataEntry.files[row]);
|
||||
}
|
||||
|
||||
auto VideoItemModel::columnCount(const QModelIndex &) const -> int
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
auto VideoItemModel::parent(const QModelIndex &) const -> QModelIndex
|
||||
{
|
||||
return {};
|
||||
}
|
||||
|
||||
auto VideoItemModel::setData(const QModelIndex &, const QVariant &, int) -> bool
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
auto VideoItemModel::state() const -> VideoItemModel::State
|
||||
{
|
||||
return m_state;
|
||||
}
|
||||
|
||||
auto VideoItemModel::setState(State state) -> void
|
||||
{
|
||||
if (m_state == state)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_state = state;
|
||||
emit stateChanged();
|
||||
}
|
||||
|
||||
auto VideoItemModel::resetState() -> void
|
||||
{
|
||||
setState(Idle);
|
||||
}
|
||||
|
||||
auto VideoItemModel::resetDataModel() -> void
|
||||
{
|
||||
if(m_lastCount > 0)
|
||||
{
|
||||
//invalidate previous model data
|
||||
beginRemoveRows(QModelIndex(), 0, m_lastCount - 1);
|
||||
endRemoveRows();
|
||||
}
|
||||
|
||||
m_lastCount = m_dataEntry.files.count();
|
||||
|
||||
//signal new data
|
||||
beginInsertRows(QModelIndex(), 0, m_dataEntry.files.count() - 1);
|
||||
endInsertRows();
|
||||
}
|
||||
|
||||
auto VideoItemModel::boundaryCheck(qsizetype index) const -> bool
|
||||
{
|
||||
if(index < 0 || index >= m_dataEntry.files.count())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
auto VideoItemModel::setDataEntry(const VideoCache &entry) -> void
|
||||
{
|
||||
if(entry == m_dataEntry)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_dataEntry = entry;
|
||||
Q_EMIT dataEntryChanged();
|
||||
}
|
||||
|
||||
auto VideoItemModel::friendlyText(const VideoEntry &video) const -> QString
|
||||
{
|
||||
qint64 size = video.size;
|
||||
qint64 sizeIndex = 0;
|
||||
|
||||
while(size >= 1000)
|
||||
{
|
||||
size = static_cast<qint64>(std::ceil(static_cast<qreal>(size) / 1000));
|
||||
++sizeIndex;
|
||||
}
|
||||
|
||||
if(!video.quality.isEmpty())
|
||||
{
|
||||
return QString("%1/%2 [%3x%4 %5FPS] (%6%7)").arg
|
||||
(
|
||||
video.quality.toUpper(),
|
||||
video.type.toUpper(),
|
||||
QString::number(video.width),
|
||||
QString::number(video.height),
|
||||
QString::number(video.fps),
|
||||
QString::number(size),
|
||||
m_sizeTexts[sizeIndex]
|
||||
);
|
||||
}
|
||||
|
||||
return QString("%1 [%2x%3 %4FPS] (%5%6)").arg
|
||||
(
|
||||
video.type.toUpper(),
|
||||
QString::number(video.width),
|
||||
QString::number(video.height),
|
||||
QString::number(video.fps),
|
||||
QString::number(size),
|
||||
m_sizeTexts[sizeIndex]
|
||||
);
|
||||
}
|
||||
|
||||
auto VideoItemModel::roleNames() const -> QHash<int, QByteArray>
|
||||
{
|
||||
return m_dataRoles;
|
||||
}
|
||||
|
||||
auto VideoItemModel::errorString() const -> QString
|
||||
{
|
||||
return m_errorString;
|
||||
}
|
||||
|
||||
auto VideoItemModel::setErrorString(const QString &errorString) -> void
|
||||
{
|
||||
if (m_errorString == errorString)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
m_errorString = errorString;
|
||||
emit errorStringChanged();
|
||||
}
|
||||
@@ -0,0 +1,294 @@
|
||||
/*
|
||||
* 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 VideoItemModel_H
|
||||
#define VideoItemModel_H
|
||||
#include <QObject>
|
||||
#include <QQmlEngine>
|
||||
#include <QList>
|
||||
#include <QStandardPaths>
|
||||
#include <QDir>
|
||||
#include <QFile>
|
||||
#include <QFileInfo>
|
||||
#include <QJsonParseError>
|
||||
#include <QJsonDocument>
|
||||
#include <QJsonObject>
|
||||
#include <QJsonArray>
|
||||
#include <QAbstractListModel>
|
||||
#include <QProcess>
|
||||
#include <QNetworkAccessManager>
|
||||
#include <QNetworkReply>
|
||||
#include <QNetworkRequest>
|
||||
#include <QEventLoop>
|
||||
#include <QtConcurrent/QtConcurrentRun>
|
||||
|
||||
#include "common/komplex_global.h"
|
||||
#include "common/videocache.h"
|
||||
|
||||
/**
|
||||
* @brief The VideoItemModel class
|
||||
*/
|
||||
class KOMPLEX_EXPORT VideoItemModel : public QAbstractListModel
|
||||
{
|
||||
Q_OBJECT
|
||||
QML_ELEMENT
|
||||
public:
|
||||
|
||||
/**
|
||||
* @brief Used to control the UI state
|
||||
*/
|
||||
enum State
|
||||
{
|
||||
Idle,
|
||||
Loading,
|
||||
Error
|
||||
};
|
||||
Q_ENUM(State)
|
||||
|
||||
/**
|
||||
* @brief Data roles used by the view to request data
|
||||
*/
|
||||
enum DataRole {
|
||||
UuidRole = Qt::UserRole + 1,
|
||||
FileTypeRole,
|
||||
FpsRole,
|
||||
HeightRole,
|
||||
WidthRole,
|
||||
SizeRole,
|
||||
UrlRole,
|
||||
QualityRole,
|
||||
TextRole
|
||||
};
|
||||
Q_ENUM(DataRole)
|
||||
|
||||
explicit VideoItemModel(QObject *parent = nullptr);
|
||||
|
||||
auto rowCount(const QModelIndex &parent = QModelIndex()) const -> int override;
|
||||
|
||||
/**
|
||||
* @brief data
|
||||
* Used by the view to pull data from the model.
|
||||
* Required by QAbstractListModel
|
||||
* @param index
|
||||
* @param role
|
||||
* @return
|
||||
*/
|
||||
auto data(
|
||||
const QModelIndex &index,
|
||||
int role = Qt::DisplayRole
|
||||
) const -> QVariant override;
|
||||
|
||||
/**
|
||||
* @brief index
|
||||
* Used by the view to create an index for the data point.
|
||||
* Required by QAbstractListModel
|
||||
* @param row
|
||||
* @param column
|
||||
* @param parent
|
||||
* @return
|
||||
*/
|
||||
auto index(
|
||||
int row,
|
||||
int column,
|
||||
const QModelIndex &parent = QModelIndex()
|
||||
) const -> QModelIndex override;
|
||||
|
||||
/**
|
||||
* @brief columnCount
|
||||
* Required by QAbstractListModel, but just returns 0
|
||||
* since we dont use cols
|
||||
* @param parent
|
||||
* @return
|
||||
*/
|
||||
auto columnCount(
|
||||
const QModelIndex &parent = QModelIndex()
|
||||
) const -> int override;
|
||||
|
||||
/**
|
||||
* @brief parent
|
||||
* @param index
|
||||
* @return
|
||||
*/
|
||||
auto parent(const QModelIndex &index) const -> QModelIndex override;
|
||||
|
||||
/**
|
||||
* @brief setData
|
||||
* Required by QAbstractListModel but not used
|
||||
* @param index
|
||||
* @param value
|
||||
* @param role
|
||||
* @return true always
|
||||
*/
|
||||
auto setData(
|
||||
const QModelIndex &index,
|
||||
const QVariant &value,
|
||||
int role = Qt::EditRole
|
||||
) -> bool override;
|
||||
|
||||
/**
|
||||
* @brief state
|
||||
* Current Model State
|
||||
* @return
|
||||
*/
|
||||
auto state() const -> State;
|
||||
|
||||
/**
|
||||
* @brief roleNames
|
||||
* Used to tell the view what data roles are available
|
||||
* and their QML friendly names
|
||||
* @return
|
||||
*/
|
||||
auto roleNames() const -> QHash<int, QByteArray> override;
|
||||
|
||||
/**
|
||||
* @brief errorString
|
||||
* User-friendly error string to be reported to the user
|
||||
* @return
|
||||
*/
|
||||
auto errorString() const -> QString;
|
||||
|
||||
/**
|
||||
* @brief setDataEntry
|
||||
* Set the dataEntry from the Search or List model
|
||||
* @param entry
|
||||
*/
|
||||
auto setDataEntry(const VideoCache &entry) -> void;
|
||||
|
||||
/**
|
||||
* @brief friendlyText
|
||||
* Generates the friendly text for comboboxes and the like
|
||||
* @param video
|
||||
* @return
|
||||
*/
|
||||
auto friendlyText(const VideoEntry &video) const -> QString;
|
||||
|
||||
protected:
|
||||
|
||||
/**
|
||||
* @brief setErrorString
|
||||
* @param errorString
|
||||
*/
|
||||
auto setErrorString(const QString &errorString) -> void;
|
||||
|
||||
/**
|
||||
* @brief setState
|
||||
* @param state
|
||||
*/
|
||||
auto setState(State state) -> void;
|
||||
|
||||
/**
|
||||
* @brief resetState
|
||||
*/
|
||||
auto resetState() -> void;
|
||||
|
||||
/**
|
||||
* @brief resetDataModel
|
||||
* Clears the data model and creates a new one if data exists
|
||||
*/
|
||||
auto resetDataModel() -> void;
|
||||
|
||||
signals:
|
||||
auto dataEntryChanged() -> void;
|
||||
|
||||
/**
|
||||
* @brief stateChanged
|
||||
* Signaled when reported state changes
|
||||
*/
|
||||
auto stateChanged() -> void;
|
||||
|
||||
/**
|
||||
* @brief errorStringChanged
|
||||
* Signaled when reported error message changes
|
||||
*/
|
||||
auto errorStringChanged() -> void;
|
||||
|
||||
private:
|
||||
/**
|
||||
* @brief boundaryCheck
|
||||
* Helper function to check the requested index boundary
|
||||
* @param index
|
||||
* @return
|
||||
*/
|
||||
auto boundaryCheck(qsizetype index) const -> bool;
|
||||
|
||||
/**
|
||||
* Size texts used in friendlyText()
|
||||
*/
|
||||
QStringList m_sizeTexts
|
||||
{
|
||||
QString::fromUtf8("B"),
|
||||
QString::fromUtf8("KB"),
|
||||
QString::fromUtf8("MB"),
|
||||
QString::fromUtf8("GB")
|
||||
};
|
||||
|
||||
/**
|
||||
* Data role map that connects VideoItemModel::DataRole to it's QML accessor name
|
||||
*/
|
||||
static inline const QHash<int, QByteArray> m_dataRoles =
|
||||
{
|
||||
{
|
||||
static_cast<int>(UuidRole),
|
||||
QByteArray("uuid")
|
||||
},
|
||||
{
|
||||
static_cast<int>(FileTypeRole),
|
||||
QByteArray("fileType")
|
||||
},
|
||||
{
|
||||
static_cast<int>(FpsRole),
|
||||
QByteArray("fps")
|
||||
},
|
||||
{
|
||||
static_cast<int>(HeightRole),
|
||||
QByteArray("height")
|
||||
},
|
||||
{
|
||||
static_cast<int>(WidthRole),
|
||||
QByteArray("width")
|
||||
},
|
||||
{
|
||||
static_cast<int>(SizeRole),
|
||||
QByteArray("size")
|
||||
},
|
||||
{
|
||||
static_cast<int>(UrlRole),
|
||||
QByteArray("url")
|
||||
},
|
||||
{
|
||||
static_cast<int>(QualityRole),
|
||||
QByteArray("quality")
|
||||
},
|
||||
{
|
||||
static_cast<int>(TextRole),
|
||||
QByteArray("text")
|
||||
}
|
||||
};
|
||||
|
||||
State m_state = Idle;
|
||||
QString m_errorString = QString();
|
||||
|
||||
VideoCache m_dataEntry;
|
||||
qint64 m_lastCount = 0;
|
||||
|
||||
Q_PROPERTY(State state READ state WRITE setState RESET resetState NOTIFY stateChanged FINAL)
|
||||
Q_PROPERTY(QString errorString READ errorString WRITE setErrorString NOTIFY errorStringChanged FINAL)
|
||||
};
|
||||
Q_DECLARE_METATYPE(VideoItemModel)
|
||||
|
||||
#endif // VideoItemModel_H
|
||||
@@ -2,6 +2,7 @@
|
||||
|
||||
VideoSearchModel::VideoSearchModel(QObject *parent) : QAbstractListModel{parent}
|
||||
{
|
||||
m_itemModel = new VideoItemModel(this);
|
||||
m_paginator = new VideoSearchPaginator(this);
|
||||
PaginationNotifier *notifier = static_cast<PaginationNotifier*>(m_paginator);
|
||||
|
||||
@@ -62,6 +63,19 @@ VideoSearchModel::VideoSearchModel(QObject *parent) : QAbstractListModel{parent}
|
||||
);
|
||||
}
|
||||
|
||||
VideoSearchModel::~VideoSearchModel()
|
||||
{
|
||||
if(m_paginator)
|
||||
{
|
||||
delete m_paginator;
|
||||
}
|
||||
|
||||
if(m_itemModel)
|
||||
{
|
||||
delete m_itemModel;
|
||||
}
|
||||
}
|
||||
|
||||
auto VideoSearchModel::rowCount(const QModelIndex &) const -> int
|
||||
{
|
||||
if(m_paginator != nullptr)
|
||||
@@ -74,18 +88,12 @@ auto VideoSearchModel::rowCount(const QModelIndex &) const -> int
|
||||
|
||||
auto VideoSearchModel::data(const QModelIndex &index, int role) const -> QVariant
|
||||
{
|
||||
if(m_paginator == nullptr)
|
||||
{
|
||||
return {};
|
||||
}
|
||||
|
||||
if(index.row() < 0 || index.row() >= m_paginator->count() )
|
||||
if(!boundaryCheck(index.row()))
|
||||
{
|
||||
return {};
|
||||
}
|
||||
|
||||
VideoCache dataPoint = m_paginator->at(index.row());
|
||||
|
||||
QVariant data;
|
||||
|
||||
switch(static_cast<DataRole>(role))
|
||||
@@ -126,8 +134,10 @@ auto VideoSearchModel::index(int row, int column, const QModelIndex &parent) con
|
||||
{
|
||||
Q_UNUSED(parent)
|
||||
|
||||
if(row < 0 || row >= m_paginator->count())
|
||||
if(!boundaryCheck(row))
|
||||
{
|
||||
return {};
|
||||
}
|
||||
|
||||
return createIndex(row, column, &m_paginator[row]);
|
||||
}
|
||||
@@ -171,14 +181,45 @@ auto VideoSearchModel::resetState() -> void
|
||||
auto VideoSearchModel::resetDataModel() -> void
|
||||
{
|
||||
//invalidate previous model data
|
||||
beginRemoveRows(QModelIndex(), 0, m_paginator->count());
|
||||
endRemoveRows();
|
||||
if(m_lastCount > 0)
|
||||
{
|
||||
beginRemoveRows(QModelIndex(), 0, m_lastCount - 1);
|
||||
endRemoveRows();
|
||||
}
|
||||
|
||||
m_lastCount = m_paginator->count();
|
||||
|
||||
//signal new data
|
||||
beginInsertRows(QModelIndex(), 0, m_paginator->count() - 1);
|
||||
endInsertRows();
|
||||
}
|
||||
|
||||
auto VideoSearchModel::setItem(qint64 index) -> bool
|
||||
{
|
||||
if(!boundaryCheck(index))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
m_itemModel->setDataEntry(m_paginator->at(index));
|
||||
return true;
|
||||
}
|
||||
|
||||
auto VideoSearchModel::boundaryCheck(qsizetype index) const -> bool
|
||||
{
|
||||
if(index < 0 || m_paginator == nullptr || index >= m_paginator->count())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
auto VideoSearchModel::itemModel() const -> VideoItemModel*
|
||||
{
|
||||
return m_itemModel;
|
||||
}
|
||||
|
||||
auto VideoSearchModel::hasNextPage() const -> bool
|
||||
{
|
||||
return m_paginator->page() < m_paginator->totalPages();
|
||||
@@ -233,7 +274,37 @@ auto VideoSearchModel::setResultsPerPage(qsizetype resultsPerPage) -> void
|
||||
(
|
||||
[this, resultsPerPage]
|
||||
{
|
||||
qsizetype difference = resultsPerPage - m_paginator->resultsPerPage();
|
||||
m_paginator->setResultsPerPage(resultsPerPage);
|
||||
m_lastCount = m_paginator->resultsPerPage();
|
||||
|
||||
if(difference > 0)
|
||||
{
|
||||
qsizetype firstIndex = m_paginator->resultsPerPage() - difference;
|
||||
|
||||
beginInsertRows
|
||||
(
|
||||
QModelIndex(),
|
||||
firstIndex,
|
||||
m_paginator->count() - 1
|
||||
);
|
||||
|
||||
endInsertRows();
|
||||
}
|
||||
|
||||
else if(difference < 0)
|
||||
{
|
||||
qsizetype firstIndex = m_paginator->resultsPerPage();
|
||||
|
||||
beginRemoveRows
|
||||
(
|
||||
QModelIndex(),
|
||||
firstIndex,
|
||||
firstIndex - difference
|
||||
);
|
||||
|
||||
endRemoveRows();
|
||||
}
|
||||
}
|
||||
);
|
||||
}
|
||||
|
||||
@@ -38,6 +38,7 @@
|
||||
#include <QtConcurrent/QtConcurrentRun>
|
||||
|
||||
#include "paginators/videosearchpaginator.h"
|
||||
#include "videoitemmodel.h"
|
||||
|
||||
/**
|
||||
* @brief The VideoSearchModel class
|
||||
@@ -76,6 +77,7 @@ public:
|
||||
Q_ENUM(DataRole)
|
||||
|
||||
explicit VideoSearchModel(QObject *parent = nullptr);
|
||||
~VideoSearchModel();
|
||||
|
||||
auto rowCount(const QModelIndex &parent = QModelIndex()) const -> int override;
|
||||
|
||||
@@ -233,6 +235,16 @@ public:
|
||||
*/
|
||||
auto hasPreviousPage() const -> bool;
|
||||
|
||||
/**
|
||||
* @brief setItem
|
||||
* Sets the current itemModel to the item at the specified index
|
||||
* @param index
|
||||
* @return
|
||||
*/
|
||||
Q_INVOKABLE auto setItem(qint64 index) -> bool;
|
||||
|
||||
VideoItemModel *itemModel() const;
|
||||
|
||||
protected:
|
||||
|
||||
/**
|
||||
@@ -309,6 +321,14 @@ signals:
|
||||
auto queryChanged() -> void;
|
||||
|
||||
private:
|
||||
/**
|
||||
* @brief boundaryCheck
|
||||
* Helper function to check the requested index boundary
|
||||
* @param index
|
||||
* @return
|
||||
*/
|
||||
auto boundaryCheck(qsizetype index) const -> bool;
|
||||
|
||||
/**
|
||||
* Data role map that connects VideoSearchModel::DataRole to it's QML accessor name
|
||||
*/
|
||||
@@ -356,6 +376,9 @@ private:
|
||||
QString m_errorString = QString();
|
||||
|
||||
VideoSearchPaginator *m_paginator = nullptr;
|
||||
VideoItemModel *m_itemModel = nullptr;
|
||||
|
||||
qint64 m_lastCount = 0;
|
||||
|
||||
Q_PROPERTY(State state READ state WRITE setState RESET resetState NOTIFY stateChanged FINAL)
|
||||
Q_PROPERTY(QString errorString READ errorString WRITE setErrorString NOTIFY errorStringChanged FINAL)
|
||||
@@ -366,6 +389,7 @@ private:
|
||||
Q_PROPERTY(bool hasNextPage READ hasNextPage NOTIFY pageChanged FINAL)
|
||||
Q_PROPERTY(bool hasPreviousPage READ hasPreviousPage NOTIFY pageChanged FINAL)
|
||||
Q_PROPERTY(QString query READ query WRITE setQuery NOTIFY queryChanged FINAL)
|
||||
Q_PROPERTY(VideoItemModel *itemModel READ itemModel CONSTANT FINAL)
|
||||
};
|
||||
Q_DECLARE_METATYPE(VideoSearchModel)
|
||||
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
<img src="https://git.digitalartifex.dev/digitalartifex/komplex-hub/raw/branch/main/images/screenshots/screenshot_04_videos.png" />
|
||||
</td>
|
||||
<td>
|
||||
<img src="" />
|
||||
<img src="https://git.digitalartifex.dev/digitalartifex/komplex-hub/raw/branch/main/images/screenshots/screenshot_05_live.png" />
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
@@ -74,4 +74,4 @@ Content purchases will be processed through the website using Paypal as will art
|
||||
|
||||
## Status
|
||||
|
||||
This app is currently under development and is pre-alpha. During this phase, the new API is only hosted locally and not yet available on digitalartifex.dev
|
||||
This app is currently under development and is pre-alpha. The API is now being hosted on https://komplex.dev. However, there is no download functionality as of yet. BETA should be here within a few weeks.
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 2.2 MiB After Width: | Height: | Size: 2.3 MiB |
Binary file not shown.
|
After Width: | Height: | Size: 2.5 MiB |
Reference in New Issue
Block a user