Merge lp:~cyphermox/mtp/design-fixes into lp:mtp

[Mathieu Trudel-Lapierre]

Expose only Music, Videos, Pictures, Downloads and Documents, plus set the name of the device storage to the device model

Expose only Music, Videos, Pictures, Downloads and Documents, plus set the name of the device storage to the device model

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:30
http://jenkins.qa.ubuntu.com/job/mtp-ci/5/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-saucy-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-saucy-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/mtp-saucy-armhf-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-saucy-i386-ci/5

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

review: Approve (continuous-integration)

[lp:~cyphermox/mtp/design-fixes]

32. By Mathieu Trudel-Lapierre on 2013-09-13

Only add content directories if they are found.

33. By Mathieu Trudel-Lapierre on 2013-09-13

Remove extra whitespace.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:33
http://jenkins.qa.ubuntu.com/job/mtp-ci/6/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-saucy-amd64-ci/6
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-saucy-armhf-ci/6
        deb: http://jenkins.qa.ubuntu.com/job/mtp-saucy-armhf-ci/6/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mtp-saucy-i386-ci/6

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

review: Approve (continuous-integration)

[Ricardo Salveti (rsalveti)]

Good, tested, works fine.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-09-12 17:41:22 +0000
+++ CMakeLists.txt	2013-09-13 17:12:07 +0000
@@ -63,6 +63,11 @@
     ${MTP_SRCS}
 )
 
+target_link_libraries(
+  mtpserver
+  android-properties
+)
+
 set_target_properties(
   mtpserver
 
 
=== modified file 'debian/control'
--- debian/control	2013-09-12 17:41:22 +0000
+++ debian/control	2013-09-13 17:12:07 +0000
@@ -8,6 +8,7 @@
                libboost-dev,
                libboost-filesystem-dev,
                libboost-test-dev,
+               libandroid-properties-dev,
 Standards-Version: 3.9.4
 Homepage: http://launchpad.net/mtp
 # If you aren't ~phablet-team but need to upload packaging changes,
 
=== modified file 'server/CMakeLists.txt'
--- server/CMakeLists.txt	2013-09-12 17:41:22 +0000
+++ server/CMakeLists.txt	2013-09-13 17:12:07 +0000
@@ -11,6 +11,7 @@
     mtp-server
     mtpserver
     usbhost
+    android-properties
     ${Boost_LIBRARIES}
     ${Boost_system_LIBRARIES}
     ${Boost_filesystem_LIBRARIES}
 
=== modified file 'server/UbuntuMtpDatabase.h'
--- server/UbuntuMtpDatabase.h	2013-09-13 17:12:07 +0000
+++ server/UbuntuMtpDatabase.h	2013-09-13 17:12:07 +0000
@@ -97,13 +97,25 @@
     void readFiles(const std::string& sourcedir)
     {
         path p (sourcedir);
+	DbEntry entry;
+	MtpObjectHandle handle = counter++;
 
         try {
             if (exists(p)) {
                 if (is_directory(p)) {
                     std::cout << p << " is a directory containing:\n";
 
-                    parse_directory (p, MTP_PARENT_ROOT);
+                    entry.storage_id = MTP_STORAGE_FIXED_RAM;
+                    entry.parent = MTP_PARENT_ROOT;
+                    entry.object_name = p.filename().string();
+                    entry.display_name = p.filename().string();
+                    entry.path = p.string();
+                    entry.object_format = MTP_FORMAT_ASSOCIATION;
+                    entry.object_size = 0;
+
+                    db.insert( std::pair<MtpObjectHandle, DbEntry>(handle, entry) );
+
+                    parse_directory (p, handle);
                 }
             } else
                 std::cout << p << " does not exist\n";
@@ -117,8 +129,15 @@
 public:
     UbuntuMtpDatabase(const char *dir) : counter(1)
     {
+	std::string basedir (dir);
+
 	db = std::map<MtpObjectHandle, DbEntry>();
-	readFiles(std::string(dir));
+
+	readFiles(basedir + "/Documents");
+	readFiles(basedir + "/Music");
+	readFiles(basedir + "/Videos");
+	readFiles(basedir + "/Pictures");
+	readFiles(basedir + "/Downloads");
 	
         std::cout << __PRETTY_FUNCTION__ << ": object count:" << db.size() << std::endl;
     }
@@ -136,12 +155,14 @@
     {
 	DbEntry entry;
 	MtpObjectHandle handle = counter;
-	MtpObjectHandle parent_id = parent == 0 ? MTP_PARENT_ROOT : parent;
+
+        if (parent == 0)
+            return kInvalidObjectHandle;
 
         std::cout << __PRETTY_FUNCTION__ << ": " << path << " - " << parent << std::endl;
 
         entry.storage_id = storage;
-        entry.parent = parent_id;
+        entry.parent = parent;
         entry.object_name = std::string(basename(path.c_str()));
         entry.display_name = std::string(basename(path.c_str()));
         entry.path = path;
 
=== modified file 'server/server.cpp'
--- server/server.cpp	2013-09-13 17:12:07 +0000
+++ server/server.cpp	2013-09-13 17:12:07 +0000
@@ -29,6 +29,8 @@
 #include <unistd.h>
 #include <pwd.h>
 
+#include <hybris/properties/properties.h>
+
 namespace
 {
 struct FileSystemConfig
@@ -44,6 +46,7 @@
 int main(int argc, char** argv)
 {
     struct passwd *userdata = getpwuid (getuid());
+    char product_name[PROP_VALUE_MAX];
     int fd = open("/dev/mtp_usb", O_RDWR);
     
     if (fd < 0)
@@ -51,14 +54,6 @@
         std::cout << "Error opening /dev/mtp_usb, aborting now..." << std::endl;
     }
         
-    home_storage = new android::MtpStorage(
-        MTP_STORAGE_FIXED_RAM, 
-        userdata->pw_dir,
-        userdata->pw_name, 
-        1024 * 1024 * 100,  /* 100 MB reserved space, to avoid filling the disk */
-        false,
-        1024 * 1024 * 1024 * 2  /* 2GB arbitrary max file size */);
-
     std::shared_ptr<android::MtpServer> server
     {
         new android::MtpServer(
@@ -69,6 +64,17 @@
             FileSystemConfig::file_perm, 
             FileSystemConfig::directory_perm)
     };
+
+    property_get ("ro.product.model", product_name, "Ubuntu Touch device");
+
+    home_storage = new android::MtpStorage(
+        MTP_STORAGE_FIXED_RAM, 
+        userdata->pw_dir,
+	product_name,
+        1024 * 1024 * 100,  /* 100 MB reserved space, to avoid filling the disk */
+        false,
+        1024 * 1024 * 1024 * 2  /* 2GB arbitrary max file size */);
+
     server->addStorage(home_storage);
     server->run();
 
 
=== modified file 'src/MtpServer.cpp'
--- src/MtpServer.cpp	2013-06-13 10:22:21 +0000
+++ src/MtpServer.cpp	2013-09-13 17:12:07 +0000
@@ -39,6 +39,8 @@
 
 #include <linux/usb/f_mtp.h>
 
+#include <hybris/properties/properties.h>
+
 namespace android {
 
 static const MtpOperationCode kSupportedOperationCodes[] = {
@@ -423,7 +425,7 @@
 MtpResponseCode MtpServer::doGetDeviceInfo() {
     ALOGV("%s", __PRETTY_FUNCTION__);
     MtpStringBuffer   string;
-    // char prop_value[PROPERTY_VALUE_MAX];
+    char prop_value[PROP_VALUE_MAX];
 
     MtpObjectFormatList* playbackFormats = mDatabase->getSupportedPlaybackFormats();
     MtpObjectFormatList* captureFormats = mDatabase->getSupportedCaptureFormats();
@@ -455,7 +457,6 @@
     mData.putAUInt16(captureFormats); // Capture Formats
     mData.putAUInt16(playbackFormats);  // Playback Formats
 
-    /* TODO(tvoss): Wire up to our system property handling here.
     property_get("ro.product.manufacturer", prop_value, "unknown manufacturer");
     string.set(prop_value);
     mData.putString(string);   // Manufacturer
@@ -468,7 +469,7 @@
 
     property_get("ro.serialno", prop_value, "????????");
     string.set(prop_value);
-    mData.putString(string);   // Serial Number*/
+    mData.putString(string);   // Serial Number
 
     delete playbackFormats;
     delete captureFormats;