Compare commits
No commits in common. "32-filename-sanitization-can-fail-with-ascii-only-target" and "master" have entirely different histories.
32-filenam
...
master
11
atom
11
atom
@ -226,12 +226,7 @@ do
|
|||||||
rest=${line#*::AtOM:SQL:Sep::}
|
rest=${line#*::AtOM:SQL:Sep::}
|
||||||
removeFileDestName=${rest%%::AtOM:SQL:Sep::*}
|
removeFileDestName=${rest%%::AtOM:SQL:Sep::*}
|
||||||
rest=${rest#*::AtOM:SQL:Sep::}
|
rest=${rest#*::AtOM:SQL:Sep::}
|
||||||
if [[ -n "${rest%%::AtOM:SQL:Sep::*}" ]]
|
removefile[$removeFileId]="${destinationpath["$removeFileDestName"]}/${rest%%::AtOM:SQL:Sep::*}"
|
||||||
then
|
|
||||||
removefile[$removeFileId]="${destinationpath["$removeFileDestName"]}/${rest%%::AtOM:SQL:Sep::*}"
|
|
||||||
else
|
|
||||||
removefile[$removeFileId]=''
|
|
||||||
fi
|
|
||||||
read -u4 -r -d $'\0' line
|
read -u4 -r -d $'\0' line
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
@ -416,7 +411,6 @@ echo '
|
|||||||
tags.genre,
|
tags.genre,
|
||||||
tags.performer,
|
tags.performer,
|
||||||
tags.rate,
|
tags.rate,
|
||||||
tags.rating,
|
|
||||||
tags.releasecountry,
|
tags.releasecountry,
|
||||||
tags.replaygain_alb,
|
tags.replaygain_alb,
|
||||||
tags.replaygain_trk,
|
tags.replaygain_trk,
|
||||||
@ -487,8 +481,6 @@ do
|
|||||||
rest=${rest#*::AtOM:SQL:Sep::}
|
rest=${rest#*::AtOM:SQL:Sep::}
|
||||||
rate=${rest%%::AtOM:SQL:Sep::*}
|
rate=${rest%%::AtOM:SQL:Sep::*}
|
||||||
rest=${rest#*::AtOM:SQL:Sep::}
|
rest=${rest#*::AtOM:SQL:Sep::}
|
||||||
rating=${rest%%::AtOM:SQL:Sep::*}
|
|
||||||
rest=${rest#*::AtOM:SQL:Sep::}
|
|
||||||
releasecountry=${rest%%::AtOM:SQL:Sep::*}
|
releasecountry=${rest%%::AtOM:SQL:Sep::*}
|
||||||
rest=${rest#*::AtOM:SQL:Sep::}
|
rest=${rest#*::AtOM:SQL:Sep::}
|
||||||
replaygain_alb=${rest%%::AtOM:SQL:Sep::*}
|
replaygain_alb=${rest%%::AtOM:SQL:Sep::*}
|
||||||
@ -542,7 +534,6 @@ do
|
|||||||
mimetype \
|
mimetype \
|
||||||
performer \
|
performer \
|
||||||
rate \
|
rate \
|
||||||
rating \
|
|
||||||
releasecountry \
|
releasecountry \
|
||||||
replaygain_alb \
|
replaygain_alb \
|
||||||
replaygain_trk \
|
replaygain_trk \
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
currentdbversion=9
|
currentdbversion=8
|
||||||
checkDatabaseVersion() {
|
checkDatabaseVersion() {
|
||||||
local dbversion
|
local dbversion
|
||||||
if dbversion=$(Select atom version <<<"\"1\" = 1")
|
if dbversion=$(Select atom version <<<"\"1\" = 1")
|
||||||
|
|||||||
@ -1,51 +0,0 @@
|
|||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
# Copyright © 2012-2026 ScriptFanix
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published by
|
|
||||||
# the Free Software Foundation, either version 3 of the License.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU General Public License for more details.
|
|
||||||
#
|
|
||||||
# A copy of the GNU General Public License v3 is includded in the LICENSE file
|
|
||||||
# at the root of the project.
|
|
||||||
|
|
||||||
upgradedatabase_8_9() {
|
|
||||||
echo "Upgrading database to version 9... (backup is $database.bak_v8)"
|
|
||||||
cp "$database" "$database.bak_v8"
|
|
||||||
|
|
||||||
echo '
|
|
||||||
ALTER TABLE tags ADD COLUMN rating FLOAT;
|
|
||||||
DROP TRIGGER force_destination_update_on_tag_update;
|
|
||||||
CREATE TRIGGER IF NOT EXISTS force_destination_update_on_tag_update
|
|
||||||
AFTER UPDATE OF
|
|
||||||
genre,
|
|
||||||
albumartist,
|
|
||||||
year,
|
|
||||||
album,
|
|
||||||
disc,
|
|
||||||
artist,
|
|
||||||
track,
|
|
||||||
title,
|
|
||||||
composer,
|
|
||||||
performer,
|
|
||||||
rating,
|
|
||||||
releasecountry,
|
|
||||||
replaygain_alb,
|
|
||||||
replaygain_trk,
|
|
||||||
rate,
|
|
||||||
channels,
|
|
||||||
bitrate,
|
|
||||||
depth
|
|
||||||
ON tags
|
|
||||||
BEGIN
|
|
||||||
UPDATE destination_files SET last_change=0
|
|
||||||
WHERE source_file_id=old.source_file;
|
|
||||||
END;
|
|
||||||
' >&3
|
|
||||||
|
|
||||||
Update atom version 9 <<<"1 = 1"
|
|
||||||
}
|
|
||||||
@ -11,7 +11,6 @@ encodeFile::mp3() {
|
|||||||
[ -n "$albumartist" ] && lameopts+=(--tv TPE2="$albumartist")
|
[ -n "$albumartist" ] && lameopts+=(--tv TPE2="$albumartist")
|
||||||
[ -n "$composer" ] && lameopts+=(--tv TCOM="$composer")
|
[ -n "$composer" ] && lameopts+=(--tv TCOM="$composer")
|
||||||
[ -n "$performer" ] && lameopts+=(--tv TOPE="$performer")
|
[ -n "$performer" ] && lameopts+=(--tv TOPE="$performer")
|
||||||
[ -n "$rating" ] && lameopts+=(--tv "FMPS_RATING=$rating")
|
|
||||||
[ -n "$releasecountry" ] \
|
[ -n "$releasecountry" ] \
|
||||||
&& lameopts+=(--tv TXXX="MusicBrainz Album Release Country=$releasecountry")
|
&& lameopts+=(--tv TXXX="MusicBrainz Album Release Country=$releasecountry")
|
||||||
[ -n "$replaygain_alb" ] \
|
[ -n "$replaygain_alb" ] \
|
||||||
|
|||||||
@ -11,7 +11,6 @@ encodeFile::opus() {
|
|||||||
[ -n "$disc" ] && opusencopts+=(--comment "DISCNUMBER=$disc")
|
[ -n "$disc" ] && opusencopts+=(--comment "DISCNUMBER=$disc")
|
||||||
[ -n "$genre" ] && opusencopts+=(--comment "GENRE=$genre")
|
[ -n "$genre" ] && opusencopts+=(--comment "GENRE=$genre")
|
||||||
[ -n "$performer" ] && opusencopts+=(--comment "PERFORMER=$performer")
|
[ -n "$performer" ] && opusencopts+=(--comment "PERFORMER=$performer")
|
||||||
[ -n "$rating" ] && opusencopts+=(--comment "FMPS_RATING=$rating")
|
|
||||||
[ -n "$releasecountry" ] \
|
[ -n "$releasecountry" ] \
|
||||||
&& opusencopts+=(--comment "RELEASECOUNTRY=$releasecountry")
|
&& opusencopts+=(--comment "RELEASECOUNTRY=$releasecountry")
|
||||||
[ -n "$replaygain_alb" ] \
|
[ -n "$replaygain_alb" ] \
|
||||||
|
|||||||
@ -8,7 +8,6 @@ encodeFile::vorbis() {
|
|||||||
[ -n "$disc" ] && oggencopts+=(-c "DISCNUMBER=$disc")
|
[ -n "$disc" ] && oggencopts+=(-c "DISCNUMBER=$disc")
|
||||||
[ -n "$genre" ] && oggencopts+=(-G "$genre")
|
[ -n "$genre" ] && oggencopts+=(-G "$genre")
|
||||||
[ -n "$performer" ] && oggencopts+=(-c "PERFORMER=$performer")
|
[ -n "$performer" ] && oggencopts+=(-c "PERFORMER=$performer")
|
||||||
[ -n "$rating" ] && oggencopts+=(--comment "FMPS_RATING=$rating")
|
|
||||||
[ -n "$releasecountry" ] \
|
[ -n "$releasecountry" ] \
|
||||||
&& oggencopts+=(-c "RELEASECOUNTRY=$releasecountry")
|
&& oggencopts+=(-c "RELEASECOUNTRY=$releasecountry")
|
||||||
[ -n "$replaygain_alb" ] \
|
[ -n "$replaygain_alb" ] \
|
||||||
|
|||||||
@ -55,13 +55,11 @@ getDestFile() {
|
|||||||
destfile="${filename##*/}"
|
destfile="${filename##*/}"
|
||||||
destfile="${destfile%.*}"
|
destfile="${destfile%.*}"
|
||||||
fi
|
fi
|
||||||
if (( ${destinationascii["$destination"]} ))
|
|
||||||
then
|
|
||||||
destfile=${destfile//$'\n'/::AtOM:NewLine:SQL:Inline::}
|
|
||||||
echo "$destfile" >&${toascii[1]}
|
|
||||||
read -r -u${toascii[0]} destfile
|
|
||||||
destfile=${destfile//::AtOM:NewLine:SQL:Inline::/$'\n'}
|
|
||||||
fi
|
|
||||||
destfile=$(sanitizeFile "$destfile")
|
destfile=$(sanitizeFile "$destfile")
|
||||||
destfile=${destfile//$'\n'/::AtOM:NewLine:SQL:Inline::}
|
destfile=${destfile//$'\n'/::AtOM:NewLine:SQL:Inline::}
|
||||||
|
if (( ${destinationascii["$destination"]} ))
|
||||||
|
then
|
||||||
|
echo "$destfile" >&${toascii[1]}
|
||||||
|
read -r -u${toascii[0]} destfile
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|||||||
@ -26,9 +26,6 @@ sanitizeFile() {
|
|||||||
string=${string/#+(.)/}
|
string=${string/#+(.)/}
|
||||||
string=${string/%+(.)/}
|
string=${string/%+(.)/}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# We can't have newlines either
|
|
||||||
string=${string//$'\n'/ }
|
|
||||||
fi
|
fi
|
||||||
echo "$string"
|
echo "$string"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
getInfosFLAC_version='FLAC-6'
|
getInfosFLAC_version='FLAC-5'
|
||||||
tagreaders+=( "$getInfosFLAC_version" )
|
tagreaders+=( "$getInfosFLAC_version" )
|
||||||
getInfos::FLAC() {
|
getInfos::FLAC() {
|
||||||
local \
|
local \
|
||||||
@ -17,7 +17,6 @@ getInfos::FLAC() {
|
|||||||
--show-tag=COMPOSER \
|
--show-tag=COMPOSER \
|
||||||
--show-tag=DATE \
|
--show-tag=DATE \
|
||||||
--show-tag=DISCNUMBER \
|
--show-tag=DISCNUMBER \
|
||||||
--show-tag=FMPS_RATING \
|
|
||||||
--show-tag=GENRE \
|
--show-tag=GENRE \
|
||||||
--show-tag=PERFORMER \
|
--show-tag=PERFORMER \
|
||||||
--show-tag=RELEASECOUNTRY \
|
--show-tag=RELEASECOUNTRY \
|
||||||
@ -35,7 +34,6 @@ getInfos::FLAC() {
|
|||||||
disc=$(gettag discnumber)
|
disc=$(gettag discnumber)
|
||||||
genre=$(gettag genre)
|
genre=$(gettag genre)
|
||||||
performer=$(gettag performer)
|
performer=$(gettag performer)
|
||||||
rating=$(gettag fmps_rating)
|
|
||||||
releasecountry=$(gettag releasecountry)
|
releasecountry=$(gettag releasecountry)
|
||||||
replaygain_alb=$(gettag replaygain_album_gain)
|
replaygain_alb=$(gettag replaygain_album_gain)
|
||||||
replaygain_trk=$(gettag replaygain_track_gain)
|
replaygain_trk=$(gettag replaygain_track_gain)
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
getInfosOpus_version='Opus-5'
|
getInfosOpus_version='Opus-4'
|
||||||
tagreaders+=( "$getInfosOpus_version" )
|
tagreaders+=( "$getInfosOpus_version" )
|
||||||
getInfos::Opus() {
|
getInfos::Opus() {
|
||||||
tagreader="$getInfosOpus_version"
|
tagreader="$getInfosOpus_version"
|
||||||
@ -15,7 +15,6 @@ getInfos::Opus() {
|
|||||||
artist=$(gettag artist)
|
artist=$(gettag artist)
|
||||||
composer=$(gettag composer)
|
composer=$(gettag composer)
|
||||||
disc=$(gettag discnumber)
|
disc=$(gettag discnumber)
|
||||||
rating=$(gettag fmps_rating)
|
|
||||||
genre=$(gettag genre)
|
genre=$(gettag genre)
|
||||||
performer=$(gettag performer)
|
performer=$(gettag performer)
|
||||||
releasecountry=$(gettag releasecountry)
|
releasecountry=$(gettag releasecountry)
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
getInfosffmpeg_version='ffmpeg-10'
|
getInfosffmpeg_version='ffmpeg-9'
|
||||||
tagreaders+=( "$getInfosffmpeg_version" )
|
tagreaders+=( "$getInfosffmpeg_version" )
|
||||||
getInfos::ffmpeg() {
|
getInfos::ffmpeg() {
|
||||||
tagreader="$getInfosffmpeg_version"
|
tagreader="$getInfosffmpeg_version"
|
||||||
@ -15,7 +15,6 @@ getInfos::ffmpeg() {
|
|||||||
artist, \
|
artist, \
|
||||||
composer, \
|
composer, \
|
||||||
disc, \
|
disc, \
|
||||||
fmps_rating,
|
|
||||||
genre, \
|
genre, \
|
||||||
TOPE, \
|
TOPE, \
|
||||||
releasecountry, \
|
releasecountry, \
|
||||||
@ -41,7 +40,6 @@ getInfos::ffmpeg() {
|
|||||||
disc=$(gettag TAG:disc)
|
disc=$(gettag TAG:disc)
|
||||||
genre=$(gettag TAG:genre)
|
genre=$(gettag TAG:genre)
|
||||||
performer=$(gettag TAG:TOPE)
|
performer=$(gettag TAG:TOPE)
|
||||||
rating=$(gettag fmps_rating)
|
|
||||||
releasecountry=$(gettag TAG:releasecountry)
|
releasecountry=$(gettag TAG:releasecountry)
|
||||||
[[ -z "$releasecountry" ]] \
|
[[ -z "$releasecountry" ]] \
|
||||||
&& releasecountry=$(gettag "TAG:MusicBrainz Album Release Country")
|
&& releasecountry=$(gettag "TAG:MusicBrainz Album Release Country")
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
getInfosSoxi_version='soxi-4'
|
getInfosSoxi_version='soxi-3'
|
||||||
tagreaders+=( "$getInfosSoxi_version" )
|
tagreaders+=( "$getInfosSoxi_version" )
|
||||||
getInfos::soxi() {
|
getInfos::soxi() {
|
||||||
tagreader="$getInfosSoxi_version"
|
tagreader="$getInfosSoxi_version"
|
||||||
@ -15,7 +15,6 @@ getInfos::soxi() {
|
|||||||
artist=$(gettag artist)
|
artist=$(gettag artist)
|
||||||
composer=$(gettag composer)
|
composer=$(gettag composer)
|
||||||
disc=$(gettag discnumber)
|
disc=$(gettag discnumber)
|
||||||
rating=$(gettag fmps_rating)
|
|
||||||
genre=$(gettag genre)
|
genre=$(gettag genre)
|
||||||
performer=$(gettag performer)
|
performer=$(gettag performer)
|
||||||
releasecountry=$(gettag releasecountry)
|
releasecountry=$(gettag releasecountry)
|
||||||
|
|||||||
@ -20,7 +20,6 @@ updateTags() {
|
|||||||
tags.disc,
|
tags.disc,
|
||||||
tags.genre,
|
tags.genre,
|
||||||
tags.performer,
|
tags.performer,
|
||||||
tags.rating,
|
|
||||||
tags.releasecountry,
|
tags.releasecountry,
|
||||||
tags.replaygain_alb,
|
tags.replaygain_alb,
|
||||||
tags.replaygain_trk,
|
tags.replaygain_trk,
|
||||||
@ -87,8 +86,6 @@ echo '
|
|||||||
rest=${rest#*::AtOM:SQL:Sep::}
|
rest=${rest#*::AtOM:SQL:Sep::}
|
||||||
oldperformer=${rest%%::AtOM:SQL:Sep::*}
|
oldperformer=${rest%%::AtOM:SQL:Sep::*}
|
||||||
rest=${rest#*::AtOM:SQL:Sep::}
|
rest=${rest#*::AtOM:SQL:Sep::}
|
||||||
oldrating=${rest%%::AtOM:SQL:Sep::*}
|
|
||||||
rest=${rest#*::AtOM:SQL:Sep::}
|
|
||||||
oldreleasecountry=${rest%%::AtOM:SQL:Sep::*}
|
oldreleasecountry=${rest%%::AtOM:SQL:Sep::*}
|
||||||
rest=${rest#*::AtOM:SQL:Sep::}
|
rest=${rest#*::AtOM:SQL:Sep::}
|
||||||
oldreplaygain_alb=${rest%%::AtOM:SQL:Sep::*}
|
oldreplaygain_alb=${rest%%::AtOM:SQL:Sep::*}
|
||||||
@ -142,8 +139,6 @@ echo '
|
|||||||
${udi:+disc "${disc:-NULL}"} \
|
${udi:+disc "${disc:-NULL}"} \
|
||||||
${uge:+genre "${genre:-NULL}"} \
|
${uge:+genre "${genre:-NULL}"} \
|
||||||
${upe:+performer "${performer:+::AtOM:FT::}${performer:-NULL}"}\
|
${upe:+performer "${performer:+::AtOM:FT::}${performer:-NULL}"}\
|
||||||
${urr:+rating "${rating:+::AtOM:FT::}${rating:-NULL}"}\
|
|
||||||
${urc:+releasecountry "${releasecountry:+::AtOM:FT::}${releasecountry:-NULL}"}\
|
|
||||||
${urc:+releasecountry "${releasecountry:+::AtOM:FT::}${releasecountry:-NULL}"}\
|
${urc:+releasecountry "${releasecountry:+::AtOM:FT::}${releasecountry:-NULL}"}\
|
||||||
${urpa:+replaygain_alb "${replaygain_alb:-NULL}"}\
|
${urpa:+replaygain_alb "${replaygain_alb:-NULL}"}\
|
||||||
${urpt:+replaygain_trk "${replaygain_trk:-NULL}"}\
|
${urpt:+replaygain_trk "${replaygain_trk:-NULL}"}\
|
||||||
@ -166,7 +161,6 @@ echo '
|
|||||||
title \
|
title \
|
||||||
composer \
|
composer \
|
||||||
performer \
|
performer \
|
||||||
rating \
|
|
||||||
releasecountry \
|
releasecountry \
|
||||||
replaygain_alb \
|
replaygain_alb \
|
||||||
replaygain_trk \
|
replaygain_trk \
|
||||||
@ -184,7 +178,6 @@ echo '
|
|||||||
oldtitle \
|
oldtitle \
|
||||||
oldcomposer \
|
oldcomposer \
|
||||||
oldperformer \
|
oldperformer \
|
||||||
oldrating \
|
|
||||||
oldreleasecountry \
|
oldreleasecountry \
|
||||||
oldreplaygain_alb \
|
oldreplaygain_alb \
|
||||||
oldreplaygain_trk \
|
oldreplaygain_trk \
|
||||||
@ -200,7 +193,6 @@ echo '
|
|||||||
udi \
|
udi \
|
||||||
uge \
|
uge \
|
||||||
upe \
|
upe \
|
||||||
urr \
|
|
||||||
urc \
|
urc \
|
||||||
urpa \
|
urpa \
|
||||||
urpt \
|
urpt \
|
||||||
|
|||||||
@ -6,6 +6,7 @@ CREATE TABLE IF NOT EXISTS source_files (
|
|||||||
id INTEGER PRIMARY KEY,
|
id INTEGER PRIMARY KEY,
|
||||||
filename TEXT UNIQUE NOT NULL,
|
filename TEXT UNIQUE NOT NULL,
|
||||||
size INTEGER NOT NULL,
|
size INTEGER NOT NULL,
|
||||||
|
hash TEXT,
|
||||||
mime_type INTEGER,
|
mime_type INTEGER,
|
||||||
last_change FLOAT NOT NULL DEFAULT (strftime('%s','now')),
|
last_change FLOAT NOT NULL DEFAULT (strftime('%s','now')),
|
||||||
last_seen INTEGER NOT NULL DEFAULT (strftime('%s','now')),
|
last_seen INTEGER NOT NULL DEFAULT (strftime('%s','now')),
|
||||||
@ -57,7 +58,6 @@ CREATE TABLE IF NOT EXISTS tags (
|
|||||||
title TEXT,
|
title TEXT,
|
||||||
composer TEXT,
|
composer TEXT,
|
||||||
performer TEXT,
|
performer TEXT,
|
||||||
rating FLOAT,
|
|
||||||
releasecountry TEXT,
|
releasecountry TEXT,
|
||||||
replaygain_alb TEXT,
|
replaygain_alb TEXT,
|
||||||
replaygain_trk TEXT,
|
replaygain_trk TEXT,
|
||||||
@ -132,7 +132,6 @@ CREATE TRIGGER IF NOT EXISTS force_destination_update_on_tag_update
|
|||||||
title,
|
title,
|
||||||
composer,
|
composer,
|
||||||
performer,
|
performer,
|
||||||
rating,
|
|
||||||
releasecountry,
|
releasecountry,
|
||||||
replaygain_alb,
|
replaygain_alb,
|
||||||
replaygain_trk,
|
replaygain_trk,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user