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

2024-04-02 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in the PAD subsystem that caused meta-events to be
	included in the update events.
	* Refactored the PAD subsystem to use native Qt JSON methods.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2024-04-02 17:42:04 -04:00
parent baec002fd0
commit 68bd802bd0
6 changed files with 150 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -24684,3 +24684,7 @@
to be emitted when processing a Chain event. to be emitted when processing a Chain event.
2024-04-02 Fred Gleason <fredg@paravelsystems.com> 2024-04-02 Fred Gleason <fredg@paravelsystems.com>
* Added an 'eventType' field to the PAD JSON schema. * Added an 'eventType' field to the PAD JSON schema.
2024-04-02 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in the PAD subsystem that caused meta-events to be
included in the update events.
* Refactored the PAD subsystem to use native Qt JSON methods.

2
apis/pypad/api/pypad.py
View File

@ -957,7 +957,7 @@ class Receiver(object):
if c[0]==10: if c[0]==10:
linebytes=line.decode('utf-8','replace') linebytes=line.decode('utf-8','replace')
msg+=linebytes msg+=linebytes
if linebytes=='\r\n': if linebytes=='\n':
jdata=json.loads(msg) jdata=json.loads(msg)
if (not self.__active_now_groups and not self.__active_next_groups) or (jdata['padUpdate'] is not None and jdata['padUpdate']['now'] is not None and jdata['padUpdate']['now']['groupName'] in self.__active_now_groups) or (jdata['padUpdate'] is not None and jdata['padUpdate']['next'] is not None and jdata['padUpdate']['next']['groupName'] in self.__active_next_groups): if (not self.__active_now_groups and not self.__active_next_groups) or (jdata['padUpdate'] is not None and jdata['padUpdate']['now'] is not None and jdata['padUpdate']['now']['groupName'] in self.__active_now_groups) or (jdata['padUpdate'] is not None and jdata['padUpdate']['next'] is not None and jdata['padUpdate']['next']['groupName'] in self.__active_next_groups):
self.__pypad_Process(Update(jdata,self.__config_parser,rd_config)) self.__pypad_Process(Update(jdata,self.__config_parser,rd_config))

235
lib/rdlogplay.cpp
View File

@ -3114,9 +3114,12 @@ void RDLogPlay::SendNowNext()
if(nextLine()>=0) { if(nextLine()>=0) {
for(int i=nextLine();i<lineCount();i++) { for(int i=nextLine();i<lineCount();i++) {
if((ll=logLine(i))!=NULL) { if((ll=logLine(i))!=NULL) {
if((ll->status()==RDLogLine::Scheduled)&&(!logLine(i)->asyncronous())) { if((ll->type()==RDLogLine::Cart)||(ll->type()==RDLogLine::Macro)) {
logline[1]=logLine(i); if((ll->status()==RDLogLine::Scheduled)&&
i=lineCount(); (!logLine(i)->asyncronous())) {
logline[1]=logLine(i);
i=lineCount();
}
} }
} }
} }
@ -3170,50 +3173,55 @@ void RDLogPlay::SendNowNext()
int next_num=1; int next_num=1;
for(int i=0;i<2;i++) { for(int i=0;i<2;i++) {
play_pad_socket[i]->write(QString("{\r\n").toUtf8());
play_pad_socket[i]->write(QString(" \"padUpdate\": {\r\n").toUtf8()); //
play_pad_socket[i]-> // Header Fields
write(RDJsonField("dateTime",QDateTime::currentDateTime(),8).toUtf8()); //
play_pad_socket[i]-> QJsonObject jo0;
write(RDJsonField("hostName",rda->station()->name(),8).toUtf8()); jo0.insert("dateTime",QDateTime::currentDateTime().toString(Qt::ISODate));
play_pad_socket[i]-> jo0.insert("hostName",rda->station()->name());
write(RDJsonField("shortHostName",rda->station()->shortName(),8).toUtf8()); jo0.insert("shortHostName",rda->station()->shortName());
play_pad_socket[i]->write(RDJsonField("machine",play_id+1,8).toUtf8()); jo0.insert("machine",1+play_id);
play_pad_socket[i]->write(RDJsonField("onairFlag",play_onair_flag,8).toUtf8()); jo0.insert("onairFlag",play_onair_flag);
play_pad_socket[i]-> jo0.insert("mode",RDAirPlayConf::logModeText(play_op_mode));
write(RDJsonField("mode",RDAirPlayConf::logModeText(play_op_mode),8).toUtf8());
// //
// Service // Service
// //
QJsonObject jo1;
if(svcname.isEmpty()) { if(svcname.isEmpty()) {
play_pad_socket[i]->write(RDJsonNullField("service",8).toUtf8()); jo1.insert("service",QJsonValue());
} }
else { else {
RDSvc *svc=new RDSvc(svcname,rda->station(),rda->config(),this); QString sql=QString("select ")+
play_pad_socket[i]->write(QString(" \"service\": {\r\n").toUtf8()); "`DESCRIPTION`,"+ // 00
play_pad_socket[i]->write(RDJsonField("name",svcname,12).toUtf8()); "`PROGRAM_CODE` "+ // 01
play_pad_socket[i]-> "from `SERVICES` where "+
write(RDJsonField("description",svc->description(),12).toUtf8()); "`NAME`='"+RDEscapeString(svcname)+"'";
play_pad_socket[i]-> RDSqlQuery *q=new RDSqlQuery(sql);
write(RDJsonField("programCode",svc->programCode(),12,true).toUtf8()); if(q->first()) {
play_pad_socket[i]->write(QString(" },\r\n").toUtf8()); jo1.insert("description",q->value(0).toString());
delete svc; jo1.insert("programCode",q->value(1).toString());
}
else {
jo1.insert("description",QJsonValue());
jo1.insert("programCode",QJsonValue());
}
delete q;
} }
jo0.insert("service",jo1);
// //
// Log // Log
// //
play_pad_socket[i]->write(QString(" \"log\": {\r\n").toUtf8()); QJsonObject jo2;
play_pad_socket[i]->write(RDJsonField("name",logName(),12,true).toUtf8()); jo2.insert("name",logName());
play_pad_socket[i]->write(QString(" },\r\n").toUtf8()); jo0.insert("log",jo2);
// //
// Now // Now
// //
play_pad_socket[i]-> jo0.insert("now",GetPadJson("now",logline[0],next_datetime,now_line));
write(GetPadJson("now",logline[0],next_datetime,now_line,8,false).
toUtf8());
// //
// Next // Next
@ -3221,25 +3229,24 @@ void RDLogPlay::SendNowNext()
if((mode()==RDAirPlayConf::Auto)&&(logline[0]!=NULL)) { if((mode()==RDAirPlayConf::Auto)&&(logline[0]!=NULL)) {
next_datetime=next_datetime.addSecs(logline[0]->forcedLength()/1000); next_datetime=next_datetime.addSecs(logline[0]->forcedLength()/1000);
} }
play_pad_socket[i]-> jo0.insert("next",GetPadJson("next",logline[1],next_datetime,nextLine()));
write(GetPadJson("next",logline[1],
next_datetime,nextLine(),8,(i==0)||
((1+nextLine())>=lineCount())||(nextLine()<0)).toUtf8());
//
// Extended Events
//
if(nextLine()>=0) { if(nextLine()>=0) {
//
// Extended Events
//
if((i>0)&&(nextLine()>=0)) { if((i>0)&&(nextLine()>=0)) {
for(int j=nextLine()+1;j<lineCount();j++) { for(int j=nextLine()+1;j<lineCount();j++) {
if((ll=logLine(j))!=NULL) { if((ll=logLine(j))!=NULL) {
if((ll->status()==RDLogLine::Scheduled)&& if((ll->type()==RDLogLine::Cart)||(ll->type()==RDLogLine::Macro)) {
(!logLine(i)->asyncronous())) { if((ll->status()==RDLogLine::Scheduled)&&
next_datetime=next_datetime.addSecs(ll->forcedLength()/1000); (!logLine(i)->asyncronous())) {
play_pad_socket[i]-> next_datetime=next_datetime.addSecs(ll->forcedLength()/1000);
write(GetPadJson(QString::asprintf("next%d",next_num++), jo0.insert(QString::asprintf("next%d",next_num),
ll,next_datetime,j,8,(1+j)==lineCount()). GetPadJson(QString::asprintf("next%d",next_num),ll,
toUtf8()); next_datetime,j));
next_num++;
}
} }
} }
} }
@ -3249,8 +3256,11 @@ void RDLogPlay::SendNowNext()
// //
// Commit the update // Commit the update
// //
play_pad_socket[i]->write(QString(" }\r\n").toUtf8()); QJsonObject jo3;
play_pad_socket[i]->write(QString("}\r\n\r\n").toUtf8()); jo3.insert("padUpdate",jo0);
QJsonDocument jdoc;
jdoc.setObject(jo3);
play_pad_socket[i]->write(jdoc.toJson().trimmed());
} }
// //
@ -3298,83 +3308,70 @@ void RDLogPlay::UpdateRestartData()
} }
QString RDLogPlay::GetPadJson(const QString &name,RDLogLine *ll, QJsonValue RDLogPlay::GetPadJson(const QString &name,RDLogLine *ll,
const QDateTime &start_datetime,int line, const QDateTime &start_datetime,int line)
int padding,bool final) const const
{ {
QString ret; QJsonObject jo0;
if(ll==NULL) { if(ll==NULL) {
ret=RDJsonNullField(name,padding,final); return QJsonValue();
}
else {
ret+=RDJsonPadding(padding)+"\""+name+"\": {\r\n";
if(start_datetime.isValid()) {
ret+=RDJsonField("startDateTime",start_datetime,4+padding);
}
else {
ret+=RDJsonNullField("startDateTime",4+padding);
}
ret+=RDJsonField("lineNumber",line,4+padding);
ret+=RDJsonField("lineId",ll->id(),4+padding);
ret+=RDJsonField("eventType",RDLogLine::typeText(ll->type()),4+padding);
if(ll->type()==RDLogLine::Cart) {
ret+=RDJsonField("cartNumber",ll->cartNumber(),4+padding);
ret+=RDJsonField("cartType",RDCart::typeText(ll->cartType()),4+padding);
if(ll->cartType()==RDCart::Audio) {
ret+=RDJsonField("cutNumber",ll->cutNumber(),4+padding);
}
else {
ret+=RDJsonNullField("cutNumber",4+padding);
}
}
else {
ret+=RDJsonNullField("cartNumber",4+padding);
ret+=RDJsonNullField("cartType",4+padding);
ret+=RDJsonNullField("cutNumber",4+padding);
}
if(ll->useEventLength()) {
ret+=RDJsonField("length",ll->eventLength(),4+padding);
}
else {
ret+=RDJsonField("length",ll->forcedLength(),4+padding);
}
if(ll->year().isValid()) {
ret+=RDJsonField("year",ll->year().year(),4+padding);
}
else {
ret+=RDJsonNullField("year",4+padding);
}
ret+=RDJsonField("groupName",ll->groupName(),4+padding);
ret+=RDJsonField("title",ll->title(),4+padding);
ret+=RDJsonField("artist",ll->artist(),4+padding);
ret+=RDJsonField("publisher",ll->publisher(),4+padding);
ret+=RDJsonField("composer",ll->composer(),4+padding);
ret+=RDJsonField("album",ll->album(),4+padding);
ret+=RDJsonField("label",ll->label(),4+padding);
ret+=RDJsonField("client",ll->client(),4+padding);
ret+=RDJsonField("agency",ll->agency(),4+padding);
ret+=RDJsonField("conductor",ll->conductor(),4+padding);
ret+=RDJsonField("userDefined",ll->userDefined(),4+padding);
ret+=RDJsonField("songId",ll->songId(),4+padding);
ret+=RDJsonField("outcue",ll->outcue(),4+padding);
ret+=RDJsonField("description",ll->description(),4+padding);
ret+=RDJsonField("isrc",ll->isrc(),4+padding);
ret+=RDJsonField("isci",ll->isci(),4+padding);
ret+=RDJsonField("recordingMbId",ll->recordingMbId(),4+padding);
ret+=RDJsonField("releaseMbId",ll->releaseMbId(),4+padding);
ret+=RDJsonField("externalEventId",ll->extEventId(),4+padding);
ret+=RDJsonField("externalData",ll->extData(),4+padding);
ret+=RDJsonField("externalAnncType",ll->extAnncType(),4+padding,true);
if(final) {
ret+=RDJsonPadding(padding)+"}\r\n";
}
else {
ret+=RDJsonPadding(padding)+"},\r\n";
}
} }
return ret; jo0.insert("startDateTime",start_datetime.toString(Qt::ISODate));
jo0.insert("lineNumber",line);
jo0.insert("lineId",ll->id());
jo0.insert("eventType",RDLogLine::typeText(ll->type()));
if((ll->type()==RDLogLine::Cart)||(ll->type()==RDLogLine::Macro)) {
jo0.insert("cartNumber",(int)ll->cartNumber());
jo0.insert("cartType",RDCart::typeText(ll->cartType()));
if(ll->cartType()==RDCart::Audio) {
jo0.insert("cutNumber",ll->cutNumber());
}
else {
jo0.insert("cutNumber",QJsonValue());
}
}
else {
jo0.insert("cartNumber",QJsonValue());
jo0.insert("cartType",QJsonValue());
jo0.insert("cutNumber",QJsonValue());
}
if(ll->useEventLength()) {
jo0.insert("length",ll->eventLength());
}
else {
jo0.insert("length",(qint64)ll->forcedLength());
}
if(ll->year().isValid()) {
jo0.insert("year",ll->year().year());
}
else {
jo0.insert("year",QJsonValue());
}
jo0.insert("groupName",ll->groupName());
jo0.insert("title",ll->title());
jo0.insert("artist",ll->artist());
jo0.insert("publisher",ll->publisher());
jo0.insert("composer",ll->composer());
jo0.insert("album",ll->album());
jo0.insert("label",ll->label());
jo0.insert("client",ll->client());
jo0.insert("agency",ll->agency());
jo0.insert("conductor",ll->conductor());
jo0.insert("userDefined",ll->userDefined());
jo0.insert("songId",ll->songId());
jo0.insert("outcue",ll->outcue());
jo0.insert("description",ll->description());
jo0.insert("isrc",ll->isrc());
jo0.insert("isci",ll->isci());
jo0.insert("recordingMbId",ll->recordingMbId());
jo0.insert("releaseMbId",ll->releaseMbId());
jo0.insert("externalEventId",ll->extEventId());
jo0.insert("externalData",ll->extData());
jo0.insert("externalAnncType",ll->extAnncType());
return jo0;
} }

8
lib/rdlogplay.h
View File

@ -22,6 +22,9 @@
#define RDLOGPLAY_H #define RDLOGPLAY_H
#include <QDateTime> #include <QDateTime>
#include <QJsonDocument>
#include <QJsonObject>
#include <QJsonValue>
#include <QObject> #include <QObject>
#include <QSignalMapper> #include <QSignalMapper>
#include <QTimer> #include <QTimer>
@ -198,9 +201,8 @@ class RDLogPlay : public RDLogModel
bool ClearBlock(int start_line); bool ClearBlock(int start_line);
void SendNowNext(); void SendNowNext();
void UpdateRestartData(); void UpdateRestartData();
QString GetPadJson(const QString &name,RDLogLine *ll, QJsonValue GetPadJson(const QString &name,RDLogLine *ll,
const QDateTime &start_datetime,int line,int padding, const QDateTime &start_datetime,int line) const;
bool final=false) const;
void LogTraffic(RDLogLine *logline,RDLogLine::PlaySource src, void LogTraffic(RDLogLine *logline,RDLogLine::PlaySource src,
RDAirPlayConf::TrafficAction action,bool onair_flag) const; RDAirPlayConf::TrafficAction action,bool onair_flag) const;
void DumpToSyslog(int prio_lvl,const QString &hdr) const; void DumpToSyslog(int prio_lvl,const QString &hdr) const;

23
rdpadd/repeater.cpp
View File

@ -30,6 +30,8 @@
MetadataSource::MetadataSource(QTcpSocket *sock) MetadataSource::MetadataSource(QTcpSocket *sock)
{ {
meta_socket=sock; meta_socket=sock;
meta_curly_count=0;
meta_quoted=false;
meta_committed=true; meta_committed=true;
} }
@ -46,7 +48,24 @@ bool MetadataSource::appendBuffer(const QByteArray &data)
meta_buffer.clear(); meta_buffer.clear();
} }
meta_buffer+=data; meta_buffer+=data;
meta_committed=meta_buffer.endsWith("\r\n\r\n");
for(int i=0;i<data.size();i++) {
if(data.at(i)=='"') {
meta_quoted=!meta_quoted;
}
if(!meta_quoted) {
if(data.at(i)=='{') {
meta_curly_count++;
}
if(data.at(i)=='}') {
meta_curly_count--;
}
}
}
meta_committed=(meta_curly_count==0);
if(meta_committed) {
meta_buffer+="\n\n";
}
return meta_committed; return meta_committed;
} }
@ -195,7 +214,7 @@ void Repeater::SendState(int id)
{ {
for(QMap<int,MetadataSource *>::const_iterator it=pad_sources.begin(); for(QMap<int,MetadataSource *>::const_iterator it=pad_sources.begin();
it!=pad_sources.end();it++) { it!=pad_sources.end();it++) {
if(it.value()->isCommitted()) { if(it.value()->isCommitted()&&(!it.value()->buffer().trimmed().isEmpty())) {
pad_client_sockets.value(id)->write(it.value()->buffer()); pad_client_sockets.value(id)->write(it.value()->buffer());
} }
} }

4
rdpadd/repeater.h
View File

@ -2,7 +2,7 @@
// //
// Rivendell PAD Data Repeater // Rivendell PAD Data Repeater
// //
// (C) Copyright 2018 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2018-2024 Fred Gleason <fredg@paravelsystems.com>
// //
// This program is free software; you can redistribute it and/or modify // This program is free software; you can redistribute it and/or modify
// it under the terms of the GNU General Public License version 2 as // it under the terms of the GNU General Public License version 2 as
@ -42,6 +42,8 @@ class MetadataSource
private: private:
QByteArray meta_buffer; QByteArray meta_buffer;
int meta_curly_count;
bool meta_quoted;
bool meta_committed; bool meta_committed;
QTcpSocket *meta_socket; QTcpSocket *meta_socket;
}; };