Katana_mirror/kde-extraapps
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-extraapps.git synced 2025-02-23 18:32:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kdeplasma-addons: pass the data size to QString constructor in ApodProvider::Private::pageRequestFinished() and EpodProvider::Private::pageRequestFinished()

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2023-08-30 21:49:01 +03:00
parent 8feb5359d4
commit e24e22a4af
2 changed files with 56 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
kdeplasma-addons/dataengines/potd/apodprovider.cpp
View file

@ -26,65 +26,67 @@
#include <KDebug> #include <KDebug>
#include <kio/job.h> #include <kio/job.h>
POTDPROVIDER_EXPORT_PLUGIN( ApodProvider, "ApodProvider", "" ) POTDPROVIDER_EXPORT_PLUGIN(ApodProvider, "ApodProvider", "")
class ApodProvider::Private class ApodProvider::Private
{ {
public: public:
Private( ApodProvider *parent ) Private(ApodProvider *parent)
: mParent( parent ) : mParent(parent)
{ {
} }
void pageRequestFinished( KJob* ); void pageRequestFinished(KJob*);
void imageRequestFinished( KJob* ); void imageRequestFinished(KJob*);
void parsePage(); void parsePage();
ApodProvider *mParent; ApodProvider *mParent;
QImage mImage; QImage mImage;
}; };
void ApodProvider::Private::pageRequestFinished( KJob *_job ) void ApodProvider::Private::pageRequestFinished(KJob *_job)
{ {
KIO::StoredTransferJob *job = static_cast<KIO::StoredTransferJob *>( _job ); KIO::StoredTransferJob *job = static_cast<KIO::StoredTransferJob*>(_job);
if ( job->error() ) { if (job->error()) {
emit mParent->error( mParent ); emit mParent->error(mParent);
return; return;
} }
const QString data = QString::fromUtf8( job->data() ); const QByteArray jobdata = job->data();
const QString data = QString::fromUtf8(jobdata.constData(), jobdata.size());
const QString pattern( QLatin1String( "<a href=\"(image/.*)\"" ) ); const QString pattern(QLatin1String("<a href=\"(image/.*)\""));
QRegExp exp( pattern ); QRegExp exp( pattern );
exp.setMinimal( true ); exp.setMinimal(true);
if ( exp.indexIn( data ) != -1 ) { if (exp.indexIn(data) != -1) {
const QString sub = exp.cap(1); const QString sub = exp.cap(1);
KUrl url( QString( QLatin1String( "https://antwrp.gsfc.nasa.gov/apod/%1" ) ).arg( sub ) ); KUrl url(QString::fromLatin1("https://antwrp.gsfc.nasa.gov/apod/%1").arg(sub));
KIO::StoredTransferJob *imageJob = KIO::storedGet( url, KIO::NoReload, KIO::HideProgressInfo ); KIO::StoredTransferJob *imageJob = KIO::storedGet(url, KIO::NoReload, KIO::HideProgressInfo);
mParent->connect( imageJob, SIGNAL(finished(KJob*)), SLOT(imageRequestFinished(KJob*)) ); mParent->connect(imageJob, SIGNAL(finished(KJob*)), SLOT(imageRequestFinished(KJob*)));
} else { } else {
emit mParent->error( mParent ); emit mParent->error(mParent);
} }
} }
void ApodProvider::Private::imageRequestFinished( KJob *_job ) void ApodProvider::Private::imageRequestFinished(KJob *_job )
{ {
KIO::StoredTransferJob *job = static_cast<KIO::StoredTransferJob *>( _job ); KIO::StoredTransferJob *job = static_cast<KIO::StoredTransferJob*>(_job);
if ( job->error() ) { if (job->error()) {
emit mParent->error( mParent ); emit mParent->error(mParent);
return; return;
} }
mImage = QImage::fromData( job->data() ); mImage = QImage::fromData(job->data());
emit mParent->finished( mParent ); emit mParent->finished( mParent );
} }
ApodProvider::ApodProvider( QObject *parent, const QVariantList &args ) ApodProvider::ApodProvider(QObject *parent, const QVariantList &args)
: PotdProvider( parent, args ), d( new Private( this ) ) : PotdProvider(parent, args),
d(new Private(this))
{ {
KUrl url( QLatin1String( "https://antwrp.gsfc.nasa.gov/apod/" ) ); KUrl url(QString::fromLatin1("https://antwrp.gsfc.nasa.gov/apod/"));
KIO::StoredTransferJob *job = KIO::storedGet( url, KIO::NoReload, KIO::HideProgressInfo ); KIO::StoredTransferJob *job = KIO::storedGet(url, KIO::NoReload, KIO::HideProgressInfo);
connect( job, SIGNAL(finished(KJob*)), SLOT(pageRequestFinished(KJob*)) ); connect(job, SIGNAL(finished(KJob*)), SLOT(pageRequestFinished(KJob*)));
} }
ApodProvider::~ApodProvider() ApodProvider::~ApodProvider()

48
kdeplasma-addons/dataengines/potd/epodprovider.cpp
View file

@ -26,13 +26,13 @@
#include <KDebug> #include <KDebug>
#include <kio/job.h> #include <kio/job.h>
POTDPROVIDER_EXPORT_PLUGIN( EpodProvider, "EpodProvider", "" ) POTDPROVIDER_EXPORT_PLUGIN(EpodProvider, "EpodProvider", "")
class EpodProvider::Private class EpodProvider::Private
{ {
public: public:
Private( EpodProvider *parent ) Private(EpodProvider *parent)
: mParent( parent ) : mParent(parent)
{ {
} }
@ -46,45 +46,47 @@ class EpodProvider::Private
void EpodProvider::Private::pageRequestFinished(KJob *_job) void EpodProvider::Private::pageRequestFinished(KJob *_job)
{ {
KIO::StoredTransferJob *job = static_cast<KIO::StoredTransferJob *>(_job); KIO::StoredTransferJob *job = static_cast<KIO::StoredTransferJob*>(_job);
if ( job->error() ) { if (job->error()) {
emit mParent->error( mParent ); emit mParent->error(mParent);
return; return;
} }
const QString data = QString::fromUtf8( job->data() ); const QByteArray jobdata = job->data();
const QString data = QString::fromUtf8(jobdata.constData(), jobdata.size());
const QString pattern( QLatin1String( "https://epod.usra.edu/.a/*-pi" ) ); const QString pattern( QLatin1String("https://epod.usra.edu/.a/*-pi"));
QRegExp exp( pattern ); QRegExp exp( pattern );
exp.setPatternSyntax(QRegExp::Wildcard); exp.setPatternSyntax(QRegExp::Wildcard);
int pos = exp.indexIn( data ) + pattern.length(); int pos = exp.indexIn( data ) + pattern.length();
const QString sub = data.mid( pos-4, pattern.length()+5); const QString sub = data.mid(pos - 4, pattern.length() + 5);
KUrl url( QString::fromLatin1("https://epod.usra.edu/.a/%1-pi" ) .arg(sub) ); KUrl url(QString::fromLatin1("https://epod.usra.edu/.a/%1-pi").arg(sub));
kDebug() << "url" << url.prettyUrl(); kDebug() << "url" << url.prettyUrl();
KIO::StoredTransferJob *imageJob = KIO::storedGet( url, KIO::NoReload, KIO::HideProgressInfo ); KIO::StoredTransferJob *imageJob = KIO::storedGet(url, KIO::NoReload, KIO::HideProgressInfo );
QObject::connect(imageJob, SIGNAL(finished(KJob*)), mParent, SLOT(imageRequestFinished(KJob*)) ); QObject::connect(imageJob, SIGNAL(finished(KJob*)), mParent, SLOT(imageRequestFinished(KJob*)) );
} }
void EpodProvider::Private::imageRequestFinished( KJob *_job) void EpodProvider::Private::imageRequestFinished( KJob *_job)
{ {
KIO::StoredTransferJob *job = static_cast<KIO::StoredTransferJob *>(_job); KIO::StoredTransferJob *job = static_cast<KIO::StoredTransferJob*>(_job);
if ( job->error() ) { if (job->error()) {
emit mParent->error( mParent ); emit mParent->error(mParent);
return; return;
} }
mImage = QImage::fromData( job->data() ); mImage = QImage::fromData(job->data());
emit mParent->finished( mParent ); emit mParent->finished(mParent);
} }
EpodProvider::EpodProvider( QObject *parent, const QVariantList &args ) EpodProvider::EpodProvider(QObject *parent, const QVariantList &args)
: PotdProvider( parent, args ), d( new Private( this ) ) : PotdProvider(parent, args),
d(new Private(this))
{ {
KUrl url( QLatin1String( "https://epod.usra.edu/blog/" ) ); KUrl url(QLatin1String("https://epod.usra.edu/blog/"));
KIO::StoredTransferJob *job = KIO::storedGet( url, KIO::NoReload, KIO::HideProgressInfo ); KIO::StoredTransferJob *job = KIO::storedGet(url, KIO::NoReload, KIO::HideProgressInfo);
connect( job, SIGNAL(finished(KJob*)), SLOT(pageRequestFinished(KJob*)) ); connect(job, SIGNAL(finished(KJob*)), SLOT(pageRequestFinished(KJob*)));
} }
EpodProvider::~EpodProvider() EpodProvider::~EpodProvider()