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

2024-06-26 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Incremented the package version to 4.3.0.
	* Incremented the Python API version to 4.3.0
	2025-08-30 Fred Gleason <fredg@paravelsystems.com>
	* Added a 'LogDropboxProcessing=' directive to the '[Debugging]'
	section of rd.conf(5).

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2025-08-30 12:17:41 -04:00
parent bbb13406f4
commit 68ae6a7794
9 changed files with 229 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -24816,3 +24816,6 @@
2024-06-26 Fred Gleason <fredg@paravelsystems.com>
* Incremented the package version to 4.3.0.
* Incremented the Python API version to 4.3.0
2025-08-30 Fred Gleason <fredg@paravelsystems.com>
* Added a 'LogDropboxProcessing=' directive to the '[Debugging]'
section of rd.conf(5).

8
conf/rd.conf-sample
View File

@ -281,3 +281,11 @@ LogSqlQueries=
; generate a useful error message in
; RDAdmin->ManageHosts->PyPADInstances->ErrorLog.
KillPypadAfterJsonError=No
; Log the internal processing steps used by rdimport(1) when processing the
; specified dropbox instances. Take a comma-delimited list of dropbox IDs,
; which can be found in the 'ID' column of the dropbox list at
; RDAdmin->ManageHosts->[hostname]->Dropboxes. The log messages are sent
; DEBUG priority level.
; LogDropboxProcessing=<dropbox-id-1>,<dropbox-id-2>,<dropbox-id-3>
;LogDropboxProcessing=27,52,12

22
lib/rdconfig.cpp
View File

@ -2,7 +2,7 @@
//
// A container class for a Rivendell Base Configuration
//
// (C) Copyright 2002-2024 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2025 Fred Gleason <fredg@paravelsystems.com>
//
// 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
@ -441,6 +441,12 @@ bool RDConfig::killPypadAfterJsonError() const
}
QList<int> RDConfig::logDropboxProcessingIds() const
{
return conf_log_dropbox_processing_ids;
}
int RDConfig::logSqlQueriesLevel() const
{
return conf_log_sql_queries_level;
@ -704,6 +710,19 @@ bool RDConfig::load()
&conf_log_sql_queries);
conf_kill_pypad_after_json_error=
profile->boolValue("Debugging","KillPypadAfterJsonError");
QStringList f0=profile->stringValue("Debugging","LogDropboxProcessing").
split(",",QString::KeepEmptyParts);
for(int i=0;i<f0.size();i++) {
bool ok=false;
int id=f0.at(i).trimmed().toUInt(&ok);
if(ok&&(id>0)) {
conf_log_dropbox_processing_ids.push_back(id);
}
else {
fprintf(stderr,"WARNING: invalid dropbox ID \"%s\" specified in LogDropboxProcessing=\n",f0.at(i).toUtf8().constData());
}
}
conf_meter_base_port=
profile->intValue("Hacks","MeterPortBaseNumber",RD_DEFAULT_METER_SOCKET_BASE_UDP_PORT);
conf_meter_port_range=
@ -847,6 +866,7 @@ void RDConfig::clear()
conf_log_sql_queries=false;
conf_log_sql_queries_level=LOG_DEBUG;
conf_kill_pypad_after_json_error=false;
conf_log_dropbox_processing_ids.clear();
conf_lock_rdairplay_memory=false;
conf_meter_base_port=RD_DEFAULT_METER_SOCKET_BASE_UDP_PORT;
conf_meter_port_range=RD_METER_SOCKET_PORT_RANGE;

4
lib/rdconfig.h
View File

@ -2,7 +2,7 @@
//
// A container class for a Rivendell Base Configuration
//
// (C) Copyright 2002-2024 Fred Gleason <fredg@paravelsystems.com>
// (C) Copyright 2002-2025 Fred Gleason <fredg@paravelsystems.com>
//
// 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
@ -113,6 +113,7 @@ class RDConfig
bool logSqlQueries() const;
int logSqlQueriesLevel() const;
bool killPypadAfterJsonError() const;
QList<int> logDropboxProcessingIds() const;
bool enableMixerLogging() const;
bool testOutputStreams() const;
uid_t uid() const;
@ -195,6 +196,7 @@ class RDConfig
int conf_log_log_refresh_level;
bool conf_log_sql_queries;
bool conf_kill_pypad_after_json_error;
QList<int> conf_log_dropbox_processing_ids;
int conf_log_sql_queries_level;
bool conf_lock_rdairplay_memory;
QString conf_save_webget_files_directory;

5
utils/rdimport/Makefile.am
View File

@ -1,6 +1,6 @@
## Makefile.am
##
## (C) Copyright 2002-2022 Fred Gleason <fredg@paravelsystems.com>
## (C) Copyright 2002-2025 Fred Gleason <fredg@paravelsystems.com>
##
## 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
@ -27,7 +27,8 @@ moc_%.cpp: %.h
bin_PROGRAMS = rdimport
dist_rdimport_SOURCES = journal.cpp journal.h\
dist_rdimport_SOURCES = dropboxlist.cpp dropboxlist.h\
journal.cpp journal.h\
markerset.cpp markerset.h\
rdimport.cpp rdimport.h

42
utils/rdimport/dropboxlist.cpp Normal file
View File

@ -0,0 +1,42 @@
// dropboxlist.cpp
//
// List of dropbox file entries
//
// (C) Copyright 2002-2025 Fred Gleason <fredg@paravelsystems.com>
//
// 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
// published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public
// License along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#include <QFile>
#include "dropboxlist.h"
DropboxList::DropboxList(const QString &fname)
{
QFile *file=new QFile(fname);
filename=fname;
size=file->size();
pass=0;
checked=true;
failed=false;
delete file;
}
QString DropboxList::dump() const
{
return QString::asprintf("%s: size: %ld pass: %d checked: %d failed: %d",
filename.toUtf8().constData(),
size,pass,checked,failed);
}

40
utils/rdimport/dropboxlist.h Normal file
View File

@ -0,0 +1,40 @@
// dropboxlist.h
//
// List of dropbox file entries
//
// (C) Copyright 2002-2025 Fred Gleason <fredg@paravelsystems.com>
//
// 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
// published by the Free Software Foundation.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public
// License along with this program; if not, write to the Free Software
// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//
#ifndef DROPBOXLIST_H
#define DROPBOXLIST_H
#include <stdint.h>
#include <QString>
class DropboxList {
public:
DropboxList(const QString &fname);
QString dump() const;
QString filename;
int64_t size;
unsigned pass;
bool checked;
bool failed;
};
#endif // DROPBOXLIST_H

120
utils/rdimport/rdimport.cpp
View File

@ -104,6 +104,7 @@ MainObject::MainObject(QObject *parent)
import_dump_isci_xref=false;
import_by_isci_program_code="";
import_by_isci=false;
import_log_processing=false;
//
// Open the Database
@ -522,10 +523,17 @@ MainObject::MainObject(QObject *parent)
ErrorExit(RDApplication::ExitInvalidOption);
}
if((import_cart_number>0)&&import_by_isci) {
Log(LOG_ERR,QString().sprintf("rdimport: --to-cart and --by-isci are mutually exclusive\n"));
Log(LOG_ERR,QString::asprintf("rdimport: --to-cart and --by-isci are mutually exclusive\n"));
ErrorExit(RDApplication::ExitInvalidOption);
}
//
// Enable Log Dropbox Processing
//
import_log_processing=(import_persistent_dropbox_id>0)&&
(rda->config()->logDropboxProcessingIds().
contains(import_persistent_dropbox_id));
import_cut_markers=new MarkerSet();
import_cut_markers->loadMarker(rda->cmdSwitch(),"cut");
import_talk_markers=new MarkerSet();
@ -882,6 +890,18 @@ MainObject::MainObject(QObject *parent)
if(import_string_year!=0) {
Log(LOG_INFO,QString::asprintf(" Year set to: %d\n",import_string_year));
}
QString str=" LogDropboxProcessing = ";
QList<int> ids=rda->config()->logDropboxProcessingIds();
for(int i=0;i<ids.size();i++) {
str+=QString::asprintf("%d,",ids.at(i));
}
Log(LOG_INFO,str.left(str.length()-1)+"\n");
if(import_log_processing) {
Log(LOG_INFO," Logging dropbox processing: Yes\n");
}
else {
Log(LOG_INFO," Logging dropbox processing: No\n");
}
if(import_xml) {
Log(LOG_INFO,QString::asprintf(" Importing RDXML metadata from external file\n"));
}
@ -1009,14 +1029,14 @@ void MainObject::RunDropBox()
struct sched_param sp;
memset(&sp,0,sizeof(sp));
if(sched_setscheduler(getpid(),SCHED_BATCH,&sp)!=0) {
printf(" Unable to set batch permissions, %s",strerror(errno));
fprintf(stderr," Unable to set batch permissions, %s",strerror(errno));
}
do {
//
// Clear the Checked Flag
//
for(std::list<struct DropboxList *>::const_iterator
for(std::list<DropboxList *>::const_iterator
ci=import_dropbox_list.begin();
ci!=import_dropbox_list.end();ci++) {
(*ci)->checked=false;
@ -1032,7 +1052,7 @@ void MainObject::RunDropBox()
//
// Take Out the Trash
//
for(std::list<struct DropboxList *>::iterator
for(std::list<DropboxList *>::iterator
ci=import_dropbox_list.begin();
ci!=import_dropbox_list.end();ci++) {
if(!(*ci)->checked) {
@ -1050,11 +1070,13 @@ void MainObject::RunDropBox()
void MainObject::ProcessFileEntry(const QString &entry)
{
LogDropBox("ProcessFileEntry(\""+entry+"\")");
glob_t globbuf;
int gflags=GLOB_MARK;
if(entry=="-") {
import_stdin_specified=true;
LogDropBox("STDIN path, no processing done");
return;
}
globbuf.gl_offs=RDIMPORT_GLOB_SIZE;
@ -1065,6 +1087,7 @@ void MainObject::ProcessFileEntry(const QString &entry)
entry.toUtf8().constData()));
globfree(&globbuf);
}
LogDropBox(QString::asprintf("found %lu matches",globbuf.gl_pathc));
for(size_t i=0;i<globbuf.gl_pathc;i++) {
if(globbuf.gl_pathv[i][strlen(globbuf.gl_pathv[i])-1]!='/') {
if(!import_single_cart) {
@ -1102,6 +1125,7 @@ void MainObject::ProcessFileEntry(const QString &entry)
MainObject::Result MainObject::ImportFile(const QString &filename,
unsigned *cartnum)
{
LogDropBox("ImportFile(\""+filename+")");
bool found_cart=false;
bool cart_created=false;
RDWaveData *wavedata=new RDWaveData();
@ -1247,7 +1271,7 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
if(isci.isEmpty()) {
isci=import_string_isci.trimmed();
if(isci.isEmpty()) {
Log(LOG_WARNING,QString().sprintf(" File \"%s\" has no ISCI code, skipping...\n",
Log(LOG_WARNING,QString::asprintf(" File \"%s\" has no ISCI code, skipping...\n",
RDGetBasePart(filename).toUtf8().constData()));
wavefile->closeWave();
import_failed_imports++;
@ -1270,7 +1294,7 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
*cartnum=wd->cartNumber();
}
if(*cartnum==0) {
Log(LOG_WARNING,QString().sprintf(" File \"%s\" has no ISCI xreference entry, skipping...\n",
Log(LOG_WARNING,QString::asprintf(" File \"%s\" has no ISCI xreference entry, skipping...\n",
RDGetBasePart(filename).toUtf8().constData()));
wavefile->closeWave();
import_failed_imports++;
@ -1282,7 +1306,7 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
return MainObject::FileBad;
}
if(!effective_group->cartNumberValid(*cartnum)) {
Log(LOG_WARNING,QString().sprintf(" File \"%s\" cart number %06u is is not valid in group \"%s\", skipping...\n",
Log(LOG_WARNING,QString::asprintf(" File \"%s\" cart number %06u is is not valid in group \"%s\", skipping...\n",
RDGetBasePart(filename).toUtf8().constData(),
*cartnum,
effective_group->name().toUtf8().constData()));
@ -1307,7 +1331,7 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
*cartnum=effective_group->nextFreeCart();
}
if(*cartnum==0) {
Log(LOG_ERR,QString().sprintf("rdimport: no free carts available in specified group\n"));
Log(LOG_ERR,QString::asprintf("rdimport: no free carts available in specified group\n"));
wavefile->closeWave();
import_failed_imports++;
import_failed_imports++;
@ -1356,8 +1380,8 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
"`TITLE`='"+RDEscapeString(wavedata->title())+"'";
q=new RDSqlQuery(sql);
if(q->first()) {
QString err_msg=QString().
sprintf(" File \"%s\" has duplicate title \"%s\", skipping...\n",
QString err_msg=
QString::asprintf(" File \"%s\" has duplicate title \"%s\", skipping...\n",
RDGetBasePart(filename).toUtf8().constData(),
wavedata->title().toUtf8().constData());
Log(LOG_WARNING,err_msg);
@ -1417,8 +1441,8 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
settings->setAutotrimLevel(import_autotrim_level/100);
conv->setDestinationSettings(settings);
conv->setUseMetadata(import_update_metadata);
Log(LOG_INFO,QString().
sprintf(" Importing file \"%s\" [%s] to cart %06u ... ",
Log(LOG_INFO,
QString::asprintf(" Importing file \"%s\" [%s] to cart %06u ... ",
RDGetBasePart(filename).toUtf8().constData(),
wavedata->title().trimmed().toUtf8().constData(),
*cartnum));
@ -1701,10 +1725,15 @@ bool MainObject::OpenAudioFile(RDWaveFile **wavefile,RDWaveData *wavedata)
void MainObject::VerifyFile(const QString &filename,unsigned *cartnum)
{
LogDropBox("VerifyFile(\""+filename+"\")");
bool found=false;
QDateTime dt;
for(std::list<struct DropboxList *>::const_iterator
//
// Monitor Previously Detected Matches
//
for(std::list<DropboxList *>::const_iterator
ci=import_dropbox_list.begin();
ci!=import_dropbox_list.end();ci++) {
if((*ci)->filename==filename) {
@ -1715,10 +1744,12 @@ void MainObject::VerifyFile(const QString &filename,unsigned *cartnum)
(file->lastModified().toSecsSinceEpoch()>dt.toSecsSinceEpoch())) {
if((file->size()==(*ci)->size)&&(!(*ci)->failed)) {
(*ci)->pass++;
LogDropBox("incremented pass count, "+(*ci)->dump());
}
else {
(*ci)->size=file->size();
(*ci)->pass=0;
LogDropBox("[1] size changed, reset pass, "+(*ci)->dump());
}
if((*ci)->failed) {
(*ci)->checked=true;
@ -1726,10 +1757,13 @@ void MainObject::VerifyFile(const QString &filename,unsigned *cartnum)
(*ci)->failed=false;
(*ci)->size=file->size();
(*ci)->pass=0;
LogDropBox("[2] size changed, reset pass, "+(*ci)->dump());
}
}
if((*ci)->pass>=RDIMPORT_DROPBOX_PASSES) {
switch(ImportFile(filename,cartnum)) {
MainObject::Result rslt=ImportFile(filename,cartnum);
LogDropBox(" Result: "+ResultText(rslt));
switch(rslt) {
case MainObject::Success:
WriteTimestampCache(filename,file->lastModified());
break;
@ -1753,18 +1787,19 @@ void MainObject::VerifyFile(const QString &filename,unsigned *cartnum)
(*ci)->checked=true;
}
}
else {
LogDropBox("stale file, ignoring");
}
delete file;
}
}
if(!found) {
QFile *file=new QFile(filename);
import_dropbox_list.push_back(new struct DropboxList());
import_dropbox_list.back()->filename=filename;
import_dropbox_list.back()->size=file->size();
import_dropbox_list.back()->pass=0;
import_dropbox_list.back()->checked=true;
import_dropbox_list.back()->failed=false;
delete file;
//
// No Remaining Matches, So Look For New Ones
//
import_dropbox_list.push_back(new DropboxList(filename));
LogDropBox("adding new file, "+import_dropbox_list.back()->dump());
}
}
@ -2451,7 +2486,7 @@ bool MainObject::LoadIsciXref(QString *err_msg,const QString &filename)
}
else {
*err_msg=tr("invalid/corrupt data at line")+
QString().sprintf("%d",3+fields.size());
QString::asprintf("%d",3+fields.size());
return false;
}
}
@ -2563,6 +2598,15 @@ void MainObject::Log(int prio,const QString &msg) const
}
void MainObject::LogDropBox(const QString &msg) const
{
if(import_log_processing) {
Log(LOG_DEBUG,
QString::asprintf("[DB-%d]: ",import_persistent_dropbox_id)+msg+"\n");
}
}
void MainObject::NormalExit() const
{
if((import_journal!=NULL)&&(import_send_mail)) {
@ -2584,6 +2628,36 @@ void MainObject::ErrorExit(RDApplication::ExitCode code) const
}
QString MainObject::ResultText(Result rslt) const
{
QString ret=QString::asprintf("Unknown [%u]",rslt);
switch(rslt) {
case MainObject::Success:
ret="Success";
break;
case MainObject::FileBad:
ret="FileBad";
break;
case MainObject::NoCart:
ret="NoCart";
break;
case MainObject::NoCut:
ret="NoCut";
break;
case MainObject::DuplicateTitle:
ret="DuplicateTitle";
break;
}
return ret;
}
int main(int argc,char *argv[])
{
QCoreApplication::setSetuidAllowed(true);

11
utils/rdimport/rdimport.h
View File

@ -40,6 +40,7 @@
#include <rdwavedata.h>
#include <rdwavefile.h>
#include "dropboxlist.h"
#include "journal.h"
#include "markerset.h"
@ -80,9 +81,11 @@ class MainObject : public QObject
bool SchedulerCodeExists(const QString &code) const;
void ReadXmlFile(const QString &basename,RDWaveData *wavedata) const;
void Log(int prio,const QString &msg) const;
void LogDropBox(const QString &msg) const;
void SendNotification(RDNotification::Action action,unsigned cartnum);
void NormalExit() const;
void ErrorExit(RDApplication::ExitCode code) const;
QString ResultText(Result rslt) const;
unsigned import_file_key;
RDGroup *import_group;
bool import_verbose;
@ -147,13 +150,7 @@ class MainObject : public QObject
QString import_string_user_defined;
int import_string_year;
int import_failed_imports;
struct DropboxList {
QString filename;
unsigned size;
unsigned pass;
bool checked;
bool failed;
};
bool import_log_processing;
std::list<DropboxList *> import_dropbox_list;
QString import_temp_fix_filename;
MarkerSet *import_cut_markers;