diff --git a/src/libdanbooru/danbooruservice.cpp b/src/libdanbooru/danbooruservice.cpp index 242ae35..0531f3c 100644 --- a/src/libdanbooru/danbooruservice.cpp +++ b/src/libdanbooru/danbooruservice.cpp @@ -440,20 +440,20 @@ void DanbooruService::processPostList(KJob *job) m_postsToFetch = postList.length(); - int postId = 0; - - for (auto element: postList) { - QVariantMap map = element.toMap(); - DanbooruPost *post = new DanbooruPost(map); - if (isPostBlacklisted(post, m_blacklist, m_maxRating)) { - m_postsToFetch--; - delete post; - continue; - } - m_posts.insert(postId, post); - postId++; - - } +// int postId = 0; +// +// for (auto element: postList) { +// QVariantMap map = element.toMap(); +// DanbooruPost *post = new DanbooruPost(map); +// if (isPostBlacklisted(post, m_blacklist, m_maxRating)) { +// m_postsToFetch--; +// delete post; +// continue; +// } +// m_posts.insert(postId, post); +// postId++; +// +// } for (auto element : postList) { @@ -470,8 +470,6 @@ void DanbooruService::processPostList(KJob *job) QPixmap pix; - // Usare QHash per KIO::multi_get! - if (m_cache->findPixmap(post->thumbnailUrl().url(), &pix)) { post->setPixmap(pix); @@ -486,18 +484,18 @@ void DanbooruService::processPostList(KJob *job) } else { StoredTransferJob *pixmapJob = KIO::storedGet(post->thumbnailUrl(), - KIO::NoReload, KIO::HideProgressInfo - ); + KIO::NoReload, KIO::HideProgressInfo); + + + // We don't want to overload the servers, so set some rational + // priority KIO::Scheduler::setJobPriority(static_cast(job), 1); QVariant variant; variant.setValue(post); - // We don't want to overload the servers, so set some rational - // priority - - pixmapJob->setProperty("danbooruPost", variant); +// pixmapJob->setProperty("danbooruPost", variant); connect(pixmapJob, &StoredTransferJob::result, [post, this, pix](KJob * job) mutable { diff --git a/src/libdanbooru/utils.cpp b/src/libdanbooru/utils.cpp index 98f0e9d..844ef13 100644 --- a/src/libdanbooru/utils.cpp +++ b/src/libdanbooru/utils.cpp @@ -111,8 +111,7 @@ QUrl requestUrl(QUrl &url, const QString &path, const QString &username, return danbooruUrl; } -QList< QVariant > parseDanbooruResult(QByteArray data, QString elementName, - bool *result) +QList< QVariant > parseDanbooruResult(QByteArray data, QString xlmElement, bool* result) { QXmlStreamReader reader; @@ -129,7 +128,7 @@ QList< QVariant > parseDanbooruResult(QByteArray data, QString elementName, } if (token == QXmlStreamReader::StartElement && - reader.name() == elementName) { + reader.name() == xlmElement) { QVariantMap values;