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

2025-04-26 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Cleaned up compiler warnings in 'utils/rdimport/'.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2025-04-26 18:38:40 -04:00
parent a5fdcf0203
commit 75e86ec9e4
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -25018,3 +25018,5 @@
* Cleaned up compiler warnings in 'utils/rddbmgr/'. * Cleaned up compiler warnings in 'utils/rddbmgr/'.
2025-04-26 Fred Gleason <fredg@paravelsystems.com> 2025-04-26 Fred Gleason <fredg@paravelsystems.com>
* Cleaned up compiler warnings in 'utils/rdexport/'. * Cleaned up compiler warnings in 'utils/rdexport/'.
2025-04-26 Fred Gleason <fredg@paravelsystems.com>
* Cleaned up compiler warnings in 'utils/rdimport/'.

14
utils/rdimport/journal.cpp
View File

@ -2,7 +2,7 @@
// //
// E-mail file importation actions // E-mail file importation actions
// //
// (C) Copyright 2020-2021 Fred Gleason <fredg@paravelsystems.com> // (C) Copyright 2020-2025 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
@ -38,13 +38,13 @@ void Journal::addSuccess(const QString &groupname,QString filename,
QString body; QString body;
RDGroup *group=new RDGroup(groupname); RDGroup *group=new RDGroup(groupname);
QStringList addrs= QStringList addrs=
group->notifyEmailAddress().split(",",QString::SkipEmptyParts); group->notifyEmailAddress().split(",",Qt::SkipEmptyParts);
if(!rda->user()->emailAddress().isEmpty()) { if(!rda->user()->emailAddress().isEmpty()) {
addrs.push_back(rda->user()->emailAddress()); addrs.push_back(rda->user()->emailAddress());
} }
if(addrs.size()>0) { if(addrs.size()>0) {
filename=filename.split("/",QString::SkipEmptyParts).last(); filename=filename.split("/",Qt::SkipEmptyParts).last();
if(c_send_immediately) { if(c_send_immediately) {
subject=QObject::tr("Rivendell import for file")+": "+filename; subject=QObject::tr("Rivendell import for file")+": "+filename;
body+=QObject::tr("Rivendell File Import Report")+"\n"; body+=QObject::tr("Rivendell File Import Report")+"\n";
@ -88,13 +88,13 @@ void Journal::addFailure(const QString &groupname,QString filename,
QString body; QString body;
RDGroup *group=new RDGroup(groupname); RDGroup *group=new RDGroup(groupname);
QStringList addrs= QStringList addrs=
group->notifyEmailAddress().split(",",QString::SkipEmptyParts); group->notifyEmailAddress().split(",",Qt::SkipEmptyParts);
if(!rda->user()->emailAddress().isEmpty()) { if(!rda->user()->emailAddress().isEmpty()) {
addrs.push_back(rda->user()->emailAddress()); addrs.push_back(rda->user()->emailAddress());
} }
if(addrs.size()>0) { if(addrs.size()>0) {
filename=filename.split("/",QString::SkipEmptyParts).last(); filename=filename.split("/",Qt::SkipEmptyParts).last();
if(c_send_immediately) { if(c_send_immediately) {
subject=QObject::tr("Rivendell import FAILURE for file")+": "+filename; subject=QObject::tr("Rivendell import FAILURE for file")+": "+filename;
body+=QObject::tr("Rivendell File Import Report")+"\n"; body+=QObject::tr("Rivendell File Import Report")+"\n";
@ -153,7 +153,7 @@ void Journal::sendAll()
} }
from_addr=rda->system()->originEmailAddress(); from_addr=rda->system()->originEmailAddress();
to_addrs=it.key().split(",",QString::SkipEmptyParts); to_addrs=it.key().split(",",Qt::SkipEmptyParts);
subject=QObject::tr("Rivendell import report")+"\n"; subject=QObject::tr("Rivendell import report")+"\n";
body+=QObject::tr("Rivendell File Import Report")+"\n"; body+=QObject::tr("Rivendell File Import Report")+"\n";
@ -197,7 +197,7 @@ void Journal::sendAll()
QStringList to_addrs; QStringList to_addrs;
from_addr=rda->system()->originEmailAddress(); from_addr=rda->system()->originEmailAddress();
to_addrs=it.key().split(",",QString::SkipEmptyParts); to_addrs=it.key().split(",",Qt::SkipEmptyParts);
if(!rda->user()->emailAddress().isEmpty()) { if(!rda->user()->emailAddress().isEmpty()) {
to_addrs.push_back(rda->user()->emailAddress()); to_addrs.push_back(rda->user()->emailAddress());
} }

20
utils/rdimport/rdimport.cpp
View File

@ -2,7 +2,7 @@
// //
// A Batch Importer for Rivendell. // A Batch Importer for Rivendell.
// //
// (C) Copyright 2002-2023 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 // 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
@ -522,7 +522,7 @@ MainObject::MainObject(QObject *parent)
ErrorExit(RDApplication::ExitInvalidOption); ErrorExit(RDApplication::ExitInvalidOption);
} }
if((import_cart_number>0)&&import_by_isci) { 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); ErrorExit(RDApplication::ExitInvalidOption);
} }
@ -1236,7 +1236,7 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
if(isci.isEmpty()) { if(isci.isEmpty()) {
isci=import_string_isci.trimmed(); isci=import_string_isci.trimmed();
if(isci.isEmpty()) { 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())); RDGetBasePart(filename).toUtf8().constData()));
wavefile->closeWave(); wavefile->closeWave();
import_failed_imports++; import_failed_imports++;
@ -1259,7 +1259,7 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
*cartnum=wd->cartNumber(); *cartnum=wd->cartNumber();
} }
if(*cartnum==0) { 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())); RDGetBasePart(filename).toUtf8().constData()));
wavefile->closeWave(); wavefile->closeWave();
import_failed_imports++; import_failed_imports++;
@ -1271,7 +1271,7 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
return MainObject::FileBad; return MainObject::FileBad;
} }
if(!effective_group->cartNumberValid(*cartnum)) { 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(), RDGetBasePart(filename).toUtf8().constData(),
*cartnum, *cartnum,
effective_group->name().toUtf8().constData())); effective_group->name().toUtf8().constData()));
@ -1296,7 +1296,7 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
*cartnum=effective_group->nextFreeCart(); *cartnum=effective_group->nextFreeCart();
} }
if(*cartnum==0) { 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(); wavefile->closeWave();
import_failed_imports++; import_failed_imports++;
import_failed_imports++; import_failed_imports++;
@ -1345,8 +1345,7 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
"`TITLE`='"+RDEscapeString(wavedata->title())+"'"; "`TITLE`='"+RDEscapeString(wavedata->title())+"'";
q=new RDSqlQuery(sql); q=new RDSqlQuery(sql);
if(q->first()) { if(q->first()) {
QString err_msg=QString(). QString err_msg=QString::asprintf(" File \"%s\" has duplicate title \"%s\", skipping...\n",
sprintf(" File \"%s\" has duplicate title \"%s\", skipping...\n",
RDGetBasePart(filename).toUtf8().constData(), RDGetBasePart(filename).toUtf8().constData(),
wavedata->title().toUtf8().constData()); wavedata->title().toUtf8().constData());
Log(LOG_WARNING,err_msg); Log(LOG_WARNING,err_msg);
@ -1406,8 +1405,7 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
settings->setAutotrimLevel(import_autotrim_level/100); settings->setAutotrimLevel(import_autotrim_level/100);
conv->setDestinationSettings(settings); conv->setDestinationSettings(settings);
conv->setUseMetadata(import_update_metadata); conv->setUseMetadata(import_update_metadata);
Log(LOG_INFO,QString(). Log(LOG_INFO,QString::asprintf(" Importing file \"%s\" [%s] to cart %06u ... ",
sprintf(" Importing file \"%s\" [%s] to cart %06u ... ",
RDGetBasePart(filename).toUtf8().constData(), RDGetBasePart(filename).toUtf8().constData(),
wavedata->title().trimmed().toUtf8().constData(), wavedata->title().trimmed().toUtf8().constData(),
*cartnum)); *cartnum));
@ -2440,7 +2438,7 @@ bool MainObject::LoadIsciXref(QString *err_msg,const QString &filename)
} }
else { else {
*err_msg=tr("invalid/corrupt data at line")+ *err_msg=tr("invalid/corrupt data at line")+
QString().sprintf("%d",3+fields.size()); QString::asprintf("%d",3+fields.size());
return false; return false;
} }
} }