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

[Jussi Pakkanen]

Add blacklist functionality and use it to block music playlists.

Add blacklist functionality and use it to block music playlists.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[James Henstridge (jamesh)]

Looks good

review: Approve

[lp:~jpakkane/mediascanner2/blacklist]

288. By Jussi Pakkanen on 2015-01-22

Merged trunk.

=== modified file 'src/daemon/MetadataExtractor.cc'
--- src/daemon/MetadataExtractor.cc	2014-10-21 22:04:14 +0000
+++ src/daemon/MetadataExtractor.cc	2015-01-22 09:04:29 +0000
@@ -35,6 +35,8 @@
 #include <string>
 #include <stdexcept>
 #include <vector>
+#include <array>
+#include <algorithm>
 
 #include <unistd.h>
 #include <sys/types.h>
@@ -43,6 +45,17 @@
 using namespace std;
 
 namespace {
+// This list was obtained by grepping /usr/share/mime/audio/.
+std::array<const char*, 4> blacklist{{"audio/x-iriver-pla", "audio/x-mpegurl", "audio/x-ms-asx", "audio/x-scpls"}};
+
+void validate_against_blacklist(const std::string &filename, const std::string &content_type) {
+
+    auto result = std::find(blacklist.begin(), blacklist.end(), content_type);
+    if(result != blacklist.end()) {
+        throw runtime_error("File " + filename + " is of blacklisted type " + content_type + ".");
+    }
+}
+
 const char exif_date_template[] = "%Y:%m:%d %H:%M:%S";
 const char iso8601_date_format[] = "%Y-%m-%dT%H:%M:%S";
 const char iso8601_date_with_zone_format[] = "%Y-%m-%dT%H:%M:%S%z";
@@ -116,6 +129,7 @@
         throw runtime_error("Could not determine content type.");
     }
 
+    validate_against_blacklist(filename, content_type);
     MediaType type;
     if (content_type.find("audio/") == 0) {
         type = AudioMedia;

=== added file 'test/media/playlist.m3u'
--- test/media/playlist.m3u	1970-01-01 00:00:00 +0000
+++ test/media/playlist.m3u	2015-01-22 09:04:29 +0000
@@ -0,0 +1,3 @@
+# This is a playlist
+file1.mp3
+

=== modified file 'test/test_metadataextractor.cc'
--- test/test_metadataextractor.cc	2014-10-09 11:27:18 +0000
+++ test/test_metadataextractor.cc	2015-01-22 09:04:29 +0000
@@ -133,8 +133,21 @@
     EXPECT_DOUBLE_EQ(153.1727346, file.getLongitude());
 }
 
-// PNG files don't have exif entries, so test we work with those, too.
+TEST_F(MetadataExtractorTest, blacklist) {
+    MetadataExtractor e;
+    string testfile = SOURCE_DIR "/media/playlist.m3u";
+    try {
+        e.detect(testfile);
+    } catch(const std::runtime_error &e) {
+        std::string error_message(e.what());
+        ASSERT_NE(error_message.find("blacklist"), std::string::npos);
+        return;
+    }
+    ASSERT_TRUE(false) << "Blacklist exception was not thrown.\n";
+}
+
 TEST_F(MetadataExtractorTest, png_file) {
+    // PNG files don't have exif entries, so test we work with those, too.
     MetadataExtractor e;
     MediaFile file = e.extract(e.detect(SOURCE_DIR "/media/image3.png"));
 
@@ -156,7 +169,6 @@
 
     EXPECT_DOUBLE_EQ(0, file.getLatitude());
     EXPECT_DOUBLE_EQ(0, file.getLongitude());
-
 }
 
 int main(int argc, char **argv) {