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

Updated file analyzer to use the "--inform" parameter of MediaInfo with a template file. Much simplifies the parsing of MediaInfo's output. Also much improved cover art retrieval.

Browse Source
This commit is contained in:
LoRd_MuldeR 2012-01-14 01:11:58 +01:00
parent 0a9debc23a
commit 603d21545b
3 changed files with 274 additions and 293 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Config.h
View File

@ -30,7 +30,7 @@
#define VER_LAMEXP_MINOR_LO 4 #define VER_LAMEXP_MINOR_LO 4
#define VER_LAMEXP_TYPE Alpha #define VER_LAMEXP_TYPE Alpha
#define VER_LAMEXP_PATCH 14 #define VER_LAMEXP_PATCH 14
#define VER_LAMEXP_BUILD 873 #define VER_LAMEXP_BUILD 876
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Tool versions (minimum expected versions!) // Tool versions (minimum expected versions!)

507
src/Thread_FileAnalyzer.cpp
View File

@ -36,6 +36,8 @@
#include <math.h> #include <math.h>
#define IS_KEY(KEY) (key.compare(KEY, Qt::CaseInsensitive) == 0)
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Constructor // Constructor
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
@ -45,6 +47,7 @@ FileAnalyzer::FileAnalyzer(const QStringList &inputFiles)
m_inputFiles(inputFiles), m_inputFiles(inputFiles),
m_mediaInfoBin(lamexp_lookup_tool("mediainfo.exe")), m_mediaInfoBin(lamexp_lookup_tool("mediainfo.exe")),
m_avs2wavBin(lamexp_lookup_tool("avs2wav.exe")), m_avs2wavBin(lamexp_lookup_tool("avs2wav.exe")),
m_templateFile(NULL),
m_abortFlag(false) m_abortFlag(false)
{ {
m_bSuccess = false; m_bSuccess = false;
@ -62,6 +65,52 @@ FileAnalyzer::FileAnalyzer(const QStringList &inputFiles)
m_filesCueSheet = 0; m_filesCueSheet = 0;
} }
FileAnalyzer::~FileAnalyzer(void)
{
if(m_templateFile)
{
QString templatePath = m_templateFile->filePath();
LAMEXP_DELETE(m_templateFile);
if(QFile::exists(templatePath)) QFile::remove(templatePath);
}
}
////////////////////////////////////////////////////////////
// Static data
////////////////////////////////////////////////////////////
const char *FileAnalyzer::g_tags_gen[] =
{
"Format",
"Format_Profile",
"Format_Version",
"Duration",
"Title", "Track",
"Track/Position",
"Artist", "Performer",
"Album",
"Genre",
"Released_Date", "Recorded_Date",
"Comment",
"Cover",
"Cover_Type",
"Cover_Mime",
"Cover_Data",
NULL
};
const char *FileAnalyzer::g_tags_aud[] =
{
"Format",
"Format_Profile",
"Format_Version",
"Channel(s)",
"SamplingRate",
"BitRate",
"BitRate_Mode",
NULL
};
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Thread Main // Thread Main
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
@ -81,6 +130,15 @@ void FileAnalyzer::run()
m_recentlyAdded.clear(); m_recentlyAdded.clear();
m_abortFlag = false; m_abortFlag = false;
if(!m_templateFile)
{
if(!createTemplate())
{
qWarning("Failed to create template file!");
return;
}
}
while(!m_inputFiles.isEmpty()) while(!m_inputFiles.isEmpty())
{ {
int fileType = fileTypeNormal; int fileType = fileTypeNormal;
@ -165,8 +223,6 @@ const AudioFileModel FileAnalyzer::analyzeFile(const QString &filePath, int *typ
*type = fileTypeNormal; *type = fileTypeNormal;
AudioFileModel audioFile(filePath); AudioFileModel audioFile(filePath);
m_currentSection = sectionOther;
m_currentCover = coverNone;
if(m_recentlyAdded.contains(filePath, Qt::CaseInsensitive)) if(m_recentlyAdded.contains(filePath, Qt::CaseInsensitive))
{ {
@ -180,19 +236,24 @@ const AudioFileModel FileAnalyzer::analyzeFile(const QString &filePath, int *typ
*type = fileTypeDenied; *type = fileTypeDenied;
return audioFile; return audioFile;
} }
if(checkFile_CDDA(readTest)) if(checkFile_CDDA(readTest))
{ {
*type = fileTypeCDDA; *type = fileTypeCDDA;
return audioFile; return audioFile;
} }
readTest.close(); readTest.close();
cover_t coverType = coverNone;
QByteArray coverData;
QStringList params;
params << QString("--Inform=file://%1").arg(QDir::toNativeSeparators(m_templateFile->filePath()));
params << QDir::toNativeSeparators(filePath);
QProcess process; QProcess process;
process.setProcessChannelMode(QProcess::MergedChannels); process.setProcessChannelMode(QProcess::MergedChannels);
process.setReadChannel(QProcess::StandardOutput); process.setReadChannel(QProcess::StandardOutput);
process.start(m_mediaInfoBin, QStringList() << QDir::toNativeSeparators(filePath)); process.start(m_mediaInfoBin, params);
if(!process.waitForStarted()) if(!process.waitForStarted())
{ {
@ -230,20 +291,18 @@ const AudioFileModel FileAnalyzer::analyzeFile(const QString &filePath, int *typ
QString line = QString::fromUtf8(process.readLine().constData()).simplified(); QString line = QString::fromUtf8(process.readLine().constData()).simplified();
if(!line.isEmpty()) if(!line.isEmpty())
{ {
int index = line.indexOf(':'); //qDebug("Line:%s", line.toUtf8().constData());
int index = line.indexOf('=');
if(index > 0) if(index > 0)
{ {
QString key = line.left(index-1).trimmed(); QString key = line.left(index).trimmed();
QString val = line.mid(index+1).trimmed(); QString val = line.mid(index+1).trimmed();
if(!key.isEmpty() && !val.isEmpty()) if(!(key.isEmpty() || val.isEmpty()))
{ {
updateInfo(audioFile, key, val); updateInfo(audioFile, &coverType, &coverData, key, val);
} }
} }
else
{
updateSection(line);
}
} }
} }
} }
@ -276,228 +335,131 @@ const AudioFileModel FileAnalyzer::analyzeFile(const QString &filePath, int *typ
process.waitForFinished(-1); process.waitForFinished(-1);
} }
if(m_currentCover != coverNone) if((coverType != coverNone) && (!coverData.isEmpty()))
{ {
retrieveCover(audioFile, filePath); retrieveCover(audioFile, coverType, coverData);
} }
return audioFile; return audioFile;
} }
void FileAnalyzer::updateSection(const QString &section) void FileAnalyzer::updateInfo(AudioFileModel &audioFile, cover_t *coverType, QByteArray *coverData, const QString &key, const QString &value)
{ {
if(section.startsWith("General", Qt::CaseInsensitive)) //qWarning("'%s' -> '%s'", key.toUtf8().constData(), value.toUtf8().constData());
{
m_currentSection = sectionGeneral;
}
else if(!section.compare("Audio", Qt::CaseInsensitive) || section.startsWith("Audio #1", Qt::CaseInsensitive))
{
m_currentSection = sectionAudio;
}
else if(section.startsWith("Audio", Qt::CaseInsensitive) || section.startsWith("Video", Qt::CaseInsensitive) || section.startsWith("Text", Qt::CaseInsensitive) ||
section.startsWith("Menu", Qt::CaseInsensitive) || section.startsWith("Image", Qt::CaseInsensitive) || section.startsWith("Chapters", Qt::CaseInsensitive))
{
m_currentSection = sectionOther;
}
else
{
m_currentSection = sectionOther;
qWarning("Unknown section: %s", section.toUtf8().constData());
}
}
void FileAnalyzer::updateInfo(AudioFileModel &audioFile, const QString &key, const QString &value) if(IS_KEY("Gen_Format"))
{
switch(m_currentSection)
{ {
case sectionGeneral: audioFile.setFormatContainerType(value);
if(!key.compare("Title", Qt::CaseInsensitive) || !key.compare("Track", Qt::CaseInsensitive) || !key.compare("Track Name", Qt::CaseInsensitive))
{
if(audioFile.fileName().isEmpty()) audioFile.setFileName(value);
} }
else if(!key.compare("Duration", Qt::CaseInsensitive)) else if(IS_KEY("Gen_Format_Profile"))
{ {
if(!audioFile.fileDuration()) audioFile.setFileDuration(parseDuration(value)); audioFile.setFormatContainerProfile(value);
} }
else if(!key.compare("Artist", Qt::CaseInsensitive) || !key.compare("Performer", Qt::CaseInsensitive)) else if(IS_KEY("Gen_Title") || IS_KEY("Gen_Track"))
{ {
if(audioFile.fileArtist().isEmpty()) audioFile.setFileArtist(value); audioFile.setFileName(value);
} }
else if(!key.compare("Album", Qt::CaseInsensitive)) else if(IS_KEY("Gen_Duration"))
{ {
if(audioFile.fileAlbum().isEmpty()) audioFile.setFileAlbum(value); unsigned int tmp = parseDuration(value);
if(tmp > 0) audioFile.setFileDuration(tmp);
} }
else if(!key.compare("Genre", Qt::CaseInsensitive)) else if(IS_KEY("Gen_Artist") || IS_KEY("Gen_Performer"))
{ {
if(audioFile.fileGenre().isEmpty()) audioFile.setFileGenre(value); audioFile.setFileArtist(value);
} }
else if(!key.compare("Year", Qt::CaseInsensitive) || !key.compare("Recorded Date", Qt::CaseInsensitive) || !key.compare("Encoded Date", Qt::CaseInsensitive)) else if(IS_KEY("Gen_Album"))
{ {
if(!audioFile.fileYear()) audioFile.setFileYear(parseYear(value)); audioFile.setFileAlbum(value);
} }
else if(!key.compare("Comment", Qt::CaseInsensitive)) else if(IS_KEY("Gen_Genre"))
{ {
if(audioFile.fileComment().isEmpty()) audioFile.setFileComment(value); audioFile.setFileGenre(value);
} }
else if(!key.compare("Track Name/Position", Qt::CaseInsensitive)) else if(IS_KEY("Gen_Released_Date") || IS_KEY("Gen_Recorded_Date"))
{ {
if(!audioFile.filePosition()) audioFile.setFilePosition(value.toInt()); unsigned int tmp = parseYear(value);
if(tmp > 0) audioFile.setFileYear(tmp);
} }
else if(!key.compare("Format", Qt::CaseInsensitive)) else if(IS_KEY("Gen_Comment"))
{ {
if(audioFile.formatContainerType().isEmpty()) audioFile.setFormatContainerType(value); audioFile.setFileComment(value);
} }
else if(!key.compare("Format Profile", Qt::CaseInsensitive)) else if(IS_KEY("Gen_Track/Position"))
{
if(audioFile.formatContainerProfile().isEmpty()) audioFile.setFormatContainerProfile(value);
}
else if(!key.compare("Cover", Qt::CaseInsensitive) || !key.compare("Cover type", Qt::CaseInsensitive))
{
if(m_currentCover == coverNone) m_currentCover = coverJpeg;
}
else if(!key.compare("Cover MIME", Qt::CaseInsensitive))
{
QString temp = value.split(" ", QString::SkipEmptyParts, Qt::CaseInsensitive).first();
if(!temp.compare("image/jpeg", Qt::CaseInsensitive))
{
m_currentCover = coverJpeg;
}
else if(!temp.compare("image/png", Qt::CaseInsensitive))
{
m_currentCover = coverPng;
}
else if(!temp.compare("image/gif", Qt::CaseInsensitive))
{
m_currentCover = coverGif;
}
}
break;
case sectionAudio:
if(!key.compare("Year", Qt::CaseInsensitive) || !key.compare("Recorded Date", Qt::CaseInsensitive) || !key.compare("Encoded Date", Qt::CaseInsensitive))
{
if(!audioFile.fileYear()) audioFile.setFileYear(parseYear(value));
}
else if(!key.compare("Format", Qt::CaseInsensitive))
{
if(audioFile.formatAudioType().isEmpty()) audioFile.setFormatAudioType(value);
}
else if(!key.compare("Format Profile", Qt::CaseInsensitive))
{
if(audioFile.formatAudioProfile().isEmpty()) audioFile.setFormatAudioProfile(value);
}
else if(!key.compare("Format Version", Qt::CaseInsensitive))
{
if(audioFile.formatAudioVersion().isEmpty()) audioFile.setFormatAudioVersion(value);
}
else if(!key.compare("Channel(s)", Qt::CaseInsensitive))
{
if(!audioFile.formatAudioChannels()) audioFile.setFormatAudioChannels(value.split(" ", QString::SkipEmptyParts).first().toUInt());
}
else if(!key.compare("Sampling rate", Qt::CaseInsensitive))
{
if(!audioFile.formatAudioSamplerate())
{ {
bool ok = false; bool ok = false;
float fTemp = abs(value.split(" ", QString::SkipEmptyParts).first().toFloat(&ok)); unsigned int tmp = value.toUInt(&ok);
if(ok) audioFile.setFormatAudioSamplerate(static_cast<unsigned int>(floor(fTemp * 1000.0f + 0.5f))); if(ok) audioFile.setFilePosition(tmp);
} }
} else if(IS_KEY("Gen_Cover") || IS_KEY("Gen_Cover_Type"))
else if(!key.compare("Bit depth", Qt::CaseInsensitive))
{ {
if(!audioFile.formatAudioBitdepth()) audioFile.setFormatAudioBitdepth(value.split(" ", QString::SkipEmptyParts).first().toUInt()); if(*coverType == coverNone)
}
else if(!key.compare("Duration", Qt::CaseInsensitive))
{ {
if(!audioFile.fileDuration()) audioFile.setFileDuration(parseDuration(value)); *coverType = coverJpeg;
} }
else if(!key.compare("Bit rate", Qt::CaseInsensitive)) }
else if(IS_KEY("Gen_Cover_Mime"))
{ {
if(!audioFile.formatAudioBitrate()) QString temp = value.split(" ", QString::SkipEmptyParts).first();
if(!temp.compare("image/jpeg", Qt::CaseInsensitive)) *coverType = coverJpeg;
else if(!temp.compare("image/png", Qt::CaseInsensitive)) *coverType = coverPng;
else if(!temp.compare("image/gif", Qt::CaseInsensitive)) *coverType = coverGif;
}
else if(IS_KEY("Gen_Cover_Data"))
{
if(!coverData->isEmpty()) coverData->clear();
coverData->append(QByteArray::fromBase64(value.toLatin1()));
}
else if(IS_KEY("Aud_Format"))
{
audioFile.setFormatAudioType(value);
}
else if(IS_KEY("Aud_Format_Profile"))
{
audioFile.setFormatAudioProfile(value);
}
else if(IS_KEY("Aud_Format_Version"))
{
audioFile.setFormatAudioVersion(value);
}
else if(IS_KEY("Aud_Channel(s)"))
{ {
bool ok = false; bool ok = false;
unsigned int uiTemp = value.split(" ", QString::SkipEmptyParts).first().toUInt(&ok); unsigned int tmp = value.toUInt(&ok);
if(ok) if(ok) audioFile.setFormatAudioChannels(tmp);
{
audioFile.setFormatAudioBitrate(uiTemp);
} }
else else if(IS_KEY("Aud_SamplingRate"))
{
float fTemp = abs(value.split(" ", QString::SkipEmptyParts).first().toFloat(&ok));
if(ok) audioFile.setFormatAudioBitrate(static_cast<unsigned int>(floor(fTemp + 0.5f)));
}
}
}
else if(!key.compare("Bit rate mode", Qt::CaseInsensitive))
{
if(audioFile.formatAudioBitrateMode() == AudioFileModel::BitrateModeUndefined)
{
if(!value.compare("Constant", Qt::CaseInsensitive)) audioFile.setFormatAudioBitrateMode(AudioFileModel::BitrateModeConstant);
if(!value.compare("Variable", Qt::CaseInsensitive)) audioFile.setFormatAudioBitrateMode(AudioFileModel::BitrateModeVariable);
}
}
break;
}
}
unsigned int FileAnalyzer::parseYear(const QString &str)
{
if(str.startsWith("UTC", Qt::CaseInsensitive))
{
QDate date = QDate::fromString(str.mid(3).trimmed().left(10), "yyyy-MM-dd");
if(date.isValid())
{
return date.year();
}
else
{
return 0;
}
}
else
{ {
bool ok = false; bool ok = false;
int year = str.toInt(&ok); unsigned int tmp = value.toUInt(&ok);
if(ok && year > 0) if(ok) audioFile.setFormatAudioSamplerate(tmp);
}
else if(IS_KEY("Aud_BitDepth"))
{ {
return year; bool ok = false;
unsigned int tmp = value.toUInt(&ok);
if(ok) audioFile.setFormatAudioBitdepth(tmp);
}
else if(IS_KEY("Aud_Duration"))
{
unsigned int tmp = parseDuration(value);
if(tmp > 0) audioFile.setFileDuration(tmp);
}
else if(IS_KEY("Aud_BitRate"))
{
bool ok = false;
unsigned int tmp = value.toUInt(&ok);
if(ok) audioFile.setFormatAudioBitrate(tmp/1000);
}
else if(IS_KEY("Aud_BitRate_Mode"))
{
if(!value.compare("CBR", Qt::CaseInsensitive)) audioFile.setFormatAudioBitrateMode(AudioFileModel::BitrateModeConstant);
if(!value.compare("VBR", Qt::CaseInsensitive)) audioFile.setFormatAudioBitrateMode(AudioFileModel::BitrateModeVariable);
} }
else else
{ {
return 0; qWarning("Unknown key '%s' with value '%s' found!", key.toUtf8().constData(), value.toUtf8().constData());
} }
}
}
unsigned int FileAnalyzer::parseDuration(const QString &str)
{
QTime time;
time = QTime::fromString(str, "z'ms'");
if(time.isValid())
{
return qMax(1, (time.hour() * 60 * 60) + (time.minute() * 60) + time.second());
}
time = QTime::fromString(str, "s's 'z'ms'");
if(time.isValid())
{
return qMax(1, (time.hour() * 60 * 60) + (time.minute() * 60) + time.second());
}
time = QTime::fromString(str, "m'mn 's's'");
if(time.isValid())
{
return qMax(1, (time.hour() * 60 * 60) + (time.minute() * 60) + time.second());
}
time = QTime::fromString(str, "h'h 'm'mn'");
if(time.isValid())
{
return qMax(1, (time.hour() * 60 * 60) + (time.minute() * 60) + time.second());
}
return 0;
} }
bool FileAnalyzer::checkFile_CDDA(QFile &file) bool FileAnalyzer::checkFile_CDDA(QFile &file)
@ -512,12 +474,12 @@ bool FileAnalyzer::checkFile_CDDA(QFile &file)
return ((i >= 0) && (j >= 0) && (k >= 0) && (k > j) && (j > i)); return ((i >= 0) && (j >= 0) && (k >= 0) && (k > j) && (j > i));
} }
void FileAnalyzer::retrieveCover(AudioFileModel &audioFile, const QString &filePath) void FileAnalyzer::retrieveCover(AudioFileModel &audioFile, cover_t coverType, const QByteArray &coverData)
{ {
qDebug("Retrieving cover from: %s", filePath.toUtf8().constData()); qDebug("Retrieving cover!");
QString extension; QString extension;
switch(m_currentCover) switch(coverType)
{ {
case coverPng: case coverPng:
extension = QString::fromLatin1("png"); extension = QString::fromLatin1("png");
@ -530,59 +492,6 @@ void FileAnalyzer::retrieveCover(AudioFileModel &audioFile, const QString &fileP
break; break;
} }
QProcess process;
process.setProcessChannelMode(QProcess::MergedChannels);
process.setReadChannel(QProcess::StandardOutput);
process.start(m_mediaInfoBin, QStringList() << "-f" << QDir::toNativeSeparators(filePath));
if(!process.waitForStarted())
{
qWarning("MediaInfo process failed to create!");
qWarning("Error message: \"%s\"\n", process.errorString().toLatin1().constData());
process.kill();
process.waitForFinished(-1);
return;
}
while(process.state() != QProcess::NotRunning)
{
if(m_abortFlag)
{
process.kill();
qWarning("Process was aborted on user request!");
break;
}
if(!process.waitForReadyRead())
{
if(process.state() == QProcess::Running)
{
qWarning("MediaInfo time out. Killing process and skipping file!");
process.kill();
process.waitForFinished(-1);
return;
}
}
while(process.canReadLine())
{
QString line = QString::fromUtf8(process.readLine().constData()).simplified();
if(!line.isEmpty())
{
int index = line.indexOf(':');
if(index > 0)
{
QString key = line.left(index-1).trimmed();
QString val = line.mid(index+1).trimmed();
if(!key.isEmpty() && !val.isEmpty())
{
if(!key.compare("Cover_Data", Qt::CaseInsensitive))
{
if(val.indexOf(" ") > 0)
{
val = val.split(" ", QString::SkipEmptyParts, Qt::CaseInsensitive).first();
}
QByteArray coverData = QByteArray::fromBase64(val.toLatin1());
if(!(QImage::fromData(coverData, extension.toUpper().toLatin1().constData()).isNull())) if(!(QImage::fromData(coverData, extension.toUpper().toLatin1().constData()).isNull()))
{ {
QFile coverFile(QString("%1/%2.%3").arg(lamexp_temp_folder2(), lamexp_rand_str(), extension)); QFile coverFile(QString("%1/%2.%3").arg(lamexp_temp_folder2(), lamexp_rand_str(), extension));
@ -597,20 +506,6 @@ void FileAnalyzer::retrieveCover(AudioFileModel &audioFile, const QString &fileP
{ {
qWarning("Image data seems to be invalid :-("); qWarning("Image data seems to be invalid :-(");
} }
break;
}
}
}
}
}
}
process.waitForFinished();
if(process.state() != QProcess::NotRunning)
{
process.kill();
process.waitForFinished(-1);
}
} }
bool FileAnalyzer::analyzeAvisynthFile(const QString &filePath, AudioFileModel &info) bool FileAnalyzer::analyzeAvisynthFile(const QString &filePath, AudioFileModel &info)
@ -730,6 +625,94 @@ bool FileAnalyzer::analyzeAvisynthFile(const QString &filePath, AudioFileModel &
} }
} }
bool FileAnalyzer::createTemplate(void)
{
if(m_templateFile)
{
qWarning("Template file already exists!");
return true;
}
QString templatePath = QString("%1/%2.txt").arg(lamexp_temp_folder2(), lamexp_rand_str());
QFile templateFile(templatePath);
if(!templateFile.open(QIODevice::WriteOnly))
{
return false;
}
templateFile.write("General;");
for(size_t i = 0; g_tags_gen[i]; i++)
{
templateFile.write(QString("Gen_%1=%%1%\\n").arg(g_tags_gen[i]).toLatin1().constData());
}
templateFile.write("\r\n");
templateFile.write("Audio;");
for(size_t i = 0; g_tags_aud[i]; i++)
{
templateFile.write(QString("Aud_%1=%%1%\\n").arg(g_tags_aud[i]).toLatin1().constData());
}
templateFile.write("\r\n");
bool success = (templateFile.error() == QFile::NoError);
templateFile.close();
if(!success)
{
QFile::remove(templatePath);
return false;
}
try
{
m_templateFile = new LockedFile(templatePath);
}
catch(...)
{
qWarning("Failed to lock template file!");
return false;
}
return true;
}
unsigned int FileAnalyzer::parseYear(const QString &str)
{
if(str.startsWith("UTC", Qt::CaseInsensitive))
{
QDate date = QDate::fromString(str.mid(3).trimmed().left(10), "yyyy-MM-dd");
if(date.isValid())
{
return date.year();
}
else
{
return 0;
}
}
else
{
bool ok = false;
int year = str.toInt(&ok);
if(ok && year > 0)
{
return year;
}
else
{
return 0;
}
}
}
unsigned int FileAnalyzer::parseDuration(const QString &str)
{
bool ok = false;
unsigned int value = str.toUInt(&ok);
return ok ? (value/1000) : 0;
}
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Public Functions // Public Functions
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////

20
src/Thread_FileAnalyzer.h
View File

@ -30,6 +30,7 @@ class AudioFileModel;
class QFile; class QFile;
class QDir; class QDir;
class QFileInfo; class QFileInfo;
class LockedFile;
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
// Splash Thread // Splash Thread
@ -41,6 +42,7 @@ class FileAnalyzer: public QThread
public: public:
FileAnalyzer(const QStringList &inputFiles); FileAnalyzer(const QStringList &inputFiles);
~FileAnalyzer(void);
void run(); void run();
bool getSuccess(void) { return !isRunning() && m_bSuccess; } bool getSuccess(void) { return !isRunning() && m_bSuccess; }
unsigned int filesAccepted(void); unsigned int filesAccepted(void);
@ -57,12 +59,6 @@ public slots:
void abortProcess(void) { m_abortFlag = true; } void abortProcess(void) { m_abortFlag = true; }
private: private:
enum section_t
{
sectionGeneral,
sectionAudio,
sectionOther
};
enum cover_t enum cover_t
{ {
coverNone, coverNone,
@ -79,29 +75,31 @@ private:
}; };
const AudioFileModel analyzeFile(const QString &filePath, int *type); const AudioFileModel analyzeFile(const QString &filePath, int *type);
void updateInfo(AudioFileModel &audioFile, const QString &key, const QString &value); void updateInfo(AudioFileModel &audioFile, cover_t *coverType, QByteArray *coverData, const QString &key, const QString &value);
void updateSection(const QString &section);
unsigned int parseYear(const QString &str); unsigned int parseYear(const QString &str);
unsigned int parseDuration(const QString &str); unsigned int parseDuration(const QString &str);
bool checkFile_CDDA(QFile &file); bool checkFile_CDDA(QFile &file);
void retrieveCover(AudioFileModel &audioFile, const QString &filePath); void retrieveCover(AudioFileModel &audioFile, cover_t coverType, const QByteArray &coverData);
bool analyzeAvisynthFile(const QString &filePath, AudioFileModel &info); bool analyzeAvisynthFile(const QString &filePath, AudioFileModel &info);
bool createTemplate(void);
const QString m_mediaInfoBin; const QString m_mediaInfoBin;
const QString m_avs2wavBin; const QString m_avs2wavBin;
QStringList m_inputFiles; QStringList m_inputFiles;
QStringList m_recentlyAdded; QStringList m_recentlyAdded;
section_t m_currentSection;
cover_t m_currentCover;
unsigned int m_filesAccepted; unsigned int m_filesAccepted;
unsigned int m_filesRejected; unsigned int m_filesRejected;
unsigned int m_filesDenied; unsigned int m_filesDenied;
unsigned int m_filesDummyCDDA; unsigned int m_filesDummyCDDA;
unsigned int m_filesCueSheet; unsigned int m_filesCueSheet;
LockedFile *m_templateFile;
volatile bool m_abortFlag; volatile bool m_abortFlag;
static const char *g_tags_gen[];
static const char *g_tags_aud[];
bool m_bAborted; bool m_bAborted;
bool m_bSuccess; bool m_bSuccess;
}; };