Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-06-03 09:32:34 +02:00
Code Issues Projects Releases Wiki Activity

2018-02-02 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Converted rdmaint(1) to use RDApplication.
This commit is contained in:
Fred Gleason 2018-02-02 02:54:01 -05:00
parent a639001137
commit 615770e9a2
3 changed files with 46 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -16637,3 +16637,5 @@
* Converted rdgpimon(1) to use RDApplication. * Converted rdgpimon(1) to use RDApplication.
2018-02-02 Fred Gleason <fredg@paravelsystems.com> 2018-02-02 Fred Gleason <fredg@paravelsystems.com>
* Converted rdimport(1) to use RDApplication. * Converted rdimport(1) to use RDApplication.
2018-02-02 Fred Gleason <fredg@paravelsystems.com>
* Converted rdmaint(1) to use RDApplication.

97
utils/rdmaint/rdmaint.cpp
View File

@ -2,7 +2,7 @@
// //
// A Utility for running periodic system maintenance. // A Utility for running periodic system maintenance.
// //
// (C) Copyright 2008-2016 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2008-2018 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
@ -32,23 +32,24 @@
#include <qfile.h> #include <qfile.h>
#include <rd.h> #include <rd.h>
#include <rdconf.h> #include <rdapplication.h>
#include <rdrehash.h>
#include <rdmaint.h>
#include <rdlibrary_conf.h>
#include <rdescape_string.h>
#include <rddb.h>
#include <rdurl.h>
#include <rdpodcast.h>
#include <rdcart.h> #include <rdcart.h>
#include <rdconf.h>
#include <rddb.h>
#include <rdescape_string.h>
#include <rdlibrary_conf.h>
#include <rdlog.h> #include <rdlog.h>
#include <rdmaint.h>
#include <rdpodcast.h>
#include <rdrehash.h>
#include <rdurl.h>
MainObject::MainObject(QObject *parent) MainObject::MainObject(QObject *parent)
:QObject(parent) :QObject(parent)
{ {
QString sql; QString sql;
RDSqlQuery *q; RDSqlQuery *q;
unsigned schema=0; QString err_msg;
// //
// Initialize Data Structures // Initialize Data Structures
@ -56,51 +57,40 @@ MainObject::MainObject(QObject *parent)
maint_verbose=false; maint_verbose=false;
maint_system=false; maint_system=false;
//
// Open the Database
//
rda=new RDApplication("rdmaint","rdmaint",RDMAINT_USAGE,this);
if(!rda->open(&err_msg)) {
fprintf(stderr,"rdmaint: %s\n",(const char *)err_msg);
exit(1);
}
// //
// Read Command Options // Read Command Options
// //
maint_cmd=new RDCmdSwitch(qApp->argc(),qApp->argv(), if(rda->cmdSwitch()->keys()>3) {
"rdmaint",RDMAINT_USAGE);
if(maint_cmd->keys()>3) {
fprintf(stderr,"\n"); fprintf(stderr,"\n");
fprintf(stderr,"%s",RDMAINT_USAGE); fprintf(stderr,"%s",RDMAINT_USAGE);
fprintf(stderr,"\n"); fprintf(stderr,"\n");
delete maint_cmd; exit(2);
exit(256);
} }
for(unsigned i=0;i<maint_cmd->keys();i++) { for(unsigned i=0;i<rda->cmdSwitch()->keys();i++) {
if(maint_cmd->key(i)=="--verbose") { if(rda->cmdSwitch()->key(i)=="--verbose") {
maint_verbose=true; maint_verbose=true;
rda->cmdSwitch()->setProcessed(i,true);
} }
if(maint_cmd->key(i)=="--system") { if(rda->cmdSwitch()->key(i)=="--system") {
maint_system=true; maint_system=true;
rda->cmdSwitch()->setProcessed(i,true);
}
if(!rda->cmdSwitch()->processed(i)) {
fprintf(stderr,"rdmaint: unknown command option \"%s\"\n",
(const char *)rda->cmdSwitch()->key(i));
exit(2);
} }
} }
//
// Read Configuration
//
maint_config=new RDConfig();
maint_config->load();
maint_config->setModuleName("rdmaint");
//
// Open Database
//
QString err (tr("rdmaint: "));
QSqlDatabase *db=RDInitDb(&schema,&err);
if(!db) {
fprintf(stderr,err.ascii());
delete maint_cmd;
exit(256);
}
delete maint_cmd;
//
// Get Station
//
maint_station=new RDStation(maint_config->stationName());
// //
// Get User // Get User
// //
@ -110,7 +100,6 @@ MainObject::MainObject(QObject *parent)
fprintf(stderr,"unable to find valid user\n"); fprintf(stderr,"unable to find valid user\n");
exit(256); exit(256);
} }
maint_user=new RDUser(q->value(0).toString());
delete q; delete q;
if(maint_system) { if(maint_system) {
@ -171,14 +160,14 @@ void MainObject::PurgeCuts()
q1=new RDSqlQuery(sql); q1=new RDSqlQuery(sql);
while(q1->next()) { while(q1->next()) {
RDCart *cart=new RDCart(q1->value(0).toUInt()); RDCart *cart=new RDCart(q1->value(0).toUInt());
if(cart->removeCut(maint_station,maint_user,q1->value(1).toString(), if(cart->removeCut(rda->station(),rda->user(),q1->value(1).toString(),
maint_config)) { rda->config())) {
maint_config-> rda->config()->
log("rdmaint",RDConfig::LogInfo,QString().sprintf("purged cut %s", log("rdmaint",RDConfig::LogInfo,QString().sprintf("purged cut %s",
(const char *)q1->value(1).toString())); (const char *)q1->value(1).toString()));
} }
else { else {
maint_config-> rda->config()->
log("rdmaint",RDConfig::LogErr,QString(). log("rdmaint",RDConfig::LogErr,QString().
sprintf("unable to purge cut %s: audio deletion error", sprintf("unable to purge cut %s: audio deletion error",
(const char *)q1->value(1).toString())); (const char *)q1->value(1).toString()));
@ -188,8 +177,8 @@ void MainObject::PurgeCuts()
q1->value(0).toUInt()); q1->value(0).toUInt());
q2=new RDSqlQuery(sql); q2=new RDSqlQuery(sql);
if(!q2->first()) { if(!q2->first()) {
cart->remove(maint_station,maint_user,maint_config); cart->remove(rda->station(),rda->user(),rda->config());
maint_config-> rda->config()->
log("rdmaint",RDConfig::LogInfo,QString(). log("rdmaint",RDConfig::LogInfo,QString().
sprintf("deleted purged cart %06u",cart->number())); sprintf("deleted purged cart %06u",cart->number()));
} }
@ -215,11 +204,11 @@ void MainObject::PurgeLogs()
"(PURGE_DATE<\""+dt.date().toString("yyyy-MM-dd")+"\")"; "(PURGE_DATE<\""+dt.date().toString("yyyy-MM-dd")+"\")";
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
while(q->next()) { while(q->next()) {
maint_config-> rda->config()->
log("rdmain",RDConfig::LogInfo,QString().sprintf("purged log %s", log("rdmain",RDConfig::LogInfo,QString().sprintf("purged log %s",
(const char *)q->value(0).toString())); (const char *)q->value(0).toString()));
RDLog *log=new RDLog(q->value(0).toString()); RDLog *log=new RDLog(q->value(0).toString());
log->remove(maint_station,maint_user,maint_config); log->remove(rda->station(),rda->user(),rda->config());
delete log; delete log;
} }
delete q; delete q;
@ -258,7 +247,7 @@ void MainObject::PurgeDropboxes()
DROPBOXES left join DROPBOX_PATHS \ DROPBOXES left join DROPBOX_PATHS \
on (DROPBOXES.ID=DROPBOX_PATHS.DROPBOX_ID) \ on (DROPBOXES.ID=DROPBOX_PATHS.DROPBOX_ID) \
where DROPBOXES.STATION_NAME=\"%s\"", where DROPBOXES.STATION_NAME=\"%s\"",
(const char *)RDEscapeString(maint_config-> (const char *)RDEscapeString(rda->config()->
stationName())); stationName()));
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
while(q->next()) { while(q->next()) {
@ -307,10 +296,10 @@ void MainObject::RehashCuts()
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
while(q->next()) { while(q->next()) {
printf("CUT: %s\n",(const char *)q->value(0).toString()); printf("CUT: %s\n",(const char *)q->value(0).toString());
if((err=RDRehash::rehash(maint_station,maint_user,maint_config, if((err=RDRehash::rehash(rda->station(),rda->user(),rda->config(),
RDCut::cartNumber(q->value(0).toString()), RDCut::cartNumber(q->value(0).toString()),
RDCut::cutNumber(q->value(0).toString())))!=RDRehash::ErrorOk) { RDCut::cutNumber(q->value(0).toString())))!=RDRehash::ErrorOk) {
maint_config-> rda->config()->
log("rdmaint", log("rdmaint",
RDConfig::LogErr,QString().sprintf("failed to rehash cut %s [%s]", RDConfig::LogErr,QString().sprintf("failed to rehash cut %s [%s]",
(const char *)q->value(0).toString(), (const char *)q->value(0).toString(),

12
utils/rdmaint/rdmaint.h
View File

@ -2,7 +2,7 @@
// //
// A Utility for running periodic system maintenance. // A Utility for running periodic system maintenance.
// //
// (C) Copyright 2008,2016 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2008,2016-2018 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
@ -22,12 +22,6 @@
#define RDMAINT_H #define RDMAINT_H
#include <qobject.h> #include <qobject.h>
#include <qsqldatabase.h>
#include <rdconfig.h>
#include <rduser.h>
#include <rdstation.h>
#include <rdcmd_switch.h>
#define RDMAINT_USAGE "[--help] [--verbose] [--system]\n\nRun Rivendell maintenance routines.\n" #define RDMAINT_USAGE "[--help] [--verbose] [--system]\n\nRun Rivendell maintenance routines.\n"
@ -46,12 +40,8 @@ class MainObject : public QObject
void PurgeGpioEvents(); void PurgeGpioEvents();
void PurgeWebapiAuths(); void PurgeWebapiAuths();
void RehashCuts(); void RehashCuts();
RDConfig *maint_config;
bool maint_verbose; bool maint_verbose;
bool maint_system; bool maint_system;
RDCmdSwitch *maint_cmd;
RDStation *maint_station;
RDUser *maint_user;
}; };