Use 'safe' filenames regardless of platform
This commit is contained in:
parent
523e362cb9
commit
86e228cacf
15
source/app.d
15
source/app.d
|
@ -51,10 +51,7 @@ int main(string[] args)
|
||||||
}
|
}
|
||||||
|
|
||||||
string dirName = artist~" - "~title~" ("~year~") [WEB FLAC]";
|
string dirName = artist~" - "~title~" ("~year~") [WEB FLAC]";
|
||||||
|
dirName = dirName.replaceAll(regex("[\\?<>:\"/\\\\|\\*]"), "");
|
||||||
version (Windows) {
|
|
||||||
dirName = dirName.replaceAll(regex("[\\?<>:\"/\\\\|\\*]"), "");
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
mkdir(dirName);
|
mkdir(dirName);
|
||||||
|
@ -99,9 +96,7 @@ int main(string[] args)
|
||||||
|
|
||||||
try {
|
try {
|
||||||
auto fileName = trackName;
|
auto fileName = trackName;
|
||||||
version (Windows) {
|
fileName = fileName.replaceAll(regex("[\\?<>:\"/\\\\|\\*]"), "");
|
||||||
fileName = fileName.replaceAll(regex("[\\?<>:\"/\\\\|\\*]"), "");
|
|
||||||
}
|
|
||||||
auto pipes = pipeProcess([magic["ffmpeg"].str, "-i", "-", "-metadata", "title="~trackName, "-metadata", "artist="~trackArtist,
|
auto pipes = pipeProcess([magic["ffmpeg"].str, "-i", "-", "-metadata", "title="~trackName, "-metadata", "artist="~trackArtist,
|
||||||
"-metadata", "album="~title, "-metadata", "year="~year, "-metadata", "track="~num, "-metadata", "genre="~genre,
|
"-metadata", "album="~title, "-metadata", "year="~year, "-metadata", "track="~num, "-metadata", "genre="~genre,
|
||||||
"-metadata", "albumartist="~artist, "-metadata", "discnumber="~discNum, "-metadata", "tracktotal="~tracks.length.text,
|
"-metadata", "albumartist="~artist, "-metadata", "discnumber="~discNum, "-metadata", "tracktotal="~tracks.length.text,
|
||||||
|
@ -144,9 +139,7 @@ int main(string[] args)
|
||||||
if (choice == "y") {
|
if (choice == "y") {
|
||||||
try {
|
try {
|
||||||
auto trackName = tracks[0]["title"].str;
|
auto trackName = tracks[0]["title"].str;
|
||||||
version (Windows) {
|
trackName = trackName.replaceAll(regex("[\\?<>:\"/\\\\|\\*]"), "");
|
||||||
trackName = trackName.replaceAll(regex("[\\?<>:\"/\\\\|\\*]"), "");
|
|
||||||
}
|
|
||||||
|
|
||||||
auto full = execute([magic["sox"].str, firstDisc~"/01 - "~trackName~".flac", "-n", "remix", "1", "spectrogram",
|
auto full = execute([magic["sox"].str, firstDisc~"/01 - "~trackName~".flac", "-n", "remix", "1", "spectrogram",
|
||||||
"-x", "3000", "-y", "513", "-z", "120", "-w", "Kaiser", "-o", "SpecFull.png"]);
|
"-x", "3000", "-y", "513", "-z", "120", "-w", "Kaiser", "-o", "SpecFull.png"]);
|
||||||
|
@ -185,3 +178,5 @@ int main(string[] args)
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ex: set tabstop=2 expandtab:
|
||||||
|
|
Loading…
Reference in New Issue