Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-12-01 22:30:13 +01:00
Code Issues Projects Releases Wiki Activity

2022-11-15 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in rdcatch(1) that could erroneously detect conflicts
	between events in the 'Edit Recording' dialog.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2022-11-15 12:09:04 -05:00
parent c266b9a4f6
commit 63841a4bf8
2 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -23675,3 +23675,6 @@
2022-11-15 Fred Gleason <fredg@paravelsystems.com> 2022-11-15 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdcatchd(8) that caused conflicting record * Fixed a regression in rdcatchd(8) that caused conflicting record
events to deadlock. events to deadlock.
2022-11-15 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdcatch(1) that could erroneously detect conflicts
between events in the 'Edit Recording' dialog.

49
rdcatch/edit_recording.cpp
View File

@@ -956,7 +956,23 @@ bool EditRecording::CheckEvent(bool include_myself)
break; break;
} }
QString sql=QString("select `ID` from `RECORDINGS` where ")+ //
// Check for Conflicting Events
//
int dows=0;
for(int i=0;i<7;i++) {
if(edit_dow_selector->dayOfWeekEnabled(i)) {
dows++;
}
}
if(dows==0) { // No days scheduled
return true;
}
QString sql=QString("select ")+
"`ID`,"+ // 00
"`DESCRIPTION` "+ // 01
"from `RECORDINGS` where "+
"(`STATION_NAME`='"+RDEscapeString(edit_event_widget->stationName())+"')&&"+ "(`STATION_NAME`='"+RDEscapeString(edit_event_widget->stationName())+"')&&"+
QString::asprintf("(`TYPE`=%d)&&",RDRecording::Recording)+ QString::asprintf("(`TYPE`=%d)&&",RDRecording::Recording)+
"(`START_TIME`='"+RDEscapeString(edit_starttime_edit->time().toString("hh:mm:ss"))+"')&&"+ "(`START_TIME`='"+RDEscapeString(edit_starttime_edit->time().toString("hh:mm:ss"))+"')&&"+
@@ -971,36 +987,45 @@ bool EditRecording::CheckEvent(bool include_myself)
edit_startline_spin->value()); edit_startline_spin->value());
break; break;
} }
if(edit_dow_selector->dayOfWeekEnabled(7)) { sql+="&&(";
sql+="&&(`SUN`='Y')"; if(edit_dow_selector->dayOfWeekEnabled(0)) {
sql+="(`MON`='Y')||";
} }
if(edit_dow_selector->dayOfWeekEnabled(1)) { if(edit_dow_selector->dayOfWeekEnabled(1)) {
sql+="&&(`MON`='Y')"; sql+="(`TUE`='Y')||";
} }
if(edit_dow_selector->dayOfWeekEnabled(2)) { if(edit_dow_selector->dayOfWeekEnabled(2)) {
sql+="&&(`TUE`='Y')"; sql+="(`WED`='Y')||";
} }
if(edit_dow_selector->dayOfWeekEnabled(3)) { if(edit_dow_selector->dayOfWeekEnabled(3)) {
sql+="&&(`WED`='Y')"; sql+="(`THU`='Y')||";
} }
if(edit_dow_selector->dayOfWeekEnabled(4)) { if(edit_dow_selector->dayOfWeekEnabled(4)) {
sql+="&&(`THU`='Y')"; sql+="(`FRI`='Y')||";
} }
if(edit_dow_selector->dayOfWeekEnabled(5)) { if(edit_dow_selector->dayOfWeekEnabled(5)) {
sql+="&&(`FRI`='Y')"; sql+="(`SAT`='Y')||";
} }
if(edit_dow_selector->dayOfWeekEnabled(6)) { if(edit_dow_selector->dayOfWeekEnabled(6)) {
sql+="&&(`SAT`='Y')"; sql+="(`SUN`='Y')||";
} }
sql=sql.left(sql.length()-2)+")";
if(!include_myself) { if(!include_myself) {
sql+=QString::asprintf("&&(`ID`!=%d)",edit_recording->id()); sql+=QString::asprintf("&&(`ID`!=%d)",edit_recording->id());
} }
RDSqlQuery *q=new RDSqlQuery(sql); RDSqlQuery *q=new RDSqlQuery(sql);
bool res=!q->first(); bool res=true;
QString descriptions;
if(q->first()) {
res=false;
descriptions="\""+q->value(1).toString()+"\""+
QString::asprintf(" [ID: %u]",q->value(0).toUInt());
}
delete q; delete q;
if(!res) { if(!res) {
QMessageBox::warning(this,tr("Duplicate Event"), QMessageBox::warning(this,tr("Conflicting Event"),
tr("An event with these parameters already exists!")); tr("The parameters of this event conflict with")+"\n"+
descriptions+".");
} }
return res; return res;