From df6fe5a0000755abdb9c921311bce225e4ba10c7 Mon Sep 17 00:00:00 2001 From: Digital Artifex <7929434+DigitalArtifex@users.noreply.github.com> Date: Thu, 20 Nov 2025 00:13:54 -0500 Subject: [PATCH] Moved Pexels API Requests to API Proxy. Closes #11 --- package/contents/ui/PexelsImageHub.qml | 4 +--- package/contents/ui/PexelsVideoHub.qml | 2 +- plugin/KomplexSearchModel.cpp | 2 +- plugin/PexelsImageSearch.cpp | 5 ++--- plugin/PexelsVideoSearch.cpp | 7 +++---- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/package/contents/ui/PexelsImageHub.qml b/package/contents/ui/PexelsImageHub.qml index 721ae55..304084e 100644 --- a/package/contents/ui/PexelsImageHub.qml +++ b/package/contents/ui/PexelsImageHub.qml @@ -10,7 +10,6 @@ Item property alias selectedFile: searchModel.lastSavedFile id: mainItem - anchors.fill: parent Komplex.PexelsImageSearchModel { @@ -19,8 +18,7 @@ Item ColumnLayout { - width: mainItem.width - height: mainItem.height + anchors.fill: parent RowLayout { diff --git a/package/contents/ui/PexelsVideoHub.qml b/package/contents/ui/PexelsVideoHub.qml index 4882a40..1831be9 100644 --- a/package/contents/ui/PexelsVideoHub.qml +++ b/package/contents/ui/PexelsVideoHub.qml @@ -408,7 +408,7 @@ Item visible: !mediaPlayer.playing anchors.fill: parent - fillMode: Image.PreserveAspectFill + fillMode: Image.PreserveAspectFit source: downloadDialog.thumbnail } } diff --git a/plugin/KomplexSearchModel.cpp b/plugin/KomplexSearchModel.cpp index 7b85ea8..67ddaaf 100644 --- a/plugin/KomplexSearchModel.cpp +++ b/plugin/KomplexSearchModel.cpp @@ -123,7 +123,7 @@ void KomplexSearchModel::downloadMedia(QString fileLocation, QString fileUrl) return; } - if(!file.write(data) != data.length()) + if(file.write(data) != data.length()) { file.close(); qWarning() << QStringLiteral("Could not write file to download").arg(type.toUpper()); diff --git a/plugin/PexelsImageSearch.cpp b/plugin/PexelsImageSearch.cpp index e1027ac..b2843e2 100644 --- a/plugin/PexelsImageSearch.cpp +++ b/plugin/PexelsImageSearch.cpp @@ -1,5 +1,4 @@ #include "PexelsImageSearch.h" -#include "PexelsAPI.h" PexelsImageSearchModel::PexelsImageSearchModel(QObject *parent) : QAbstractItemModel { parent } { @@ -83,7 +82,7 @@ void PexelsImageSearchModel::getSearchResults(QString url) setStatus(Searching); QNetworkRequest request; - request.setRawHeader(QStringLiteral("Authorization").toLatin1(), QStringLiteral(PAK).toLatin1()); + //request.setRawHeader(QStringLiteral("Authorization").toLatin1(), QStringLiteral(PAK).toLatin1()); request.setUrl(QUrl(url)); QNetworkReply *reply = m_networkManager.get(request); @@ -382,5 +381,5 @@ void PexelsImageSearchModel::setQuery(const QString &query) m_query = query; Q_EMIT queryChanged(); - getSearchResults(QStringLiteral("https://api.pexels.com/v1/search?query=%1&per_page=%2").arg(m_query).arg(m_resultsPerPage)); + getSearchResults(QStringLiteral("https://api.artifex.services/v1/images/search/%1/0/%2").arg(m_query).arg(m_resultsPerPage)); } diff --git a/plugin/PexelsVideoSearch.cpp b/plugin/PexelsVideoSearch.cpp index 941db20..fdd6a15 100644 --- a/plugin/PexelsVideoSearch.cpp +++ b/plugin/PexelsVideoSearch.cpp @@ -1,5 +1,4 @@ #include "PexelsVideoSearch.h" -#include "PexelsAPI.h" #include PexelsVideoSearchModel::PexelsVideoSearchModel(QObject *parent) : QAbstractItemModel { parent } @@ -73,7 +72,7 @@ void PexelsVideoSearchModel::getSearchResults(QString url) setStatus(Searching); QNetworkRequest request; - request.setRawHeader(QStringLiteral("Authorization").toLatin1(), QStringLiteral(PAK).toLatin1()); + //request.setRawHeader(QStringLiteral("Authorization").toLatin1(), QStringLiteral(PAK).toLatin1()); request.setUrl(QUrl(url)); QNetworkReply *reply = m_networkManager.get(request); @@ -378,6 +377,6 @@ void PexelsVideoSearchModel::setQuery(const QString &query) m_query = query; Q_EMIT queryChanged(); - - getSearchResults(QStringLiteral("https://api.pexels.com/videos/search?query=%1&per_page=%2").arg(QUrl::toPercentEncoding(m_query)).arg(m_resultsPerPage)); + + getSearchResults(QStringLiteral("https://api.artifex.services/v1/videos/search/%1/0/%2").arg(m_query).arg(m_resultsPerPage)); }