Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2026-04-26 07:53:38 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
* Added a 'STATIONS.SHORT_NAME' field to the database.
	* Incremented the database version to 270.
	* Added 'RDStation::shortName()' and 'RDStation::setShortName()'
	methods.
	* Removed the 'Broadcast Security Model' control from the 'Edit
	Host' dialog.
	* Added a 'Short Name' control to the 'Edit Host' dialog.
	* Implemented a '%R' wildcard for Rivendell Host Short Name.
This commit is contained in:
Fred Gleason
2017-10-15 10:40:29 -04:00
parent ee211e5fca
commit 52d1d8be52
58 changed files with 600 additions and 506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rdlogmanager/commandline_ops.cpp
View File

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

30
rdlogmanager/generate_log.cpp
View File

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

6
rdlogmanager/pick_report_dates.cpp
View File

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