KDE/danbooru-client
1
0
Fork 0
Code Issues Pull requests Releases Activity

Adapt the Donmai class to the change in the base class

Browse source
This commit is contained in:
Luca Beltrame 2020-08-19 16:31:10 +02:00
parent 32fc63118d
commit 1a6fc34895
Signed by: einar
GPG key ID: 4707F46E9EC72DEC
2 changed files with 61 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

114
src/libdanbooru/danbooru_donmai.cpp
View file

@ -38,28 +38,39 @@ namespace Danbooru {
// URIs // URIs
/////// ///////
const QLatin1String DanbooruService::postUri() const { const QUrl DanbooruService::postUri() const {
return QLatin1String("posts.json"); auto url = QUrl(m_url);
url.setPath("/posts.json");
return url;
} }
const QLatin1String DanbooruService::poolUri() const { const QUrl DanbooruService::poolUri() const {
return QLatin1String("pools.json"); auto url = QUrl(m_url);
url.setPath("/pools.json");
return url;
} }
const QLatin1String DanbooruService::artistUri() const { const QUrl DanbooruService::artistUri() const {
return QLatin1String("artists.json"); auto url = QUrl(m_url);
url.setPath("/artists.json");
return url;
} }
const QLatin1String DanbooruService::tagUri() const { const QUrl DanbooruService::tagUri() const {
return QLatin1String("tags.json"); auto url = QUrl(m_url);
url.setPath("/tags.json");
return url;
} }
const QLatin1String DanbooruService::poolDataUri() const { const QUrl DanbooruService::poolDataUri() const {
return QLatin1String("pools/%1.json"); return QUrl();
} }
const QLatin1String DanbooruService::relatedTagUri() const { const QUrl DanbooruService::relatedTagUri() const {
return QLatin1String("related_tag.json"); auto url = QUrl(m_url);
url.setPath("/related_tag.json");
return url;
} }
//////////////// ////////////////
@ -83,7 +94,7 @@ void DanbooruService::getPostList() {
parameters.insert("limit", QString::number(m_maxPosts)); parameters.insert("limit", QString::number(m_maxPosts));
parameters.insert("page", QString::number(m_currentPage)); parameters.insert("page", QString::number(m_currentPage));
QUrl danbooruUrl = requestUrl(m_url, postUri(), m_username, QUrl danbooruUrl = requestUrl(postUri(), m_username,
m_password, parameters, m_tags); m_password, parameters, m_tags);
qCDebug(LIBDANBOORU) << "Final constructed post URL" << danbooruUrl; qCDebug(LIBDANBOORU) << "Final constructed post URL" << danbooruUrl;
@ -101,12 +112,12 @@ void DanbooruService::getPoolList(int limit)
QUrl danbooruUrl; QUrl danbooruUrl;
if (m_currentPage == 1) { if (m_currentPage == 1) {
danbooruUrl = requestUrl(m_url, poolUri(), m_username, m_password); danbooruUrl = requestUrl(poolUri(), m_username, m_password);
} else { } else {
QMap<QString, QString> map; QMap<QString, QString> map;
map.insert("page", QString::number(m_currentPage)); map.insert("page", QString::number(m_currentPage));
danbooruUrl = requestUrl(m_url, poolUri(), m_username, danbooruUrl = requestUrl(poolUri(), m_username,
m_password, map); m_password, map);
} }
@ -161,18 +172,20 @@ void DanbooruService::getPool(int poolId, int page)
parameters.insert("page", QString::number(page)); parameters.insert("page", QString::number(page));
} }
const QString dataUri = QString(poolDataUri()).arg(poolId); QUrl dataUri;
dataUri = QUrl(m_url);
QUrl danbooruUrl = requestUrl(m_url, dataUri, m_username, dataUri.setPath(QString("pools/%1.json").arg(poolId));
QUrl danbooruUrl = requestUrl(dataUri, m_username,
m_password, parameters); m_password, parameters);
qCDebug(LIBDANBOORU) << "Final constructed URL pool" << danbooruUrl; qCDebug(LIBDANBOORU) << "Final constructed URL pool" << danbooruUrl;
KIO::StoredTransferJob *job = KIO::storedGet(danbooruUrl, KIO::NoReload, KIO::StoredTransferJob *job = KIO::storedGet(danbooruUrl, KIO::NoReload,
KIO::HideProgressInfo); KIO::HideProgressInfo);
connect(job, &StoredTransferJob::result, [this](KJob * job) { connect(job, &StoredTransferJob::result, [this](KJob * job) {
if (job->error()) { if (job->error()) {
Q_EMIT(downloadError(job->errorString())); Q_EMIT(downloadError(job->errorString()));
return; return;
@ -182,22 +195,24 @@ void DanbooruService::getPool(int poolId, int page)
QByteArray data = jobResult->data(); QByteArray data = jobResult->data();
bool ok; bool ok;
const QList<QVariantMap> postList = parseResult(data, apiType(), Pool, &ok); const QList<QVariantMap> postList = parseResult(data, apiType(), Pool, &ok);
if (!ok) { if (!ok) {
Q_EMIT(downloadError(QString("Unable to decode data"))); Q_EMIT(downloadError(QString("Unable to decode data")));
return; return;
} }
const auto postIds = postList.at(0).value("raw_post_data").toList(); const auto postIds = postList.at(0).value("raw_post_data").toList();
m_postsToFetch = postIds.length(); m_postsToFetch = postIds.length();
for (const auto postId: postIds) { for (const auto &postId: postIds) {
QUrl postUrl = requestUrl(m_url, QString("posts/%1.json").arg(postId.toString()), m_username, auto postUrl = QUrl(m_url);
postUrl.setPath(QString("/posts/%1.json").arg(postId.toString()));
postUrl = requestUrl(postUrl, m_username,
m_password); m_password);
StoredTransferJob* postJob = KIO::storedGet(postUrl, KIO::NoReload, StoredTransferJob* postJob = KIO::storedGet(postUrl, KIO::NoReload,
KIO::HideProgressInfo); KIO::HideProgressInfo);
connect(postJob, &StoredTransferJob::result, this, &DanbooruService::processSinglePost); connect(postJob, &StoredTransferJob::result, this, &DanbooruService::processSinglePost);
} }
}); });
@ -213,7 +228,7 @@ void DanbooruService::getTagList(int limit, QString name)
} }
parameters.insert("search[order]", "date"); parameters.insert("search[order]", "date");
QUrl danbooruUrl = requestUrl(m_url, tagUri(), m_username, m_password, QUrl danbooruUrl = requestUrl(tagUri(), m_username, m_password,
parameters); parameters);
// qCDebug(LIBDANBOORU) << "Final constructed tag URL" << danbooruUrl.url(); // qCDebug(LIBDANBOORU) << "Final constructed tag URL" << danbooruUrl.url();
@ -250,7 +265,7 @@ void DanbooruService::getRelatedTags(const QStringList &tags,
parameters.insert("type", type); parameters.insert("type", type);
parameters.insert("query", tags.join(" ")); parameters.insert("query", tags.join(" "));
QUrl danbooruUrl = requestUrl(m_url, relatedTagUri(), m_username, QUrl danbooruUrl = requestUrl(relatedTagUri(), m_username,
m_password, parameters); m_password, parameters);
// qCDebug(LIBDANBOORU) << "Final constructed related tag URL" << danbooruUrl; // qCDebug(LIBDANBOORU) << "Final constructed related tag URL" << danbooruUrl;
@ -347,7 +362,7 @@ void DanbooruService::processTagList(KJob *job)
} }
void DanbooruService::processSinglePost(KJob* job) { void DanbooruService::processSinglePost(KJob* job) {
if (job->error()) if (job->error())
{ {
Q_EMIT(downloadError(job->errorString())); Q_EMIT(downloadError(job->errorString()));
@ -364,7 +379,7 @@ void DanbooruService::processSinglePost(KJob* job) {
QByteArray data = jobResult->data(); QByteArray data = jobResult->data();
bool ok; bool ok;
QList<QVariantMap> postList; QList<QVariantMap> postList;
postList = parseResult(data, apiType(), Danbooru::Post, &ok); postList = parseResult(data, apiType(), Danbooru::Post, &ok);
if (!ok) { if (!ok) {
@ -379,46 +394,27 @@ void DanbooruService::processSinglePost(KJob* job) {
Q_EMIT(postDownloadFinished()); Q_EMIT(postDownloadFinished());
return; return;
} }
DanbooruPost* post = new DanbooruPost(postList.at(0)); DanbooruPost* post = new DanbooruPost(postList.at(0));
if (isPostBlacklisted(post, m_blacklist, m_maxRating)) { if (isPostBlacklisted(post, m_blacklist, m_maxRating)) {
m_postsToFetch--; m_postsToFetch--;
delete post; delete post;
return; return;
} }
QPixmap pix; QPixmap pix;
qCDebug(LIBDANBOORU) << "About to download image"; qCDebug(LIBDANBOORU) << "About to download image";
if (m_cache && m_cache->findPixmap(post->thumbnailUrl().url(), &pix)) {
post->setPixmap(pix);
Q_EMIT(postDownloaded(post));
m_postsToFetch--;
if (m_postsToFetch == 0) { StoredTransferJob *pixmapJob = KIO::storedGet(post->thumbnailUrl(),
qCDebug(LIBDANBOORU) << "Post download finished"; KIO::NoReload, KIO::HideProgressInfo);
Q_EMIT(postDownloadFinished());
}
} else { QVariant variant;
StoredTransferJob *pixmapJob = KIO::storedGet(post->thumbnailUrl(), variant.setValue(post);
KIO::NoReload, KIO::HideProgressInfo);
// We don't want to overload the servers, so set some rational pixmapJob->setProperty("post", variant);
// priority pixmapJob->setProperty("pixmap", pix);
connect(pixmapJob, &StoredTransferJob::result, this, &DanbooruServiceBase::processPixmap);
KIO::Scheduler::setJobPriority(static_cast<KIO::SimpleJob *>(pixmapJob), 1);
QVariant variant;
variant.setValue(post);
pixmapJob->setProperty("post", variant);
pixmapJob->setProperty("pixmap", pix);
connect(pixmapJob, &StoredTransferJob::result, this, &DanbooruServiceBase::processPixmap);
}
} }

12
src/libdanbooru/danbooru_donmai.h
View file

@ -32,12 +32,12 @@ class DanbooruService: public DanbooruServiceBase {
Q_OBJECT Q_OBJECT
private: private:
const QLatin1String postUri() const override; const QUrl postUri() const override;
const QLatin1String poolUri() const override; const QUrl poolUri() const override;
const QLatin1String artistUri() const override; const QUrl artistUri() const override;
const QLatin1String tagUri() const override; const QUrl tagUri() const override;
const QLatin1String poolDataUri() const override; const QUrl poolDataUri() const override;
const QLatin1String relatedTagUri() const override; const QUrl relatedTagUri() const override;
public: public: