Muldersoft/LameXP
Muldersoft/LameXP
1
0
Fork 0
Code Releases 2 Activity

Clean up output file name at a slightly later point.

Browse Source
This commit is contained in:
LoRd_MuldeR 2016-07-17 20:25:11 +02:00
parent 117770c88c
commit ec78557a05
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Config.h
View File

@ -35,7 +35,7 @@
#define VER_LAMEXP_MINOR_LO 4 #define VER_LAMEXP_MINOR_LO 4
#define VER_LAMEXP_TYPE Beta #define VER_LAMEXP_TYPE Beta
#define VER_LAMEXP_PATCH 2 #define VER_LAMEXP_PATCH 2
#define VER_LAMEXP_BUILD 1894 #define VER_LAMEXP_BUILD 1896
#define VER_LAMEXP_CONFG 1818 #define VER_LAMEXP_CONFG 1818
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////

7
src/Thread_Process.cpp
View File

@ -451,12 +451,11 @@ int ProcessThread::generateOutFileName(QString &outFileName)
} }
//Apply rename pattern //Apply rename pattern
const QString fileName = MUtils::clean_file_name(applyRegularExpression(applyRenamePattern(baseName, m_audioFile.metaInfo()))); const QString fileName = applyRegularExpression(applyRenamePattern(baseName, m_audioFile.metaInfo()));
//Generate full output path //Generate full output path
const QString fileExt = m_renameFileExt.isEmpty() ? QString::fromUtf8(m_encoder->toEncoderInfo()->extension()) : m_renameFileExt; const QString fileExt = m_renameFileExt.isEmpty() ? QString::fromUtf8(m_encoder->toEncoderInfo()->extension()) : m_renameFileExt;
outFileName = QString("%1/%2.%3").arg(targetDir.canonicalPath(), fileName, fileExt); outFileName = MUtils::clean_file_path(QString("%1/%2.%3").arg(targetDir.canonicalPath(), fileName, fileExt));
//Skip file, if target file exists (optional!) //Skip file, if target file exists (optional!)
if((m_overwriteMode == OverwriteMode_SkipExisting) && QFileInfo(outFileName).exists()) if((m_overwriteMode == OverwriteMode_SkipExisting) && QFileInfo(outFileName).exists())
@ -492,7 +491,7 @@ int ProcessThread::generateOutFileName(QString &outFileName)
//Generate final name //Generate final name
while(QFileInfo(outFileName).exists() && (n < (INT_MAX/2))) while(QFileInfo(outFileName).exists() && (n < (INT_MAX/2)))
{ {
outFileName = QString("%1/%2 (%3).%4").arg(targetDir.canonicalPath(), fileName, QString::number(++n), fileExt); outFileName = MUtils::clean_file_path(QString("%1/%2 (%3).%4").arg(targetDir.canonicalPath(), fileName, QString::number(++n), fileExt));
} }
//Create placeholder //Create placeholder