Changeset 119 for smplayer/trunk/src/helper.cpp

Timestamp:

Dec 27, 2011, 5:44:12 PM (14 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: latest svn update

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/helper.cpp (modified) (3 diffs)

smplayer/trunk/src/helper.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2010 Ricardo Villalba <rvm@escomposlinux.org>
+    Copyright (C) 2006-2011 Ricardo Villalba <rvm@escomposlinux.org>
 
     This program is free software; you can redistribute it and/or modify
@@ -200 +200 @@
 
         QStringList files_to_add;
+        QStringList matching_files;
 
         QFileInfo fi(initial_file);
@@ -206 +207 @@
         QString path = fi.absolutePath();
 
-        QRegExp rx("^.*(\\d+)");
-
-        if ( rx.indexIn(basename) > -1) {
-                int digits = rx.cap(1).length();
-                int current_number = rx.cap(1).toInt();
-
-                //qDebug("Helper::searchForConsecutiveFiles: filename ends with a number (%s)", rx.cap(1).toUtf8().constData());
-                qDebug("Helper::searchForConsecutiveFiles: filename ends with a number (%d)", current_number);
-                qDebug("Helper::searchForConsecutiveFiles: trying to find consecutive files");
-
-                QString template_name = path + "/" + basename.left(basename.length() - digits);
-                //qDebug("BaseGui::newMediaLoaded: name without digits: '%s'", template_name.toUtf8().constData());
-
-                current_number++;
-                QString next_name = template_name + QString("%1").arg(current_number, digits, 10, QLatin1Char('0')) +"."+ extension;
-                qDebug("Helper::searchForConsecutiveFiles: looking for '%s'", next_name.toUtf8().constData());
-
-                while (QFile::exists(next_name)) {
-                        qDebug("Helper::searchForConsecutiveFiles: '%s' exists, added to the list", next_name.toUtf8().constData());
-                        files_to_add.append(next_name);
+        QDir dir(path);
+        dir.setFilter(QDir::Files);
+        dir.setSorting(QDir::Name);
+
+        QRegExp rx("(\\d+)");
+
+        int digits;
+        int current_number;
+        int pos = 0;
+        QString next_name;
+        bool next_found = false;
+        qDebug("Helper::searchForConsecutiveFiles: trying to find consecutive files");
+        while  ( ( pos = rx.indexIn(basename, pos) ) != -1 ) {
+                qDebug("Helper::searchForConsecutiveFiles: captured: %s",rx.cap(1).toStdString().c_str());
+                digits = rx.cap(1).length();
+                current_number = rx.cap(1).toInt() + 1;
+                next_name = basename.left(pos) + QString("%1").arg(current_number, digits, 10, QLatin1Char('0'));
+                next_name.replace(QRegExp("([\\[\\]?*])"), "[\\1]");
+                next_name += "*." + extension;
+                qDebug("Helper::searchForConsecutiveFiles: next name = %s",next_name.toStdString().c_str());
+                matching_files = dir.entryList((QStringList)next_name);
+
+                if ( !matching_files.isEmpty() ) {
+                        next_found = true;
+                        break;
+                }
+                qDebug("Helper::searchForConsecutiveFiles: pos = %d",pos);
+                pos  += digits;
+        }
+
+        if (next_found) {
+                qDebug("Helper::searchForConsecutiveFiles: adding consecutive files");
+                while ( !matching_files.isEmpty() ) {
+                        qDebug("Helper::searchForConsecutiveFiles: '%s' exists, added to the list", matching_files[0].toUtf8().constData());
+                        files_to_add << path  + "/" + matching_files[0];
                         current_number++;
-                        next_name = template_name + QString("%1").arg(current_number, digits, 10, QLatin1Char('0')) +"."+ extension;
+                        next_name = basename.left(pos) + QString("%1").arg(current_number, digits, 10, QLatin1Char('0'));
+                        next_name.replace(QRegExp("([\\[\\]?*])"), "[\\1]");
+                        next_name += "*." + extension;
+                        matching_files = dir.entryList((QStringList)next_name);
                         qDebug("Helper::searchForConsecutiveFiles: looking for '%s'", next_name.toUtf8().constData());
                 }