Moved Pexels API Requests to API Proxy. Closes #11
This commit is contained in:
@@ -10,7 +10,6 @@ Item
|
|||||||
property alias selectedFile: searchModel.lastSavedFile
|
property alias selectedFile: searchModel.lastSavedFile
|
||||||
|
|
||||||
id: mainItem
|
id: mainItem
|
||||||
anchors.fill: parent
|
|
||||||
|
|
||||||
Komplex.PexelsImageSearchModel
|
Komplex.PexelsImageSearchModel
|
||||||
{
|
{
|
||||||
@@ -19,8 +18,7 @@ Item
|
|||||||
|
|
||||||
ColumnLayout
|
ColumnLayout
|
||||||
{
|
{
|
||||||
width: mainItem.width
|
anchors.fill: parent
|
||||||
height: mainItem.height
|
|
||||||
|
|
||||||
RowLayout
|
RowLayout
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -408,7 +408,7 @@ Item
|
|||||||
visible: !mediaPlayer.playing
|
visible: !mediaPlayer.playing
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
|
||||||
fillMode: Image.PreserveAspectFill
|
fillMode: Image.PreserveAspectFit
|
||||||
source: downloadDialog.thumbnail
|
source: downloadDialog.thumbnail
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -123,7 +123,7 @@ void KomplexSearchModel::downloadMedia(QString fileLocation, QString fileUrl)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!file.write(data) != data.length())
|
if(file.write(data) != data.length())
|
||||||
{
|
{
|
||||||
file.close();
|
file.close();
|
||||||
qWarning() << QStringLiteral("Could not write file to download").arg(type.toUpper());
|
qWarning() << QStringLiteral("Could not write file to download").arg(type.toUpper());
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
#include "PexelsImageSearch.h"
|
#include "PexelsImageSearch.h"
|
||||||
#include "PexelsAPI.h"
|
|
||||||
|
|
||||||
PexelsImageSearchModel::PexelsImageSearchModel(QObject *parent) : QAbstractItemModel { parent }
|
PexelsImageSearchModel::PexelsImageSearchModel(QObject *parent) : QAbstractItemModel { parent }
|
||||||
{
|
{
|
||||||
@@ -83,7 +82,7 @@ void PexelsImageSearchModel::getSearchResults(QString url)
|
|||||||
setStatus(Searching);
|
setStatus(Searching);
|
||||||
|
|
||||||
QNetworkRequest request;
|
QNetworkRequest request;
|
||||||
request.setRawHeader(QStringLiteral("Authorization").toLatin1(), QStringLiteral(PAK).toLatin1());
|
//request.setRawHeader(QStringLiteral("Authorization").toLatin1(), QStringLiteral(PAK).toLatin1());
|
||||||
request.setUrl(QUrl(url));
|
request.setUrl(QUrl(url));
|
||||||
|
|
||||||
QNetworkReply *reply = m_networkManager.get(request);
|
QNetworkReply *reply = m_networkManager.get(request);
|
||||||
@@ -382,5 +381,5 @@ void PexelsImageSearchModel::setQuery(const QString &query)
|
|||||||
m_query = query;
|
m_query = query;
|
||||||
Q_EMIT queryChanged();
|
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));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
#include "PexelsVideoSearch.h"
|
#include "PexelsVideoSearch.h"
|
||||||
#include "PexelsAPI.h"
|
|
||||||
#include <qeventloop.h>
|
#include <qeventloop.h>
|
||||||
|
|
||||||
PexelsVideoSearchModel::PexelsVideoSearchModel(QObject *parent) : QAbstractItemModel { parent }
|
PexelsVideoSearchModel::PexelsVideoSearchModel(QObject *parent) : QAbstractItemModel { parent }
|
||||||
@@ -73,7 +72,7 @@ void PexelsVideoSearchModel::getSearchResults(QString url)
|
|||||||
setStatus(Searching);
|
setStatus(Searching);
|
||||||
|
|
||||||
QNetworkRequest request;
|
QNetworkRequest request;
|
||||||
request.setRawHeader(QStringLiteral("Authorization").toLatin1(), QStringLiteral(PAK).toLatin1());
|
//request.setRawHeader(QStringLiteral("Authorization").toLatin1(), QStringLiteral(PAK).toLatin1());
|
||||||
request.setUrl(QUrl(url));
|
request.setUrl(QUrl(url));
|
||||||
|
|
||||||
QNetworkReply *reply = m_networkManager.get(request);
|
QNetworkReply *reply = m_networkManager.get(request);
|
||||||
@@ -379,5 +378,5 @@ void PexelsVideoSearchModel::setQuery(const QString &query)
|
|||||||
m_query = query;
|
m_query = query;
|
||||||
Q_EMIT queryChanged();
|
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));
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user