mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-12-05 16:20:14 +01:00
2017-10-14 Fred Gleason <fredg@paravelsystems.com>
* Implemented a '%r' wildcard for Rivendell Host Name.
This commit is contained in:
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user