Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-16 15:41:13 +02:00
Code Issues Projects Releases Wiki Activity

2023-05-14 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Added a 'FEEDS.CDN_PURGE_PLUGIN_PATH' field to the database.
	* Incremented the database version to 369.
	* Added ' RDFeed::cdnPurgePluginPath()' and
	'RDFeed::setCdnPurgePluginPath()' methods.
	* Removed the RD_MODULES_DIR #define from 'lib/rd.h'.
	* Changed the RD_PYPAD_SCRIPT_DIR #define in 'lib/rd.h' to be
	a static value of "/usr/lib/rivendell/pypad".
	* Added a 'CDN Purge Plug-In' control to the 'Feed' dialog in
	rdadmin(1).

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2023-05-14 08:56:49 -04:00
parent 7716315bd9
commit ff63adcf3c
21 changed files with 972 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
web/rdxport/podcasts.cpp
View File

@@ -26,6 +26,9 @@
#include <curl/curl.h>
#include <QProcess>
#include <QProcessEnvironment>
#include <rdapplication.h>
#include <rdconf.h>
#include <rddelete.h>
@@ -575,6 +578,22 @@ bool Xport::PostRssElemental(RDFeed *feed,const QDateTime &now,QString *err_msg)
}
curl_easy_cleanup(curl);
//
// Cache Management
//
rda->syslog(LOG_NOTICE,"CDN1");
if(ret) {
QString cdn_script=feed->cdnPurgePluginPath();
rda->syslog(LOG_NOTICE,"CDN2 script: %s",
cdn_script.toUtf8().constData());
if(!cdn_script.isEmpty()) {
rda->syslog(LOG_NOTICE,"CDN3");
QStringList args;
args.push_back(RDFeed::publicUrl(feed->baseUrl(""),feed->keyName()));
RunCdnScript(cdn_script,args);
}
}
return ret;
}
@@ -871,3 +890,35 @@ void Xport::RemoveImage() // Remove podcast image from the remote archive
Exit(0);
}
void Xport::RunCdnScript(const QString &cmd,const QStringList &args)
{
QStringList f0=cmd.split("/",QString::KeepEmptyParts);
f0.removeLast();
QProcess *proc=new QProcess(this);
QProcessEnvironment env=QProcessEnvironment::systemEnvironment();
QString path=env.value("PATH");
env.remove("PATH");
env.insert("PATH",f0.join("/")+":"+path);
proc->setEnvironment(env.toStringList());
proc->start(cmd,args);
proc->waitForFinished();
if(proc->exitStatus()!=QProcess::NormalExit) {
rda->syslog(LOG_WARNING,"cdn script \"%s\" crashed",
(cmd+" "+args.join(" ")).toUtf8().constData());
}
else {
if(proc->exitCode()!=0) {
rda->syslog(LOG_WARNING,"cdn script \"%s\" returned exit code %d [%s]",
(cmd+" "+args.join(" ")).toUtf8().constData(),
proc->exitCode(),
proc->readAllStandardError().constData());
}
else {
rda->syslog(LOG_DEBUG,"ran cdn script \"%s\"",
(cmd+" "+args.join(" ")).toUtf8().constData());
}
}
delete proc;
}

1
web/rdxport/rdxport.h
View File

@@ -94,6 +94,7 @@ class Xport : public QObject
void RemoveRss();
void PostImage();
void RemoveImage();
void RunCdnScript(const QString &cmd,const QStringList &args);
void LockLog();
QString LogLockXml(bool result,const QString &log_name,const QString &guid,
const QString &username,const QString &stationname,