Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-04-09 22:43:11 +02:00
Code Issues Projects Releases Wiki Activity

2020-12-24 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Modified rdimport(1) so as to send e-mail reports to the address
	of the current Rivendell user in addition to the group's
	Notification E-Mail Address.
	* Modified the Webget service so as to send e-mail reports to the
	address	of the current Rivendell user in addition to the group's
	Notification E-Mail Address.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2020-12-24 12:29:06 -05:00
parent 1ca8339457
commit 0a54812cfa
3 changed files with 38 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -20686,3 +20686,10 @@
* Incremented the package version to 3.4.1int9.
2020-12-12 Fred Gleason <fredg@paravelsystems.com>
* Incremented the package version to 3.5.0.
2020-12-24 Fred Gleason <fredg@paravelsystems.com>
* Modified rdimport(1) so as to send e-mail reports to the address
of the current Rivendell user in addition to the group's
Notification E-Mail Address.
* Modified the Webget service so as to send e-mail reports to the
address of the current Rivendell user in addition to the group's
Notification E-Mail Address.

14
utils/rdimport/journal.cpp
View File

@ -39,6 +39,9 @@ void Journal::addSuccess(const QString &groupname,QString filename,
RDGroup *group=new RDGroup(groupname);
QStringList addrs=
group->notifyEmailAddress().split(",",QString::SkipEmptyParts);
if(!rda->user()->emailAddress().isEmpty()) {
addrs.push_back(rda->user()->emailAddress());
}
if(addrs.size()>0) {
filename=filename.split("/",QString::SkipEmptyParts).last();
@ -86,6 +89,9 @@ void Journal::addFailure(const QString &groupname,QString filename,
RDGroup *group=new RDGroup(groupname);
QStringList addrs=
group->notifyEmailAddress().split(",",QString::SkipEmptyParts);
if(!rda->user()->emailAddress().isEmpty()) {
addrs.push_back(rda->user()->emailAddress());
}
if(addrs.size()>0) {
filename=filename.split("/",QString::SkipEmptyParts).last();
@ -142,6 +148,10 @@ void Journal::sendAll()
QString from_addr;
QStringList to_addrs;
if(!rda->user()->emailAddress().isEmpty()) {
to_addrs.push_back(rda->user()->emailAddress());
}
from_addr=rda->system()->originEmailAddress();
to_addrs=it.key().split(",",QString::SkipEmptyParts);
subject=QObject::tr("Rivendell import report")+"\n";
@ -188,6 +198,10 @@ void Journal::sendAll()
from_addr=rda->system()->originEmailAddress();
to_addrs=it.key().split(",",QString::SkipEmptyParts);
if(!rda->user()->emailAddress().isEmpty()) {
to_addrs.push_back(rda->user()->emailAddress());
}
subject=QObject::tr("Rivendell import FAILURE report")+"\n";
body+=QObject::tr("Rivendell File Import FAILURE Report")+"\n";

20
web/webget/webget.cpp
View File

@ -417,6 +417,17 @@ void MainObject::PutAudio()
f1.removeLast();
QString title=f1.join(".");
//
// Generate destination e-mail addresses
//
QStringList to_addrs;
if(!group->notifyEmailAddress().isEmpty()) {
to_addrs.push_back(group->notifyEmailAddress());
}
if(!rda->user()->emailAddress().isEmpty()) {
to_addrs.push_back(rda->user()->emailAddress());
}
//
// Validate title uniqueness
//
@ -442,9 +453,12 @@ void MainObject::PutAudio()
short_name.toUtf8().constData(),
rda->user()->name().toUtf8().constData(),
webget_post->clientAddress().toString().toUtf8().constData());
RDSendMail(&err_msg,tr("Rivendell import FAILURE for file: ")+short_name,
body,rda->system()->originEmailAddress(),
group->notifyEmailAddress());
if(to_addrs.size()>0) {
RDSendMail(&err_msg,tr("Rivendell import FAILURE for file: ")+
short_name,body,rda->system()->originEmailAddress(),
to_addrs);
//group->notifyEmailAddress());
}
TextExit(tr("Audio import failed: title already exists!"),400,
LINE_NUMBER);
}