Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-05-30 15:42:34 +02:00
Code Issues Projects Releases Wiki Activity

Fixed conflict in 'ChangeLog'

Browse Source
This commit is contained in:
Fred Gleason 2020-12-09 11:44:24 -05:00
commit fb78003a32
2 changed files with 74 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -20667,3 +20667,7 @@
* Refactored rdimport(1) to allow detection of duplicate titles. * Refactored rdimport(1) to allow detection of duplicate titles.
2020-12-09 Fred Gleason <fredg@paravelsystems.com> 2020-12-09 Fred Gleason <fredg@paravelsystems.com>
* Reverted changed from 2020-12-09. * Reverted changed from 2020-12-09.
2020-12-09 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in the 'Webget' service that caused it to automatically
unique-ify the title even when 'Auto-Correct Duplicate Cart Titles'
in rdadmin(1) was unchecked.

72
web/webget/webget.cpp
View File

@ -33,6 +33,8 @@
#include <rdapplication.h> #include <rdapplication.h>
#include <rdescape_string.h> #include <rdescape_string.h>
#include <rdgroup.h>
#include <rdsendmail.h>
#include <rdweb.h> #include <rdweb.h>
#include "webget.h" #include "webget.h"
@ -341,6 +343,14 @@ void MainObject::GetAudio()
void MainObject::PutAudio() void MainObject::PutAudio()
{ {
QString sql;
RDSqlQuery *q=NULL;
QString err_msg;
RDGroup *group;
//
// Verify permissions
//
if(!rda->user()->createCarts()) { if(!rda->user()->createCarts()) {
rda->syslog(LOG_WARNING,"user \"%s\" lacks CreateCarts permission", rda->syslog(LOG_WARNING,"user \"%s\" lacks CreateCarts permission",
rda->user()->name().toUtf8().constData()); rda->user()->name().toUtf8().constData());
@ -356,6 +366,9 @@ void MainObject::PutAudio()
Exit(0); Exit(0);
} }
//
// Get user values
//
QString group_name; QString group_name;
if(!webget_post->getValue("group",&group_name)) { if(!webget_post->getValue("group",&group_name)) {
rda->syslog(LOG_WARNING,"missing \"group\" in put submission"); rda->syslog(LOG_WARNING,"missing \"group\" in put submission");
@ -371,6 +384,14 @@ void MainObject::PutAudio()
ServeLogin(403); ServeLogin(403);
Exit(0); Exit(0);
} }
group=new RDGroup(group_name);
if(!group->exists()) {
rda->syslog(LOG_WARNING,"group \"%s\" does not exist",
group_name.toUtf8().constData());
rda->logAuthenticationFailure(webget_post->clientAddress());
ServeLogin(403);
Exit(0);
}
QString filename; QString filename;
if(!webget_post->getValue("filename",&filename)) { if(!webget_post->getValue("filename",&filename)) {
@ -387,6 +408,52 @@ void MainObject::PutAudio()
Exit(0); Exit(0);
} }
//
// Generate Title
//
QStringList f0=filename.split("/",QString::SkipEmptyParts);
QStringList f1=f0.last().split(".",QString::KeepEmptyParts);
QString short_name=f0.last();
f1.removeLast();
QString title=f1.join(".");
//
// Validate title uniqueness
//
if((!rda->system()->allowDuplicateCartTitles())&&
(!rda->system()->fixDuplicateCartTitles())) {
sql=QString("select ")+
"NUMBER "+ // 00
"from CART where "+
"TITLE=\""+RDEscapeString(title)+"\"";
q=new RDSqlQuery(sql);
if(q->first()) {
QString body;
body+="Rivendell File Import Report\n";
body+="\n";
body+="IMPORT FAILED!\n";
body+="\n";
body+="Filename: "+short_name+"\n";
body+="Submitted by: "+rda->user()->emailContact()+"\n";
body+="Group: "+group_name+"\n";
body+="Reason: Title exists\n";
rda->syslog(LOG_WARNING,
"failed import of file \"%s\" from \"%s\" at %s, title already exists",
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());
TextExit(tr("Audio import failed: title already exists!"),400,
LINE_NUMBER);
}
delete q;
}
//
// Import audio
//
QStringList args; QStringList args;
args.push_back(QString("--ticket=")+webget_ticket+":"+ args.push_back(QString("--ticket=")+webget_ticket+":"+
@ -397,6 +464,7 @@ void MainObject::PutAudio()
args.push_back("--to-mono"); args.push_back("--to-mono");
} }
args.push_back("--output-pattern=Added cart %n [%t]"); args.push_back("--output-pattern=Added cart %n [%t]");
args.push_back("--set-string-title="+title);
args.push_back(group_name); args.push_back(group_name);
args.push_back(filename); args.push_back(filename);
QProcess *proc=new QProcess(this); QProcess *proc=new QProcess(this);
@ -447,8 +515,8 @@ void MainObject::PutAudio()
} }
QString resultstr=proc->readAllStandardOutput(); QString resultstr=proc->readAllStandardOutput();
rda->syslog(LOG_INFO,"%s from user %s at %s", rda->syslog(LOG_INFO,"%s from user \"%s\" at %s",
resultstr.toUtf8().constData(), resultstr.trimmed().toUtf8().constData(),
rda->user()->name().toUtf8().constData(), rda->user()->name().toUtf8().constData(),
webget_post->clientAddress().toString().toUtf8().constData()); webget_post->clientAddress().toString().toUtf8().constData());
TextExit(resultstr.toUtf8().constData(),200,LINE_NUMBER); TextExit(resultstr.toUtf8().constData(),200,LINE_NUMBER);