From 26bcbcb86bc45ac9996c663b64c50c552f38e3ef Mon Sep 17 00:00:00 2001 From: Fred Gleason Date: Wed, 23 Sep 2020 14:34:37 -0400 Subject: [PATCH] 2020-09-22 Fred Gleason * Renamed the 'RDFeed::deleteImages()' method to 'RDFeed::removeAllImages()'. --- ChangeLog | 3 +++ lib/rdfeed.cpp | 32 ++++++++------------------------ lib/rdfeed.h | 2 +- rdadmin/list_feeds.cpp | 6 +----- rdadmin/rdadmin_cs.ts | 4 ---- rdadmin/rdadmin_de.ts | 4 ---- rdadmin/rdadmin_es.ts | 4 ---- rdadmin/rdadmin_fr.ts | 4 ---- rdadmin/rdadmin_nb.ts | 4 ---- rdadmin/rdadmin_nn.ts | 4 ---- rdadmin/rdadmin_pt_BR.ts | 4 ---- 11 files changed, 13 insertions(+), 58 deletions(-) diff --git a/ChangeLog b/ChangeLog index de532ffb..735bbe1b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -20312,3 +20312,6 @@ * Incremented the database version to 337. * Added a sanity check to the 'Image Manager' dialog in rdadmin(1) to prevent deletion of in-use images. +2020-09-22 Fred Gleason + * Renamed the 'RDFeed::deleteImages()' method to + 'RDFeed::removeAllImages()'. diff --git a/lib/rdfeed.cpp b/lib/rdfeed.cpp index 0f799b89..524ed301 100644 --- a/lib/rdfeed.cpp +++ b/lib/rdfeed.cpp @@ -1119,36 +1119,20 @@ bool RDFeed::removeImage(int img_id) const } -bool RDFeed::deleteImages(QString *err_msg) +void RDFeed::removeAllImages() { - RDDelete::ErrorCode conv_err=RDDelete::ErrorOk; + QString sql; + RDSqlQuery *q=NULL; - QString sql=QString("select ")+ - "ID,"+ // 00 - "FILE_EXTENSION "+ // 01 + sql=QString("select ")+ + "ID "+ // 00 "from FEED_IMAGES where "+ - "FEED_KEY_NAME=\""+RDEscapeString(keyName())+"\""; - RDSqlQuery *q=new RDSqlQuery(sql); + QString().sprintf("FEED_ID=%u",feed_id); + q=new RDSqlQuery(sql); while(q->next()) { - QString img_url=purgeUrl()+"/"+ - RDFeed::imageFilename(id(),q->value(0).toInt(),q->value(1).toString()); - RDDelete *conv=new RDDelete(rda->config()); - if(!conv->urlIsSupported(img_url)) { - *err_msg="unsupported url scheme"; - delete conv; - return false; - } - conv->setTargetUrl(img_url); - conv_err=conv->runDelete(purgeUsername(),purgePassword(), - rda->station()->sshIdentityFile(), - purgeUseIdFile(), - rda->config()->logXloadDebugData()); - *err_msg=RDDelete::errorText(conv_err); - delete conv; + removeImage(q->value(0).toUInt()); } delete q; - - return conv_err==RDDelete::ErrorOk; } diff --git a/lib/rdfeed.h b/lib/rdfeed.h index e1255a5e..181b1fde 100644 --- a/lib/rdfeed.h +++ b/lib/rdfeed.h @@ -140,7 +140,7 @@ class RDFeed : public QObject bool removeRss(QString *err_msg); bool postImage(int img_id) const; bool removeImage(int img_id) const; - bool deleteImages(QString *err_msg); + void removeAllImages(); unsigned postCut(const QString &cutname,Error *err); unsigned postFile(const QString &srcfile,Error *err); unsigned postLog(const QString &logname,const QTime &start_time, diff --git a/rdadmin/list_feeds.cpp b/rdadmin/list_feeds.cpp index 5540b16e..506e58bb 100644 --- a/rdadmin/list_feeds.cpp +++ b/rdadmin/list_feeds.cpp @@ -262,11 +262,7 @@ void ListFeeds::deleteData() // // Delete Images // - if(!feed->deleteImages(&errs)) { - QMessageBox::warning(this,"RDAdmin - "+tr("Warning"), - tr("Failed to delete remote images.")+ - "["+errs+"]."); - } + feed->removeAllImages(); sql=QString("delete from FEED_IMAGES where ")+ QString().sprintf("FEED_ID=%d",feed->id()); RDSqlQuery::apply(sql); diff --git a/rdadmin/rdadmin_cs.ts b/rdadmin/rdadmin_cs.ts index 319083e7..e5d70a32 100644 --- a/rdadmin/rdadmin_cs.ts +++ b/rdadmin/rdadmin_cs.ts @@ -5192,10 +5192,6 @@ Stále ještě jej chcete smazat? Failed to delete remote feed XML. - - Failed to delete remote images. - - Warning Varování diff --git a/rdadmin/rdadmin_de.ts b/rdadmin/rdadmin_de.ts index 728bf87f..b162eff1 100644 --- a/rdadmin/rdadmin_de.ts +++ b/rdadmin/rdadmin_de.ts @@ -4958,10 +4958,6 @@ Wollen Sie ihn immernoch löschen? Failed to delete remote feed XML. - - Failed to delete remote images. - - Warning diff --git a/rdadmin/rdadmin_es.ts b/rdadmin/rdadmin_es.ts index 5565bbc4..2fac6c1d 100644 --- a/rdadmin/rdadmin_es.ts +++ b/rdadmin/rdadmin_es.ts @@ -5155,10 +5155,6 @@ Do you still want to delete it? Failed to delete remote feed XML. - - Failed to delete remote images. - - Warning Advertencia diff --git a/rdadmin/rdadmin_fr.ts b/rdadmin/rdadmin_fr.ts index ce0dba37..497bc500 100644 --- a/rdadmin/rdadmin_fr.ts +++ b/rdadmin/rdadmin_fr.ts @@ -4104,10 +4104,6 @@ Permissions Failed to delete remote feed XML. - - Failed to delete remote images. - - Warning diff --git a/rdadmin/rdadmin_nb.ts b/rdadmin/rdadmin_nb.ts index 145e30a4..10272475 100644 --- a/rdadmin/rdadmin_nb.ts +++ b/rdadmin/rdadmin_nb.ts @@ -4819,10 +4819,6 @@ Klikk på "Lisens"-knappen for fleire opplysningar. Failed to delete remote feed XML. - - Failed to delete remote images. - - Warning diff --git a/rdadmin/rdadmin_nn.ts b/rdadmin/rdadmin_nn.ts index 145e30a4..10272475 100644 --- a/rdadmin/rdadmin_nn.ts +++ b/rdadmin/rdadmin_nn.ts @@ -4819,10 +4819,6 @@ Klikk på "Lisens"-knappen for fleire opplysningar. Failed to delete remote feed XML. - - Failed to delete remote images. - - Warning diff --git a/rdadmin/rdadmin_pt_BR.ts b/rdadmin/rdadmin_pt_BR.ts index 44a6e34f..abd8353a 100644 --- a/rdadmin/rdadmin_pt_BR.ts +++ b/rdadmin/rdadmin_pt_BR.ts @@ -4942,10 +4942,6 @@ Você ainda quer Deletar? Failed to delete remote feed XML. - - Failed to delete remote images. - - Warning