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

[Jussi Pakkanen]

Add support for .nomedia files to prevent chosen subtrees from being scanned.

Add support for .nomedia files to prevent chosen subtrees from being scanned.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[James Henstridge (jamesh)]

Looks good.

review: Approve

[James Henstridge (jamesh)]

Looks like this has conflicts against trunk.

[lp:~jpakkane/mediascanner2/nomedia]

231. By Jussi Pakkanen on 2014-05-14

Merged trunk.

[Jussi Pakkanen (jpakkane)]

Conflict fixed.

=== modified file 'src/daemon/Scanner.cc'
--- src/daemon/Scanner.cc	2014-05-05 09:19:17 +0000
+++ src/daemon/Scanner.cc	2014-05-14 11:58:12 +0000
@@ -77,6 +77,12 @@
             p->dir.reset();
             continue;
         }
+        if(has_scanblock(p->curdir)) {
+            fprintf(stderr, "Directory %s has a scan block file, skipping it.\n",
+                    p->curdir.c_str());
+            p->dir.reset();
+            continue;
+        }
         printf("In subdir %s\n", p->curdir.c_str());
     }
 

=== modified file 'src/daemon/SubtreeWatcher.cc'
--- src/daemon/SubtreeWatcher.cc	2014-03-21 11:01:31 +0000
+++ src/daemon/SubtreeWatcher.cc	2014-05-14 11:58:12 +0000
@@ -101,6 +101,11 @@
                 root.c_str(), __PRETTY_FUNCTION__);
         return;
     }
+    if(has_scanblock(root)) {
+        fprintf(stderr, "Directory %s has a scan block file, skipping it.\n",
+                root.c_str());
+        return;
+    }
     if(p->str2wd.find(root) != p->str2wd.end())
         return;
     unique_ptr<DIR, int(*)(DIR*)> dir(opendir(root.c_str()), closedir);

=== modified file 'src/daemon/scannerdaemon.cc'
--- src/daemon/scannerdaemon.cc	2014-05-08 10:17:57 +0000
+++ src/daemon/scannerdaemon.cc	2014-05-14 11:58:12 +0000
@@ -150,6 +150,10 @@
         fprintf(stderr, "Directory %s looks like an optical disc, skipping it.\n", dir.c_str());
         return;
     }
+    if(has_scanblock(dir)) {
+        fprintf(stderr, "Directory %s has a scan block file, skipping it.\n", dir.c_str());
+        return;
+    }
     unique_ptr<SubtreeWatcher> sw(new SubtreeWatcher(*store.get(), *extractor.get(), invalidator));
     store->restoreItems(dir);
     store->pruneDeleted();

=== modified file 'src/daemon/util.cc'
--- src/daemon/util.cc	2014-04-09 13:25:51 +0000
+++ src/daemon/util.cc	2014-05-14 11:58:12 +0000
@@ -35,6 +35,17 @@
     return S_ISDIR(statbuf.st_mode) ;
 }
 
+static bool file_exists(const string &path) {
+    struct stat statbuf;
+    if(stat(path.c_str(), &statbuf) < 0) {
+        if(errno != ENOENT) {
+            printf("Error while trying to determine state of file %s: %s\n", path.c_str(), strerror(errno));
+        }
+        return false;
+    }
+    return S_ISREG(statbuf.st_mode) ;
+}
+
 bool is_rootlike(const string &path) {
     string s1 = path + "/usr";
     string s2 = path + "/var";
@@ -49,3 +60,7 @@
     string bluray = path + "/BDMV";
     return (dir_exists(dvd1) && dir_exists(dvd2)) || dir_exists(bluray);
 }
+
+bool has_scanblock(const std::string &path) {
+    return file_exists(path + "/.nomedia");
+}

=== modified file 'src/daemon/util.h'
--- src/daemon/util.h	2014-04-09 13:25:51 +0000
+++ src/daemon/util.h	2014-05-14 11:58:12 +0000
@@ -24,5 +24,6 @@
 
 bool is_rootlike(const std::string &path);
 bool is_optical_disc(const std::string &path);
+bool has_scanblock(const std::string &path);
 
 #endif

=== added directory 'test/noscan'
=== added file 'test/noscan/.nomedia'
=== modified file 'test/test_util.cc'
--- test/test_util.cc	2014-05-02 08:53:16 +0000
+++ test/test_util.cc	2014-05-14 11:58:12 +0000
@@ -42,6 +42,13 @@
     ASSERT_FALSE(is_optical_disc(nodisc_root));
 }
 
+TEST_F(UtilTest, scanblock) {
+    std::string noblock_root(SOURCE_DIR "/media");
+    std::string block_root(SOURCE_DIR "/noscan");
+    ASSERT_TRUE(has_scanblock(block_root));
+    ASSERT_FALSE(has_scanblock(noblock_root));
+}
+
 int main(int argc, char **argv) {
     ::testing::InitGoogleTest(&argc, argv);
     return RUN_ALL_TESTS();