2019-06-17 Fred Gleason <fredg@paravelsystems.com>

* Refactored logging system to use syslog(3) exclusively.
	* Removed the 'Facility=', 'LogDirectory=', 'CoreDumpDirectory='
	and 'LogPattern=' directives from rd.conf(5).
This commit is contained in:
Fred Gleason
2019-06-17 17:46:26 -04:00
parent 5d7e82e540
commit a094fbc788
67 changed files with 934 additions and 1441 deletions

View File

@@ -18,16 +18,17 @@
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <limits.h>
#include <ctype.h>
#include <errno.h>
#include <fcntl.h>
#include <glob.h>
#include <signal.h>
#include <limits.h>
#include <math.h>
#include <sched.h>
#include <signal.h>
#include <syslog.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
#include <ctype.h>
#include <sched.h>
#include <errno.h>
#include <qapplication.h>
#include <qdir.h>
@@ -110,7 +111,7 @@ MainObject::MainObject(QObject *parent)
// Read Command Options
//
if(rda->cmdSwitch()->keys()<2) {
Log(RDConfig::LogErr,QString().sprintf("\n%s\n",RDIMPORT_USAGE));
Log(LOG_ERR,QString().sprintf("\n%s\n",RDIMPORT_USAGE));
exit(2);
}
for(unsigned i=0;i<rda->cmdSwitch()->keys()-2;i++) {
@@ -133,11 +134,11 @@ MainObject::MainObject(QObject *parent)
if(rda->cmdSwitch()->key(i)=="--to-cart") {
import_cart_number=rda->cmdSwitch()->value(i).toUInt(&ok);
if((!ok)||(import_cart_number<1)||(import_cart_number>999999)) {
Log(RDConfig::LogErr,QString("rdimport: invalid cart number\n"));
Log(LOG_ERR,QString("rdimport: invalid cart number\n"));
exit(2);
}
if(import_use_cartchunk_cutid) {
Log(RDConfig::LogErr,QString("rdimport: '--to-cart' and '--use-cartchunk-cutid' are mutually exclusive\n"));
Log(LOG_ERR,QString("rdimport: '--to-cart' and '--use-cartchunk-cutid' are mutually exclusive\n"));
exit(2);
}
import_single_cart=true;
@@ -145,7 +146,7 @@ MainObject::MainObject(QObject *parent)
}
if(rda->cmdSwitch()->key(i)=="--use-cartchunk-cutid") {
if(import_cart_number!=0) {
Log(RDConfig::LogErr,QString("rdimport: '--to-cart' and '--use-cartchunk-cutid' are mutually exclusive\n"));
Log(LOG_ERR,QString("rdimport: '--to-cart' and '--use-cartchunk-cutid' are mutually exclusive\n"));
exit(2);
}
import_use_cartchunk_cutid=true;
@@ -154,7 +155,7 @@ MainObject::MainObject(QObject *parent)
if(rda->cmdSwitch()->key(i)=="--cart-number-offset") {
import_cart_number_offset=rda->cmdSwitch()->value(i).toInt(&ok);
if(!ok) {
Log(RDConfig::LogErr,QString("rdimport: invalid --cart-number-offset\n"));
Log(LOG_ERR,QString("rdimport: invalid --cart-number-offset\n"));
exit(2);
}
rda->cmdSwitch()->setProcessed(i,true);
@@ -174,7 +175,7 @@ MainObject::MainObject(QObject *parent)
if(rda->cmdSwitch()->key(i)=="--startdate-offset") {
import_startdate_offset=rda->cmdSwitch()->value(i).toInt(&ok);
if(!ok) {
Log(RDConfig::LogErr,QString("rdimport: invalid startdate-offset\n"));
Log(LOG_ERR,QString("rdimport: invalid startdate-offset\n"));
exit(2);
}
rda->cmdSwitch()->setProcessed(i,true);
@@ -182,7 +183,7 @@ MainObject::MainObject(QObject *parent)
if(rda->cmdSwitch()->key(i)=="--enddate-offset") {
import_enddate_offset=rda->cmdSwitch()->value(i).toInt(&ok);
if(!ok) {
Log(RDConfig::LogErr,QString("rdimport: invalid enddate-offset\n"));
Log(LOG_ERR,QString("rdimport: invalid enddate-offset\n"));
exit(2);
}
rda->cmdSwitch()->setProcessed(i,true);
@@ -194,52 +195,52 @@ MainObject::MainObject(QObject *parent)
if(rda->cmdSwitch()->key(i)=="--set-datetimes") {
QStringList f0=rda->cmdSwitch()->value(i).split(",");
if(f0.size()!=2) {
Log(RDConfig::LogErr,QString("rdimport: invalid argument to --set-datetimes\n"));
Log(LOG_ERR,QString("rdimport: invalid argument to --set-datetimes\n"));
exit(2);
}
for(unsigned j=0;j<2;j++) {
if((f0[j].length()!=15)||(f0[j].mid(8,1)!="-")) {
Log(RDConfig::LogErr,QString("rdimport: invalid argument to --set-datetimes\n"));
Log(LOG_ERR,QString("rdimport: invalid argument to --set-datetimes\n"));
exit(2);
}
unsigned year=f0[j].left(4).toUInt(&ok);
if(!ok) {
Log(RDConfig::LogErr,QString("rdimport: invalid year argument to --set-datetimes\n"));
Log(LOG_ERR,QString("rdimport: invalid year argument to --set-datetimes\n"));
exit(2);
}
unsigned month=f0[j].mid(4,2).toUInt(&ok);
if((!ok)||(month>12)) {
Log(RDConfig::LogErr,QString("rdimport: invalid month argument to --set-datetimes\n"));
Log(LOG_ERR,QString("rdimport: invalid month argument to --set-datetimes\n"));
exit(2);
}
unsigned day=f0[j].mid(6,2).toUInt(&ok);
if((!ok)||(day>31)) {
Log(RDConfig::LogErr,QString("rdimport: invalid day argument to --set-datetimes\n"));
Log(LOG_ERR,QString("rdimport: invalid day argument to --set-datetimes\n"));
exit(2);
}
unsigned hour=f0[j].mid(9,2).toUInt(&ok);
if((!ok)||(hour>23)) {
Log(RDConfig::LogErr,QString("rdimport: invalid hour argument to --set-datetimes\n"));
Log(LOG_ERR,QString("rdimport: invalid hour argument to --set-datetimes\n"));
exit(2);
}
unsigned min=f0[j].mid(11,2).toUInt(&ok);
if((!ok)||(min>59)) {
Log(RDConfig::LogErr,QString("rdimport: invalid minute argument to --set-datetimes\n"));
Log(LOG_ERR,QString("rdimport: invalid minute argument to --set-datetimes\n"));
exit(2);
}
unsigned sec=f0[j].right(2).toUInt(&ok);
if((!ok)||(sec>59)) {
Log(RDConfig::LogErr,QString("rdimport: invalid seconds argument to --set-datetimes\n"));
Log(LOG_ERR,QString("rdimport: invalid seconds argument to --set-datetimes\n"));
exit(2);
}
import_datetimes[j]=QDateTime(QDate(year,month,day),
QTime(hour,min,sec));
if(!import_datetimes[j].isValid()) {
Log(RDConfig::LogErr,QString("rdimport: invalid argument to --set-datetimes\n"));
Log(LOG_ERR,QString("rdimport: invalid argument to --set-datetimes\n"));
}
}
if(import_datetimes[0]>=import_datetimes[1]) {
Log(RDConfig::LogErr,QString("rdimport: datetime cannot end before it begins\n"));
Log(LOG_ERR,QString("rdimport: datetime cannot end before it begins\n"));
exit(2);
}
rda->cmdSwitch()->setProcessed(i,true);
@@ -247,33 +248,33 @@ MainObject::MainObject(QObject *parent)
if(rda->cmdSwitch()->key(i)=="--set-daypart-times") {
QStringList f0=rda->cmdSwitch()->value(i).split(",");
if(f0.size()!=2) {
Log(RDConfig::LogErr,QString("rdimport: invalid argument to --set-daypart-times\n"));
Log(LOG_ERR,QString("rdimport: invalid argument to --set-daypart-times\n"));
exit(2);
}
for(unsigned j=0;j<2;j++) {
if(f0[j].length()!=6) {
Log(RDConfig::LogErr,QString("rdimport: invalid argument to --set-daypart-times\n"));
Log(LOG_ERR,QString("rdimport: invalid argument to --set-daypart-times\n"));
exit(2);
}
unsigned hour=f0[j].left(2).toUInt(&ok);
if((!ok)||(hour>23)) {
Log(RDConfig::LogErr,QString("rdimport: invalid hour argument to --set-daypart-times\n"));
Log(LOG_ERR,QString("rdimport: invalid hour argument to --set-daypart-times\n"));
exit(2);
}
unsigned min=f0[j].mid(2,2).toUInt(&ok);
if((!ok)||(min>59)) {
Log(RDConfig::LogErr,QString("rdimport: invalid minute argument to --set-daypart-times\n"));
Log(LOG_ERR,QString("rdimport: invalid minute argument to --set-daypart-times\n"));
exit(2);
}
unsigned sec=f0[j].right(2).toUInt(&ok);
if((!ok)||(sec>59)) {
Log(RDConfig::LogErr,QString("rdimport: invalid seconds argument to --set-daypart-times\n"));
Log(LOG_ERR,QString("rdimport: invalid seconds argument to --set-daypart-times\n"));
exit(2);
}
import_dayparts[j].setHMS(hour,min,sec);
}
if(import_dayparts[0]>=import_dayparts[1]) {
Log(RDConfig::LogErr,QString("rdimport: daypart cannot end before it begins\n"));
Log(LOG_ERR,QString("rdimport: daypart cannot end before it begins\n"));
exit(2);
}
rda->cmdSwitch()->setProcessed(i,true);
@@ -304,7 +305,7 @@ MainObject::MainObject(QObject *parent)
if(rda->cmdSwitch()->key(i)=="--metadata-pattern") {
import_metadata_pattern=rda->cmdSwitch()->value(i);
if(!VerifyPattern(import_metadata_pattern)) {
Log(RDConfig::LogErr,QString("rdimport: invalid metadata pattern\n"));
Log(LOG_ERR,QString("rdimport: invalid metadata pattern\n"));
exit(2);
}
rda->cmdSwitch()->setProcessed(i,true);
@@ -316,7 +317,7 @@ MainObject::MainObject(QObject *parent)
if(rda->cmdSwitch()->key(i)=="--persistent-dropbox-id") {
import_persistent_dropbox_id=rda->cmdSwitch()->value(i).toInt(&ok);
if(!ok) {
Log(RDConfig::LogErr,QString("rdimport: invalid persistent dropbox id\n"));
Log(LOG_ERR,QString("rdimport: invalid persistent dropbox id\n"));
exit(2);
}
rda->cmdSwitch()->setProcessed(i,true);
@@ -324,7 +325,7 @@ MainObject::MainObject(QObject *parent)
if(rda->cmdSwitch()->key(i)=="--create-startdate-offset") {
import_create_startdate_offset=rda->cmdSwitch()->value(i).toInt(&ok);
if(!ok) {
Log(RDConfig::LogErr,QString("rdimport: invalid create-startddate-offset\n"));
Log(LOG_ERR,QString("rdimport: invalid create-startddate-offset\n"));
exit(2);
}
import_create_dates=true;
@@ -334,7 +335,7 @@ MainObject::MainObject(QObject *parent)
import_create_enddate_offset=rda->cmdSwitch()->value(i).toInt(&ok);
if((!ok) ||
(import_create_startdate_offset > import_create_enddate_offset )) {
Log(RDConfig::LogErr,QString("rdimport: invalid create-enddate-offset\n"));
Log(LOG_ERR,QString("rdimport: invalid create-enddate-offset\n"));
exit(2);
}
import_create_dates=true;
@@ -355,7 +356,7 @@ MainObject::MainObject(QObject *parent)
if(rda->cmdSwitch()->key(i)=="--set-string-bpm") {
import_string_bpm=rda->cmdSwitch()->value(i).toInt(&ok);
if(!ok) {
Log(RDConfig::LogErr,QString("rdimport: invalid value for --set-string-bpm\n"));
Log(LOG_ERR,QString("rdimport: invalid value for --set-string-bpm\n"));
exit(255);
}
rda->cmdSwitch()->setProcessed(i,true);
@@ -394,7 +395,7 @@ MainObject::MainObject(QObject *parent)
}
if(rda->cmdSwitch()->key(i)=="--set-string-title") {
if(rda->cmdSwitch()->value(i).isEmpty()) {
Log(RDConfig::LogErr,QString("rdimport: title field cannot be empty\n"));
Log(LOG_ERR,QString("rdimport: title field cannot be empty\n"));
exit(255);
}
import_string_title=rda->cmdSwitch()->value(i);
@@ -407,7 +408,7 @@ MainObject::MainObject(QObject *parent)
if(rda->cmdSwitch()->key(i)=="--set-string-year") {
import_string_year=rda->cmdSwitch()->value(i).toInt(&ok);
if(!ok) {
Log(RDConfig::LogErr,QString("rdimport: invalid value for --set-string-year\n"));
Log(LOG_ERR,QString("rdimport: invalid value for --set-string-year\n"));
exit(255);
}
rda->cmdSwitch()->setProcessed(i,true);
@@ -422,43 +423,30 @@ MainObject::MainObject(QObject *parent)
// Sanity Checks
//
if(import_datetimes[0].isValid()&&import_clear_datetimes) {
Log(RDConfig::LogErr,QString("rdimport: --set-datetimes and --clear-datetimes are mutually exclusive\n"));
Log(LOG_ERR,QString("rdimport: --set-datetimes and --clear-datetimes are mutually exclusive\n"));
exit(255);
}
if((!import_dayparts[1].isNull())&&import_clear_dayparts) {
Log(RDConfig::LogErr,QString("rdimport: --set-daypart-times and --clear-daypart-times are mutually exclusive\n"));
Log(LOG_ERR,QString("rdimport: --set-daypart-times and --clear-daypart-times are mutually exclusive\n"));
exit(255);
}
if((!import_metadata_pattern.isEmpty())&&import_xml) {
Log(RDConfig::LogErr,QString().sprintf("rdimport: --metadata-pattern and --xml are mutually exclusive\n"));
Log(LOG_ERR,QString().sprintf("rdimport: --metadata-pattern and --xml are mutually exclusive\n"));
exit(255);
}
if((!import_log_directory.isEmpty())&&import_log_filename.isEmpty()) {
Log(RDConfig::LogErr,QString().sprintf("rdimport: --log-directory requires --log-filename\n"));
Log(LOG_ERR,QString().sprintf("rdimport: --log-directory requires --log-filename\n"));
exit(255);
}
if((!import_log_filename.isEmpty())&&import_log_directory.isEmpty()) {
Log(RDConfig::LogErr,QString().sprintf("rdimport: --log-filename requires --log-directory\n"));
Log(LOG_ERR,QString().sprintf("rdimport: --log-filename requires --log-directory\n"));
exit(255);
}
if((!import_log_filename.isEmpty())&&import_log_syslog) {
Log(RDConfig::LogErr,QString().sprintf("rdimport: --log-filename and --log-syslog are mutually exclusive\n"));
Log(LOG_ERR,QString().sprintf("rdimport: --log-filename and --log-syslog are mutually exclusive\n"));
exit(255);
}
//
// Set Logging
//
if(import_log_syslog) {
rda->config()->setLogFacility(RDConfig::LogSyslog);
}
else if((!import_log_filename.isEmpty())&&!import_log_directory.isEmpty()) {
rda->config()->setLogDirectory(import_log_directory);
rda->config()->setLogPattern(import_log_filename);
rda->config()->setLogFacility(RDConfig::LogFile);
import_log_file=true;
}
import_cut_markers=new MarkerSet();
import_cut_markers->loadMarker(rda->cmdSwitch(),"cut");
import_talk_markers=new MarkerSet();
@@ -486,7 +474,7 @@ MainObject::MainObject(QObject *parent)
if(rda->cmdSwitch()->key(i).left(2)!="--") {
import_group=new RDGroup(rda->cmdSwitch()->key(i));
if(!import_group->exists()) {
Log(RDConfig::LogErr,QString().sprintf("rdimport: invalid group specified\n"));
Log(LOG_ERR,QString().sprintf("rdimport: invalid group specified\n"));
delete import_group;
exit(2);
}
@@ -495,12 +483,12 @@ MainObject::MainObject(QObject *parent)
}
}
if(import_group==NULL) {
Log(RDConfig::LogErr,QString().sprintf("rdimport: invalid group specified\n"));
Log(LOG_ERR,QString().sprintf("rdimport: invalid group specified\n"));
exit(2);
}
if(import_cart_number>0) {
if(!import_group->cartNumberValid(import_cart_number)) {
Log(RDConfig::LogErr,QString().sprintf("rdimport: invalid cart number for group\n"));
Log(LOG_ERR,QString().sprintf("rdimport: invalid cart number for group\n"));
delete import_group;
exit(2);
}
@@ -511,7 +499,7 @@ MainObject::MainObject(QObject *parent)
//
for(unsigned i=0;i<import_add_scheduler_codes.size();i++) {
if(!SchedulerCodeExists(import_add_scheduler_codes[i])) {
Log(RDConfig::LogErr,QString().sprintf("rdimport: scheduler code \"%s\" does not exist\n",
Log(LOG_ERR,QString().sprintf("rdimport: scheduler code \"%s\" does not exist\n",
(const char *)import_add_scheduler_codes[i].utf8()));
exit(2);
}
@@ -537,7 +525,7 @@ MainObject::MainObject(QObject *parent)
import_normalization_level=100*n;
}
else {
Log(RDConfig::LogErr,QString("rdimport: invalid normalization level\n"));
Log(LOG_ERR,QString("rdimport: invalid normalization level\n"));
exit(2);
}
rda->cmdSwitch()->setProcessed(i,true);
@@ -548,7 +536,7 @@ MainObject::MainObject(QObject *parent)
import_autotrim_level=100*n;
}
else {
Log(RDConfig::LogErr,QString("rdimport: invalid autotrim level\n"));
Log(LOG_ERR,QString("rdimport: invalid autotrim level\n"));
exit(2);
}
rda->cmdSwitch()->setProcessed(i,true);
@@ -559,7 +547,7 @@ MainObject::MainObject(QObject *parent)
import_segue_level=n;
}
else {
Log(RDConfig::LogErr,QString("rdimport: invalid segue level\n"));
Log(LOG_ERR,QString("rdimport: invalid segue level\n"));
exit(2);
}
rda->cmdSwitch()->setProcessed(i,true);
@@ -570,7 +558,7 @@ MainObject::MainObject(QObject *parent)
import_segue_length=n;
}
else {
Log(RDConfig::LogErr,QString("rdimport: invalid segue length\n"));
Log(LOG_ERR,QString("rdimport: invalid segue length\n"));
exit(2);
}
rda->cmdSwitch()->setProcessed(i,true);
@@ -581,7 +569,7 @@ MainObject::MainObject(QObject *parent)
}
if((!rda->cmdSwitch()->processed(i))&&
(rda->cmdSwitch()->key(i).left(2)=="--")) {
Log(RDConfig::LogErr,QString().sprintf("rdimport: unknown command option \"%s\"\n",
Log(LOG_ERR,QString().sprintf("rdimport: unknown command option \"%s\"\n",
(const char *)rda->cmdSwitch()->key(i)));
exit(2);
}
@@ -594,168 +582,168 @@ MainObject::MainObject(QObject *parent)
// Print Status Messages
//
if(import_verbose) {
Log(RDConfig::LogInfo,QString("rdimport started\n"));
Log(LOG_INFO,QString("rdimport started\n"));
Log(RDConfig::LogInfo,QString().sprintf("RDImport v%s\n",VERSION));
Log(LOG_INFO,QString().sprintf("RDImport v%s\n",VERSION));
if(import_to_mono) {
Log(RDConfig::LogInfo,QString(" Force to Mono is ON\n"));
Log(LOG_INFO,QString(" Force to Mono is ON\n"));
}
else {
Log(RDConfig::LogInfo,QString(" Force to Mono is OFF\n"));
Log(LOG_INFO,QString(" Force to Mono is OFF\n"));
}
if(import_normalization_level==0) {
Log(RDConfig::LogInfo,QString(" Normalization is OFF\n"));
Log(LOG_INFO,QString(" Normalization is OFF\n"));
}
else {
Log(RDConfig::LogInfo,QString().sprintf(" Normalization level = %d dB\n",import_normalization_level/100));
Log(LOG_INFO,QString().sprintf(" Normalization level = %d dB\n",import_normalization_level/100));
}
if(import_autotrim_level==0) {
Log(RDConfig::LogInfo,QString(" AutoTrim is OFF\n"));
Log(LOG_INFO,QString(" AutoTrim is OFF\n"));
}
else {
Log(RDConfig::LogInfo,QString().sprintf(" AutoTrim level = %d dB\n",import_autotrim_level/100));
Log(LOG_INFO,QString().sprintf(" AutoTrim level = %d dB\n",import_autotrim_level/100));
}
if(import_cart_number==0) {
if(import_use_cartchunk_cutid) {
Log(RDConfig::LogInfo,QString(" Destination cart is taken from CartChunk CutID\n"));
Log(LOG_INFO,QString(" Destination cart is taken from CartChunk CutID\n"));
}
else {
Log(RDConfig::LogInfo,QString(" Destination cart is AUTO\n"));
Log(LOG_INFO,QString(" Destination cart is AUTO\n"));
}
}
else {
Log(RDConfig::LogInfo,QString().sprintf(" Destination cart is %06u\n",import_cart_number));
Log(LOG_INFO,QString().sprintf(" Destination cart is %06u\n",import_cart_number));
}
if(import_single_cart) {
Log(RDConfig::LogInfo,QString(" Single cart mode is ON\n"));
Log(LOG_INFO,QString(" Single cart mode is ON\n"));
}
else {
Log(RDConfig::LogInfo,QString(" Single cart mode is OFF\n"));
Log(LOG_INFO,QString(" Single cart mode is OFF\n"));
}
if(import_title_from_cartchunk_cutid) {
Log(RDConfig::LogInfo,QString(" Destination cart title is taken from CartChunk CutID\n"));
Log(LOG_INFO,QString(" Destination cart title is taken from CartChunk CutID\n"));
}
if(import_cart_number_offset!=0) {
Log(RDConfig::LogInfo,QString().sprintf(" Cart number offset is %d\n",import_cart_number_offset));
Log(LOG_INFO,QString().sprintf(" Cart number offset is %d\n",import_cart_number_offset));
}
if(import_delete_source) {
Log(RDConfig::LogInfo,QString(" Delete source mode is ON\n"));
Log(LOG_INFO,QString(" Delete source mode is ON\n"));
}
else {
Log(RDConfig::LogInfo,QString(" Delete source mode is OFF\n"));
Log(LOG_INFO,QString(" Delete source mode is OFF\n"));
}
if(import_delete_cuts) {
Log(RDConfig::LogInfo,QString(" Delete cuts mode is ON\n"));
Log(LOG_INFO,QString(" Delete cuts mode is ON\n"));
}
else {
Log(RDConfig::LogInfo,QString(" Delete cuts mode is OFF\n"));
Log(LOG_INFO,QString(" Delete cuts mode is OFF\n"));
}
if(import_drop_box) {
Log(RDConfig::LogInfo,QString(" DropBox mode is ON\n"));
Log(LOG_INFO,QString(" DropBox mode is ON\n"));
}
else {
Log(RDConfig::LogInfo,QString(" DropBox mode is OFF\n"));
Log(LOG_INFO,QString(" DropBox mode is OFF\n"));
}
if(import_add_scheduler_codes.size()>0) {
Log(RDConfig::LogInfo,QString(" Adding Scheduler Code(s):\n"));
Log(LOG_INFO,QString(" Adding Scheduler Code(s):\n"));
for(unsigned i=0;i<import_add_scheduler_codes.size();i++) {
Log(RDConfig::LogInfo,QString().sprintf(" %s\n",(const char *)import_add_scheduler_codes[i].utf8()));
Log(LOG_INFO,QString().sprintf(" %s\n",(const char *)import_add_scheduler_codes[i].utf8()));
}
}
if(!import_set_user_defined.isEmpty()) {
Log(RDConfig::LogInfo,QString().sprintf(" Setting the User Defined field to \"%s\"\n",
Log(LOG_INFO,QString().sprintf(" Setting the User Defined field to \"%s\"\n",
(const char *)import_set_user_defined));
}
if(!import_metadata_pattern.isEmpty()) {
Log(RDConfig::LogInfo,QString().sprintf(" Using metadata pattern: %s\n",
Log(LOG_INFO,QString().sprintf(" Using metadata pattern: %s\n",
(const char *)import_metadata_pattern));
}
Log(RDConfig::LogInfo,QString().sprintf(" Start Date Offset = %d days\n",import_startdate_offset));
Log(RDConfig::LogInfo,QString().sprintf(" End Date Offset = %d days\n",import_enddate_offset));
Log(LOG_INFO,QString().sprintf(" Start Date Offset = %d days\n",import_startdate_offset));
Log(LOG_INFO,QString().sprintf(" End Date Offset = %d days\n",import_enddate_offset));
if((!import_dayparts[0].isNull())||(!import_dayparts[1].isNull())) {
Log(RDConfig::LogInfo,QString().sprintf(" Start Daypart = %s\n",
Log(LOG_INFO,QString().sprintf(" Start Daypart = %s\n",
(const char *)import_dayparts[0].toString("hh:mm:ss")));
Log(RDConfig::LogInfo,QString().sprintf(" End Daypart = %s\n",
Log(LOG_INFO,QString().sprintf(" End Daypart = %s\n",
(const char *)import_dayparts[1].toString("hh:mm:ss")));
}
if(import_clear_dayparts) {
Log(RDConfig::LogInfo,QString(" Clearing daypart times\n"));
Log(LOG_INFO,QString(" Clearing daypart times\n"));
}
if((!import_datetimes[0].isNull())||(!import_datetimes[1].isNull())) {
Log(RDConfig::LogInfo,QString().sprintf(" Start DateTime = %s\n",
Log(LOG_INFO,QString().sprintf(" Start DateTime = %s\n",
(const char *)import_datetimes[0].toString("MM/dd/yyyy hh:mm:ss")));
Log(RDConfig::LogInfo,QString().sprintf(" End DateTime = %s\n",
Log(LOG_INFO,QString().sprintf(" End DateTime = %s\n",
(const char *)import_datetimes[1].toString("MM/dd/yyyy hh:mm:ss")));
}
if(import_clear_datetimes) {
Log(RDConfig::LogInfo,QString(" Clearing datetimes\n"));
Log(LOG_INFO,QString(" Clearing datetimes\n"));
}
if(import_fix_broken_formats) {
Log(RDConfig::LogInfo,QString(" Broken format workarounds are ENABLED\n"));
Log(LOG_INFO,QString(" Broken format workarounds are ENABLED\n"));
}
else {
Log(RDConfig::LogInfo,QString(" Broken format workarounds are DISABLED\n"));
Log(LOG_INFO,QString(" Broken format workarounds are DISABLED\n"));
}
if(import_create_dates) {
Log(RDConfig::LogInfo,QString(" Import Create Dates mode is ON\n"));
Log(RDConfig::LogInfo,QString().sprintf(" Import Create Start Date Offset = %d days\n",import_create_startdate_offset));
Log(RDConfig::LogInfo,QString().sprintf(" Import Create End Date Offset = %d days\n",import_create_enddate_offset));
Log(LOG_INFO,QString(" Import Create Dates mode is ON\n"));
Log(LOG_INFO,QString().sprintf(" Import Create Start Date Offset = %d days\n",import_create_startdate_offset));
Log(LOG_INFO,QString().sprintf(" Import Create End Date Offset = %d days\n",import_create_enddate_offset));
}
else {
Log(RDConfig::LogInfo,QString(" Import Create Dates mode is OFF\n"));
Log(LOG_INFO,QString(" Import Create Dates mode is OFF\n"));
}
if(import_persistent_dropbox_id>=0) {
Log(RDConfig::LogInfo,QString().sprintf(" Persistent DropBox ID = %d\n",import_persistent_dropbox_id));
Log(LOG_INFO,QString().sprintf(" Persistent DropBox ID = %d\n",import_persistent_dropbox_id));
}
if(!import_string_agency.isNull()) {
Log(RDConfig::LogInfo,QString().sprintf(" Agency set to: %s\n",(const char *)import_string_agency));
Log(LOG_INFO,QString().sprintf(" Agency set to: %s\n",(const char *)import_string_agency));
}
if(!import_string_album.isNull()) {
Log(RDConfig::LogInfo,QString().sprintf(" Album set to: %s\n",(const char *)import_string_album));
Log(LOG_INFO,QString().sprintf(" Album set to: %s\n",(const char *)import_string_album));
}
if(!import_string_artist.isNull()) {
Log(RDConfig::LogInfo,QString().sprintf(" Artist set to: %s\n",(const char *)import_string_artist));
Log(LOG_INFO,QString().sprintf(" Artist set to: %s\n",(const char *)import_string_artist));
}
if(import_string_bpm!=0) {
Log(RDConfig::LogInfo,QString().sprintf(" BPM set to: %d\n",import_string_bpm));
Log(LOG_INFO,QString().sprintf(" BPM set to: %d\n",import_string_bpm));
}
if(!import_string_client.isNull()) {
Log(RDConfig::LogInfo,QString().sprintf(" Client set to: %s\n",(const char *)import_string_client));
Log(LOG_INFO,QString().sprintf(" Client set to: %s\n",(const char *)import_string_client));
}
if(!import_string_composer.isNull()) {
Log(RDConfig::LogInfo,QString().sprintf(" Composer set to: %s\n",(const char *)import_string_composer));
Log(LOG_INFO,QString().sprintf(" Composer set to: %s\n",(const char *)import_string_composer));
}
if(!import_string_conductor.isNull()) {
Log(RDConfig::LogInfo,QString().sprintf(" Conductor set to: %s\n",(const char *)import_string_conductor));
Log(LOG_INFO,QString().sprintf(" Conductor set to: %s\n",(const char *)import_string_conductor));
}
if(!import_string_description.isNull()) {
Log(RDConfig::LogInfo,QString().sprintf(" Description set to: %s\n",
Log(LOG_INFO,QString().sprintf(" Description set to: %s\n",
(const char *)import_string_description));
}
if(!import_string_label.isNull()) {
Log(RDConfig::LogInfo,QString().sprintf(" Label set to: %s\n",(const char *)import_string_label));
Log(LOG_INFO,QString().sprintf(" Label set to: %s\n",(const char *)import_string_label));
}
if(!import_string_outcue.isNull()) {
Log(RDConfig::LogInfo,QString().sprintf(" Outcue set to: %s\n",(const char *)import_string_outcue));
Log(LOG_INFO,QString().sprintf(" Outcue set to: %s\n",(const char *)import_string_outcue));
}
if(!import_string_publisher.isNull()) {
Log(RDConfig::LogInfo,QString().sprintf(" Publisher set to: %s\n",(const char *)import_string_publisher));
Log(LOG_INFO,QString().sprintf(" Publisher set to: %s\n",(const char *)import_string_publisher));
}
if(!import_string_song_id.isNull()) {
Log(RDConfig::LogInfo,QString().sprintf(" Song ID set to: %s\n",(const char *)import_string_song_id));
Log(LOG_INFO,QString().sprintf(" Song ID set to: %s\n",(const char *)import_string_song_id));
}
if(!import_string_title.isNull()) {
Log(RDConfig::LogInfo,QString().sprintf(" Title set to: %s\n",(const char *)import_string_title));
Log(LOG_INFO,QString().sprintf(" Title set to: %s\n",(const char *)import_string_title));
}
if(!import_string_user_defined.isNull()) {
Log(RDConfig::LogInfo,QString().sprintf(" User Defined set to: %s\n",
Log(LOG_INFO,QString().sprintf(" User Defined set to: %s\n",
(const char *)import_string_user_defined));
}
if(import_string_year!=0) {
Log(RDConfig::LogInfo,QString().sprintf(" Year set to: %d\n",import_string_year));
Log(LOG_INFO,QString().sprintf(" Year set to: %d\n",import_string_year));
}
if(import_xml) {
Log(RDConfig::LogInfo,QString().sprintf(" Importing RDXML metadata from external file\n"));
Log(LOG_INFO,QString().sprintf(" Importing RDXML metadata from external file\n"));
}
import_cut_markers->dump();
import_talk_markers->dump();
@@ -763,9 +751,9 @@ MainObject::MainObject(QObject *parent)
import_segue_markers->dump();
import_fadedown_marker->dump();
import_fadeup_marker->dump();
Log(RDConfig::LogInfo,QString(" Files to process:\n"));
Log(LOG_INFO,QString(" Files to process:\n"));
for(unsigned i=import_file_key;i<rda->cmdSwitch()->keys();i++) {
Log(RDConfig::LogInfo,QString().sprintf(" \"%s\"\n",(const char *)rda->cmdSwitch()->key(i)));
Log(LOG_INFO,QString().sprintf(" \"%s\"\n",(const char *)rda->cmdSwitch()->key(i)));
}
}
@@ -789,7 +777,7 @@ void MainObject::userData()
// Verify Permissions
//
if(!rda->user()->editAudio()) {
Log(RDConfig::LogErr,
Log(LOG_ERR,
QString().sprintf("rdimport: user \"%s\" has no edit audio permission\n",
(const char *)rda->user()->name()));
exit(256);
@@ -860,7 +848,7 @@ void MainObject::userData()
// delete import_cmd;
if(import_verbose) {
Log(RDConfig::LogInfo,QString("rdimport finished\n"));
Log(LOG_INFO,QString("rdimport finished\n"));
}
exit(0);
@@ -911,7 +899,7 @@ void MainObject::RunDropBox()
sleep(RDIMPORT_DROPBOX_SCAN_INTERVAL);
} while(import_run);
if(import_verbose) {
Log(RDConfig::LogInfo,QString("rdimport stopped\n"));
Log(LOG_INFO,QString("rdimport stopped\n"));
}
}
@@ -940,7 +928,7 @@ void MainObject::ProcessFileEntry(const QString &entry)
while((globbuf.gl_pathc==RDIMPORT_GLOB_SIZE)||(gflags==GLOB_MARK)) {
glob(RDEscapeString(entry),gflags,NULL,&globbuf);
if((globbuf.gl_pathc==0)&&(gflags==GLOB_MARK)&&(!import_drop_box)) {
Log(RDConfig::LogErr,QString().sprintf(" Unable to open \"%s\", skipping...\n",
Log(LOG_WARNING,QString().sprintf(" Unable to open \"%s\", skipping...\n",
(const char *)entry));
globfree(&globbuf);
}
@@ -984,15 +972,15 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
else {
if(import_fix_broken_formats) {
if(import_verbose) {
Log(RDConfig::LogWarning,QString().sprintf(" File \"%s\" appears to be malformed, trying workaround ... ",
Log(LOG_WARNING,QString().sprintf(" File \"%s\" appears to be malformed, trying workaround ... ",
(const char *)RDGetBasePart(filename).utf8()));
}
delete wavefile;
if((wavefile=FixFile(filename,wavedata))==NULL) {
if(import_verbose) {
Log(RDConfig::LogWarning,QString().sprintf("failed.\n"));
Log(LOG_WARNING,QString().sprintf("failed.\n"));
}
Log(RDConfig::LogWarning,QString().sprintf(
Log(LOG_WARNING,QString().sprintf(
" File \"%s\" is not readable or not a recognized format, skipping...\n",
(const char *)RDGetBasePart(filename).utf8()));
delete wavefile;
@@ -1009,12 +997,12 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
return MainObject::FileBad;
}
if(import_verbose) {
Log(RDConfig::LogWarning,QString().sprintf("success.\n"));
Log(LOG_WARNING,QString().sprintf("success.\n"));
}
effective_filename=import_temp_fix_filename;
}
else {
Log(RDConfig::LogWarning,QString().sprintf(
Log(LOG_WARNING,QString().sprintf(
" File \"%s\" is not readable or not a recognized format, skipping...\n",
(const char *)RDGetBasePart(filename).utf8()));
delete wavefile;
@@ -1035,7 +1023,7 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
found_cart=RunPattern(import_metadata_pattern,RDGetBasePart(filename),
wavedata,&groupname);
if(wavedata->validateDateTimes()) {
Log(RDConfig::LogErr,QString().sprintf(
Log(LOG_WARNING,QString().sprintf(
" File \"%s\": End date/time cannot be prior to start date/time, ignoring...\n",
(const char *)filename.utf8()));
}
@@ -1043,7 +1031,7 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
delete effective_group;
effective_group=new RDGroup(groupname);
if(!effective_group->exists()) {
Log(RDConfig::LogErr,QString().sprintf(" Specified group \"%s\" from file \"%s\" does not exist, using default group...\n",
Log(LOG_WARNING,QString().sprintf(" Specified group \"%s\" from file \"%s\" does not exist, using default group...\n",
(const char *)groupname,(const char *)filename.utf8()));
delete effective_group;
effective_group=new RDGroup(import_group->name());
@@ -1065,7 +1053,7 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
if((*cartnum==0)||(*cartnum>999999)||
(effective_group->enforceCartRange()&&
(!effective_group->cartNumberValid(*cartnum)))) {
Log(RDConfig::LogErr,QString().sprintf(
Log(LOG_WARNING,QString().sprintf(
" File \"%s\" has an invalid or out of range Cart Number, skipping...\n",
(const char *)RDGetBasePart(filename).utf8()));
wavefile->closeWave();
@@ -1079,7 +1067,7 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
*cartnum=effective_group->nextFreeCart();
}
if(*cartnum==0) {
Log(RDConfig::LogErr,QString().sprintf("rdimport: no free carts available in specified group\n"));
Log(LOG_ERR,QString().sprintf("rdimport: no free carts available in specified group\n"));
wavefile->closeWave();
delete wavefile;
delete wavedata;
@@ -1110,7 +1098,7 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
int cutnum=
cart->addCut(import_format,import_bitrate,import_channels);
if(cutnum<0) {
Log(RDConfig::LogErr,QString().sprintf("rdimport: no free cuts available in cart %06u\n",*cartnum));
Log(LOG_WARNING,QString().sprintf("rdimport: no free cuts available in cart %06u\n",*cartnum));
delete cart;
return MainObject::NoCut;
}
@@ -1136,18 +1124,18 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
conv->setUseMetadata(cart_created);
if(import_verbose) {
if(wavedata->title().length()==0 || ( (wavedata->title().length()>0) && (wavedata->title()[0] == '\0')) ) {
Log(RDConfig::LogInfo,QString().sprintf(" Importing file \"%s\" to cart %06u ... ",
Log(LOG_INFO,QString().sprintf(" Importing file \"%s\" to cart %06u ... ",
(const char *)RDGetBasePart(filename).utf8(),*cartnum));
}
else {
if(import_string_title.isNull()) {
Log(RDConfig::LogInfo,QString().sprintf(" Importing file \"%s\" [%s] to cart %06u ... ",
Log(LOG_INFO,QString().sprintf(" Importing file \"%s\" [%s] to cart %06u ... ",
(const char *)RDGetBasePart(filename).utf8(),
(const char *)wavedata->title().stripWhiteSpace().utf8(),
*cartnum));
}
else {
Log(RDConfig::LogInfo,QString().sprintf(" Importing file \"%s\" [%s] to cart %06u ... ",
Log(LOG_INFO,QString().sprintf(" Importing file \"%s\" [%s] to cart %06u ... ",
(const char *)RDGetBasePart(filename).utf8(),
(const char *)import_string_title.stripWhiteSpace().utf8(),
*cartnum));
@@ -1159,12 +1147,12 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
&audio_conv_err)) {
case RDAudioImport::ErrorOk:
if(import_verbose) {
Log(RDConfig::LogInfo,QString().sprintf("done.\n"));
Log(LOG_INFO,QString().sprintf("done.\n"));
}
break;
default:
Log(RDConfig::LogNotice,QString().sprintf(" %s, skipping %s...\n",
Log(LOG_INFO,QString().sprintf(" %s, skipping %s...\n",
(const char *)RDAudioImport::errorText(conv_err,audio_conv_err),
(const char *)filename.utf8()));
if(cart_created) {
@@ -1369,7 +1357,7 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
if(import_delete_source) {
unlink(filename.utf8());
if(import_verbose) {
Log(RDConfig::LogInfo,QString().sprintf(" Deleted file \"%s\"\n",(const char *)RDGetBasePart(filename).utf8()));
Log(LOG_INFO,QString().sprintf(" Deleted file \"%s\"\n",(const char *)RDGetBasePart(filename).utf8()));
}
}
if(!import_run) {
@@ -1900,7 +1888,7 @@ bool MainObject::VerifyPattern(const QString &pattern)
void MainObject::DeleteCuts(unsigned cartnum)
{
if(import_verbose) {
Log(RDConfig::LogInfo,QString().sprintf(" Deleting cuts from cart %06u\n",cartnum));
Log(LOG_INFO,QString().sprintf(" Deleting cuts from cart %06u\n",cartnum));
}
unsigned dev;
RDCart *cart=new RDCart(cartnum);
@@ -1991,7 +1979,7 @@ void MainObject::ReadXmlFile(const QString &basename,RDWaveData *wavedata) const
}
xmlname+="xml";
if(import_verbose) {
Log(RDConfig::LogInfo,QString().sprintf(" Reading xml metadata from \"%s\": ",(const char *)xmlname));
Log(LOG_INFO,QString().sprintf(" Reading xml metadata from \"%s\": ",(const char *)xmlname));
}
//
@@ -2000,12 +1988,12 @@ void MainObject::ReadXmlFile(const QString &basename,RDWaveData *wavedata) const
wavedata->clear();
if((f=fopen(xmlname,"r"))==NULL) {
if(import_verbose) {
Log(RDConfig::LogErr,QString().sprintf("failed [%s]\n",strerror(errno)));
Log(LOG_WARNING,QString().sprintf("failed [%s]\n",strerror(errno)));
return;
}
}
if(import_verbose) {
Log(RDConfig::LogInfo,QString("success\n"));
Log(LOG_INFO,QString("success\n"));
}
while(fgets(line,1024,f)!=NULL) {
xml+=line;
@@ -2032,15 +2020,15 @@ void MainObject::SendNotification(RDNotification::Action action,
}
void MainObject::Log(RDConfig::LogPriority prio,const QString &msg) const
void MainObject::Log(int prio,const QString &msg) const
{
QString m=msg;
if (import_drop_box||import_log_syslog||import_log_file) {
rda->log(prio,m.replace(QRegExp("^rdimport: "),"").simplified());
syslog(prio,m.replace(QRegExp("^rdimport: "),"").simplified());
}
else {
if(prio==RDConfig::LogErr) {
if(prio==LOG_ERR) {
fprintf(stderr,"%s",(const char *)msg);
fflush(stderr);
}

View File

@@ -73,7 +73,7 @@ class MainObject : public QObject
void WriteTimestampCache(const QString &filename,const QDateTime &dt);
bool SchedulerCodeExists(const QString &code) const;
void ReadXmlFile(const QString &basename,RDWaveData *wavedata) const;
void Log(RDConfig::LogPriority prio,const QString &msg) const;
void Log(int prio,const QString &msg) const;
void SendNotification(RDNotification::Action action,unsigned cartnum);
unsigned import_file_key;
RDGroup *import_group;