2020-02-07 Fred Gleason <fredg@paravelsystems.com>

* Added a '%wc' ['Industry Standard Commercial Identification (ISCI)
	Code'] metadata wildcard.
	* Implemented the '%wc' metadata wildcard for PyPAD.
	* Added support for the '%wc' wildcards to the '--metadata-pattern='
	switch in rdimport(1).
	* Added '--set-string-isci' switch to rdimport(1).
	* Added support for the '%wc' wildcard to the '--metadata-pattern='
	switch in rdexport(1).
This commit is contained in:
Fred Gleason
2020-02-07 08:58:48 -05:00
parent 6eee8cb9d9
commit 0344db5fee
8 changed files with 50 additions and 4 deletions

View File

@@ -382,6 +382,10 @@ MainObject::MainObject(QObject *parent)
import_string_outcue=rda->cmdSwitch()->value(i);
rda->cmdSwitch()->setProcessed(i,true);
}
if(rda->cmdSwitch()->key(i)=="--set-string-isci") {
import_string_isci=rda->cmdSwitch()->value(i);
rda->cmdSwitch()->setProcessed(i,true);
}
if(rda->cmdSwitch()->key(i)=="--set-string-isrc") {
if(RDDiscLookup::isrcIsValid(rda->cmdSwitch()->value(i))) {
import_string_isrc=rda->cmdSwitch()->value(i);
@@ -742,6 +746,9 @@ MainObject::MainObject(QObject *parent)
if(!import_string_outcue.isNull()) {
Log(LOG_INFO,QString().sprintf(" Outcue set to: %s\n",(const char *)import_string_outcue));
}
if(!import_string_isci.isNull()) {
Log(LOG_INFO,QString().sprintf(" ISCI set to: %s\n",(const char *)import_string_isci));
}
if(!import_string_isrc.isNull()) {
Log(LOG_INFO,QString().sprintf(" ISRC set to: %s\n",(const char *)import_string_isrc));
}
@@ -1242,6 +1249,9 @@ MainObject::Result MainObject::ImportFile(const QString &filename,
if(!import_string_outcue.isNull()) {
cut->setOutcue(import_string_outcue);
}
if(!import_string_isci.isNull()) {
cut->setIsci(import_string_isci);
}
if(!import_string_isrc.isNull()) {
cut->setIsrc(RDDiscLookup::normalizedIsrc(import_string_isrc));
}
@@ -1801,6 +1811,11 @@ bool MainObject::RunPattern(const QString &pattern,const QString &filename,
case 'w':
switch(subfield.toAscii()) {
case 'c':
wavedata->setIsci(value);
wavedata->setMetadataFound(true);
break;
case 'i':
if(RDDiscLookup::isrcIsValid(value)) {
wavedata->setIsrc(RDDiscLookup::normalizedIsrc(value));

View File

@@ -124,6 +124,7 @@ class MainObject : public QObject
QString import_string_description;
QString import_string_outcue;
QString import_string_isrc;
QString import_string_isci;
QString import_string_recording_mbid;
QString import_string_release_mbid;
QString import_string_publisher;