Differential D5729 Diff 14202 dataengines/potd/natgeoprovider.cpp

Changeset View

Standalone View

dataengines/potd/natgeoprovider.cpp

Context not available.
23		23
24	#include <QtCore/QRegExp>	24		#include <QtCore/QRegExp>
25	#include <QtGui/QImage>	25		#include <QtGui/QImage>
26	#include <QXmlStreamReader>	26		#include <QRegularExpression>
27		27
28	#include <QDebug>	28		#include <QDebug>
29	#include <KIO/Job>	29		#include <KIO/Job>
Context not available.
42	NatGeoProvider *mParent;	42		NatGeoProvider *mParent;
43	QImage mImage;	43		QImage mImage;
44		44
45	QXmlStreamReader mXmlReader;	45		QRegularExpression re;
46	};	46		};
47		47
48	void NatGeoProvider::Private::pageRequestFinished( KJob* _job )	48		void NatGeoProvider::Private::pageRequestFinished( KJob* _job )
Context not available.
54	}	54		}
55		55
56	const QString data = QString::fromUtf8( job->data() );	56		const QString data = QString::fromUtf8( job->data() );
57		57		const QStringList lines = data.split('\n');
58	mXmlReader.clear();
59	mXmlReader.addData(data);
60		58
61	QString url;	59		QString url;
62	while (!mXmlReader.atEnd()) {	60
63	mXmlReader.readNext();	61		re.setPattern("^<meta\\s+property=\"og:image\"\\s+content=\"(.)\"./>$");
			vitaliAuthorUnsubmitted Not Done An alternative regex may be `"^<meta\\s.property=\"og:image\"\\s.content=\"(.)\"./>$"`, so to match any possible future fields before `property`, and between `property` and `content`. vitali: An alternative regex may be `"^<meta\\s.property=\"og:image\"\\s.content=\"(.)\"./>$"`, so…
64		62
65	if (mXmlReader.isStartElement() && mXmlReader.name() == QLatin1String( "meta" )) {	63		for (int i = 0; i < lines.size(); i++) {
66	const auto attrs = mXmlReader.attributes();	64		QRegularExpressionMatch match = re.match(lines.at(i).toLocal8Bit().constData());
67	if (attrs.value(QLatin1String("property")).toString() == QLatin1String("og:image")) {	65		if (match.hasMatch()) {
68	url = attrs.value(QLatin1String("content")).toString();	66		url = match.captured(1);
69	break;
70	}
71	}	67		}
72	}	68		}
73		69
Context not available.
97	NatGeoProvider::NatGeoProvider( QObject *parent, const QVariantList &args )	93		NatGeoProvider::NatGeoProvider( QObject *parent, const QVariantList &args )
98	: PotdProvider( parent, args ), d( new Private( this ) )	94		: PotdProvider( parent, args ), d( new Private( this ) )
99	{	95		{
100	const QUrl url( QLatin1String( "https://www.nationalgeographic.com/photography/photo-of-the-day" ) );	96		const QUrl url( QLatin1String( "http://www.nationalgeographic.com/photography/photo-of-the-day/" ) );
			sebasUnsubmitted Not Done Why this change? Moving away from https to http seems backward... sebas: Why this change? Moving away from https to http seems backward...
			vitaliAuthorUnsubmitted Not Done The versions with https or without the trailing slash were not working for me, so I changed it to that one, but it could as well be just be my mistake. vitali: The versions with https or without the trailing slash were not working for me, so I changed it…
			ZrenUnsubmitted Not Done The https redirects to http (HTTP 302 temp move), then redirects to add the trailing slash (HTTP 301 Perm Move). Zren: The https redirects to http (HTTP 302 temp move), then redirects to add the trailing slash…
101	KIO::StoredTransferJob *job = KIO::storedGet( url, KIO::NoReload, KIO::HideProgressInfo );	97		KIO::StoredTransferJob *job = KIO::storedGet( url, KIO::NoReload, KIO::HideProgressInfo );
102	connect( job, &KIO::StoredTransferJob::finished, this, [this] (KJob *job) {	98		connect( job, &KIO::StoredTransferJob::finished, this, [this] (KJob *job) {
103	d->pageRequestFinished(job);	99		d->pageRequestFinished(job);
Context not available.