Fixed output path generation: Applying MUtils::clean_file_path() on the complete output path is *not* sufficient, as it doesn't catch path separators introduced by the rename pattern. We need to explicitly apply MUtils::clean_file_name() on the file name part.

This commit is contained in:
LoRd_MuldeR 2017-03-12 21:14:56 +01:00
parent 6d64463bb9
commit 8e526fbb0a
18 changed files with 176 additions and 166 deletions

View File

@ -34,7 +34,7 @@
<nav id="TOC">
<ul>
<li><a href="#lamexp-v4.xx-history"><span class="toc-section-number">1</span> LameXP v4.xx History</a><ul>
<li><a href="#lamexp-v4.15-2016--">LameXP v4.15 [2016-??-??]</a></li>
<li><a href="#lamexp-v4.15-2017--">LameXP v4.15 [2017-??-??]</a></li>
<li><a href="#lamexp-v4.14-2016-11-19">LameXP v4.14 [2016-11-19]</a></li>
<li><a href="#lamexp-v4.13-2015-12-12">LameXP v4.13 [2015-12-12]</a></li>
<li><a href="#lamexp-v4.12-2015-10-23">LameXP v4.12 [2015-10-23]</a></li>
@ -83,10 +83,12 @@
</ul>
</nav>
<h1 id="lamexp-v4.xx-history"><span class="header-section-number">1</span> LameXP v4.xx History</h1>
<h2 id="lamexp-v4.15-2016--" class="unnumbered">LameXP v4.15 [2016-??-??]</h2>
<h2 id="lamexp-v4.15-2017--" class="unnumbered">LameXP v4.15 [2017-??-??]</h2>
<ul>
<li>Updated MediaInfo to v0.7.91 (2016-11-30), compiled with ICL 17.0 and MSVC 12.0</li>
<li>Fixed a bug in auto-rename feature, that caused problem when meta-tag contains path separator</li>
<li>Fixed included MediaInfo binary not working on processor <em>without</em> SSE2 support</li>
<li>Some improvements for &quot;high DPI&quot; screens: Adjust initial window size according to DPI setting</li>
<li>Updated MediaInfo to v0.7.91 (2016-11-30), compiled with ICL 17.0 and MSVC 12.0</li>
</ul>
<h2 id="lamexp-v4.14-2016-11-19" class="unnumbered">LameXP v4.14 [2016-11-19]</h2>
<ul>

View File

@ -2,9 +2,11 @@
# LameXP v4.xx History #
## LameXP v4.15 [2016-??-??] ## {-}
* Updated MediaInfo to v0.7.91 (2016-11-30), compiled with ICL 17.0 and MSVC 12.0
## LameXP v4.15 [2017-??-??] ## {-}
* Fixed a bug in auto-rename feature, that caused problem when meta-tag contains path separator
* Fixed included MediaInfo binary not working on processor *without* SSE2 support
* Some improvements for "high DPI" screens: Adjust initial window size according to DPI setting
* Updated MediaInfo to v0.7.91 (2016-11-30), compiled with ICL 17.0 and MSVC 12.0
## LameXP v4.14 [2016-11-19] ## {-}

View File

@ -3072,57 +3072,57 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="442"/>
<location filename="../../src/Thread_Process.cpp" line="447"/>
<source>The target output directory doesn&apos;t exist and could NOT be created:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="451"/>
<location filename="../../src/Thread_Process.cpp" line="456"/>
<source>The target output directory is NOT writable:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="517"/>
<location filename="../../src/Thread_Process.cpp" line="522"/>
<source>Unknown File Name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="519"/>
<location filename="../../src/Thread_Process.cpp" line="524"/>
<source>Unknown Title</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<location filename="../../src/Thread_Process.cpp" line="525"/>
<source>Unknown Artist</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="521"/>
<location filename="../../src/Thread_Process.cpp" line="526"/>
<source>Unknown Album</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="523"/>
<location filename="../../src/Thread_Process.cpp" line="528"/>
<source>Unknown Comment</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="469"/>
<location filename="../../src/Thread_Process.cpp" line="474"/>
<source>Target output file already exists, going to skip this file:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="470"/>
<location filename="../../src/Thread_Process.cpp" line="475"/>
<source>If you don&apos;t want existing files to be skipped, please change the overwrite mode!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="477"/>
<location filename="../../src/Thread_Process.cpp" line="482"/>
<source>Target output file already exists, going to delete existing file:</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="491"/>
<location filename="../../src/Thread_Process.cpp" line="496"/>
<source>Failed to delete existing target file, will save to another file name!</source>
<translation type="unfinished"></translation>
</message>

View File

@ -3065,37 +3065,37 @@
<translation>Die Quell-Audiodatei konnte nicht zum Lesen geöffnet werden:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="442"/>
<location filename="../../src/Thread_Process.cpp" line="447"/>
<source>The target output directory doesn&apos;t exist and could NOT be created:</source>
<translation>Das Zielverzeichnis existiert nicht und konnte nicht erstellt werden:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="451"/>
<location filename="../../src/Thread_Process.cpp" line="456"/>
<source>The target output directory is NOT writable:</source>
<translation>In das Zielverzeichnis kann nicht geschrieben werden:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="517"/>
<location filename="../../src/Thread_Process.cpp" line="522"/>
<source>Unknown File Name</source>
<translation>Unbekannter Dateiname</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="519"/>
<location filename="../../src/Thread_Process.cpp" line="524"/>
<source>Unknown Title</source>
<translation>Unbekannter Titel</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<location filename="../../src/Thread_Process.cpp" line="525"/>
<source>Unknown Artist</source>
<translation>Unbekannter Künstler</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="521"/>
<location filename="../../src/Thread_Process.cpp" line="526"/>
<source>Unknown Album</source>
<translation>Unbekanntes Album</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="523"/>
<location filename="../../src/Thread_Process.cpp" line="528"/>
<source>Unknown Comment</source>
<translation>Unbekannter Kommentar</translation>
</message>
@ -3116,22 +3116,22 @@
<translation>Übersprungen.</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="469"/>
<location filename="../../src/Thread_Process.cpp" line="474"/>
<source>Target output file already exists, going to skip this file:</source>
<translation>Zieldatei existiert bereits, die Datei wird übersprungen:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="470"/>
<location filename="../../src/Thread_Process.cpp" line="475"/>
<source>If you don&apos;t want existing files to be skipped, please change the overwrite mode!</source>
<translation>Wenn existierende Dateien nicht übersprungen werden sollen, ändern Sie bitte den Überschreiben-Modus!</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="477"/>
<location filename="../../src/Thread_Process.cpp" line="482"/>
<source>Target output file already exists, going to delete existing file:</source>
<translation>Zieldatei existiert bereits, die Datei wird gelöscht und überschrieben:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="491"/>
<location filename="../../src/Thread_Process.cpp" line="496"/>
<source>Failed to delete existing target file, will save to another file name!</source>
<translation>Die existierende Datei konnte nicht gelöscht werden, ein anderer Dateiname wird gewählt!</translation>
</message>

View File

@ -3065,37 +3065,37 @@
<translation>No se puede abrir el archivo de entrada para su lectura:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="442"/>
<location filename="../../src/Thread_Process.cpp" line="447"/>
<source>The target output directory doesn&apos;t exist and could NOT be created:</source>
<translation>La carpeta de salida no existe y NO puede ser creada:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="451"/>
<location filename="../../src/Thread_Process.cpp" line="456"/>
<source>The target output directory is NOT writable:</source>
<translation>NO se puede escribir en la carpeta de salida:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="517"/>
<location filename="../../src/Thread_Process.cpp" line="522"/>
<source>Unknown File Name</source>
<translation>Nombre de archivo desconocido</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="519"/>
<location filename="../../src/Thread_Process.cpp" line="524"/>
<source>Unknown Title</source>
<translation>Título desconocido</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<location filename="../../src/Thread_Process.cpp" line="525"/>
<source>Unknown Artist</source>
<translation>Artista desconocido</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="521"/>
<location filename="../../src/Thread_Process.cpp" line="526"/>
<source>Unknown Album</source>
<translation>Álbum desconocido</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="523"/>
<location filename="../../src/Thread_Process.cpp" line="528"/>
<source>Unknown Comment</source>
<translation>Comentario desconocido</translation>
</message>
@ -3116,22 +3116,22 @@
<translation>Omitidos.</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="469"/>
<location filename="../../src/Thread_Process.cpp" line="474"/>
<source>Target output file already exists, going to skip this file:</source>
<translation>El archivo de destino ya existe, se omitirá este archivo:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="470"/>
<location filename="../../src/Thread_Process.cpp" line="475"/>
<source>If you don&apos;t want existing files to be skipped, please change the overwrite mode!</source>
<translation>¡Si no quiere sobreescribir los archivos existentes, cambie el modo sobreescritura por favor!</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="477"/>
<location filename="../../src/Thread_Process.cpp" line="482"/>
<source>Target output file already exists, going to delete existing file:</source>
<translation>El archivo de destino ya existe, se eliminará este archivo:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="491"/>
<location filename="../../src/Thread_Process.cpp" line="496"/>
<source>Failed to delete existing target file, will save to another file name!</source>
<translation>¡Error al eliminar el archivo de destino existente, se guardará con otro nombre!</translation>
</message>

View File

@ -3072,37 +3072,37 @@ Sélection automatique (par défaut)</translation>
<translation>Le fichier audio source n&apos;a pas pu être ouvert pour la lecture:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="442"/>
<location filename="../../src/Thread_Process.cpp" line="447"/>
<source>The target output directory doesn&apos;t exist and could NOT be created:</source>
<translation>Le répertoire de sortie cible n&apos;existe pas et ne peut PAS être créé:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="451"/>
<location filename="../../src/Thread_Process.cpp" line="456"/>
<source>The target output directory is NOT writable:</source>
<translation>Le répertoire de sortie cible n&apos;est pas accessible en écriture:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="517"/>
<location filename="../../src/Thread_Process.cpp" line="522"/>
<source>Unknown File Name</source>
<translation>Nom de fichier inconnu</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="519"/>
<location filename="../../src/Thread_Process.cpp" line="524"/>
<source>Unknown Title</source>
<translation>Titre inconnu</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<location filename="../../src/Thread_Process.cpp" line="525"/>
<source>Unknown Artist</source>
<translation>Artiste inconnu</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="521"/>
<location filename="../../src/Thread_Process.cpp" line="526"/>
<source>Unknown Album</source>
<translation>Album inconnu</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="523"/>
<location filename="../../src/Thread_Process.cpp" line="528"/>
<source>Unknown Comment</source>
<translation>Commentaire inconnu</translation>
</message>
@ -3124,22 +3124,22 @@ Sélection automatique (par défaut)</translation>
<translation>Ignoré.</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="469"/>
<location filename="../../src/Thread_Process.cpp" line="474"/>
<source>Target output file already exists, going to skip this file:</source>
<translation>Le fichier de sortie existe déjà, il sera ignoré :</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="470"/>
<location filename="../../src/Thread_Process.cpp" line="475"/>
<source>If you don&apos;t want existing files to be skipped, please change the overwrite mode!</source>
<translation>Si vous ne voulez pas ignorer les fichiers existants, veuillez changer le mode de remplacement !</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="477"/>
<location filename="../../src/Thread_Process.cpp" line="482"/>
<source>Target output file already exists, going to delete existing file:</source>
<translation>Le fichier de sortie existe déjà, il sera supprimé :</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="491"/>
<location filename="../../src/Thread_Process.cpp" line="496"/>
<source>Failed to delete existing target file, will save to another file name!</source>
<translation>Impossible de supprimer le fichier cible existant, il sera enregistré sous un autre nom !</translation>
</message>

View File

@ -3072,57 +3072,57 @@
<translation>A forrás hangfájl nem nyitható meg olvasásra:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="442"/>
<location filename="../../src/Thread_Process.cpp" line="447"/>
<source>The target output directory doesn&apos;t exist and could NOT be created:</source>
<translation>A cél kimeneti könyvtár nem létezik, és NEM hozható létre:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="451"/>
<location filename="../../src/Thread_Process.cpp" line="456"/>
<source>The target output directory is NOT writable:</source>
<translation>A cél kimeneti könyvtár NEM írható:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="517"/>
<location filename="../../src/Thread_Process.cpp" line="522"/>
<source>Unknown File Name</source>
<translation>Ismeretlen fájlnév</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="519"/>
<location filename="../../src/Thread_Process.cpp" line="524"/>
<source>Unknown Title</source>
<translation>Ismeretlen cím</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<location filename="../../src/Thread_Process.cpp" line="525"/>
<source>Unknown Artist</source>
<translation>Ismeretlen előadó</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="521"/>
<location filename="../../src/Thread_Process.cpp" line="526"/>
<source>Unknown Album</source>
<translation>Ismeretlen album</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="523"/>
<location filename="../../src/Thread_Process.cpp" line="528"/>
<source>Unknown Comment</source>
<translation>Ismeretlen hozzászólás</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="469"/>
<location filename="../../src/Thread_Process.cpp" line="474"/>
<source>Target output file already exists, going to skip this file:</source>
<translation>A cél kimeneti fájl már létezik, ez a fájl ki lesz hagyva:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="470"/>
<location filename="../../src/Thread_Process.cpp" line="475"/>
<source>If you don&apos;t want existing files to be skipped, please change the overwrite mode!</source>
<translation>Ha nem szeretné a meglévő fájlokat kihagyni, kérjük, változtassa meg a felülírási módot!</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="477"/>
<location filename="../../src/Thread_Process.cpp" line="482"/>
<source>Target output file already exists, going to delete existing file:</source>
<translation>A cél kimeneti fájl már létezik, a meglévő fájl törlésre kerül:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="491"/>
<location filename="../../src/Thread_Process.cpp" line="496"/>
<source>Failed to delete existing target file, will save to another file name!</source>
<translation>Nem sikerült törölni a meglévő cél fájlt. Az állomány másik fájlnéven lesz elmentve!</translation>
</message>

View File

@ -3131,38 +3131,38 @@
<translation>Il file audio sorgente non può essere aperto per la lettura:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="442"/>
<location filename="../../src/Thread_Process.cpp" line="447"/>
<source>The target output directory doesn&apos;t exist and could NOT be created:</source>
<translation>La cartella di destinazione assegnata non esiste e NON può essere creata:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="451"/>
<location filename="../../src/Thread_Process.cpp" line="456"/>
<source>The target output directory is NOT writable:</source>
<translatorcomment>La directory di destinazione assegnata è di SOLA LETTURA:</translatorcomment>
<translation>La directory di destinazione assegnata NON è scrivibile:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="517"/>
<location filename="../../src/Thread_Process.cpp" line="522"/>
<source>Unknown File Name</source>
<translation>Nome File Sconosciuto</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="519"/>
<location filename="../../src/Thread_Process.cpp" line="524"/>
<source>Unknown Title</source>
<translation>Titolo Sconosciuto</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<location filename="../../src/Thread_Process.cpp" line="525"/>
<source>Unknown Artist</source>
<translation>Artista Sconosciuto</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="521"/>
<location filename="../../src/Thread_Process.cpp" line="526"/>
<source>Unknown Album</source>
<translation>Album Sconosciuto</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="523"/>
<location filename="../../src/Thread_Process.cpp" line="528"/>
<source>Unknown Comment</source>
<translation>Commento Sconosciuto</translation>
</message>
@ -3183,22 +3183,22 @@
<translation>Saltato.</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="469"/>
<location filename="../../src/Thread_Process.cpp" line="474"/>
<source>Target output file already exists, going to skip this file:</source>
<translation>Il file di destinazione esiste già, questo file verrà saltato:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="470"/>
<location filename="../../src/Thread_Process.cpp" line="475"/>
<source>If you don&apos;t want existing files to be skipped, please change the overwrite mode!</source>
<translation>Se non vuoi saltare i file esistenti, cambia la modalità di sovrascrittura!</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="477"/>
<location filename="../../src/Thread_Process.cpp" line="482"/>
<source>Target output file already exists, going to delete existing file:</source>
<translation>Il file di destinazione esiste già, il file esistente verrà eliminato:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="491"/>
<location filename="../../src/Thread_Process.cpp" line="496"/>
<source>Failed to delete existing target file, will save to another file name!</source>
<translation>Impossibile eliminare il file di destinazione esistente, il file verrà salvato con un altro nome!</translation>
</message>

View File

@ -3056,37 +3056,37 @@
<translation type="unfinished"> :</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="442"/>
<location filename="../../src/Thread_Process.cpp" line="447"/>
<source>The target output directory doesn&apos;t exist and could NOT be created:</source>
<translation type="unfinished"> , :</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="451"/>
<location filename="../../src/Thread_Process.cpp" line="456"/>
<source>The target output directory is NOT writable:</source>
<translation type="unfinished"> :</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="517"/>
<location filename="../../src/Thread_Process.cpp" line="522"/>
<source>Unknown File Name</source>
<translation type="unfinished"> </translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="519"/>
<location filename="../../src/Thread_Process.cpp" line="524"/>
<source>Unknown Title</source>
<translation type="unfinished"> </translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<location filename="../../src/Thread_Process.cpp" line="525"/>
<source>Unknown Artist</source>
<translation type="unfinished"> </translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="521"/>
<location filename="../../src/Thread_Process.cpp" line="526"/>
<source>Unknown Album</source>
<translation type="unfinished"> </translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="523"/>
<location filename="../../src/Thread_Process.cpp" line="528"/>
<source>Unknown Comment</source>
<translation type="unfinished"> </translation>
</message>
@ -3107,22 +3107,22 @@
<translation type="unfinished">.</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="469"/>
<location filename="../../src/Thread_Process.cpp" line="474"/>
<source>Target output file already exists, going to skip this file:</source>
<translation type="unfinished"> . :</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="470"/>
<location filename="../../src/Thread_Process.cpp" line="475"/>
<source>If you don&apos;t want existing files to be skipped, please change the overwrite mode!</source>
<translation type="unfinished"> , !</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="477"/>
<location filename="../../src/Thread_Process.cpp" line="482"/>
<source>Target output file already exists, going to delete existing file:</source>
<translation type="unfinished"> . :</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="491"/>
<location filename="../../src/Thread_Process.cpp" line="496"/>
<source>Failed to delete existing target file, will save to another file name!</source>
<translation type="unfinished"> . !</translation>
</message>

View File

@ -3089,57 +3089,57 @@
<translation type="unfinished">Źródłowy plik dźwiękowy nie mógł zostać otworzony:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="442"/>
<location filename="../../src/Thread_Process.cpp" line="447"/>
<source>The target output directory doesn&apos;t exist and could NOT be created:</source>
<translation type="unfinished">Lokalizacja docelowa nie istnieje lu NIE mogła zostać utworzona:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="451"/>
<location filename="../../src/Thread_Process.cpp" line="456"/>
<source>The target output directory is NOT writable:</source>
<translation type="unfinished">Nie można zapisać do lokalizacji docelowej:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="517"/>
<location filename="../../src/Thread_Process.cpp" line="522"/>
<source>Unknown File Name</source>
<translation type="unfinished">Nieznana nazwa pliku</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="519"/>
<location filename="../../src/Thread_Process.cpp" line="524"/>
<source>Unknown Title</source>
<translation type="unfinished">Nieznany Tytuł</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<location filename="../../src/Thread_Process.cpp" line="525"/>
<source>Unknown Artist</source>
<translation type="unfinished">Nieznany Artysta</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="521"/>
<location filename="../../src/Thread_Process.cpp" line="526"/>
<source>Unknown Album</source>
<translation type="unfinished">Nieznany Album</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="523"/>
<location filename="../../src/Thread_Process.cpp" line="528"/>
<source>Unknown Comment</source>
<translation type="unfinished">Nieznany Komentarz</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="469"/>
<location filename="../../src/Thread_Process.cpp" line="474"/>
<source>Target output file already exists, going to skip this file:</source>
<translation type="unfinished">Plik wynikowy już istnieje, zostanie pominięty plik:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="470"/>
<location filename="../../src/Thread_Process.cpp" line="475"/>
<source>If you don&apos;t want existing files to be skipped, please change the overwrite mode!</source>
<translation type="unfinished">Jeśli nie chcesz aby istniejące pliki były pomijane, zmień tryb nadpisywania!</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="477"/>
<location filename="../../src/Thread_Process.cpp" line="482"/>
<source>Target output file already exists, going to delete existing file:</source>
<translation type="unfinished">Plik wynikowy już istnieje, zostanie usunięty plik:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="491"/>
<location filename="../../src/Thread_Process.cpp" line="496"/>
<source>Failed to delete existing target file, will save to another file name!</source>
<translation type="unfinished">Usuwanie istniejącego pliku zakończone niepowodzeniem, nowy plik zostanie zapisany pod inną nazwą!</translation>
</message>

View File

@ -3080,37 +3080,37 @@
<translation>Исходный аудио файл не может быть открыт:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="442"/>
<location filename="../../src/Thread_Process.cpp" line="447"/>
<source>The target output directory doesn&apos;t exist and could NOT be created:</source>
<translation>Папка для выходных файлов не существует и не может быть создана:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="451"/>
<location filename="../../src/Thread_Process.cpp" line="456"/>
<source>The target output directory is NOT writable:</source>
<translation>Папка для выходных файлов недоступна для записи:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="517"/>
<location filename="../../src/Thread_Process.cpp" line="522"/>
<source>Unknown File Name</source>
<translation>Неизвестное имя файла</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="519"/>
<location filename="../../src/Thread_Process.cpp" line="524"/>
<source>Unknown Title</source>
<translation>Неизвестное Название</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<location filename="../../src/Thread_Process.cpp" line="525"/>
<source>Unknown Artist</source>
<translation>Неизвестный Артист</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="521"/>
<location filename="../../src/Thread_Process.cpp" line="526"/>
<source>Unknown Album</source>
<translation>Неизвестный Альбом</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="523"/>
<location filename="../../src/Thread_Process.cpp" line="528"/>
<source>Unknown Comment</source>
<translation>Неизвестный Комментарий</translation>
</message>
@ -3131,22 +3131,22 @@
<translation>Пропущен.</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="469"/>
<location filename="../../src/Thread_Process.cpp" line="474"/>
<source>Target output file already exists, going to skip this file:</source>
<translation>Файл уже существует, будет пропущен:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="470"/>
<location filename="../../src/Thread_Process.cpp" line="475"/>
<source>If you don&apos;t want existing files to be skipped, please change the overwrite mode!</source>
<translation>Если Вы не хотите пропускать уже существующие файлы, пожалуйста, измените режим перезаписи!</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="477"/>
<location filename="../../src/Thread_Process.cpp" line="482"/>
<source>Target output file already exists, going to delete existing file:</source>
<translation>Файл уже существует, будет удалён:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="491"/>
<location filename="../../src/Thread_Process.cpp" line="496"/>
<source>Failed to delete existing target file, will save to another file name!</source>
<translation>Ошибка удаления существующего файла, будет сохранение с другим именем!</translation>
</message>

View File

@ -3082,57 +3082,57 @@
<translation>Källfilen kan inte öppnas för läsning:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="442"/>
<location filename="../../src/Thread_Process.cpp" line="447"/>
<source>The target output directory doesn&apos;t exist and could NOT be created:</source>
<translation>Målmappen finns inte och kan inte skapas:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="451"/>
<location filename="../../src/Thread_Process.cpp" line="456"/>
<source>The target output directory is NOT writable:</source>
<translation>Målmappen är INTE skrivbar:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="517"/>
<location filename="../../src/Thread_Process.cpp" line="522"/>
<source>Unknown File Name</source>
<translation>Okänt filnamn</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="519"/>
<location filename="../../src/Thread_Process.cpp" line="524"/>
<source>Unknown Title</source>
<translation>Okänd titel</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<location filename="../../src/Thread_Process.cpp" line="525"/>
<source>Unknown Artist</source>
<translation>Okänd artist</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="521"/>
<location filename="../../src/Thread_Process.cpp" line="526"/>
<source>Unknown Album</source>
<translation>Okänt album</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="523"/>
<location filename="../../src/Thread_Process.cpp" line="528"/>
<source>Unknown Comment</source>
<translation>Okänd kommentar</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="469"/>
<location filename="../../src/Thread_Process.cpp" line="474"/>
<source>Target output file already exists, going to skip this file:</source>
<translation>Målfilen finns redan! Den här filen hoppas över:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="470"/>
<location filename="../../src/Thread_Process.cpp" line="475"/>
<source>If you don&apos;t want existing files to be skipped, please change the overwrite mode!</source>
<translation>Om du inte vill att befintliga filer hoppas över, måste du ändra överskrivningsläge!</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="477"/>
<location filename="../../src/Thread_Process.cpp" line="482"/>
<source>Target output file already exists, going to delete existing file:</source>
<translation>Målfilen finns redan! Befintlig fil kommer att tas bort:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="491"/>
<location filename="../../src/Thread_Process.cpp" line="496"/>
<source>Failed to delete existing target file, will save to another file name!</source>
<translation>Kunde inte ta bort befintlig målfil. Sparar med annat filnamn!</translation>
</message>

View File

@ -3056,37 +3056,37 @@
<translation>:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="442"/>
<location filename="../../src/Thread_Process.cpp" line="447"/>
<source>The target output directory doesn&apos;t exist and could NOT be created:</source>
<translation>,:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="451"/>
<location filename="../../src/Thread_Process.cpp" line="456"/>
<source>The target output directory is NOT writable:</source>
<translation>:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="517"/>
<location filename="../../src/Thread_Process.cpp" line="522"/>
<source>Unknown File Name</source>
<translation></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="519"/>
<location filename="../../src/Thread_Process.cpp" line="524"/>
<source>Unknown Title</source>
<translation></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<location filename="../../src/Thread_Process.cpp" line="525"/>
<source>Unknown Artist</source>
<translation></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="521"/>
<location filename="../../src/Thread_Process.cpp" line="526"/>
<source>Unknown Album</source>
<translation></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="523"/>
<location filename="../../src/Thread_Process.cpp" line="528"/>
<source>Unknown Comment</source>
<translation></translation>
</message>
@ -3107,22 +3107,22 @@
<translation>.</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="469"/>
<location filename="../../src/Thread_Process.cpp" line="474"/>
<source>Target output file already exists, going to skip this file:</source>
<translation>, : </translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="470"/>
<location filename="../../src/Thread_Process.cpp" line="475"/>
<source>If you don&apos;t want existing files to be skipped, please change the overwrite mode!</source>
<translation>, !</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="477"/>
<location filename="../../src/Thread_Process.cpp" line="482"/>
<source>Target output file already exists, going to delete existing file:</source>
<translation>, : </translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="491"/>
<location filename="../../src/Thread_Process.cpp" line="496"/>
<source>Failed to delete existing target file, will save to another file name!</source>
<translation>, !</translation>
</message>

View File

@ -3073,37 +3073,37 @@
<translation>Неможливо відкрити для читання вхідний файл аудіо:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="442"/>
<location filename="../../src/Thread_Process.cpp" line="447"/>
<source>The target output directory doesn&apos;t exist and could NOT be created:</source>
<translation>Вихідної теки не існує і її неможливо створити:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="451"/>
<location filename="../../src/Thread_Process.cpp" line="456"/>
<source>The target output directory is NOT writable:</source>
<translation>До вихідної теки неможливо проводити запис:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="517"/>
<location filename="../../src/Thread_Process.cpp" line="522"/>
<source>Unknown File Name</source>
<translation>Невідома назва файла</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="519"/>
<location filename="../../src/Thread_Process.cpp" line="524"/>
<source>Unknown Title</source>
<translation>Невідомий заголовок</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<location filename="../../src/Thread_Process.cpp" line="525"/>
<source>Unknown Artist</source>
<translation>Невідомий виконавець</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="521"/>
<location filename="../../src/Thread_Process.cpp" line="526"/>
<source>Unknown Album</source>
<translation>Невідомий альбом</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="523"/>
<location filename="../../src/Thread_Process.cpp" line="528"/>
<source>Unknown Comment</source>
<translation>Невідомий коментар</translation>
</message>
@ -3124,22 +3124,22 @@
<translation>Пропущено.</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="469"/>
<location filename="../../src/Thread_Process.cpp" line="474"/>
<source>Target output file already exists, going to skip this file:</source>
<translation>Вихідний цільовий файл вже існує, спроба пропустити цей файл:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="470"/>
<location filename="../../src/Thread_Process.cpp" line="475"/>
<source>If you don&apos;t want existing files to be skipped, please change the overwrite mode!</source>
<translation>Якщо ви не хочете, щоб існуючі файли були пропущені, будь ласка, змініть режим перезапису!</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="477"/>
<location filename="../../src/Thread_Process.cpp" line="482"/>
<source>Target output file already exists, going to delete existing file:</source>
<translation>Вихідний цільовий файл вже існує, спроба видалити існуючий файл:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="491"/>
<location filename="../../src/Thread_Process.cpp" line="496"/>
<source>Failed to delete existing target file, will save to another file name!</source>
<translation>Неможливо видалити існуючий файл, збереження буде проведено до файла з іншою назвою!</translation>
</message>

View File

@ -3056,37 +3056,37 @@
<translation>:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="442"/>
<location filename="../../src/Thread_Process.cpp" line="447"/>
<source>The target output directory doesn&apos;t exist and could NOT be created:</source>
<translation>:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="451"/>
<location filename="../../src/Thread_Process.cpp" line="456"/>
<source>The target output directory is NOT writable:</source>
<translation>:</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="517"/>
<location filename="../../src/Thread_Process.cpp" line="522"/>
<source>Unknown File Name</source>
<translation></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="519"/>
<location filename="../../src/Thread_Process.cpp" line="524"/>
<source>Unknown Title</source>
<translation></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="520"/>
<location filename="../../src/Thread_Process.cpp" line="525"/>
<source>Unknown Artist</source>
<translation></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="521"/>
<location filename="../../src/Thread_Process.cpp" line="526"/>
<source>Unknown Album</source>
<translation></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="523"/>
<location filename="../../src/Thread_Process.cpp" line="528"/>
<source>Unknown Comment</source>
<translation></translation>
</message>
@ -3107,22 +3107,22 @@
<translation></translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="469"/>
<location filename="../../src/Thread_Process.cpp" line="474"/>
<source>Target output file already exists, going to skip this file:</source>
<translation>, : </translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="470"/>
<location filename="../../src/Thread_Process.cpp" line="475"/>
<source>If you don&apos;t want existing files to be skipped, please change the overwrite mode!</source>
<translation>, !</translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="477"/>
<location filename="../../src/Thread_Process.cpp" line="482"/>
<source>Target output file already exists, going to delete existing file:</source>
<translation>, : </translation>
</message>
<message>
<location filename="../../src/Thread_Process.cpp" line="491"/>
<location filename="../../src/Thread_Process.cpp" line="496"/>
<source>Failed to delete existing target file, will save to another file name!</source>
<translation>, !</translation>
</message>

View File

@ -34,8 +34,8 @@
#define VER_LAMEXP_MINOR_HI 1
#define VER_LAMEXP_MINOR_LO 5
#define VER_LAMEXP_TYPE Alpha
#define VER_LAMEXP_PATCH 4
#define VER_LAMEXP_BUILD 1955
#define VER_LAMEXP_PATCH 5
#define VER_LAMEXP_BUILD 1956
#define VER_LAMEXP_CONFG 1934
///////////////////////////////////////////////////////////////////////////////

View File

@ -420,17 +420,22 @@ int ProcessThread::generateOutFileName(QString &outFileName)
}
const QString baseName = sourceFile.completeBaseName();
QDir targetDir(m_outputDirectory.isEmpty() ? sourceFile.canonicalPath() : m_outputDirectory);
QDir targetDir(MUtils::clean_file_path(m_outputDirectory.isEmpty() ? sourceFile.canonicalPath() : m_outputDirectory));
//Prepend relative source file path?
if(m_prependRelativeSourcePath && !m_outputDirectory.isEmpty())
{
QDir rootDir = sourceFile.dir();
while(!rootDir.isRoot())
QDir sourceDir = sourceFile.dir();
if (!sourceDir.isRoot())
{
if(!rootDir.cdUp()) break;
quint32 depth = 0;
while ((!sourceDir.isRoot()) && (++depth <= 0xFF))
{
if (!sourceDir.cdUp()) break;
}
const QString postfix = QFileInfo(sourceDir.relativeFilePath(sourceFile.canonicalFilePath())).path();
targetDir.setPath(MUtils::clean_file_path(QString("%1/%2").arg(targetDir.absolutePath(), postfix)));
}
targetDir.setPath(QString("%1/%2").arg(targetDir.absolutePath(), QFileInfo(rootDir.relativeFilePath(sourceFile.canonicalFilePath())).path()));
}
//Make sure output directory does exist
@ -457,11 +462,11 @@ int ProcessThread::generateOutFileName(QString &outFileName)
}
//Apply rename pattern
const QString fileName = applyRegularExpression(applyRenamePattern(baseName, m_audioFile.metaInfo()));
const QString fileName = MUtils::clean_file_name(applyRegularExpression(applyRenamePattern(baseName, m_audioFile.metaInfo())));
//Generate full output path
const QString fileExt = m_renameFileExt.isEmpty() ? QString::fromUtf8(m_encoder->toEncoderInfo()->extension()) : m_renameFileExt;
outFileName = MUtils::clean_file_path(QString("%1/%2.%3").arg(targetDir.canonicalPath(), fileName, fileExt));
outFileName = QString("%1/%2.%3").arg(targetDir.canonicalPath(), fileName, fileExt);
//Skip file, if target file exists (optional!)
if((m_overwriteMode == OverwriteMode_SkipExisting) && QFileInfo(outFileName).exists())
@ -497,7 +502,7 @@ int ProcessThread::generateOutFileName(QString &outFileName)
//Generate final name
while(QFileInfo(outFileName).exists() && (n < (INT_MAX/2)))
{
outFileName = MUtils::clean_file_path(QString("%1/%2 (%3).%4").arg(targetDir.canonicalPath(), fileName, QString::number(++n), fileExt));
outFileName = QString("%1/%2 (%3).%4").arg(targetDir.canonicalPath(), fileName, QString::number(++n), fileExt);
}
//Create placeholder
@ -522,24 +527,25 @@ QString ProcessThread::applyRenamePattern(const QString &baseName, const AudioFi
fileName.replace("<Year>", QString().sprintf("%04d", metaInfo.year()), Qt::CaseInsensitive);
fileName.replace("<Comment>", STRDEF(metaInfo.comment(), tr("Unknown Comment")), Qt::CaseInsensitive);
return fileName;
return fileName.trimmed().isEmpty() ? baseName : fileName;
}
QString ProcessThread::applyRegularExpression(const QString &fileName)
QString ProcessThread::applyRegularExpression(const QString &baseName)
{
if(m_renameRegExp_Search.isEmpty() || m_renameRegExp_Replace.isEmpty())
{
return fileName;
return baseName;
}
QRegExp regExp(m_renameRegExp_Search);
if(!regExp.isValid())
{
qWarning("Invalid regular expression detected -> cannot rename!");
return fileName;
return baseName;
}
return (QString(fileName).replace(regExp, m_renameRegExp_Replace));
const QString fileName = QString(baseName).replace(regExp, m_renameRegExp_Replace);
return fileName.trimmed().isEmpty() ? baseName : fileName;
}
QString ProcessThread::generateTempFileName(void)

View File

@ -90,7 +90,7 @@ private:
void processFile();
int generateOutFileName(QString &outFileName);
QString applyRenamePattern(const QString &baseName, const AudioFileModel_MetaInfo &metaInfo);
QString applyRegularExpression(const QString &fileName);
QString applyRegularExpression(const QString &baseName);
QString generateTempFileName(void);
bool insertDownmixFilter(const unsigned int *const supportedChannels);
bool insertDownsampleFilter(const unsigned int *const supportedSamplerates, const unsigned int *const supportedBitdepths);