Merge lp:~jpakkane/mediascanner2/standalone-art-uri into lp:mediascanner2

[Jussi Pakkanen]

Detect standalone album art and return art uris that points to it.

Detect standalone album art and return art uris that points to it.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:290
http://jenkins.qa.ubuntu.com/job/mediascanner2-ci/174/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-armhf-ci/11/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-i386-ci/11/console

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

review: Needs Fixing (continuous-integration)

[lp:~jpakkane/mediascanner2/standalone-art-uri]

291. By Jussi Pakkanen on 2015-01-20

Whitespace fix to restart Jenkins.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:291
http://jenkins.qa.ubuntu.com/job/mediascanner2-ci/178/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-amd64-ci/15
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-armhf-ci/15
        deb: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-armhf-ci/15/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-i386-ci/15

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

review: Approve (continuous-integration)

[Ruben Maes (ruben-maes96)]

When is this going to be reviewed and merged? It seems like a pretty minor change but it's important to the UX.

[Marcus Tomlinson (marcustomlinson)]

Replaced by: https://code.launchpad.net/~jamesh/mediascanner2/folder-coverart/+merge/278099

review: Disapprove

Unmerged revisions

=== modified file 'src/mediascanner/MediaFile.cc'
--- src/mediascanner/MediaFile.cc	2014-08-31 03:24:25 +0000
+++ src/mediascanner/MediaFile.cc	2015-01-20 15:02:41 +0000
@@ -22,9 +22,52 @@
 #include "internal/MediaFilePrivate.hh"
 #include "internal/utils.hh"
 #include <stdexcept>
+#include<array>
+#include<cstdlib>
+#include<memory>
+#include<dirent.h>
+#include<algorithm>
 
 using namespace std;
 
+namespace {
+
+std::string detect_standalone_albumart(const string &absolute_filename) {
+    static const std::array<const char *, 2> suffixes{"png", "jpg"};
+    static const std::array<const char *, 6> namebases{"cover", "album", "albumart", "front", ".folder", "folder"};
+    auto slash = absolute_filename.rfind('/');
+    if (slash == string::npos) {
+        return "";
+    }
+    string dirname = absolute_filename.substr(0, slash);
+    string detected;
+    unique_ptr<DIR, int(*)(DIR*)> dir(opendir(dirname.c_str()), closedir);
+    if(!dir) {
+        return "";
+    }
+    unique_ptr<struct dirent, void(*)(void*)> entry((dirent*)malloc(sizeof(dirent) + NAME_MAX + 1), free);
+    struct dirent *de = nullptr;
+    while(readdir_r(dir.get(), entry.get(), &de) == 0 && de) {
+        const string fname(entry->d_name);
+        auto sufpoint = fname.rfind('.');
+        if(sufpoint == string::npos) {
+            continue;
+        }
+        auto namebase = fname.substr(0, sufpoint);
+        auto suffix = fname.substr(sufpoint+1);
+        transform(namebase.begin(), namebase.end(), namebase.begin(), ::tolower);
+        transform(suffix.begin(), suffix.end(), suffix.begin(), ::tolower);
+        if(find(namebases.begin(), namebases.end(), namebase) != namebases.end() &&
+           find(suffixes.begin(), suffixes.end(), suffix) != suffixes.end()) {
+            detected = dirname + "/" + fname;
+            break;
+        }
+    }
+    return detected;
+}
+
+}
+
 namespace mediascanner {
 
 MediaFile::MediaFile() : p(new MediaFilePrivate) {
@@ -151,12 +194,17 @@
 
 std::string MediaFile::getArtUri() const {
     switch (p->type) {
-    case AudioMedia:
+    case AudioMedia: {
         if (p->has_thumbnail) {
             return make_thumbnail_uri(getUri());
-        } else {
-            return make_album_art_uri(getAuthor(), getAlbum());
-        }
+        }
+        auto standalone = detect_standalone_albumart(p->filename);
+        if(!standalone.empty()) {
+            return make_thumbnail_uri(mediascanner::getUri(standalone));
+        }
+        return make_album_art_uri(getAuthor(), getAlbum());
+    }
+
     default:
         return make_thumbnail_uri(getUri());
     }

=== added directory 'test/media/standalone_art'
=== added file 'test/media/standalone_art/cover.jpg'
Binary files test/media/standalone_art/cover.jpg	1970-01-01 00:00:00 +0000 and test/media/standalone_art/cover.jpg	2015-01-20 15:02:41 +0000 differ
=== modified file 'test/test_mfbuilder.cc'
--- test/test_mfbuilder.cc	2014-08-29 06:58:59 +0000
+++ test/test_mfbuilder.cc	2015-01-20 15:02:41 +0000
@@ -20,8 +20,11 @@
 #include<gtest/gtest.h>
 #include"mediascanner/MediaFile.hh"
 #include"mediascanner/MediaFileBuilder.hh"
+#include"test_config.h"
 #include<stdexcept>
 
+#define STANDALONE_DIR SOURCE_DIR "/media/standalone_art"
+
 using namespace mediascanner;
 
 class MFBTest : public ::testing::Test {
@@ -203,6 +206,17 @@
     EXPECT_EQ("image://thumbnailer/file:///foo/bar/baz.mp4", mf.getArtUri());
 }
 
+TEST_F(MFBTest, standaloneArt) {
+    std::string fname(STANDALONE_DIR "/dummy.mp3");
+    MediaFileBuilder mfb(fname);
+    mfb.setType(AudioMedia);
+    MediaFile m(mfb);
+    std::string expected("image://thumbnailer/file://");
+    expected += STANDALONE_DIR;
+    expected += "/cover.jpg";
+    ASSERT_EQ(expected, m.getArtUri());
+}
+
 int main(int argc, char **argv) {
     ::testing::InitGoogleTest(&argc, argv);
     return RUN_ALL_TESTS();

=== modified file 'test/test_util.cc'
--- test/test_util.cc	2014-05-09 14:04:48 +0000
+++ test/test_util.cc	2015-01-20 15:02:41 +0000
@@ -19,6 +19,9 @@
 
 #include <gtest/gtest.h>
 #include"../src/mediascanner/internal/utils.hh"
+#include"../src/mediascanner/MediaFile.hh"
+#include"../src/mediascanner/MediaFileBuilder.hh"
+
 #include "test_config.h"
 
 using namespace mediascanner;