Merge lp:~cyphermox/mtp/books into lp:mtp

[Mathieu Trudel-Lapierre]

Allow following the ~/Books directory, used by ebook readers such as Beru.

Allow following the ~/Books directory, used by ebook readers such as Beru.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:31
http://jenkins.qa.ubuntu.com/job/mtp-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-saucy-amd64-ci/7
    FAILURE: http://jenkins.qa.ubuntu.com/job/mtp-saucy-armhf-ci/7/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-saucy-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mtp-ci/7/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

31. By Mathieu Trudel-Lapierre on 2013-09-18

Add a ~/Books directory to watch if it exists, would be used by ebook readers.

=== modified file 'server/UbuntuMtpDatabase.h'
--- server/UbuntuMtpDatabase.h	2013-09-13 17:11:57 +0000
+++ server/UbuntuMtpDatabase.h	2013-09-18 14:11:16 +0000
@@ -138,6 +138,10 @@
 	readFiles(basedir + "/Videos");
 	readFiles(basedir + "/Pictures");
 	readFiles(basedir + "/Downloads");
+
+        /* Also include Books, which will be created automatically if
+         * and ebook reader runs. */
+        readFiles(basedir + "/Books");
 	
         std::cout << __PRETTY_FUNCTION__ << ": object count:" << db.size() << std::endl;
     }