mirror of
https://bitbucket.org/smil3y/kde-extraapps.git
synced 2025-02-23 18:32:53 +00:00
kdeplasma-addons: manually delete the flickr POTD provider jobs
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
parent
ffcc43bab8
commit
151c68b8de
1 changed files with 12 additions and 3 deletions
|
@ -63,10 +63,11 @@ class FlickrProvider::Private
|
||||||
|
|
||||||
void FlickrProvider::Private::pageRequestFinished(KJob *kjob)
|
void FlickrProvider::Private::pageRequestFinished(KJob *kjob)
|
||||||
{
|
{
|
||||||
KIO::StoredTransferJob *kstoredjob = static_cast<KIO::StoredTransferJob*>(kjob);
|
KIO::StoredTransferJob* kstoredjob = qobject_cast<KIO::StoredTransferJob*>(kjob);
|
||||||
if (kstoredjob->error()) {
|
if (kstoredjob->error()) {
|
||||||
|
kWarning() << "request error" << kstoredjob->url();
|
||||||
|
kstoredjob->deleteLater();
|
||||||
emit mParent->error(mParent);
|
emit mParent->error(mParent);
|
||||||
kWarning() << "pageRequestFinished error";
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -77,6 +78,7 @@ void FlickrProvider::Private::pageRequestFinished(KJob *kjob)
|
||||||
if (jsondata.startsWith("jsonFlickrApi(") && jsondata.endsWith(')')) {
|
if (jsondata.startsWith("jsonFlickrApi(") && jsondata.endsWith(')')) {
|
||||||
jsondata = jsondata.mid(14, jsondata.size() - 15);
|
jsondata = jsondata.mid(14, jsondata.size() - 15);
|
||||||
}
|
}
|
||||||
|
kstoredjob->deleteLater();
|
||||||
|
|
||||||
const QJsonDocument jsondoc = QJsonDocument::fromJson(jsondata);
|
const QJsonDocument jsondoc = QJsonDocument::fromJson(jsondata);
|
||||||
if (jsondoc.isNull()) {
|
if (jsondoc.isNull()) {
|
||||||
|
@ -92,7 +94,9 @@ void FlickrProvider::Private::pageRequestFinished(KJob *kjob)
|
||||||
|
|
||||||
const KUrl queryurl(s_flickrapiurl + mActualDate.toString(Qt::ISODate));
|
const KUrl queryurl(s_flickrapiurl + mActualDate.toString(Qt::ISODate));
|
||||||
kDebug() << "stat fail, retrying with" << queryurl.prettyUrl();
|
kDebug() << "stat fail, retrying with" << queryurl.prettyUrl();
|
||||||
|
kstoredjob->deleteLater();
|
||||||
kstoredjob = KIO::storedGet(queryurl, KIO::NoReload, KIO::HideProgressInfo);
|
kstoredjob = KIO::storedGet(queryurl, KIO::NoReload, KIO::HideProgressInfo);
|
||||||
|
kstoredjob->setAutoDelete(false);
|
||||||
mParent->connect(kstoredjob, SIGNAL(finished(KJob*)), SLOT(pageRequestFinished(KJob*)));
|
mParent->connect(kstoredjob, SIGNAL(finished(KJob*)), SLOT(pageRequestFinished(KJob*)));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -120,13 +124,16 @@ void FlickrProvider::Private::pageRequestFinished(KJob *kjob)
|
||||||
const KUrl photourl(m_photoList.at(KRandom::randomMax(m_photoList.size())));
|
const KUrl photourl(m_photoList.at(KRandom::randomMax(m_photoList.size())));
|
||||||
kDebug() << "chosen photo" << photourl.prettyUrl();
|
kDebug() << "chosen photo" << photourl.prettyUrl();
|
||||||
kstoredjob = KIO::storedGet(photourl, KIO::NoReload, KIO::HideProgressInfo);
|
kstoredjob = KIO::storedGet(photourl, KIO::NoReload, KIO::HideProgressInfo);
|
||||||
|
kstoredjob->setAutoDelete(false);
|
||||||
mParent->connect(kstoredjob, SIGNAL(finished(KJob*)), SLOT(imageRequestFinished(KJob*)));
|
mParent->connect(kstoredjob, SIGNAL(finished(KJob*)), SLOT(imageRequestFinished(KJob*)));
|
||||||
}
|
}
|
||||||
|
|
||||||
void FlickrProvider::Private::imageRequestFinished(KJob *kjob)
|
void FlickrProvider::Private::imageRequestFinished(KJob *kjob)
|
||||||
{
|
{
|
||||||
KIO::StoredTransferJob *kstoredjob = static_cast<KIO::StoredTransferJob*>(kjob);
|
KIO::StoredTransferJob* kstoredjob = qobject_cast<KIO::StoredTransferJob*>(kjob);
|
||||||
if (kstoredjob->error()) {
|
if (kstoredjob->error()) {
|
||||||
|
kWarning() << "image job error" << kstoredjob->url();
|
||||||
|
kstoredjob->deleteLater();
|
||||||
emit mParent->error(mParent);
|
emit mParent->error(mParent);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -135,6 +142,7 @@ void FlickrProvider::Private::imageRequestFinished(KJob *kjob)
|
||||||
if (mImage.isNull()) {
|
if (mImage.isNull()) {
|
||||||
kWarning() << "null image for" << kstoredjob->url();
|
kWarning() << "null image for" << kstoredjob->url();
|
||||||
}
|
}
|
||||||
|
kstoredjob->deleteLater();
|
||||||
emit mParent->finished(mParent);
|
emit mParent->finished(mParent);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -146,6 +154,7 @@ FlickrProvider::FlickrProvider(QObject *parent, const QVariantList &args)
|
||||||
const KUrl queryurl(s_flickrapiurl + d->mActualDate.toString(Qt::ISODate));
|
const KUrl queryurl(s_flickrapiurl + d->mActualDate.toString(Qt::ISODate));
|
||||||
kDebug() << "starting job for" << queryurl.prettyUrl();
|
kDebug() << "starting job for" << queryurl.prettyUrl();
|
||||||
KIO::StoredTransferJob *kstoredjob = KIO::storedGet(queryurl, KIO::NoReload, KIO::HideProgressInfo);
|
KIO::StoredTransferJob *kstoredjob = KIO::storedGet(queryurl, KIO::NoReload, KIO::HideProgressInfo);
|
||||||
|
kstoredjob->setAutoDelete(false);
|
||||||
connect(kstoredjob, SIGNAL(finished(KJob*)), SLOT(pageRequestFinished(KJob*)));
|
connect(kstoredjob, SIGNAL(finished(KJob*)), SLOT(pageRequestFinished(KJob*)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue