///////////////////////////////////////////////////////////////////////////////
// LameXP - Audio Encoder Front-End
-// Copyright (C) 2004-2011 LoRd_MuldeR <MuldeR2@GMX.de>
+// Copyright (C) 2004-2020 LoRd_MuldeR <MuldeR2@GMX.de>
//
// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
+// it under the terms of the GNU GENERAL PUBLIC LICENSE as published by
// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// (at your option) any later version; always including the non-optional
+// LAMEXP GNU GENERAL PUBLIC LICENSE ADDENDUM. See "License.txt" file!
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
#include "Thread_FileAnalyzer.h"
+//Internal
#include "Global.h"
#include "LockedFile.h"
#include "Model_AudioFile.h"
+#include "Thread_FileAnalyzer_Task.h"
+#include "PlaylistImporter.h"
+//MUtils
+#include <MUtils/Global.h>
+#include <MUtils/Exception.h>
+
+//Qt
#include <QDir>
#include <QFileInfo>
#include <QProcess>
#include <QDate>
#include <QTime>
#include <QDebug>
+#include <QImage>
+#include <QThreadPool>
+#include <QTime>
+#include <QElapsedTimer>
+#include <QTimer>
+#include <QQueue>
-#include <math.h>
-
-////////////////////////////////////////////////////////////
-// Constructor
-////////////////////////////////////////////////////////////
-
-FileAnalyzer::FileAnalyzer(const QStringList &inputFiles)
-:
- m_inputFiles(inputFiles),
- m_mediaInfoBin_x86(lamexp_lookup_tool("mediainfo_i386.exe")),
- m_mediaInfoBin_x64(lamexp_lookup_tool("mediainfo_x64.exe"))
+//Insert into QStringList *without* duplicates
+static inline void SAFE_APPEND_STRING(QStringList &list, const QString &str)
{
- m_bSuccess = false;
-
- if(m_mediaInfoBin_x86.isEmpty() || m_mediaInfoBin_x64.isEmpty())
+ if(!list.contains(str, Qt::CaseInsensitive))
{
- qFatal("Invalid path to MediaInfo binary. Tool not initialized properly.");
+ list << str;
}
-
- m_filesAccepted = 0;
- m_filesRejected = 0;
- m_filesDenied = 0;
}
////////////////////////////////////////////////////////////
-// Thread Main
+// Constructor
////////////////////////////////////////////////////////////
-void FileAnalyzer::run()
+FileAnalyzer::FileAnalyzer(const QStringList &inputFiles)
+:
+ m_tasksCounterNext(0),
+ m_tasksCounterDone(0),
+ m_inputFiles(inputFiles)
{
- m_bSuccess = false;
-
m_filesAccepted = 0;
m_filesRejected = 0;
m_filesDenied = 0;
+ m_filesDummyCDDA = 0;
+ m_filesCueSheet = 0;
- m_inputFiles.sort();
+ moveToThread(this); /*makes sure queued slots are executed in the proper thread context*/
+ m_timer.reset(new QElapsedTimer());
+}
- while(!m_inputFiles.isEmpty())
+FileAnalyzer::~FileAnalyzer(void)
+{
+ if(!m_pool.isNull())
{
- QString currentFile = QDir::fromNativeSeparators(m_inputFiles.takeFirst());
- qDebug("Analyzing: %s", currentFile.toUtf8().constData());
- emit fileSelected(QFileInfo(currentFile).fileName());
- AudioFileModel file = analyzeFile(currentFile);
- if(file.fileName().isEmpty() || file.formatContainerType().isEmpty() || file.formatAudioType().isEmpty())
+ if(!m_pool->waitForDone(2500))
{
- if(!importPlaylist(m_inputFiles, currentFile))
- {
- m_filesRejected++;
- qDebug("Skipped: %s", file.filePath().toUtf8().constData());
- }
- continue;
+ qWarning("There are still running tasks in the thread pool!");
}
- m_filesAccepted++;
- emit fileAnalyzed(file);
}
-
- qDebug("All files added.\n");
- m_bSuccess = true;
}
////////////////////////////////////////////////////////////
-// Privtae Functions
+// Thread Main
////////////////////////////////////////////////////////////
-const AudioFileModel FileAnalyzer::analyzeFile(const QString &filePath)
+void FileAnalyzer::run()
{
- lamexp_cpu_t cpuInfo = lamexp_detect_cpu_features();
- const QString mediaInfoBin = cpuInfo.x64 ? m_mediaInfoBin_x64 : m_mediaInfoBin_x86;
-
- AudioFileModel audioFile(filePath);
- m_currentSection = sectionOther;
+ m_bSuccess.fetchAndStoreOrdered(0);
- QFile readTest(filePath);
- if(!readTest.open(QIODevice::ReadOnly))
- {
- qWarning("Cannot access file for reading, skipping!");
- m_filesDenied++;
- return audioFile;
- }
- else
- {
- readTest.close();
- }
+ m_tasksCounterNext = 0;
+ m_tasksCounterDone = 0;
+ m_completedCounter = 0;
- QProcess process;
- process.setProcessChannelMode(QProcess::MergedChannels);
- process.setReadChannel(QProcess::StandardOutput);
- process.start(mediaInfoBin, QStringList() << 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 audioFile;
- }
+ m_completedFiles.clear();
+ m_completedTaskIds.clear();
+ m_runningTaskIds.clear();
- while(process.state() != QProcess::NotRunning)
- {
- if(!process.waitForReadyRead())
- {
- if(process.state() == QProcess::Running)
- {
- qWarning("MediaInfo time out. Killing process and skipping file!");
- process.kill();
- process.waitForFinished(-1);
- return audioFile;
- }
- }
-
- QByteArray data;
-
- 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())
- {
- updateInfo(audioFile, key, val);
- }
- }
- else
- {
- updateSection(line);
- }
- }
- }
- }
-
- if(audioFile.fileName().isEmpty())
- {
- QString baseName = QFileInfo(filePath).fileName();
- int index = baseName.lastIndexOf(".");
-
- if(index >= 0)
- {
- baseName = baseName.left(index);
- }
+ m_filesAccepted = 0;
+ m_filesRejected = 0;
+ m_filesDenied = 0;
+ m_filesDummyCDDA = 0;
+ m_filesCueSheet = 0;
- baseName = baseName.replace("_", " ").simplified();
- index = baseName.lastIndexOf(" - ");
+ m_timer->invalidate();
- if(index >= 0)
- {
- baseName = baseName.mid(index + 3).trimmed();
- }
+ //Sort files
+ MUtils::natural_string_sort(m_inputFiles, true);
- audioFile.setFileName(baseName);
- }
-
- return audioFile;
-}
+ //Handle playlist files first!
+ handlePlaylistFiles();
-void FileAnalyzer::updateSection(const QString §ion)
-{
- if(section.startsWith("General", Qt::CaseInsensitive))
+ const unsigned int nFiles = m_inputFiles.count();
+ if(nFiles < 1)
{
- m_currentSection = sectionGeneral;
+ qWarning("File list is empty, nothing to do!");
+ return;
}
- 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
- {
- qWarning("Unknown section: %s", section.toUtf8().constData());
- }
-}
-
-void FileAnalyzer::updateInfo(AudioFileModel &audioFile, const QString &key, const QString &value)
-{
- switch(m_currentSection)
- {
- case sectionGeneral:
- 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))
- {
- if(!audioFile.fileDuration()) audioFile.setFileDuration(parseDuration(value));
- }
- else if(!key.compare("Artist", Qt::CaseInsensitive) || !key.compare("Performer", Qt::CaseInsensitive))
- {
- if(audioFile.fileArtist().isEmpty()) audioFile.setFileArtist(value);
- }
- else if(!key.compare("Album", Qt::CaseInsensitive))
- {
- if(audioFile.fileAlbum().isEmpty()) audioFile.setFileAlbum(value);
- }
- else if(!key.compare("Genre", Qt::CaseInsensitive))
- {
- if(audioFile.fileGenre().isEmpty()) audioFile.setFileGenre(value);
- }
- else 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("Comment", Qt::CaseInsensitive))
- {
- if(audioFile.fileComment().isEmpty()) audioFile.setFileComment(value);
- }
- else if(!key.compare("Track Name/Position", Qt::CaseInsensitive))
- {
- if(!audioFile.filePosition()) audioFile.setFilePosition(value.toInt());
- }
- else if(!key.compare("Format", Qt::CaseInsensitive))
- {
- if(audioFile.formatContainerType().isEmpty()) audioFile.setFormatContainerType(value);
- }
- else if(!key.compare("Format Profile", Qt::CaseInsensitive))
- {
- if(audioFile.formatContainerProfile().isEmpty()) audioFile.setFormatContainerProfile(value);
- }
- 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().toInt());
- }
- else if(!key.compare("Sampling rate", Qt::CaseInsensitive))
- {
- if(!audioFile.formatAudioSamplerate()) audioFile.setFormatAudioSamplerate(ceil(value.split(" ", QString::SkipEmptyParts).first().toFloat() * 1000.0f));
- }
- else if(!key.compare("Bit depth", Qt::CaseInsensitive))
- {
- if(!audioFile.formatAudioBitdepth()) audioFile.setFormatAudioBitdepth(value.split(" ", QString::SkipEmptyParts).first().toInt());
- }
- else if(!key.compare("Duration", Qt::CaseInsensitive))
- {
- if(!audioFile.fileDuration()) audioFile.setFileDuration(parseDuration(value));
- }
- break;
- }
-}
+ //Update progress
+ emit progressMaxChanged(nFiles);
+ emit progressValChanged(0);
-unsigned int FileAnalyzer::parseYear(const QString &str)
-{
- if(str.startsWith("UTC", Qt::CaseInsensitive))
+ //Create the thread pool
+ if (m_pool.isNull())
{
- QDate date = QDate::fromString(str.mid(3).trimmed().left(10), "yyyy-MM-dd");
- if(date.isValid())
- {
- return date.year();
- }
- else
- {
- return 0;
- }
+ m_pool.reset(new QThreadPool());
}
- 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)
-{
- QTime time;
-
- time = QTime::fromString(str, "z'ms'");
- if(time.isValid())
- {
- return max(1, (time.hour() * 60 * 60) + (time.minute() * 60) + time.second());
- }
-
- time = QTime::fromString(str, "s's 'z'ms'");
- if(time.isValid())
- {
- return max(1, (time.hour() * 60 * 60) + (time.minute() * 60) + time.second());
- }
-
- time = QTime::fromString(str, "m'mn 's's'");
- if(time.isValid())
+ //Update thread count
+ const int idealThreadCount = QThread::idealThreadCount();
+ if(idealThreadCount > 0)
{
- return max(1, (time.hour() * 60 * 60) + (time.minute() * 60) + time.second());
+ m_pool->setMaxThreadCount(qBound(2, ((idealThreadCount * 3) / 2), 12));
}
- time = QTime::fromString(str, "h'h 'm'mn'");
- if(time.isValid())
- {
- return max(1, (time.hour() * 60 * 60) + (time.minute() * 60) + time.second());
- }
-
- return 0;
-}
-
-
-bool FileAnalyzer::importPlaylist(QStringList &fileList, const QString &playlistFile)
-{
- QFileInfo file(playlistFile);
- QDir baseDir(file.canonicalPath());
+ //Start first N threads
+ QTimer::singleShot(0, this, SLOT(initializeTasks()));
- QDir rootDir(baseDir);
- while(rootDir.cdUp());
+ //Start event processing
+ this->exec();
- //Sanity check
- if(file.size() < 3 || file.size() > 512000)
- {
- return false;
- }
-
- //Detect playlist type
- playlist_t playlistType = isPlaylist(file.canonicalFilePath());
+ //Wait for pending tasks to complete
+ m_pool->waitForDone();
- //Exit if not a playlist
- if(playlistType == noPlaylist)
+ //Was opertaion aborted?
+ if(MUTILS_BOOLIFY(m_bAborted))
{
- return false;
+ qWarning("Operation cancelled by user!");
+ return;
}
- QFile data(playlistFile);
+ //Update progress
+ emit progressValChanged(nFiles);
- //Open file for reading
- if(!data.open(QIODevice::ReadOnly))
+ //Emit pending files (this should not be required though!)
+ if(!m_completedFiles.isEmpty())
{
- return false;
+ qWarning("FileAnalyzer: Pending file information found after last thread terminated!");
+ QList<unsigned int> keys = m_completedFiles.keys(); qSort(keys);
+ while(!keys.isEmpty())
+ {
+ emit fileAnalyzed(m_completedFiles.take(keys.takeFirst()));
+ }
}
- //Parse playlist depending on type
- switch(playlistType)
- {
- case m3uPlaylist:
- return parsePlaylist_m3u(data, fileList, baseDir, rootDir);
- break;
- case plsPlaylist:
- return parsePlaylist_pls(data, fileList, baseDir, rootDir);
- break;
- case wplPlaylist:
- return parsePlaylist_wpl(data, fileList, baseDir, rootDir);
- break;
- default:
- return false;
- break;
- }
+ qDebug("All files added.\n");
+ m_bSuccess.fetchAndStoreOrdered(1);
+ QThread::msleep(333);
}
-bool FileAnalyzer::parsePlaylist_m3u(QFile &data, QStringList &fileList, const QDir &baseDir, const QDir &rootDir)
+////////////////////////////////////////////////////////////
+// Privtae Functions
+////////////////////////////////////////////////////////////
+
+bool FileAnalyzer::analyzeNextFile(void)
{
- QByteArray line = data.readLine();
-
- while(line.size() > 0)
+ if(!(m_inputFiles.isEmpty() || MUTILS_BOOLIFY(m_bAborted)))
{
- QFileInfo filename1(QDir::fromNativeSeparators(QString::fromUtf8(line.constData(), line.size()).trimmed()));
- QFileInfo filename2(QDir::fromNativeSeparators(QString::fromLatin1(line.constData(), line.size()).trimmed()));
-
- filename1.setCaching(false);
- filename2.setCaching(false);
+ const unsigned int taskId = m_tasksCounterNext++;
+ const QString currentFile = QDir::fromNativeSeparators(m_inputFiles.takeFirst());
- if(!(filename1.filePath().startsWith("#") || filename2.filePath().startsWith("#")))
+ if((!m_timer->isValid()) || (m_timer->elapsed() >= 333))
{
- fixFilePath(filename1, baseDir, rootDir);
- fixFilePath(filename2, baseDir, rootDir);
-
- if(filename1.exists())
- {
- if(isPlaylist(filename1.canonicalFilePath()) == noPlaylist)
- {
- fileList << filename1.canonicalFilePath();
- }
- }
- else if(filename2.exists())
- {
- if(isPlaylist(filename2.canonicalFilePath()) == noPlaylist)
- {
- fileList << filename2.canonicalFilePath();
- }
- }
+ emit fileSelected(QFileInfo(currentFile).fileName());
+ m_timer->restart();
}
+
+ AnalyzeTask *task = new AnalyzeTask(taskId, currentFile, m_bAborted);
+ connect(task, SIGNAL(fileAnalyzed(const unsigned int, const int, AudioFileModel)), this, SLOT(taskFileAnalyzed(unsigned int, const int, AudioFileModel)), Qt::QueuedConnection);
+ connect(task, SIGNAL(taskCompleted(const unsigned int)), this, SLOT(taskThreadFinish(const unsigned int)), Qt::QueuedConnection);
+ m_runningTaskIds.insert(taskId); m_pool->start(task);
- line = data.readLine();
+ return true;
}
- return true;
+ return false;
}
-bool FileAnalyzer::parsePlaylist_pls(QFile &data, QStringList &fileList, const QDir &baseDir, const QDir &rootDir)
+void FileAnalyzer::handlePlaylistFiles(void)
{
- QRegExp plsEntry("File(\\d+)=(.+)", Qt::CaseInsensitive);
- QByteArray line = data.readLine();
+ QQueue<QVariant> queue;
+ QStringList importedFromPlaylist;
- while(line.size() > 0)
+ //Import playlist files into "hierarchical" list
+ while(!m_inputFiles.isEmpty())
{
- bool flag = false;
-
- QString temp1(QDir::fromNativeSeparators(QString::fromUtf8(line.constData(), line.size()).trimmed()));
- QString temp2(QDir::fromNativeSeparators(QString::fromLatin1(line.constData(), line.size()).trimmed()));
-
- if(!flag && plsEntry.indexIn(temp1) >= 0)
+ const QString currentFile = m_inputFiles.takeFirst();
+ QStringList importedFiles;
+ if(PlaylistImporter::importPlaylist(importedFiles, currentFile))
{
- QFileInfo filename(QDir::fromNativeSeparators(plsEntry.cap(2)).trimmed());
- filename.setCaching(false);
- fixFilePath(filename, baseDir, rootDir);
-
- if(filename.exists())
- {
- if(isPlaylist(filename.canonicalFilePath()) == noPlaylist)
- {
- fileList << filename.canonicalFilePath();
- flag = true;
- }
- }
+ queue.enqueue(importedFiles);
+ importedFromPlaylist << importedFiles;
}
-
- if(!flag && plsEntry.indexIn(temp2) >= 0)
+ else
{
- QFileInfo filename(QDir::fromNativeSeparators(plsEntry.cap(2)).trimmed());
- filename.setCaching(false);
- fixFilePath(filename, baseDir, rootDir);
-
- if(filename.exists())
- {
- if(isPlaylist(filename.canonicalFilePath()) == noPlaylist)
- {
- fileList << filename.canonicalFilePath();
- flag = true;
- }
- }
+ queue.enqueue(currentFile);
}
-
- line = data.readLine();
}
- return true;
-}
+ //Reduce temporary list
+ importedFromPlaylist.removeDuplicates();
-bool FileAnalyzer::parsePlaylist_wpl(QFile &data, QStringList &fileList, const QDir &baseDir, const QDir &rootDir)
-{
- QRegExp wplEntry("<(media|ref)[^<>]*(src|href)=\"([^\"]+)\"[^<>]*>", Qt::CaseInsensitive);
- QByteArray line = data.readLine();
-
- while(line.size() > 0)
+ //Now build the complete "flat" file list (files imported from playlist take precedence!)
+ while(!queue.isEmpty())
{
- bool flag = false;
-
- QString temp1(QDir::fromNativeSeparators(QString::fromUtf8(line.constData(), line.size()).trimmed()));
- QString temp2(QDir::fromNativeSeparators(QString::fromLatin1(line.constData(), line.size()).trimmed()));
-
- if(!flag && wplEntry.indexIn(temp1) >= 0)
+ const QVariant current = queue.dequeue();
+ if(current.type() == QVariant::String)
{
- QFileInfo filename(QDir::fromNativeSeparators(wplEntry.cap(3)).trimmed());
- filename.setCaching(false);
- fixFilePath(filename, baseDir, rootDir);
-
- if(filename.exists())
+ const QString temp = current.toString();
+ if(!importedFromPlaylist.contains(temp, Qt::CaseInsensitive))
{
- if(isPlaylist(filename.canonicalFilePath()) == noPlaylist)
- {
- fileList << filename.canonicalFilePath();
- flag = true;
- }
+ SAFE_APPEND_STRING(m_inputFiles, temp);
}
}
-
- if(!flag && wplEntry.indexIn(temp2) >= 0)
+ else if(current.type() == QVariant::StringList)
{
- QFileInfo filename(QDir::fromNativeSeparators(wplEntry.cap(3)).trimmed());
- filename.setCaching(false);
- fixFilePath(filename, baseDir, rootDir);
-
- if(filename.exists())
+ const QStringList temp = current.toStringList();
+ for(QStringList::ConstIterator iter = temp.constBegin(); iter != temp.constEnd(); iter++)
{
- if(isPlaylist(filename.canonicalFilePath()) == noPlaylist)
- {
- fileList << filename.canonicalFilePath();
- flag = true;
- }
+ SAFE_APPEND_STRING(m_inputFiles, (*iter));
}
}
-
- line = data.readLine();
+ else
+ {
+ qWarning("Encountered an unexpected variant type!");
+ }
}
-
- return true;
}
-FileAnalyzer::playlist_t FileAnalyzer::isPlaylist(const QString &fileName)
+////////////////////////////////////////////////////////////
+// Slot Functions
+////////////////////////////////////////////////////////////
+
+void FileAnalyzer::initializeTasks(void)
{
- QFileInfo file (fileName);
-
- if(file.suffix().compare("m3u", Qt::CaseInsensitive) == 0)
- {
- return m3uPlaylist;
- }
- else if(file.suffix().compare("m3u8", Qt::CaseInsensitive) == 0)
- {
- return m3uPlaylist;
- }
- else if(file.suffix().compare("pls", Qt::CaseInsensitive) == 0)
+ for(int i = 0; i < m_pool->maxThreadCount(); i++)
{
- return plsPlaylist;
+ if(!analyzeNextFile()) break;
}
- else if(file.suffix().compare("asx", Qt::CaseInsensitive) == 0)
- {
- return wplPlaylist;
- }
- else if(file.suffix().compare("wpl", Qt::CaseInsensitive) == 0)
+}
+
+void FileAnalyzer::taskFileAnalyzed(const unsigned int taskId, const int fileType, const AudioFileModel &file)
+{
+ m_completedTaskIds.insert(taskId);
+
+ switch(fileType)
{
- return wplPlaylist;
+ case AnalyzeTask::fileTypeNormal:
+ m_filesAccepted++;
+ if(m_tasksCounterDone == taskId)
+ {
+ emit fileAnalyzed(file);
+ m_tasksCounterDone++;
+ }
+ else
+ {
+ m_completedFiles.insert(taskId, file);
+ }
+ break;
+ case AnalyzeTask::fileTypeCDDA:
+ m_filesDummyCDDA++;
+ break;
+ case AnalyzeTask::fileTypeDenied:
+ m_filesDenied++;
+ break;
+ case AnalyzeTask::fileTypeCueSheet:
+ m_filesCueSheet++;
+ break;
+ case AnalyzeTask::fileTypeUnknown:
+ m_filesRejected++;
+ break;
+ default:
+ MUTILS_THROW("Unknown file type identifier!");
}
- else
+
+ //Emit all pending files
+ while(m_completedTaskIds.contains(m_tasksCounterDone))
{
- return noPlaylist;
+ if(m_completedFiles.contains(m_tasksCounterDone))
+ {
+ emit fileAnalyzed(m_completedFiles.take(m_tasksCounterDone));
+ }
+ m_completedTaskIds.remove(m_tasksCounterDone);
+ m_tasksCounterDone++;
}
}
-void FileAnalyzer::fixFilePath(QFileInfo &filename, const QDir &baseDir, const QDir &rootDir)
+void FileAnalyzer::taskThreadFinish(const unsigned int taskId)
{
- if(filename.filePath().startsWith("/"))
+ m_runningTaskIds.remove(taskId);
+ emit progressValChanged(++m_completedCounter);
+
+ if(!analyzeNextFile())
{
- while(filename.filePath().startsWith("/"))
+ if(m_runningTaskIds.empty())
{
- filename.setFile(filename.filePath().mid(1));
+ QTimer::singleShot(0, this, SLOT(quit())); //Stop event processing, if all threads have completed!
}
- filename.setFile(rootDir.filePath(filename.filePath()));
- }
-
- if(!filename.isAbsolute())
- {
- filename.setFile(baseDir.filePath(filename.filePath()));
}
}
unsigned int FileAnalyzer::filesRejected(void)
{
- return m_filesRejected - m_filesDenied;
+ return m_filesRejected;
}
unsigned int FileAnalyzer::filesDenied(void)
return m_filesDenied;
}
+unsigned int FileAnalyzer::filesDummyCDDA(void)
+{
+ return m_filesDummyCDDA;
+}
+
+unsigned int FileAnalyzer::filesCueSheet(void)
+{
+ return m_filesCueSheet;
+}
+
////////////////////////////////////////////////////////////
// EVENTS
////////////////////////////////////////////////////////////
OSDN Git Service
