diff --git a/dataengines/potd/flickrprovider.cpp b/dataengines/potd/flickrprovider.cpp index 6a05fa1e9..a7ddc89aa 100644 --- a/dataengines/potd/flickrprovider.cpp +++ b/dataengines/potd/flickrprovider.cpp @@ -1,155 +1,190 @@ /* * Copyright (C) 2007 Tobias Koenig * Copyright 2008 by Anne-Marie Mahfouf * Copyright 2008 by Georges Toth * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details * * You should have received a copy of the GNU Library General Public * License along with this program; if not, write to the * Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "flickrprovider.h" #include #include #include #include #include #define FLICKR_API_KEY "11829a470557ad8e10b02e80afacb3af" class FlickrProvider::Private { public: Private( FlickrProvider *parent ) : mParent( parent ) { qsrand(QTime(0,0,0).secsTo(QTime::currentTime())); } + QUrl buildUrl(const QDate &date) { + QUrl url(QLatin1String( "https://api.flickr.com/services/rest/")); + url.addQueryItem("api_key", FLICKR_API_KEY); + url.addQueryItem("method", "flickr.interestingness.getList"); + url.addQueryItem("date", date.toString( Qt::ISODate ) ); + // url_o might be either too small or too large. + url.addQueryItem("extras", "url_k,url_h,url_o"); + + return url; + } + void pageRequestFinished( KJob* ); void imageRequestFinished( KJob* ); void parsePage(); FlickrProvider *mParent; QDate mActualDate; QImage mImage; QXmlStreamReader xml; + int mFailureNumber = 0; + private: QStringList m_photoList; }; void FlickrProvider::Private::pageRequestFinished( KJob *_job ) { KIO::StoredTransferJob *job = static_cast( _job ); if (job->error()) { emit mParent->error( mParent ); qDebug() << "pageRequestFinished error"; return; } const QString data = QString::fromUtf8( job->data() ); // Clear the list m_photoList.clear(); xml.clear(); xml.addData(data); while (!xml.atEnd()) { xml.readNext(); if (xml.isStartElement()) { + auto attributes = xml.attributes(); if (xml.name() == "rsp") { + const int maxFailure = 5; /* no pictures available for the specified parameters */ - if (xml.attributes().value ( QLatin1String( "stat" ) ).toString() == QLatin1String( "fail" ) ) { - /* To be sure, decrement the date to two days earlier... @TODO */ - mActualDate = mActualDate.addDays(-2); - - QUrl url(QLatin1String( "https://api.flickr.com/services/rest/")); - url.addQueryItem("api_key", FLICKR_API_KEY); - url.addQueryItem("method", "flickr.interestingness.getList"); - url.addQueryItem("date", mActualDate.toString(Qt::ISODate)); - KIO::StoredTransferJob *pageJob = KIO::storedGet(url, KIO::NoReload, KIO::HideProgressInfo); - mParent->connect( pageJob, SIGNAL(finished(KJob*)), SLOT(pageRequestFinished(KJob*)) ); - return; + if (attributes.value ( QLatin1String( "stat" ) ).toString() != QLatin1String( "ok" )) { + if (mFailureNumber < maxFailure) { + /* To be sure, decrement the date to two days earlier... @TODO */ + mActualDate = mActualDate.addDays(-2); + QUrl url = buildUrl(mActualDate); + KIO::StoredTransferJob *pageJob = KIO::storedGet(url, KIO::NoReload, KIO::HideProgressInfo); + mParent->connect( pageJob, SIGNAL(finished(KJob*)), SLOT(pageRequestFinished(KJob*)) ); + mFailureNumber++; + return; + } else { + emit mParent->error(mParent); + qDebug() << "pageRequestFinished error"; + return; + } } } else if (xml.name() == QLatin1String( "photo" )) { - if (xml.attributes().value ( QLatin1String( "ispublic" ) ).toString() != QLatin1String( "1" )) - continue; + if (attributes.value ( QLatin1String( "ispublic" ) ).toString() != QLatin1String( "1" )) { + continue; + } - QString fileUrl = QString(QLatin1String( "http://farm" ) + xml.attributes().value ( QLatin1String( "farm" ) ).toString() + QLatin1String( ".static.flickr.com/" ) - + xml.attributes().value ( QLatin1String( "server" ) ).toString() + QLatin1Char( '/' ) + xml.attributes().value ( QLatin1String( "id" ) ).toString() - + QLatin1Char( '_' ) + xml.attributes().value ( QLatin1String( "secret" ) ).toString() + QLatin1String( ".jpg" )); + const char *fallbackList[] = { + "url_k", "url_h" + }; + + bool found = false; + for (auto urlAttr : fallbackList) { + // Get the best url. + QLatin1String urlAttrString(urlAttr); + if (attributes.hasAttribute(urlAttrString)) { + m_photoList.append(attributes.value(urlAttrString).toString()); + found = true; + break; + } + } - m_photoList.append(fileUrl); + // The logic here is, if url_h or url_k are present, url_o must + // has higher quality, otherwise, url_o is worse than k/h size. + // If url_o is better, prefer url_o. + if (found) { + QLatin1String originAttr("url_o"); + if (attributes.hasAttribute(originAttr)) { + m_photoList.back() = attributes.value(QLatin1String(originAttr)).toString(); + } + } } } } if (xml.error() && xml.error() != QXmlStreamReader::PrematureEndOfDocumentError) { qWarning() << "XML ERROR:" << xml.lineNumber() << ": " << xml.errorString(); } if (m_photoList.begin() != m_photoList.end()) { QUrl url( m_photoList.at(qrand() % m_photoList.size()) ); KIO::StoredTransferJob *imageJob = KIO::storedGet(url, KIO::NoReload, KIO::HideProgressInfo); mParent->connect( imageJob, SIGNAL(finished(KJob*)), SLOT(imageRequestFinished(KJob*)) ); } else { qDebug() << "empty list"; } } void FlickrProvider::Private::imageRequestFinished( KJob *_job ) { KIO::StoredTransferJob *job = static_cast( _job ); if ( job->error() ) { emit mParent->error( mParent ); return; } mImage = QImage::fromData( job->data() ); emit mParent->finished( mParent ); } FlickrProvider::FlickrProvider( QObject *parent, const QVariantList &args ) : PotdProvider( parent, args ), d( new Private( this ) ) { d->mActualDate = date(); - QUrl url(QLatin1String( "https://api.flickr.com/services/rest/")); - url.addQueryItem("api_key", FLICKR_API_KEY); - url.addQueryItem("method", "flickr.interestingness.getList"); - url.addQueryItem("date", date().toString( Qt::ISODate ) ); + QUrl url = d->buildUrl(date()); KIO::StoredTransferJob *job = KIO::storedGet( url, KIO::NoReload, KIO::HideProgressInfo ); connect( job, SIGNAL(finished(KJob*)), SLOT(pageRequestFinished(KJob*)) ); } FlickrProvider::~FlickrProvider() { delete d; } QImage FlickrProvider::image() const { return d->mImage; } K_PLUGIN_FACTORY_WITH_JSON(FlickrProviderFactory, "flickrprovider.json", registerPlugin();) #include "moc_flickrprovider.cpp" #include "flickrprovider.moc"