int clipType;
QDomElement e;
QString resource;
+ int max;
QDomNodeList documentProducers = m_doc.elementsByTagName("producer");
QList <QDomElement> wrongDurationClips;
QList <QDomElement> missingProxies;
- for (int i = 0; i < m_info.count(); i++) {
+ m_safeImages.clear();
+ m_safeFonts.clear();
+ max = m_info.count();
+ for (int i = 0; i < max; i++) {
e = m_info.item(i).toElement();
clipType = e.attribute("type").toInt();
if (clipType == COLOR) continue;
QString id = e.attribute("id");
int duration = e.attribute("duration").toInt();
int mltDuration = -1;
+ QDomElement mltProd;
+ QString prodId;
// Check that the duration is in sync between Kdenlive's info and MLT's playlist
- for (int j = 0; j < documentProducers.count(); j++) {
- QDomElement mltProd = documentProducers.at(j).toElement();
- QString prodId = mltProd.attribute("id");
+ int prodsCount = documentProducers.count();
+ for (int j = 0; j < prodsCount; j++) {
+ mltProd = documentProducers.at(j).toElement();
+ prodId = mltProd.attribute("id");
// Don't check slowmotion clips for now... (TODO?)
if (prodId.startsWith("slowmotion")) continue;
if (prodId.contains("_")) prodId = prodId.section("_", 0, 0);
//TODO: Check is clip template is missing (xmltemplate) or hash changed
QStringList images = TitleWidget::extractImageList(e.attribute("xmldata"));
QStringList fonts = TitleWidget::extractFontList(e.attribute("xmldata"));
- checkMissingImages(images, fonts, e.attribute("id"), e.attribute("name"));
+ checkMissingImagesAndFonts(images, fonts, e.attribute("id"), e.attribute("name"));
continue;
}
resource = e.attribute("resource");
}
}
+ // Get list of used Luma files
QStringList missingLumas;
+ QStringList filesToCheck;
+ QString filePath;
QString root = m_doc.documentElement().attribute("root");
if (!root.isEmpty()) root = KUrl(root).path(KUrl::AddTrailingSlash);
QDomNodeList trans = m_doc.elementsByTagName("transition");
- for (int i = 0; i < trans.count(); i++) {
+ max = trans.count();
+ for (int i = 0; i < max; i++) {
QString luma = getProperty(trans.at(i).toElement(), "luma");
- if (!luma.isEmpty()) {
- QString lumaPath = luma;
- if (!lumaPath.startsWith('/')) lumaPath.prepend(root);
- if (!QFile::exists(lumaPath) && !missingLumas.contains(luma)) {
- missingLumas.append(luma);
- }
+ if (!luma.isEmpty() && !filesToCheck.contains(luma))
+ filesToCheck.append(luma);
+ }
+ // Check existence of luma files
+ foreach (const QString lumafile, filesToCheck) {
+ filePath = lumafile;
+ if (!filePath.startsWith('/')) filePath.prepend(root);
+ if (!QFile::exists(filePath)) {
+ missingLumas.append(lumafile);
}
}
+
+
if (m_missingClips.isEmpty() && missingLumas.isEmpty() && wrongDurationClips.isEmpty() && missingProxies.isEmpty())
return false;
}
m_ui.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
- for (int i = 0; i < m_missingClips.count(); i++) {
+ max = m_missingClips.count();
+ for (int i = 0; i < max; i++) {
e = m_missingClips.at(i).toElement();
QString clipType;
int t = e.attribute("type").toInt();
m_ui.recursiveSearch->setEnabled(!m_missingClips.isEmpty() || !missingLumas.isEmpty());
m_ui.usePlaceholders->setEnabled(!m_missingClips.isEmpty());
m_ui.fixDuration->setEnabled(!wrongDurationClips.isEmpty());
-
- for (int i = 0; i < wrongDurationClips.count(); i++) {
+
+ max = wrongDurationClips.count();
+ for (int i = 0; i < max; i++) {
e = wrongDurationClips.at(i).toElement();
QString clipType;
int t = e.attribute("type").toInt();
item->setToolTip(0, i18n("Missing proxy"));
}
- for (int i = 0; i < missingProxies.count(); i++) {
+ max = missingProxies.count();
+ for (int i = 0; i < max; i++) {
e = missingProxies.at(i).toElement();
QString clipType;
QString realPath = e.attribute("resource");
QDomNodeList properties;
QDomElement mltProd;
QDomElement property;
- for (int j = 0; j < documentProducers.count(); j++) {
+ int prodsCount = documentProducers.count();
+ for (int j = 0; j < prodsCount; j++) {
mltProd = documentProducers.at(j).toElement();
QString prodId = mltProd.attribute("id");
bool slowmotion = false;
if (missingProxies.count() > 0) {
// original doc was modified
- QDomNode infoXmlNode = m_doc.elementsByTagName("kdenlivedoc").at(0);
- QDomElement infoXml = infoXmlNode.toElement();
+ QDomElement infoXml = m_doc.elementsByTagName("kdenlivedoc").at(0).toElement();
infoXml.setAttribute("modified", "1");
}
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);
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);
}
m_ui.recursiveSearch->setEnabled(true);
if (fixed) {
// original doc was modified
- QDomNode infoXmlNode = m_doc.elementsByTagName("kdenlivedoc").at(0);
- QDomElement infoXml = infoXmlNode.toElement();
+ QDomElement infoXml = m_doc.elementsByTagName("kdenlivedoc").at(0).toElement();
infoXml.setAttribute("modified", "1");
}
checkStatus();
}
-QString DocumentChecker::searchLuma(QString file) const
+QString DocumentChecker::searchLuma(const QString &file) const
{
KUrl searchPath(KdenliveSettings::mltpath());
if (file.contains("PAL"))
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
{
ix++;
child = m_ui.treeWidget->topLevelItem(ix);
}
- QDomNode infoXmlNode = m_doc.elementsByTagName("kdenlivedoc").at(0);
- QDomElement infoXml = infoXmlNode.toElement();
+ QDomElement infoXml = m_doc.elementsByTagName("kdenlivedoc").at(0).toElement();
infoXml.setAttribute("modified", "1");
m_ui.fixDuration->setEnabled(false);
checkStatus();
QDomNodeList producers = m_doc.elementsByTagName("producer");
QDomNodeList infoproducers = m_doc.elementsByTagName("kdenlive_producer");
- QDomElement mlt = m_doc.firstChildElement("mlt");
- QDomElement kdenlivedoc = mlt.firstChildElement("kdenlivedoc");
+ QDomNode mlt = m_doc.elementsByTagName("mlt").at(0);
+ QDomNode kdenlivedoc = m_doc.elementsByTagName("kdenlivedoc").at(0);
for (int i = 0, j = 0; i < infoproducers.count() && j < deletedIds.count(); i++) {
e = infoproducers.item(i).toElement();
}
}
}
- QDomNode infoXmlNode = m_doc.elementsByTagName("kdenlivedoc").at(0);
- QDomElement infoXml = infoXmlNode.toElement();
+ QDomElement infoXml = m_doc.elementsByTagName("kdenlivedoc").at(0).toElement();
infoXml.setAttribute("modified", "1");
checkStatus();
}
}
-void DocumentChecker::checkMissingImages(QStringList images, QStringList fonts, QString id, QString baseClip)
+void DocumentChecker::checkMissingImagesAndFonts(QStringList images, QStringList fonts, const QString &id, const QString &baseClip)
{
QDomDocument doc;
foreach(const QString &img, images) {
+ if (m_safeImages.contains(img)) continue;
if (!KIO::NetAccess::exists(KUrl(img), KIO::NetAccess::SourceSide, 0)) {
QDomElement e = doc.createElement("missingclip");
e.setAttribute("type", TITLE_IMAGE_ELEMENT);
e.setAttribute("name", baseClip);
m_missingClips.append(e);
}
+ else m_safeImages.append(img);
}
- kDebug() << "/ / / CHK FONTS: " << fonts;
foreach(const QString &fontelement, fonts) {
+ if (m_safeFonts.contains(fontelement)) continue;
QFont f(fontelement);
- kDebug() << "/ / / CHK FONTS: " << fontelement << " = " << QFontInfo(f).family();
+ //kDebug() << "/ / / CHK FONTS: " << fontelement << " = " << QFontInfo(f).family();
if (fontelement != QFontInfo(f).family()) {
QDomElement e = doc.createElement("missingclip");
e.setAttribute("type", TITLE_FONT_ELEMENT);
e.setAttribute("name", baseClip);
m_missingClips.append(e);
}
+ else m_safeFonts.append(fontelement);
}
}
projects / kdenlive / blobdiff