Fixes #290

Komet · Mar 10, 2013 · 161669e · 161669e
1 parent 57e59b3
commit 161669e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/data/MovieFileSearcher.cpp b/data/MovieFileSearcher.cpp
@@ -84,13 +84,15 @@ void MovieFileSearcher::reload(bool force)
                 if (QString::compare("index.bdmv", it.fileName(), Qt::CaseInsensitive) == 0) {
                     qDebug() << "Found BluRay structure";
                     QDir dir(it.fileInfo().dir());
-                    dir.cdUp();
+                    if (QString::compare(dir.dirName(), "BDMV", Qt::CaseInsensitive) == 0)
+                        dir.cdUp();
                     bluRays << dir.path();
                 }
                 if (QString::compare("VIDEO_TS.IFO", it.fileName(), Qt::CaseInsensitive) == 0) {
                     qDebug() << "Found DVD structure";
                     QDir dir(it.fileInfo().dir());
-                    dir.cdUp();
+                    if (QString::compare(dir.dirName(), "VIDEO_TS", Qt::CaseInsensitive) == 0)
+                        dir.cdUp();
                     dvds << dir.path();
                 }
 

diff --git a/mediaCenterPlugins/XbmcXml.cpp b/mediaCenterPlugins/XbmcXml.cpp
@@ -1982,9 +1982,15 @@ QString XbmcXml::getPath(Movie *movie)
     if (movie->files().isEmpty())
         return QString();
     QFileInfo fi(movie->files().first());
-    if (movie->discType() == DiscBluRay || movie->discType() == DiscDvd) {
+    if (movie->discType() == DiscBluRay) {
         QDir dir = fi.dir();
-        dir.cdUp();
+        if (QString::compare(dir.dirName(), "BDMV", Qt::CaseInsensitive) == 0)
+            dir.cdUp();
+        return dir.absolutePath();
+    } else if (movie->discType() == DiscDvd) {
+        QDir dir = fi.dir();
+        if (QString::compare(dir.dirName(), "VIDEO_TS", Qt::CaseInsensitive) == 0)
+            dir.cdUp();
         return dir.absolutePath();
     }
     return fi.absolutePath();