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

Update API

Browse source
This commit is contained in:
Luca Beltrame 2018-08-22 19:44:28 +02:00
commit 9b37769c62
Signed by: einar
GPG key ID: 8DF631FD021DB0C5
2 changed files with 43 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

86
src/libdanbooru/moebooru.cpp
View file

@ -38,27 +38,27 @@ namespace Danbooru {
// URIs // URIs
/////// ///////
const QLatin1String KonachanDanbooruService::postUri() const { const QLatin1String MoebooruService::postUri() const {
return QLatin1String("post/index.json"); return QLatin1String("post/index.json");
} }
const QLatin1String KonachanDanbooruService::poolUri() const { const QLatin1String MoebooruService::poolUri() const {
return QLatin1String("pool/index.json"); return QLatin1String("pool/index.json");
} }
const QLatin1String KonachanDanbooruService::artistUri() const { const QLatin1String MoebooruService::artistUri() const {
return QLatin1String("artist/index.json"); return QLatin1String("artist/index.json");
} }
const QLatin1String KonachanDanbooruService::tagUri() const { const QLatin1String MoebooruService::tagUri() const {
return QLatin1String("tag/index.xml"); return QLatin1String("tag/index.xml");
} }
const QLatin1String KonachanDanbooruService::poolDataUri() const { const QLatin1String MoebooruService::poolDataUri() const {
return QLatin1String("pool/show.xml"); return QLatin1String("pool/show.json");
} }
const QLatin1String KonachanDanbooruService::relatedTagUri() const { const QLatin1String MoebooruService::relatedTagUri() const {
return QLatin1String("tag/related.json"); return QLatin1String("tag/related.json");
} }
@ -67,7 +67,7 @@ const QLatin1String KonachanDanbooruService::relatedTagUri() const {
//////////////// ////////////////
Danbooru::ApiType KonachanDanbooruService::apiType() const { Danbooru::ApiType MoebooruService::apiType() const {
return Danbooru::ApiType::MoeBooru; return Danbooru::ApiType::MoeBooru;
} }
@ -75,7 +75,7 @@ Danbooru::ApiType KonachanDanbooruService::apiType() const {
// API methods // API methods
////////////// //////////////
void KonachanDanbooruService::getPostList() { void MoebooruService::getPostList() {
// We can't fetch more than 100 items, API limitation // We can't fetch more than 100 items, API limitation
QMap<QString, QString> parameters; QMap<QString, QString> parameters;
@ -94,11 +94,11 @@ void KonachanDanbooruService::getPostList() {
// This job can use JSON data // This job can use JSON data
job->setProperty("needsXML", false); job->setProperty("needsXML", false);
connect(job, &KIO::StoredTransferJob::result, this, &KonachanDanbooruService::processPostList); connect(job, &KIO::StoredTransferJob::result, this, &MoebooruService::processPostList);
} }
void KonachanDanbooruService::getPoolList(int limit) void MoebooruService::getPoolList(int limit)
{ {
QUrl danbooruUrl; QUrl danbooruUrl;
@ -113,14 +113,10 @@ void KonachanDanbooruService::getPoolList(int limit)
m_password, map); m_password, map);
} }
// qCDebug(LIBDANBOORU) << "Final constructed pool list URL" << danbooruUrl.url(); qCDebug(LIBDANBOORU) << "Final constructed pool list URL" << danbooruUrl.url();
KIO::StoredTransferJob *job = KIO::storedGet(danbooruUrl, KIO::NoReload, KIO::StoredTransferJob *job = KIO::storedGet(danbooruUrl, KIO::NoReload,
KIO::HideProgressInfo); KIO::HideProgressInfo);
// This job can use JSON data
job->setProperty("needsXML", false);
// connect(job, &KIO::StoredTransferJob::result, this, &DanbooruService::processPoolList);
connect(job, &KIO::StoredTransferJob::result, [this, limit](KJob * job) { connect(job, &KIO::StoredTransferJob::result, [this, limit](KJob * job) {
@ -159,7 +155,7 @@ void KonachanDanbooruService::getPoolList(int limit)
} }
void KonachanDanbooruService::getPool(int poolId, int page) void MoebooruService::getPool(int poolId, int page)
{ {
QMap<QString, QString> parameters; QMap<QString, QString> parameters;
@ -172,22 +168,19 @@ void KonachanDanbooruService::getPool(int poolId, int page)
QUrl danbooruUrl = requestUrl(m_url, poolDataUri(), m_username, QUrl danbooruUrl = requestUrl(m_url, poolDataUri(), m_username,
m_password, parameters); m_password, parameters);
// qCDebug(LIBDANBOORU) << "Final constructed pool URL" << danbooruUrl.url(); 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);
job->setProperty("is_pool", true);
//HACK: Most Danbooru implementations don't provide valid data on connect(job, &KIO::StoredTransferJob::result, this, &MoebooruService::processPostList);
// pools via JSON, hence we set XML and parse the XML data.
job->setProperty("needsXML", true);
connect(job, &KIO::StoredTransferJob::result, this, &KonachanDanbooruService::processPostList);
} }
void KonachanDanbooruService::getTagList(int limit, QString name) void MoebooruService::getTagList(int limit, QString name)
{ {
QMap<QString, QString> parameters; QMap<QString, QString> parameters;
parameters.insert("limit", QString::number(limit)); parameters.insert("limit", QString::number(limit));
@ -203,11 +196,11 @@ void KonachanDanbooruService::getTagList(int limit, QString name)
KIO::StoredTransferJob *job = KIO::storedGet(danbooruUrl, KIO::NoReload, KIO::StoredTransferJob *job = KIO::storedGet(danbooruUrl, KIO::NoReload,
KIO::HideProgressInfo); KIO::HideProgressInfo);
connect(job, &KIO::StoredTransferJob::result, this, &KonachanDanbooruService::processTagList); connect(job, &KIO::StoredTransferJob::result, this, &MoebooruService::processTagList);
} }
void KonachanDanbooruService::getRelatedTags(const QStringList &tags, void MoebooruService::getRelatedTags(const QStringList &tags,
DanbooruTag::TagType tagType) DanbooruTag::TagType tagType)
{ {
@ -295,7 +288,7 @@ void KonachanDanbooruService::getRelatedTags(const QStringList &tags,
// Slots // Slots
//////// ////////
void KonachanDanbooruService::processTagList(KJob *job) void MoebooruService::processTagList(KJob *job)
{ {
if (job->error()) { if (job->error()) {
@ -329,7 +322,7 @@ void KonachanDanbooruService::processTagList(KJob *job)
} }
} }
void KonachanDanbooruService::processPostList(KJob *job) void MoebooruService::processPostList(KJob *job)
{ {
qCDebug(LIBDANBOORU) << "Got post data OK"; qCDebug(LIBDANBOORU) << "Got post data OK";
@ -347,17 +340,22 @@ void KonachanDanbooruService::processPostList(KJob *job)
} }
QByteArray data = jobResult->data(); QByteArray data = jobResult->data();
bool ok; bool ok;
bool needsXML = job->property("needsXML").toBool(); bool is_pool = job->property("is_pool").toBool();
QList<QVariant> postList; QList<QVariantMap> postList;
if (needsXML) { if (is_pool) {
// Special cases for pools // Special cases for pools
postList = parseDanbooruResult(data, QString("post"), &ok); QVariantMap postMap = parseResult(data, Danbooru::MoeBooru, Danbooru::Pool, &ok).at(0);
auto postData = postMap.value("raw_post_data").toList();
for (const auto post: postData) {
postList.append(extractPostData(post, apiType()));
}
} else { } else {
postList = parseDanbooruResult(data, &ok).toList(); postList = parseResult(data, Danbooru::MoeBooru, Danbooru::Post, &ok);
} }
if (!ok) { if (!ok) {
@ -382,10 +380,9 @@ void KonachanDanbooruService::processPostList(KJob *job)
postList = postList.mid(0, m_maxPosts); postList = postList.mid(0, m_maxPosts);
} }
for (auto element : postList) { for (const auto element : postList) {
QVariantMap map = element.toMap(); DanbooruPost *post = new DanbooruPost(element);
DanbooruPost *post = new DanbooruPost(map);
// Remove unwanted posts // Remove unwanted posts
@ -399,8 +396,9 @@ void KonachanDanbooruService::processPostList(KJob *job)
qCDebug(LIBDANBOORU) << "About to donwload images"; qCDebug(LIBDANBOORU) << "About to donwload images";
if (m_cache && m_cache->findPixmap(post->thumbnailUrl().url(), &pix)) { if (0 && m_cache && m_cache->findPixmap(post->thumbnailUrl().url(), &pix)) {
qDebug() << "reimplement";
post->setPixmap(pix); post->setPixmap(pix);
Q_EMIT(postDownloaded(post)); Q_EMIT(postDownloaded(post));
m_postsToFetch--; m_postsToFetch--;
@ -412,7 +410,7 @@ void KonachanDanbooruService::processPostList(KJob *job)
} else { } else {
// qCDebug(LIBDANBOORU) << "Downloading image" << post->thumbnailUrl(); qCDebug(LIBDANBOORU) << "Downloading image" << post->thumbnailUrl();
StoredTransferJob *pixmapJob = KIO::storedGet(post->thumbnailUrl(), StoredTransferJob *pixmapJob = KIO::storedGet(post->thumbnailUrl(),
KIO::NoReload, KIO::HideProgressInfo); KIO::NoReload, KIO::HideProgressInfo);
@ -442,7 +440,7 @@ void KonachanDanbooruService::processPostList(KJob *job)
post->setPixmap(pix); post->setPixmap(pix);
if (m_cache) if (0 && m_cache)
{ {
//qCDebug(LIBDANBOORU) << "Inserting item in cache"; //qCDebug(LIBDANBOORU) << "Inserting item in cache";
m_cache->insertPixmap(post->thumbnailUrl().url(), pix); m_cache->insertPixmap(post->thumbnailUrl().url(), pix);
@ -467,7 +465,7 @@ void KonachanDanbooruService::processPostList(KJob *job)
} }
void KonachanDanbooruService::downloadAllTags(KJob* job) { void MoebooruService::downloadAllTags(KJob* job) {
Q_UNUSED(job); Q_UNUSED(job);
} }

3
src/libdanbooru/moebooru.h
View file

@ -27,7 +27,7 @@ class KJob;
namespace Danbooru { namespace Danbooru {
class KonachanDanbooruService: public DanbooruServiceBase { class MoebooruService: public DanbooruServiceBase {
Q_OBJECT Q_OBJECT
@ -42,7 +42,6 @@ private:
public: public:
using DanbooruServiceBase::DanbooruServiceBase; // superclass constructor using DanbooruServiceBase::DanbooruServiceBase; // superclass constructor
~KonachanDanbooruService() override = default;
Danbooru::ApiType apiType() const override; Danbooru::ApiType apiType() const override;