Merge lp:~jpakkane/mediascanner2/skipspecialhome into lp:mediascanner2

[Jussi Pakkanen]

Skip scanning of special directories if they point to user home dir.

Skip scanning of special directories if they point to user home dir.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:287
http://jenkins.qa.ubuntu.com/job/mediascanner2-ci/161/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-utopic-amd64-ci/102
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-utopic-armhf-ci/102
        deb: http://jenkins.qa.ubuntu.com/job/mediascanner2-utopic-armhf-ci/102/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-utopic-i386-ci/102

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediascanner2-ci/161/rebuild

review: Approve (continuous-integration)

[James Henstridge (jamesh)]

Ignore my previous question. I had lstat/stat mixed up.

review: Approve

=== modified file 'src/daemon/scannerdaemon.cc'
--- src/daemon/scannerdaemon.cc	2014-09-30 11:50:44 +0000
+++ src/daemon/scannerdaemon.cc	2014-10-22 21:10:11 +0000
@@ -24,6 +24,8 @@
 #include<map>
 #include<memory>
 
+#include<sys/types.h>
+#include<sys/stat.h>
 #include<glib.h>
 #include<glib-unix.h>
 #include<gio/gio.h>
@@ -42,6 +44,21 @@
 
 using namespace mediascanner;
 
+namespace {
+
+bool is_same_directory(const char *dir1, const char *dir2) {
+    struct stat s1, s2;
+    if(stat(dir1, &s1) != 0) {
+        return false;
+    }
+    if(stat(dir2, &s2) != 0) {
+        return false;
+    }
+    return s1.st_dev == s2.st_dev && s1.st_ino == s2.st_ino;
+}
+
+}
+
 static const char BUS_NAME[] = "com.canonical.MediaScanner2.Daemon";
 
 class ScannerDaemon final {
@@ -84,15 +101,20 @@
     setupMountWatcher();
 
     const char *musicdir = g_get_user_special_dir(G_USER_DIRECTORY_MUSIC);
-    if (musicdir)
+    const char *videodir = g_get_user_special_dir(G_USER_DIRECTORY_VIDEOS);
+    const char *picturesdir = g_get_user_special_dir(G_USER_DIRECTORY_PICTURES);
+    const char *homedir = g_get_home_dir();
+
+    // According to XDG specification, when one of the special dirs is missing
+    // it falls back to home directory. This would mean scanning the entire home
+    // directory. This is probably not what people want so skip if this is the case.
+    if (musicdir && !is_same_directory(musicdir, homedir))
         addDir(musicdir);
 
-    const char *videodir = g_get_user_special_dir(G_USER_DIRECTORY_VIDEOS);
-    if (videodir)
+    if (videodir && !is_same_directory(videodir, homedir))
         addDir(videodir);
 
-    const char *picturesdir = g_get_user_special_dir(G_USER_DIRECTORY_PICTURES);
-    if (picturesdir)
+    if (picturesdir && !is_same_directory(picturesdir, homedir))
         addDir(picturesdir);
 
     // In case someone opened the db file before we could populate it.