Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-11-13 16:44:10 +01:00
Code Issues Projects Releases Wiki Activity

Fixed conflicts in 'ChangeLog' and 'utils/rddbmgr/schemamap.cpp'

Browse Source 
Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2023-07-07 11:33:13 -04:00
parent 62b1e8a3a8 f3ce20eb99
commit 0a89990b9a
15 changed files with 159 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
utils/rdimport/rdimport.cpp
View File

@@ -98,6 +98,7 @@ MainObject::MainObject(QObject *parent)
import_to_mono=false;
import_failed_imports=0;
import_send_mail=false;
import_update_metadata = false;
import_mail_per_file=false;
import_journal=NULL;
import_dump_isci_xref=false;
@@ -175,6 +176,10 @@ MainObject::MainObject(QObject *parent)
import_delete_cuts=true;
rda->cmdSwitch()->setProcessed(i,true);
}
if (rda->cmdSwitch()->key(i)=="--update-metadata") {
import_update_metadata=true;
rda->cmdSwitch()->setProcessed(i, true);
}
if(rda->cmdSwitch()->key(i)=="--dump-isci-xref") {
import_dump_isci_xref=true;
rda->cmdSwitch()->setProcessed(i,true);
@@ -711,8 +716,14 @@ MainObject::MainObject(QObject *parent)
else {
Log(LOG_INFO,QString(" Delete cuts mode is OFF\n"));
}
if(import_dump_isci_xref) {
Log(LOG_INFO,QString(" Dump ISCI Cross Reference File is ON\n"));
if(import_update_metadata) {
Log(LOG_INFO,QString(" Update Metadata mode is ON\n"));
}
else {
Log(LOG_INFO,QString(" Update Metadata mode is OFF\n"));
}
if (import_dump_isci_xref) {
Log(LOG_INFO, QString(" Dump ISCI Cross Reference File is ON\n"));
}
else {
Log(LOG_INFO,QString(" Dump ISCI Cross Reference File is OFF\n"));
@@ -1186,11 +1197,19 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
//
// If the cart already exists and no title was found in metadata,
// then keep the existing title. Otherwise, generate a default title.
// - OR -
// If the cart already exists and a title was found in metadata,
// AND --update-metadata was specified on the command line,
// then use that title.
//
if((!cart_exists)&&wavedata->metadataFound()&&wavedata->title().isEmpty()) {
wavedata->setTitle(effective_group->generateTitle(filename));
}
}
else if ((cart_exists)&&wavedata->metadataFound()&&
!wavedata->title().isEmpty()&&(import_update_metadata)) {
wavedata->setTitle(import_string_title);
}
}
else { // Use specified title
wavedata->setTitle(import_string_title);
}
@@ -1397,7 +1416,7 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
settings->setNormalizationLevel(import_normalization_level/100);
settings->setAutotrimLevel(import_autotrim_level/100);
conv->setDestinationSettings(settings);
conv->setUseMetadata(false);
conv->setUseMetadata(import_update_metadata);
Log(LOG_INFO,QString().
sprintf(" Importing file \"%s\" [%s] to cart %06u ... ",
RDGetBasePart(filename).toUtf8().constData(),