Merge lp:~jamesh/mediascanner/mediastore-path into lp:mediascanner/v2

[James Henstridge]

Add a constructor for MediaStore that opens the default database. This removes the need for users of the client locate the library themselves.

Add a constructor for MediaStore that opens the default database. This removes the need for users of the client locate the library themselves.

[lp:~jamesh/mediascanner/mediastore-path]

188. By James Henstridge on 2013-11-22

Update the query test program to open the default database. The
MEDIASCANNER_CACHE environment variable can be used to point it at
different databases.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:188
http://jenkins.qa.ubuntu.com/job/mediascanner-v2-ci/2/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-amd64-ci/2
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-armhf-ci/2/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner-v2-trusty-i386-ci/2

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediascanner-v2-ci/2/rebuild

review: Approve (continuous-integration)

=== modified file 'src/daemon/scannerdaemon.cc'
--- src/daemon/scannerdaemon.cc	2013-11-12 05:00:59 +0000
+++ src/daemon/scannerdaemon.cc	2013-11-22 11:59:26 +0000
@@ -17,24 +17,26 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "../mediascanner/MediaFile.hh"
-#include "../mediascanner/MediaStore.hh"
-#include "MetadataExtractor.hh"
-#include "SubtreeWatcher.hh"
-#include "Scanner.hh"
-
-#include<cstdio>
-#include<gst/gst.h>
 #include<sys/select.h>
 #include<sys/stat.h>
 #include<sys/inotify.h>
+#include<unistd.h>
+#include<cstdio>
 #include<cerrno>
 #include<cstring>
-#include<unistd.h>
 #include<map>
 #include<memory>
 #include<cassert>
 
+#include<glib.h>
+#include<gst/gst.h>
+
+#include "../mediascanner/MediaFile.hh"
+#include "../mediascanner/MediaStore.hh"
+#include "MetadataExtractor.hh"
+#include "SubtreeWatcher.hh"
+#include "Scanner.hh"
+
 using namespace std;
 
 class ScannerDaemon final {
@@ -61,32 +63,20 @@
 };
 
 ScannerDaemon::ScannerDaemon() {
-    string homedir = "/home/";
-    homedir += getlogin();
-    string musicdir = homedir + "/Music";
-    string videodir = homedir + "/Videos";
-    char *env_cachedir = getenv("MEDIASCANNER_CACHEDIR");
-    if(env_cachedir) {
-        cachedir = env_cachedir;
-    } else {
-        cachedir = homedir + "/.cache/mediascanner-test";
-    }
-    int ec;
-    errno = 0;
-    ec = mkdir(cachedir.c_str(), S_IRUSR | S_IWUSR | S_IXUSR);
-    if(ec < 0 && errno != EEXIST) {
-        string msg("Could not create cache dir: ");
-        msg += strerror(errno);
-        throw runtime_error(msg);
-    }
     mountDir = string("/media/") + getlogin();
-    unique_ptr<MediaStore> tmp(new MediaStore(cachedir + "/mediastore.db", MS_READ_WRITE, "/media/"));
+    unique_ptr<MediaStore> tmp(new MediaStore(MS_READ_WRITE, "/media/"));
     store = move(tmp);
     extractor.reset(new MetadataExtractor());
     setupMountWatcher();
     addMountedVolumes();
-    addDir(musicdir);
-    addDir(videodir);
+
+    const char *musicdir = g_get_user_special_dir(G_USER_DIRECTORY_MUSIC);
+    if (musicdir)
+        addDir(musicdir);
+
+    const char *videodir = g_get_user_special_dir(G_USER_DIRECTORY_VIDEOS);
+    if (videodir)
+        addDir(videodir);
 }
 
 ScannerDaemon::~ScannerDaemon() {

=== modified file 'src/mediascanner/MediaStore.cc'
--- src/mediascanner/MediaStore.cc	2013-11-20 11:36:25 +0000
+++ src/mediascanner/MediaStore.cc	2013-11-22 11:59:26 +0000
@@ -17,16 +17,22 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <sys/stat.h>
+#include <unistd.h>
+#include <cerrno>
+#include <cstdint>
+#include <cstring>
+#include <stdexcept>
+
+#include <glib.h>
+#include <sqlite3.h>
+
 #include "mozilla/fts3_tokenizer.h"
 #include"MediaStore.hh"
 #include"MediaFile.hh"
 #include "Album.hh"
 #include "sqliteutils.hh"
 #include"utils.hh"
-#include <sqlite3.h>
-#include <cstdint>
-#include <cstdio>
-#include <stdexcept>
 
 using namespace std;
 
@@ -194,6 +200,29 @@
     version.step();
 }
 
+static std::string get_default_database() {
+    std::string cachedir;
+
+    char *env_cachedir = getenv("MEDIASCANNER_CACHEDIR");
+    if (env_cachedir) {
+        cachedir = env_cachedir;
+    } else {
+        cachedir = g_get_user_cache_dir();
+        cachedir += "/mediascanner-test";
+    }
+    if (g_mkdir_with_parents(cachedir.c_str(), S_IRWXU) < 0) {
+        std::string msg("Could not create cache dir: ");
+        msg += strerror(errno);
+        throw runtime_error(msg);
+    }
+    return cachedir + "/mediastore.db";
+}
+
+MediaStore::MediaStore(OpenType access, const std::string &retireprefix)
+    : MediaStore(get_default_database(), access, retireprefix)
+{
+}
+
 MediaStore::MediaStore(const std::string &filename, OpenType access, const std::string &retireprefix) {
     int sqliteFlags = access == MS_READ_WRITE ? SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE : SQLITE_OPEN_READONLY;
     p = new MediaStorePrivate();

=== modified file 'src/mediascanner/MediaStore.hh'
--- src/mediascanner/MediaStore.hh	2013-11-12 04:35:16 +0000
+++ src/mediascanner/MediaStore.hh	2013-11-22 11:59:26 +0000
@@ -38,6 +38,7 @@
     MediaStorePrivate *p;
 
 public:
+    MediaStore(OpenType access, const std::string &retireprefix="");
     MediaStore(const std::string &filename, OpenType access, const std::string &retireprefix="");
     MediaStore(const MediaStore &other) = delete;
     MediaStore operator=(const MediaStore &other) = delete;

=== modified file 'src/utils/query.cc'
--- src/utils/query.cc	2013-11-13 07:19:59 +0000
+++ src/utils/query.cc	2013-11-22 11:59:26 +0000
@@ -27,8 +27,8 @@
 
 using namespace std;
 
-void queryDb(const string &db_file, const string &core_term) {
-    MediaStore store(db_file, MS_READ_ONLY);
+void queryDb(const string &core_term) {
+    MediaStore store(MS_READ_ONLY);
     vector<MediaFile> results;
     results = store.query(core_term, AudioMedia);
     if(results.empty()) {
@@ -52,11 +52,10 @@
 }
 
 int main(int argc, char **argv) {
-    if(argc < 3) {
-        printf("%s <db file> <term>\n", argv[0]);
+    if(argc < 2) {
+        printf("%s <term>\n", argv[0]);
         return 1;
     }
-    string db_file(argv[1]);
-    string core_term(argv[2]);
-    queryDb(db_file, core_term);
+    string core_term(argv[1]);
+    queryDb(core_term);
 }