Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-07-24 16:38:13 +02:00
Code Issues Projects Releases Wiki Activity

2018-10-18 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a regression in rdmaint(8) that broke cut rehashing.
This commit is contained in:
Fred Gleason 2018-10-18 17:18:52 -04:00
parent 0ba8622147
commit 6945d54cab
4 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -17833,3 +17833,5 @@
screen of rdlibrary(1).
* Changed the minimum size of the main screen of rdlibrary to
850x600.
2018-10-18 Fred Gleason <fredg@paravelsystems.com>
* Fixed a regression in rdmaint(8) that broke cut rehashing.

2
utils/rdmaint/Makefile.am
View File

@ -29,6 +29,8 @@ bin_PROGRAMS = rdmaint
dist_rdmaint_SOURCES = rdmaint.cpp rdmaint.h
nodist_rdmaint_SOURCES = moc_rdmaint.cpp
rdmaint_LDADD = @LIB_RDLIBS@ @LIBVORBIS@ @QT4_LIBS@ -lQt3Support
CLEANFILES = *~\

28
utils/rdmaint/rdmaint.cpp
View File

@ -47,8 +47,6 @@
MainObject::MainObject(QObject *parent)
:QObject(parent)
{
QString sql;
RDSqlQuery *q;
QString err_msg;
//
@ -92,23 +90,22 @@ MainObject::MainObject(QObject *parent)
}
//
// Get User
// RIPC Connection
//
sql="select LOGIN_NAME from USERS where ADMIN_CONFIG_PRIV=\"Y\"";
q=new RDSqlQuery(sql);
if(!q->first()) {
fprintf(stderr,"unable to find valid user\n");
exit(256);
}
delete q;
connect(rda,SIGNAL(userChanged()),this,SLOT(userData()));
rda->ripc()->
connectHost("localhost",RIPCD_TCP_PORT,rda->config()->password());
}
void MainObject::userData()
{
if(maint_system) {
RunSystemMaintenance();
}
else {
RunLocalMaintenance();
}
exit(0);
}
@ -358,7 +355,6 @@ void MainObject::RehashCuts()
sql="select CUT_NAME from CUTS where SHA1_HASH is null limit 100";
q=new RDSqlQuery(sql);
while(q->next()) {
printf("CUT: %s\n",(const char *)q->value(0).toString());
if((err=RDRehash::rehash(rda->station(),rda->user(),rda->config(),
RDCut::cartNumber(q->value(0).toString()),
RDCut::cutNumber(q->value(0).toString())))!=RDRehash::ErrorOk) {
@ -369,9 +365,11 @@ void MainObject::RehashCuts()
(const char *)RDRehash::errorText(err)));
}
if(maint_verbose) {
fprintf(stderr,"rehashed cut \"%s\"\n",
(const char *)q->value(0).toString());
else {
if(maint_verbose) {
fprintf(stderr,"rehashed cut \"%s\"\n",
(const char *)q->value(0).toString());
}
}
sleep(1);
}

4
utils/rdmaint/rdmaint.h
View File

@ -27,9 +27,13 @@
class MainObject : public QObject
{
Q_OBJECT;
public:
MainObject(QObject *parent=0);
private slots:
void userData();
private:
void RunSystemMaintenance();
void RunLocalMaintenance();