diff --git a/lib/tags/ffmpeg b/lib/tags/ffmpeg index 0e75477..364a463 100644 --- a/lib/tags/ffmpeg +++ b/lib/tags/ffmpeg @@ -1,5 +1,5 @@ #!/bin/bash -getInfosffmpeg_version='ffmpeg-6' +getInfosffmpeg_version='ffmpeg-7' tagreaders+=( "$getInfosffmpeg_version" ) getInfos::ffmpeg() { tagreader="$getInfosffmpeg_version" @@ -32,6 +32,7 @@ getInfos::ffmpeg() { disc=$(gettag disc) genre=$(gettag genre) performer=$(gettag TOPE) + releasecountry=$(gettag releasecountry) title=$(gettag title) tracknum=$(gettag track) year=$(gettag date) diff --git a/lib/tags/flac b/lib/tags/flac index 32a37be..1a41a4a 100644 --- a/lib/tags/flac +++ b/lib/tags/flac @@ -1,21 +1,22 @@ #!/bin/bash -getInfosFLAC_version='FLAC-3' +getInfosFLAC_version='FLAC-4' tagreaders+=( "$getInfosFLAC_version" ) getInfos::FLAC() { tagreader="$getInfosFLAC_version" infos=$( - metaflac \ - --show-tag=ALBUM \ - --show-tag=ALBUMARTIST \ - --show-tag=ARTIST \ - --show-tag=COMPOSER \ - --show-tag=DATE \ - --show-tag=DISCNUMBER \ - --show-tag=GENRE \ - --show-tag=PERFORMER \ - --show-tag=TITLE \ - --show-tag=TRACKNUMBER \ - --show-tag=TRACKTOTAL \ + metaflac \ + --show-tag=ALBUM \ + --show-tag=ALBUMARTIST \ + --show-tag=ARTIST \ + --show-tag=COMPOSER \ + --show-tag=DATE \ + --show-tag=DISCNUMBER \ + --show-tag=GENRE \ + --show-tag=PERFORMER \ + --show-tag=RELEASECOUNTRY \ + --show-tag=TITLE \ + --show-tag=TRACKNUMBER \ + --show-tag=TRACKTOTAL \ "$sourcepath/$filename" ) albumartist=$(gettag albumartist) @@ -25,6 +26,7 @@ getInfos::FLAC() { disc=$(gettag discnumber) genre=$(gettag genre) performer=$(gettag performer) + releasecountry=$(gettag releasecountry) title=$(gettag title) tracknum=$(gettag tracknumber) tracktotal=$(gettag tracktotal) diff --git a/lib/tags/opus b/lib/tags/opus index bed6242..ea3affd 100644 --- a/lib/tags/opus +++ b/lib/tags/opus @@ -1,5 +1,5 @@ #!/bin/bash -getInfosOpus_version='Opus-2' +getInfosOpus_version='Opus-3' tagreaders+=( "$getInfosOpus_version" ) getInfos::Opus() { tagreader="$getInfosOpus_version" @@ -14,6 +14,7 @@ getInfos::Opus() { disc=$(gettag discnumber) genre=$(gettag genre) performer=$(gettag performer) + releasecountry=$(gettag releasecountry) title=$(gettag title) tracknum=$(gettag tracknumber) tracktotal=$(gettag tracktotal) diff --git a/lib/tags/soxi b/lib/tags/soxi index ccd60fd..fa3aeb5 100644 --- a/lib/tags/soxi +++ b/lib/tags/soxi @@ -1,5 +1,5 @@ #!/bin/bash -getInfosSoxi_version='soxi-1' +getInfosSoxi_version='soxi-2' tagreaders+=( "$getInfosSoxi_version" ) getInfos::soxi() { tagreader="$getInfosSoxi_version" @@ -13,6 +13,7 @@ getInfos::soxi() { disc=$(gettag discnumber) genre=$(gettag genre) performer=$(gettag performer) + releasecountry=$(gettag releasecountry) title=$(gettag title) tracknum=$(gettag tracknumber) tracktotal=$(gettag tracktotal) diff --git a/lib/tags/update b/lib/tags/update index dad68c4..789c5a8 100644 --- a/lib/tags/update +++ b/lib/tags/update @@ -18,6 +18,7 @@ updateTags() { tags.disc, tags.genre, tags.performer, + tags.releasecountry, tags.title, tags.track, tags.year, @@ -81,6 +82,8 @@ echo ' rest=${rest#*::AtOM:SQL:Sep::} oldperformer=${rest%%::AtOM:SQL:Sep::*} rest=${rest#*::AtOM:SQL:Sep::} + oldreleasecountry=${rest%%::AtOM:SQL:Sep::*} + rest=${rest#*::AtOM:SQL:Sep::} oldtitle=${rest%%::AtOM:SQL:Sep::*} rest=${rest#*::AtOM:SQL:Sep::} oldtrack=${rest%%::AtOM:SQL:Sep::*} @@ -110,6 +113,7 @@ echo ' [[ $olddisc != "$disc" ]]&& udi=1 [[ $oldgenre != "$genre" ]]&& uge=1 [[ $oldperformer != "$performer" ]]&& upe=1 + [[ $oldreleasecountry != "$releasecountry" ]]&& urc=1 [[ $oldtitle != "$title" ]]&& uti=1 [[ $oldtrack != "$tracknum" ]]&& utr=1 [[ $oldyear != "$year" ]]&& uye=1 @@ -125,6 +129,7 @@ echo ' ${udi:+disc "${disc:-NULL}"} \ ${uge:+genre "${genre:-NULL}"} \ ${upe:+performer "${performer:+::AtOM:FT::}${performer:-NULL}"}\ + ${urc:+releasecountry "${releasecountry:+::AtOM:FT::}${releasecountry:-NULL}"}\ ${uti:+title "${title:+::AtOM:FT::}${title:-NULL}"}\ ${utr:+track "${track:+::AtOM:FT::}${tracknum:-NULL}"}\ ${uye:+year "${year:-NULL}"} \ @@ -144,6 +149,7 @@ echo ' title \ composer \ performer \ + releasecountry \ rate \ bitdepth \ bitrate \ @@ -156,6 +162,7 @@ echo ' udi \ uge \ upe \ + urc \ uti \ utr \ uye \