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

2021-04-06 Fred Gleason <fredg@paravelsystems.com>

Browse Source 
* Fixed a bug in rdimport(1) where the title of an existing cart
	would be overwritten with a default title even when no title
	was found in the file metadata.

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason 2021-04-06 11:57:44 -04:00
parent 24c109ea28
commit 75387491da
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -21402,3 +21402,7 @@
2021-04-06 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdairplay(1) that caused the Talk Timer to
fail to be populated when adding new carts to a log.
2021-04-06 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdimport(1) where the title of an existing cart
would be overwritten with a default title even when no title
was found in the file metadata.

24
utils/rdimport/rdimport.cpp
View File

@ -1055,13 +1055,6 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
effective_group=new RDGroup(import_group->name());
}
}
//
// Ensure that we have at least a Title
//
if(wavedata->metadataFound()&&wavedata->title().isEmpty()) {
wavedata->setTitle(effective_group->generateTitle(filename));
}
}
//
@ -1097,6 +1090,21 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
}
}
//
// Ensure that we have a valid title
//
bool cart_exists=false;
if(*cartnum!=0) {
cart_exists=RDCart::exists(*cartnum);
}
//
// If the cart already exists and no title was found in metadata,
// then keep the existing title. Otherwise, generate a default title.
//
if((!cart_exists)&&wavedata->metadataFound()&&wavedata->title().isEmpty()) {
wavedata->setTitle(effective_group->generateTitle(filename));
}
//
// Attempt to find a free cart
//
@ -1269,7 +1277,7 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
if(cut->description().isEmpty()) { // Final backstop, so we don't end up
cut->setDescription(cart->title()); // with an empty description field.
}
if(!import_metadata_pattern.isEmpty()) {
if((!import_metadata_pattern.isEmpty())&&(!wavedata->title().isEmpty())) {
cart->setTitle(wavedata->title());
}
if(import_startdate_offset!=0) {