Small fixes to clip job progress bar

[kdenlive] / src / slideshowclip.cpp

diff --git a/src/slideshowclip.cpp b/src/slideshowclip.cpp
index db30cfc0e4ec54b8ff77d1cfd5e6a321246b4d8c..8a0b5c9716709a61684e8e7606f2c26cff913dbd 100644 (file)
--- a/src/slideshowclip.cpp
+++ b/src/slideshowclip.cpp
@@ -31,7 +31,6 @@
 SlideshowClip::SlideshowClip(Timecode tc, QWidget * parent) :
     QDialog(parent),
     m_count(0),
-    m_patternBegin(0),
     m_timecode(tc),
     m_thumbJob(NULL)
 {
@@ -177,12 +176,13 @@ int SlideshowClip::sequenceCount(KUrl file)
 
     // Find number of digits in sequence
     int precision = fullSize - filter.size();
+    int firstFrame = file.fileName().section('.', 0, -2).right(precision).toInt();    
     QString folder = file.directory(KUrl::AppendTrailingSlash);
     // Check how many files we have
     QDir dir(folder);
     QString path;
     int gap = 0;
-    for (int i = 0; gap < 100; i++) {
+    for (int i = firstFrame; gap < 100; i++) {
         path = filter + QString::number(i).rightJustified(precision, '0', false) + ext;
         if (dir.exists(path)) {
             count ++;
@@ -200,7 +200,12 @@ void SlideshowClip::parseFolder()
     bool isMime = m_view.method_mime->isChecked();
     QString path = isMime ? m_view.folder_url->url().path() : m_view.pattern_url->url().directory();
     QDir dir(path);
-    if (path.isEmpty() || !dir.exists()) return;
+    if (path.isEmpty() || !dir.exists()) {
+       m_count = 0;
+       m_view.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
+       m_view.label_info->setText(QString());
+       return;
+    }
 
     KIcon unknownicon("unknown");
     QStringList result;
@@ -219,13 +224,13 @@ void SlideshowClip::parseFolder()
         filter = filter.section('.', 0, -2);
         int fullSize = filter.size();
         while (filter.at(filter.size() - 1).isDigit()) {
-            filter.remove(filter.size() - 1, 1);
+            filter.chop(1);
         }
         int precision = fullSize - filter.size();
-        m_patternBegin = m_view.pattern_url->url().fileName().section('.', 0, -2).right(precision).toInt();
+        int firstFrame = m_view.pattern_url->url().fileName().section('.', 0, -2).right(precision).toInt();
         QString path;
         int gap = 0;
-        for (int i = m_patternBegin; gap < 100; i++) {
+        for (int i = firstFrame; gap < 100; i++) {
             path = filter + QString::number(i).rightJustified(precision, '0', false) + ext;
             if (dir.exists(path)) {
                 result.append(path);
@@ -241,9 +246,8 @@ void SlideshowClip::parseFolder()
         item->setData(Qt::UserRole, dir.filePath(path));
         m_view.icon_list->addItem(item);
     }
-    m_count = result.count();
-    if (m_count == 0) m_view.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
-    else m_view.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
+    m_count = m_view.icon_list->count();
+    m_view.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(m_count > 0);
     m_view.label_info->setText(i18np("1 image found", "%1 images found", m_count));
     if (m_view.show_thumbs->isChecked()) slotGenerateThumbs();
     m_view.icon_list->setCurrentRow(0);
@@ -300,6 +304,7 @@ QString SlideshowClip::selectedPath()
     else url = m_view.pattern_url->url();
     QString path = selectedPath(url, m_view.method_mime->isChecked(), ".all." + m_view.image_type->itemData(m_view.image_type->currentIndex()).toString(), &list);
     m_count = list.count();
+    kDebug()<<"// SELECTED PATH: "<<path;
     return path;
 }
 
@@ -321,12 +326,19 @@ QString SlideshowClip::selectedPath(KUrl url, bool isMime, QString extension, QS
     QString folder;
     if (isMime) {
         folder = url.path(KUrl::AddTrailingSlash);
+       // Check how many files we have
+        QDir dir(folder);
+       QStringList filters;
+       filters << "*." + extension.section('.', -1);
+       dir.setNameFilters(filters);
+       *list = dir.entryList(QDir::Files);
     } else {
         folder = url.directory(KUrl::AppendTrailingSlash);
         QString filter = url.fileName();
         QString ext = '.' + filter.section('.', -1);
         filter = filter.section('.', 0, -2);
         int fullSize = filter.size();
+       QString firstFrameData = filter;
 
         while (filter.at(filter.size() - 1).isDigit()) {
             filter.chop(1);
@@ -334,12 +346,16 @@ QString SlideshowClip::selectedPath(KUrl url, bool isMime, QString extension, QS
 
         // Find number of digits in sequence
         int precision = fullSize - filter.size();
+       int firstFrame = firstFrameData.right(precision).toInt();
+
+       // Workaround bug in MLT image sequence detection
+       if (firstFrame < 3) firstFrame = 0;
 
         // Check how many files we have
         QDir dir(folder);
         QString path;
         int gap = 0;
-        for (int i = 0; gap < 100; i++) {
+        for (int i = firstFrame; gap < 100; i++) {
             path = filter + QString::number(i).rightJustified(precision, '0', false) + ext;
             if (dir.exists(path)) {
                 (*list).append(folder + path);
@@ -348,7 +364,8 @@ QString SlideshowClip::selectedPath(KUrl url, bool isMime, QString extension, QS
                 gap++;
             }
         }
-        extension = filter + "%." + QString::number(precision) + "d" + ext;
+        if (firstFrame > 0) extension = filter + '%' + QString::number(firstFrame).rightJustified(precision, '0', false) + 'd' + ext;
+        else extension = filter + "%0" + QString::number(precision) + 'd' + ext;
     }
     kDebug() << "// FOUND " << (*list).count() << " items for " << url.path();
     return  folder + extension;
@@ -467,10 +484,6 @@ QString SlideshowClip::animationToGeometry(const QString &animation, int &ttl)
     return geometry;
 }
 
-int SlideshowClip::begin() const
-{
-   return m_patternBegin;
-}
 
 #include "slideshowclip.moc"