From 50beadffe9cb05a925ffffe1e669b119860ffcb0 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Sun, 31 Jul 2011 10:23:30 +0000 Subject: [PATCH] Try to find missing images in title clips with recursive search svn path=/trunk/kdenlive/; revision=5815 --- src/documentchecker.cpp | 33 ++++++++++++++++++++++++++++++++- src/documentchecker.h | 1 + 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/src/documentchecker.cpp b/src/documentchecker.cpp index e3444c03..2cdd9325 100644 --- a/src/documentchecker.cpp +++ b/src/documentchecker.cpp @@ -393,9 +393,10 @@ void DocumentChecker::slotSearchClips() bool fixed = false; m_ui.recursiveSearch->setEnabled(false); QTreeWidgetItem *child = m_ui.treeWidget->topLevelItem(ix); + QDir searchDir(newpath); while (child) { if (child->data(0, statusRole).toInt() == CLIPMISSING) { - QString clipPath = searchFileRecursively(QDir(newpath), child->data(0, sizeRole).toString(), child->data(0, hashRole).toString()); + QString clipPath = searchFileRecursively(searchDir, child->data(0, sizeRole).toString(), child->data(0, hashRole).toString()); if (!clipPath.isEmpty()) { fixed = true; child->setText(1, clipPath); @@ -411,6 +412,18 @@ void DocumentChecker::slotSearchClips() child->setData(0, statusRole, LUMAOK); } } + else if (child->data(0, typeRole).toInt() == TITLE_IMAGE_ELEMENT && child->data(0, statusRole).toInt() == CLIPPLACEHOLDER) { + // Search missing title images + QString missingFileName = KUrl(child->text(1)).fileName(); + QString newPath = searchPathRecursively(searchDir, missingFileName); + if (!newPath.isEmpty()) { + // File found + fixed = true; + child->setText(1, newPath); + child->setIcon(0, KIcon("dialog-ok")); + child->setData(0, statusRole, CLIPOK); + } + } ix++; child = m_ui.treeWidget->topLevelItem(ix); } @@ -445,6 +458,24 @@ QString DocumentChecker::searchLuma(QString file) const return QString(); } +QString DocumentChecker::searchPathRecursively(const QDir &dir, const QString &fileName) const +{ + QString foundFileName; + QStringList filters; + filters << fileName; + QDir searchDir(dir); + searchDir.setNameFilters(filters); + QStringList filesAndDirs = searchDir.entryList(QDir::Files | QDir::Readable); + if (!filesAndDirs.isEmpty()) return searchDir.absoluteFilePath(filesAndDirs.at(0)); + searchDir.setNameFilters(QStringList()); + filesAndDirs = searchDir.entryList(QDir::Dirs | QDir::Readable | QDir::Executable | QDir::NoDotAndDotDot); + for (int i = 0; i < filesAndDirs.size() && foundFileName.isEmpty(); i++) { + foundFileName = searchPathRecursively(searchDir.absoluteFilePath(filesAndDirs.at(i)), fileName); + if (!foundFileName.isEmpty()) + break; + } + return foundFileName; +} QString DocumentChecker::searchFileRecursively(const QDir &dir, const QString &matchSize, const QString &matchHash) const { diff --git a/src/documentchecker.h b/src/documentchecker.h index 852f3999..90b66fa5 100644 --- a/src/documentchecker.h +++ b/src/documentchecker.h @@ -57,6 +57,7 @@ private: QDomDocument m_doc; Ui::MissingClips_UI m_ui; QDialog *m_dialog; + QString searchPathRecursively(const QDir &dir, const QString &fileName) const; QString searchFileRecursively(const QDir &dir, const QString &matchSize, const QString &matchHash) const; void checkStatus(); QMap m_missingTitleImages; -- 2.39.2