Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-11-26 15:20:29 +01:00
Code Issues Projects Releases Wiki Activity

2017-10-14 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Implemented a '%r' wildcard for Rivendell Host Name.
This commit is contained in:
Fred Gleason
2017-10-14 10:38:55 -04:00
parent 162ebe545b
commit fb9487810b
43 changed files with 211 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rdlogmanager/commandline_ops.cpp
View File

@@ -77,13 +77,14 @@ int RunLogOperation(int argc,char *argv[],const QString &svcname,
#ifndef WIN32
rduser=new RDUser(rdstation_conf->defaultName());
#endif // WIN32
RDSvc *svc=new RDSvc(svcname);
RDSvc *svc=new RDSvc(svcname,config);
if(!svc->exists()) {
fprintf(stderr,"rdlogmanager: no such service\n");
return 256;
}
QDate start_date=QDate::currentDate().addDays(1+start_offset);
QString logname=RDDateDecode(svc->nameTemplate(),start_date,svc->name());
QString logname=
RDDateDecode(svc->nameTemplate(),start_date,config,svc->name());
RDLog *log=new RDLog(logname);
//
@@ -107,9 +108,9 @@ int RunLogOperation(int argc,char *argv[],const QString &svcname,
delete q;
if(!svc->generateLog(start_date,
RDDateDecode(svc->nameTemplate(),start_date,
svc->name()),
config,svc->name()),
RDDateDecode(svc->nameTemplate(),start_date.addDays(1),
svc->name()),
config,svc->name()),
&unused_report)) {
fprintf(stderr,"rdlogmanager: unable to generate log\n");
return 256;
@@ -234,7 +235,7 @@ int RunReportOperation(int argc,char *argv[],const QString &rptname,
//
// Open Report Generator
//
RDReport *report=new RDReport(rptname);
RDReport *report=new RDReport(rptname,config);
if(!report->exists()) {
fprintf(stderr,"rdlogmanager: no such report\n");
return 256;

25
rdlogmanager/generate_log.cpp
View File

@@ -306,9 +306,9 @@ void GenerateLog::createData()
//
// Generate Log
//
RDSvc *svc=new RDSvc(gen_service_box->currentText(),this);
RDSvc *svc=new RDSvc(gen_service_box->currentText(),log_config,this);
QString logname=RDDateDecode(svc->nameTemplate(),gen_date_edit->date(),
svc->name());
log_config,svc->name());
RDLog *log=new RDLog(logname);
if(log->exists()) {
str1=QString(tr("The log for"));
@@ -363,9 +363,10 @@ void GenerateLog::createData()
gen_progress_dialog,SLOT(setProgress(int)));
svc->generateLog(gen_date_edit->date(),
RDDateDecode(svc->nameTemplate(),gen_date_edit->date(),
svc->name()),
log_config,svc->name()),
RDDateDecode(svc->nameTemplate(),gen_date_edit->date().
addDays(1),svc->name()),&unused_report);
addDays(1),log_config,svc->name()),
&unused_report);
log->updateTracks();
delete log;
delete svc;
@@ -393,9 +394,9 @@ void GenerateLog::musicData()
{
unsigned tracks=0;
RDSvc *svc=new RDSvc(gen_service_box->currentText(),this);
RDSvc *svc=new RDSvc(gen_service_box->currentText(),log_config,this);
QString logname=RDDateDecode(svc->nameTemplate(),gen_date_edit->date(),
svc->name());
log_config,svc->name());
RDLog *log=new RDLog(logname);
if(((log->linkState(RDLog::SourceMusic)==RDLog::LinkDone)||
(log->linkState(RDLog::SourceTraffic)==RDLog::LinkDone))) {
@@ -445,9 +446,9 @@ void GenerateLog::musicData()
void GenerateLog::trafficData()
{
RDSvc *svc=new RDSvc(gen_service_box->currentText(),this);
RDSvc *svc=new RDSvc(gen_service_box->currentText(),log_config,this);
QString logname=RDDateDecode(svc->nameTemplate(),gen_date_edit->date(),
svc->name());
log_config,svc->name());
RDLog *log=new RDLog(logname);
if((log->linkState(RDLog::SourceTraffic)==RDLog::LinkDone)) {
QString str1=QString(tr("The log for"));
@@ -480,9 +481,9 @@ void GenerateLog::trafficData()
void GenerateLog::fileScanData()
{
RDSvc *svc=new RDSvc(gen_service_box->currentText(),this);
RDSvc *svc=new RDSvc(gen_service_box->currentText(),log_config,this);
QString logname=RDDateDecode(svc->nameTemplate(),gen_date_edit->date(),
svc->name());
log_config,svc->name());
RDLog *log=new RDLog(logname);
if(gen_music_enabled) {
if(QFile::exists(svc->
@@ -549,9 +550,9 @@ void GenerateLog::resizeEvent(QResizeEvent *e)
void GenerateLog::UpdateControls()
{
RDSvc *svc=new RDSvc(gen_service_box->currentText(),this);
RDSvc *svc=new RDSvc(gen_service_box->currentText(),log_config,this);
QString logname=RDDateDecode(svc->nameTemplate(),gen_date_edit->date(),
svc->name());
log_config,svc->name());
RDLog *log=new RDLog(logname);
if(log->exists()) {
if(log->linkQuantity(RDLog::SourceMusic)>0) {

12
rdlogmanager/pick_report_dates.cpp
View File

@@ -178,7 +178,7 @@ void PickReportDates::generateData()
tr("The end date cannot be earlier than the start date!"));
return;
}
RDReport *report=new RDReport(edit_report_box->currentText(),this);
RDReport *report=new RDReport(edit_report_box->currentText(),log_config,this);
if((edit_startdate_edit->date()!=edit_enddate_edit->date())&&
(!RDReport::multipleDaysAllowed(report->filter()))) {
QMessageBox::warning(this,tr("Invalid Date Range"),
@@ -194,11 +194,13 @@ void PickReportDates::generateData()
return;
}
#ifdef WIN32
QString filename=RDDateDecode(report->exportPath(RDReport::Windows),
edit_startdate_edit->date(),edit_svcname);
QString filename=
RDDateDecode(report->exportPath(RDReport::Windows),
edit_startdate_edit->date(),log_config,edit_svcname);
#else
QString filename=RDDateDecode(report->exportPath(RDReport::Linux),
edit_startdate_edit->date(),edit_svcname);
QString filename=
RDDateDecode(report->exportPath(RDReport::Linux),
edit_startdate_edit->date(),log_config,edit_svcname);
#endif
QFile file(filename);
if(file.exists()) {