Updated MediaInfo to v0.7.91 (2016-11-30), compiled with ICL 17.0 and MSVC 12.0
+
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]
diff --git a/doc/Changelog.md b/doc/Changelog.md
index 3c16fc9e..b4518add 100644
--- a/doc/Changelog.md
+++ b/doc/Changelog.md
@@ -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] ## {-}
diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts
index 209bb842..6ff684ee 100644
--- a/etc/Translation/Blank.ts
+++ b/etc/Translation/Blank.ts
@@ -3072,57 +3072,57 @@
-
+ The target output directory doesn't exist and could NOT be created:
-
+ The target output directory is NOT writable:
-
+ Unknown File Name
-
+ Unknown Title
-
+ Unknown Artist
-
+ Unknown Album
-
+ Unknown Comment
-
+ Target output file already exists, going to skip this file:
-
+ If you don't want existing files to be skipped, please change the overwrite mode!
-
+ Target output file already exists, going to delete existing file:
-
+ Failed to delete existing target file, will save to another file name!
diff --git a/etc/Translation/LameXP_DE.ts b/etc/Translation/LameXP_DE.ts
index 995b5949..233be21d 100644
--- a/etc/Translation/LameXP_DE.ts
+++ b/etc/Translation/LameXP_DE.ts
@@ -3065,37 +3065,37 @@
Die Quell-Audiodatei konnte nicht zum Lesen geöffnet werden:
-
+ The target output directory doesn't exist and could NOT be created:Das Zielverzeichnis existiert nicht und konnte nicht erstellt werden:
-
+ The target output directory is NOT writable:In das Zielverzeichnis kann nicht geschrieben werden:
-
+ Unknown File NameUnbekannter Dateiname
-
+ Unknown TitleUnbekannter Titel
-
+ Unknown ArtistUnbekannter Künstler
-
+ Unknown AlbumUnbekanntes Album
-
+ Unknown CommentUnbekannter Kommentar
@@ -3116,22 +3116,22 @@
Übersprungen.
-
+ Target output file already exists, going to skip this file:Zieldatei existiert bereits, die Datei wird übersprungen:
-
+ If you don't want existing files to be skipped, please change the overwrite mode!Wenn existierende Dateien nicht übersprungen werden sollen, ändern Sie bitte den Überschreiben-Modus!
-
+ Target output file already exists, going to delete existing file:Zieldatei existiert bereits, die Datei wird gelöscht und überschrieben:
-
+ Failed to delete existing target file, will save to another file name!Die existierende Datei konnte nicht gelöscht werden, ein anderer Dateiname wird gewählt!
diff --git a/etc/Translation/LameXP_ES.ts b/etc/Translation/LameXP_ES.ts
index f73fea68..468751f8 100644
--- a/etc/Translation/LameXP_ES.ts
+++ b/etc/Translation/LameXP_ES.ts
@@ -3065,37 +3065,37 @@
No se puede abrir el archivo de entrada para su lectura:
-
+ The target output directory doesn't exist and could NOT be created:La carpeta de salida no existe y NO puede ser creada:
-
+ The target output directory is NOT writable:NO se puede escribir en la carpeta de salida:
-
+ Unknown File NameNombre de archivo desconocido
-
+ Unknown TitleTítulo desconocido
-
+ Unknown ArtistArtista desconocido
-
+ Unknown AlbumÁlbum desconocido
-
+ Unknown CommentComentario desconocido
@@ -3116,22 +3116,22 @@
Omitidos.
-
+ Target output file already exists, going to skip this file:El archivo de destino ya existe, se omitirá este archivo:
-
+ If you don't want existing files to be skipped, please change the overwrite mode!¡Si no quiere sobreescribir los archivos existentes, cambie el modo sobreescritura por favor!
-
+ Target output file already exists, going to delete existing file:El archivo de destino ya existe, se eliminará este archivo:
-
+ Failed to delete existing target file, will save to another file name!¡Error al eliminar el archivo de destino existente, se guardará con otro nombre!
diff --git a/etc/Translation/LameXP_FR.ts b/etc/Translation/LameXP_FR.ts
index 9546a653..28fa7f9a 100644
--- a/etc/Translation/LameXP_FR.ts
+++ b/etc/Translation/LameXP_FR.ts
@@ -3072,37 +3072,37 @@ Sélection automatique (par défaut)
Le fichier audio source n'a pas pu être ouvert pour la lecture:
-
+ The target output directory doesn't exist and could NOT be created:Le répertoire de sortie cible n'existe pas et ne peut PAS être créé:
-
+ The target output directory is NOT writable:Le répertoire de sortie cible n'est pas accessible en écriture:
-
+ Unknown File NameNom de fichier inconnu
-
+ Unknown TitleTitre inconnu
-
+ Unknown ArtistArtiste inconnu
-
+ Unknown AlbumAlbum inconnu
-
+ Unknown CommentCommentaire inconnu
@@ -3124,22 +3124,22 @@ Sélection automatique (par défaut)
Ignoré.
-
+ Target output file already exists, going to skip this file:Le fichier de sortie existe déjà, il sera ignoré :
-
+ If you don't want existing files to be skipped, please change the overwrite mode!Si vous ne voulez pas ignorer les fichiers existants, veuillez changer le mode de remplacement !
-
+ Target output file already exists, going to delete existing file:Le fichier de sortie existe déjà, il sera supprimé :
-
+ Failed to delete existing target file, will save to another file name!Impossible de supprimer le fichier cible existant, il sera enregistré sous un autre nom !
diff --git a/etc/Translation/LameXP_HU.ts b/etc/Translation/LameXP_HU.ts
index c403a4f7..db2ec8d3 100644
--- a/etc/Translation/LameXP_HU.ts
+++ b/etc/Translation/LameXP_HU.ts
@@ -3072,57 +3072,57 @@
A forrás hangfájl nem nyitható meg olvasásra:
-
+ The target output directory doesn't exist and could NOT be created:A cél kimeneti könyvtár nem létezik, és NEM hozható létre:
-
+ The target output directory is NOT writable:A cél kimeneti könyvtár NEM írható:
-
+ Unknown File NameIsmeretlen fájlnév
-
+ Unknown TitleIsmeretlen cím
-
+ Unknown ArtistIsmeretlen előadó
-
+ Unknown AlbumIsmeretlen album
-
+ Unknown CommentIsmeretlen hozzászólás
-
+ Target output file already exists, going to skip this file:A cél kimeneti fájl már létezik, ez a fájl ki lesz hagyva:
-
+ If you don't want existing files to be skipped, please change the overwrite mode!Ha nem szeretné a meglévő fájlokat kihagyni, kérjük, változtassa meg a felülírási módot!
-
+ Target output file already exists, going to delete existing file:A cél kimeneti fájl már létezik, a meglévő fájl törlésre kerül:
-
+ Failed to delete existing target file, will save to another file name!Nem sikerült törölni a meglévő cél fájlt. Az állomány másik fájlnéven lesz elmentve!
diff --git a/etc/Translation/LameXP_IT.ts b/etc/Translation/LameXP_IT.ts
index f6dbbb35..bfc3ddf1 100644
--- a/etc/Translation/LameXP_IT.ts
+++ b/etc/Translation/LameXP_IT.ts
@@ -3131,38 +3131,38 @@
Il file audio sorgente non può essere aperto per la lettura:
-
+ The target output directory doesn't exist and could NOT be created:La cartella di destinazione assegnata non esiste e NON può essere creata:
-
+ The target output directory is NOT writable:La directory di destinazione assegnata è di SOLA LETTURA:La directory di destinazione assegnata NON è scrivibile:
-
+ Unknown File NameNome File Sconosciuto
-
+ Unknown TitleTitolo Sconosciuto
-
+ Unknown ArtistArtista Sconosciuto
-
+ Unknown AlbumAlbum Sconosciuto
-
+ Unknown CommentCommento Sconosciuto
@@ -3183,22 +3183,22 @@
Saltato.
-
+ Target output file already exists, going to skip this file:Il file di destinazione esiste già, questo file verrà saltato:
-
+ If you don't want existing files to be skipped, please change the overwrite mode!Se non vuoi saltare i file esistenti, cambia la modalità di sovrascrittura!
-
+ Target output file already exists, going to delete existing file:Il file di destinazione esiste già, il file esistente verrà eliminato:
-
+ Failed to delete existing target file, will save to another file name!Impossibile eliminare il file di destinazione esistente, il file verrà salvato con un altro nome!
diff --git a/etc/Translation/LameXP_KR.ts b/etc/Translation/LameXP_KR.ts
index 41ef2aa5..bc1b44b6 100644
--- a/etc/Translation/LameXP_KR.ts
+++ b/etc/Translation/LameXP_KR.ts
@@ -3056,37 +3056,37 @@
원본 오디오 파일을 열 수 없음:
-
+ The target output directory doesn't exist and could NOT be created:대상 출력 디렉터리가 존재하지 않으며, 만들 수 없습니다:
-
+ The target output directory is NOT writable:대상 출력 디렉터리에 쓰기 불가:
-
+ Unknown File Name알수 없는 파일명
-
+ Unknown Title알수 없는 제목
-
+ Unknown Artist알수 없는 가수
-
+ Unknown Album알수 없는 앨범
-
+ Unknown Comment알수 없는 설명
@@ -3107,22 +3107,22 @@
건너뜀.
-
+ Target output file already exists, going to skip this file:대상 출력 파일이 이미 존재합니다. 건너뛰기할 파일:
-
+ If you don't want existing files to be skipped, please change the overwrite mode!기존 파일을 건너뛰기하지 않으려면, 덮어쓰기 방식을 변경하시기 바랍니다!
-
+ Target output file already exists, going to delete existing file:대상 출력 파일이 이미 존재합니다. 건너뛰기할 파일:
-
+ Failed to delete existing target file, will save to another file name!기존 대상 파일 삭제 실패. 다른 파일명으로 저장됩니다!
diff --git a/etc/Translation/LameXP_PL.ts b/etc/Translation/LameXP_PL.ts
index 56a5b298..69c4bf56 100644
--- a/etc/Translation/LameXP_PL.ts
+++ b/etc/Translation/LameXP_PL.ts
@@ -3089,57 +3089,57 @@
Źródłowy plik dźwiękowy nie mógł zostać otworzony:
-
+ The target output directory doesn't exist and could NOT be created:Lokalizacja docelowa nie istnieje lu NIE mogła zostać utworzona:
-
+ The target output directory is NOT writable:Nie można zapisać do lokalizacji docelowej:
-
+ Unknown File NameNieznana nazwa pliku
-
+ Unknown TitleNieznany Tytuł
-
+ Unknown ArtistNieznany Artysta
-
+ Unknown AlbumNieznany Album
-
+ Unknown CommentNieznany Komentarz
-
+ Target output file already exists, going to skip this file:Plik wynikowy już istnieje, zostanie pominięty plik:
-
+ If you don't want existing files to be skipped, please change the overwrite mode!Jeśli nie chcesz aby istniejące pliki były pomijane, zmień tryb nadpisywania!
-
+ Target output file already exists, going to delete existing file:Plik wynikowy już istnieje, zostanie usunięty plik:
-
+ Failed to delete existing target file, will save to another file name!Usuwanie istniejącego pliku zakończone niepowodzeniem, nowy plik zostanie zapisany pod inną nazwą!
diff --git a/etc/Translation/LameXP_RU.ts b/etc/Translation/LameXP_RU.ts
index 49b4eada..648025f0 100644
--- a/etc/Translation/LameXP_RU.ts
+++ b/etc/Translation/LameXP_RU.ts
@@ -3080,37 +3080,37 @@
Исходный аудио файл не может быть открыт:
-
+ The target output directory doesn't exist and could NOT be created:Папка для выходных файлов не существует и не может быть создана:
-
+ The target output directory is NOT writable:Папка для выходных файлов недоступна для записи:
-
+ Unknown File NameНеизвестное имя файла
-
+ Unknown TitleНеизвестное Название
-
+ Unknown ArtistНеизвестный Артист
-
+ Unknown AlbumНеизвестный Альбом
-
+ Unknown CommentНеизвестный Комментарий
@@ -3131,22 +3131,22 @@
Пропущен.
-
+ Target output file already exists, going to skip this file:Файл уже существует, будет пропущен:
-
+ If you don't want existing files to be skipped, please change the overwrite mode!Если Вы не хотите пропускать уже существующие файлы, пожалуйста, измените режим перезаписи!
-
+ Target output file already exists, going to delete existing file:Файл уже существует, будет удалён:
-
+ Failed to delete existing target file, will save to another file name!Ошибка удаления существующего файла, будет сохранение с другим именем!
diff --git a/etc/Translation/LameXP_SV.ts b/etc/Translation/LameXP_SV.ts
index 897a2e01..c8ef4a25 100644
--- a/etc/Translation/LameXP_SV.ts
+++ b/etc/Translation/LameXP_SV.ts
@@ -3082,57 +3082,57 @@
Källfilen kan inte öppnas för läsning:
-
+ The target output directory doesn't exist and could NOT be created:Målmappen finns inte och kan inte skapas:
-
+ The target output directory is NOT writable:Målmappen är INTE skrivbar:
-
+ Unknown File NameOkänt filnamn
-
+ Unknown TitleOkänd titel
-
+ Unknown ArtistOkänd artist
-
+ Unknown AlbumOkänt album
-
+ Unknown CommentOkänd kommentar
-
+ Target output file already exists, going to skip this file:Målfilen finns redan! Den här filen hoppas över:
-
+ If you don't want existing files to be skipped, please change the overwrite mode!Om du inte vill att befintliga filer hoppas över, måste du ändra överskrivningsläge!
-
+ Target output file already exists, going to delete existing file:Målfilen finns redan! Befintlig fil kommer att tas bort:
-
+ Failed to delete existing target file, will save to another file name!Kunde inte ta bort befintlig målfil. Sparar med annat filnamn!
diff --git a/etc/Translation/LameXP_TW.ts b/etc/Translation/LameXP_TW.ts
index 785be572..451b7a1c 100644
--- a/etc/Translation/LameXP_TW.ts
+++ b/etc/Translation/LameXP_TW.ts
@@ -3056,37 +3056,37 @@
無法打開源音頻文件進行讀取:
-
+ The target output directory doesn't exist and could NOT be created:目標輸出目錄不存在,無法創建:
-
+ The target output directory is NOT writable:目標輸出目錄不是可寫:
-
+ Unknown File Name未知文件名稱
-
+ Unknown Title未知標題
-
+ Unknown Artist未知藝術家
-
+ Unknown Album未知專輯
-
+ Unknown Comment未知評論
@@ -3107,22 +3107,22 @@
跳過.
-
+ Target output file already exists, going to skip this file:目標輸出文件已經存在, 將跳過此文件:
-
+ If you don't want existing files to be skipped, please change the overwrite mode!如果你不希望被跳過已存在的文件, 請更改覆蓋模式!
-
+ Target output file already exists, going to delete existing file:目標輸出文件已經存在, 要刪除現有的文件:
-
+ Failed to delete existing target file, will save to another file name!無法刪除現有目標文件, 將保存到另一個文件名!
diff --git a/etc/Translation/LameXP_UK.ts b/etc/Translation/LameXP_UK.ts
index 6da4d476..f024cbc9 100644
--- a/etc/Translation/LameXP_UK.ts
+++ b/etc/Translation/LameXP_UK.ts
@@ -3073,37 +3073,37 @@
Неможливо відкрити для читання вхідний файл аудіо:
-
+ The target output directory doesn't exist and could NOT be created:Вихідної теки не існує і її неможливо створити:
-
+ The target output directory is NOT writable:До вихідної теки неможливо проводити запис:
-
+ Unknown File NameНевідома назва файла
-
+ Unknown TitleНевідомий заголовок
-
+ Unknown ArtistНевідомий виконавець
-
+ Unknown AlbumНевідомий альбом
-
+ Unknown CommentНевідомий коментар
@@ -3124,22 +3124,22 @@
Пропущено.
-
+ Target output file already exists, going to skip this file:Вихідний цільовий файл вже існує, спроба пропустити цей файл:
-
+ If you don't want existing files to be skipped, please change the overwrite mode!Якщо ви не хочете, щоб існуючі файли були пропущені, будь ласка, змініть режим перезапису!
-
+ Target output file already exists, going to delete existing file:Вихідний цільовий файл вже існує, спроба видалити існуючий файл:
-
+ Failed to delete existing target file, will save to another file name!Неможливо видалити існуючий файл, збереження буде проведено до файла з іншою назвою!
diff --git a/etc/Translation/LameXP_ZH.ts b/etc/Translation/LameXP_ZH.ts
index e5dd49fe..5736eacb 100644
--- a/etc/Translation/LameXP_ZH.ts
+++ b/etc/Translation/LameXP_ZH.ts
@@ -3056,37 +3056,37 @@
无法打开源音频文件进行读取:
-
+ The target output directory doesn't exist and could NOT be created:目标输出目录不存在且无法创建:
-
+ The target output directory is NOT writable:目标输出目录不可写:
-
+ Unknown File Name未知文件名称
-
+ Unknown Title未知标题
-
+ Unknown Artist未知艺术家
-
+ Unknown Album未知专辑
-
+ Unknown Comment未知注释
@@ -3107,22 +3107,22 @@
跳过。
-
+ Target output file already exists, going to skip this file:目标输出文件已经存在, 将跳过此文件:
-
+ If you don't want existing files to be skipped, please change the overwrite mode!如果你不希望跳过已存在的文件, 请更改覆盖模式!
-
+ Target output file already exists, going to delete existing file:目标输出文件已经存在, 将删除现有的文件:
-
+ Failed to delete existing target file, will save to another file name!无法删除现有目标文件, 将保存为另一个文件名!
diff --git a/src/Config.h b/src/Config.h
index 90fcf818..9eeb4a16 100644
--- a/src/Config.h
+++ b/src/Config.h
@@ -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
///////////////////////////////////////////////////////////////////////////////
diff --git a/src/Thread_Process.cpp b/src/Thread_Process.cpp
index 65f99ca3..7eeaca6a 100644
--- a/src/Thread_Process.cpp
+++ b/src/Thread_Process.cpp
@@ -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));
+ const QString fileExt = m_renameFileExt.isEmpty() ? QString::fromUtf8(m_encoder->toEncoderInfo()->extension()) : m_renameFileExt;
+ 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("", QString().sprintf("%04d", metaInfo.year()), Qt::CaseInsensitive);
fileName.replace("", 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)
diff --git a/src/Thread_Process.h b/src/Thread_Process.h
index 941ebdad..4dc359b1 100644
--- a/src/Thread_Process.h
+++ b/src/Thread_Process.h
@@ -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);