mcloud

Merge lp:~gary-wzl77/mcloud/job_uuid into lp:mcloud/devel

job_uuid
Merge into devel

Proposed by Gary.Wang on 2016-10-14

Status:	Merged
Approved by:	Zhang Enwei on 2016-10-28
Approved revision:	60
Merged at revision:	16
Proposed branch:	lp:~gary-wzl77/mcloud/job_uuid
Merge into:	lp:mcloud/devel
Diff against target:	8284 lines (+2819/-2895) 52 files modified CMakeLists.txt (+1/-1) debian/VERSION (+1/-1) debian/VERSION.vivid (+1/-1) debian/changelog (+13/-2) debian/control (+2/-0) debian/control.in (+2/-0) debian/libmcloud0.install (+0/-3) debian/libmcloud1.install (+0/-3) debian/libmcloud2.install (+3/-0) include/mcloud/api/client.h (+32/-34) include/mcloud/api/cloudcontent.h (+18/-18) include/mcloud/api/cloudfolder.h (+14/-14) include/mcloud/api/cloudresource.h (+13/-13) include/mcloud/api/diskinfo.h (+7/-6) include/mcloud/api/downloadtask.h (+16/-19) include/mcloud/api/exceptions.h (+49/-49) include/mcloud/api/outlink.h (+9/-9) include/mcloud/api/syncmanager.h (+12/-12) include/mcloud/api/task.h (+10/-10) include/mcloud/api/taskqueue.h (+11/-10) include/mcloud/api/uploadtask.h (+18/-22) provider/CMakeLists.txt (+2/-2) provider/McloudProvider.cpp (+0/-666) provider/McloudProvider.h (+0/-82) provider/main.cpp (+10/-12) provider/mcloudprovider.cpp (+648/-0) provider/mcloudprovider.h (+82/-0) src/mcloud/api/client.cpp (+45/-53) src/mcloud/api/client_priv.cpp (+628/-632) src/mcloud/api/client_priv.h (+63/-63) src/mcloud/api/cloudcontent.cpp (+53/-50) src/mcloud/api/cloudfolder.cpp (+40/-38) src/mcloud/api/diskinfo.cpp (+8/-5) src/mcloud/api/downloadtask.cpp (+10/-11) src/mcloud/api/downloadtask_priv.cpp (+44/-44) src/mcloud/api/downloadtask_priv.h (+28/-28) src/mcloud/api/outlink.cpp (+11/-8) src/mcloud/api/syncmanager.cpp (+10/-7) src/mcloud/api/syncmanager_priv.cpp (+6/-10) src/mcloud/api/syncmanager_priv.h (+10/-11) src/mcloud/api/syncthread.cpp (+107/-116) src/mcloud/api/syncthread.h (+3/-3) src/mcloud/api/taskhandler.h (+32/-24) src/mcloud/api/uploadtask.cpp (+10/-11) src/mcloud/api/uploadtask_priv.cpp (+46/-46) src/mcloud/api/uploadtask_priv.h (+33/-33) tests/server/server.py (+1/-1) tests/unit/mcloud-provider/CMakeLists.txt (+1/-1) tests/unit/mcloud-provider/mcloud-provider-unit-tests.cpp (+133/-163) tests/unit/mcloud/CMakeLists.txt (+0/-3) tests/unit/mcloud/api/mcloud-rest-test.cpp (+217/-233) tests/unit/mcloud/api/mcloud-sync-test.cpp (+306/-312)
To merge this branch:	bzr merge lp:~gary-wzl77/mcloud/job_uuid
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
unity-api-1-bot	continuous-integration		Approve on 2016-10-26
Zhang Enwei (community)		2016-10-14	Approve on 2016-10-26
Review via email: mp+308474@code.launchpad.net

Commit message

1.generate job id with uuid.
2.reduce the size of temporary generated file.

Description of the change

1.generate job id with uuid.
2.reduce the size of temporary generated file.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2016-10-14:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-mcloud-ci/26/rebuild

review: Approve (continuous-integration)

lp:~gary-wzl77/mcloud/job_uuid updated on 2016-10-14

55. By Gary.Wang on 2016-10-14: little printout fixed
56. By Gary.Wang on 2016-10-14: making code look better.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2016-10-14:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-mcloud-ci/27/rebuild

review: Approve (continuous-integration)

Revision history for this message

Zhang Enwei (zhangew401) wrote on 2016-10-26:

LGTM

review: Approve

lp:~gary-wzl77/mcloud/job_uuid updated on 2016-10-26

57. By Gary.Wang on 2016-10-14: get rid of std::bind and use lamda.
58. By Gary.Wang on 2016-10-24: code formatting.
59. By Gary.Wang on 2016-10-26: 1.more unique_ptr instead of shared_ptr
2.code formatting.
60. By Gary.Wang on 2016-10-26: 1.add missing dependency(account-plugin-mcloud)
2.generate job upload id with uuid.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2016-10-26:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-mcloud-ci/28/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes:

Gary.Wang

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2016-09-17 14:21:57 +0000
 +++ CMakeLists.txt	2016-10-26 10:36:06 +0000
@@ -28,7 +28,7 @@
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -Werror -Wall -fno-strict-aliasing -fvisibility=hidden -fvisibility-inlines-hidden -pedantic -Wextra")
  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined")
--set(MCLOUD_LIB_VERSION_MAJOR 1)
++set(MCLOUD_LIB_VERSION_MAJOR 2)
  set(MCLOUD_LIB_VERSION_MINOR 0)
  set(MCLOUD_LIB_VERSION_PATCH 0)
 === modified file 'debian/VERSION'
 --- debian/VERSION	2016-09-17 14:21:57 +0000
 +++ debian/VERSION	2016-10-26 10:36:06 +0000
@@ -1,1 +1,1 @@
--1
++2
 === modified file 'debian/VERSION.vivid'
 --- debian/VERSION.vivid	2016-09-17 14:21:57 +0000
 +++ debian/VERSION.vivid	2016-10-26 10:36:06 +0000
@@ -1,1 +1,1 @@
--0
++1
 === modified file 'debian/changelog'
 --- debian/changelog	2016-09-17 14:21:57 +0000
 +++ debian/changelog	2016-10-26 10:36:06 +0000
@@ -1,4 +1,12 @@
--mcloud (1.0.0-0ubuntu1) UNRELEASED; urgency=medium
++mcloud (2.0.0-0ubuntu1) UNRELEASED; urgency=medium
++
++  [ Gary.Wzl]
++  * add missing dependency(account-plugin-mcloud)
++  * generate job upload id with uuid.
++
++ -- Gary.Wang <gary.wang@canonical.com>  Wed, 26 Oct 2016 16:58:11 +0800
++
++mcloud (1.0.0+16.10.20160927.3-0ubuntu1) yakkety; urgency=medium
    [ Gary Wang ]
    * Update provider to enable data streaming directly without local cache.
@@ -29,4 +37,7 @@
    * Add status handler for download and upload task.
    * Remove deprecated API(set_auth_info).
-- -- Gary Wang <gary.wang@canonical.com>  Mon, 04 Jul 2016 16:09:14 +0800
++  [ Gary.Wzl ]
++  * First landing of mcloud library.
++
++ -- Gary.Wang <gary.wang@canonical.com>  Tue, 27 Sep 2016 04:44:02 +0000
 === modified file 'debian/control'
 --- debian/control	2016-09-17 14:21:57 +0000
 +++ debian/control	2016-10-26 10:36:06 +0000
@@ -30,6 +30,7 @@
                 python3-dbus,
                 python3-gi,
                 libglib2.0-dev,
++               lsb-release,
  Standards-Version: 3.9.5
  Section: libs
  Homepage: https://launchpad.net/mcloud
@@ -42,6 +43,7 @@
  Pre-Depends: ${misc:Pre-Depends},
  Depends: ${misc:Depends},
           ${shlibs:Depends},
++         account-plugin-mcloud,
  Description: A C++ library for open API of cmcc mcloud service
   Mcloud API provides developers easily access to authenticated
   user's cmcc mcloud resources.
 === modified file 'debian/control.in'
 --- debian/control.in	2016-09-17 14:21:57 +0000
 +++ debian/control.in	2016-10-26 10:36:06 +0000
@@ -25,6 +25,7 @@
                 python3-dbus,
                 python3-gi,
                 libglib2.0-dev,
++               lsb-release,
  Standards-Version: 3.9.5
  Section: libs
  Homepage: https://launchpad.net/mcloud
@@ -37,6 +38,7 @@
  Pre-Depends: ${misc:Pre-Depends},
  Depends: ${misc:Depends},
           ${shlibs:Depends},
++         account-plugin-mcloud,
  Description: A C++ library for open API of cmcc mcloud service
   Mcloud API provides developers easily access to authenticated
   user's cmcc mcloud resources.
 === removed file 'debian/libmcloud0.install'
 --- debian/libmcloud0.install	2016-09-13 02:13:23 +0000
 +++ debian/libmcloud0.install	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
--usr/lib/*/lib*.so.*
--usr/bin/*
--usr/share/dbus-1/services/*
 === added file 'debian/libmcloud1.install'
 --- debian/libmcloud1.install	1970-01-01 00:00:00 +0000
 +++ debian/libmcloud1.install	2016-10-26 10:36:06 +0000
@@ -0,0 +1,3 @@
++usr/lib/*/lib*.so.*
++usr/bin/*
++usr/share/dbus-1/services/*
 === removed file 'debian/libmcloud1.install'
 --- debian/libmcloud1.install	2016-09-17 14:21:57 +0000
 +++ debian/libmcloud1.install	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
--usr/lib/*/lib*.so.*
--usr/bin/*
--usr/share/dbus-1/services/*
 === added file 'debian/libmcloud2.install'
 --- debian/libmcloud2.install	1970-01-01 00:00:00 +0000
 +++ debian/libmcloud2.install	2016-10-26 10:36:06 +0000
@@ -0,0 +1,3 @@
++usr/lib/*/lib*.so.*
++usr/bin/*
++usr/share/dbus-1/services/*
 === modified file 'include/mcloud/api/client.h'
 --- include/mcloud/api/client.h	2016-09-26 01:43:23 +0000
 +++ include/mcloud/api/client.h	2016-10-26 10:36:06 +0000
@@ -31,8 +31,6 @@
  #include <mcloud/api/syncmanager.h>
  #include <deque>
--/*#include <future>*/
--/*#include <thread>*/
  namespace mcloud {
  namespace api {
@@ -59,7 +57,7 @@
      \note Mcloud API covers cloud resourece access and content sync-up between local and cloud. It does not take
      responsibility of account authentication. So before using mcloud APIs, developers need to call \sa set_access_token to
--    manually set a valid access_token or \sa refresh_token to fetch access token,
++    manually set a valid access_token or \sa refresh_token to fetch access token,
      which is used to call mcloud APIs internally to pass through authentication.
   */
@@ -90,7 +88,7 @@
       * \brief Set \a access_token to authenticate all mcloud API calls with the bearer HTTP authorization scheme.
       * The access token can be fetched through ubuntu sso services.
       */
--    void set_access_token(const std::string &access_token);
++    void set_access_token(const std::string& access_token);
      /*!
       * \brief Retrieves and refreshes access token by using \a refresh_token.
@@ -98,14 +96,14 @@
       * \throw std::runtime_error if error occurs.
       * \returns true if access token is refreshed, otherwise returns false.
       */
--    bool refresh_token(const std::string &refresh_token);
++    bool refresh_token(const std::string& refresh_token);
      /*!
       * \brief Returns login user's clcoud storage info.
       * \throw std::runtime_error if error occurs.
       * @sa DiskInfo
       */
--    DiskInfo disk_info();
++    DiskInfo::Ptr disk_info();
      /*!
       * \brief Returns root folder id on mlcoud for third-party app to use, such as mcloud-lib.
@@ -128,7 +126,7 @@
      ResourceList cloud_content_list(int start_index,
                                      int count,
                                      CloudContent::Type content_type = CloudContent::Type::All,
--                                    const std::string &folder_id = std::string());
++                                    const std::string& folder_id = std::string());
      /*!
       * \brief Returns a cloud content object if a content \a content_id exists on mcloud.
@@ -136,7 +134,7 @@
       * \throw std::runtime_error if error occurs.
       * \sa delete_contents(), move_items()
       */
--    CloudContent::Ptr   content_info(const std::string & content_id);
++    CloudContent::Ptr   content_info(const std::string& content_id);
      /*!
       * \brief Returns a cloud folder object if a folder with \a folder_name is created under a given \a folder_id folder.
@@ -144,8 +142,8 @@
       * \throw std::runtime_error if error occurs.
       * \sa delete_contents(), move_items()
       */
--    CloudFolder::Ptr    create_folder(const std::string &folder_name,
--                                      const std::string &folder_id);
++    CloudFolder::Ptr    create_folder(const std::string& folder_name,
++                                      const std::string& folder_id);
      /*!
       * \brief Returns a cloud item list if there are available items that matches with \a name under a given \a folder_id folder.
@@ -155,25 +153,25 @@
       */
      [[gnu::deprecated("cmcc closes this api for security reason")]]
--    Client::ResourceList    look_up(const std::string &name,
--                                    const std::string &folder_id,
++    Client::ResourceList    look_up(const std::string& name,
++                                    const std::string& folder_id,
                                      CloudResource::Property property = CloudResource::Property::Content);
      /*!
--     * \brief Creates folders extranet link object with a given \a folder_ids.
++     * \brief Creates folders sharing url object with a given \a folder_ids.
       * \throw std::runtime_error if error occurs.
--     * \sa create_content_extranet_link()
--     * \return a list of Outlink after extranet links are created.
++     * \sa create_content_sharing_url()
++     * \return a list of Outlink after sharing urls are created.
       */
--    OutlinkList create_folder_extranet_link(const Stringlist &folder_ids);
++    OutlinkList create_folder_sharing_url(const Stringlist& folder_ids);
      /*!
--     * \brief Creates a content_extranet link object with a given \a content_ids.
++     * \brief Creates a content_sharing url object with a given \a content_ids.
       * \throw std::runtime_error if error occurs.
--     * \sa create_folder_extranet_link()
--     * \return a list of Outlink after extranet links are created.
++     * \sa create_folder_sharing_url()
++     * \return a list of Outlink after sharing urls are created.
       */
--    OutlinkList create_content_extranet_link(const Stringlist &content_ids);
++    OutlinkList create_content_sharing_url(const Stringlist& content_ids);
      /*!
       * \brief Returns folder id list if folders \a folder_ids are copies to another folder with a given \a folder_id on mcloud
@@ -181,8 +179,8 @@
       * \note the destination folder \a folder_id should not be the same as the folders' \a folder_ids folder ids.
       * \sa move_items(), update_folder(), copy_contents()
       */
--    Client::Stringlist copy_folders(const Stringlist  &folder_ids,
--                                    const std::string &_folder_id);
++    Client::Stringlist copy_folders(const Stringlist&  folder_ids,
++                                    const std::string& folder_id);
      /*!
       * \brief Returns content id list if contents \a content_ids are copies to another folder with a given \a folder_id on mcloud.
@@ -190,8 +188,8 @@
       * \note the destination folder \a folder_id should not be the same as the contents' \a contents_ids folder id.
       * \sa move_items(), update_folder(), copy_folders()
       */
--    Client::Stringlist copy_contents(const Stringlist  &contents_ids,
--                                     const std::string &folder_id);
++    Client::Stringlist copy_contents(const Stringlist&  contents_ids,
++                                     const std::string& folder_id);
      /*!
       * \brief Returns true if \a folders with a given folder_ids and \a contents with a given \a content_ids
@@ -199,32 +197,32 @@
       * \throw std::runtime_error if error occurs.
       * \sa delete_contents(), copy_folders(), copy_contents()
       */
--    bool move_items(const Stringlist &folder_ids,
--                    const Stringlist &content_ids,
--                    const std::string &folder_id);
++    bool move_items(const Stringlist& folder_ids,
++                    const Stringlist& content_ids,
++                    const std::string& folder_id);
      /*!
       * \brief Returns true if folder \a folder_id are updated with \a new_folder_name, otherwise return false.
       * \throw std::runtime_error if error occurs.
       * \sa delete_contents(), copy_folders(),
       */
--    bool update_folder(const std::string &folder_id,
--                       const std::string &new_folder_name);
++    bool update_folder(const std::string& folder_id,
++                       const std::string& new_folder_name);
      /*!
       * \brief Returns true if contents \a content_ids are deleted, otherwise return false.
       * \throw std::runtime_error if error occurs.
       * \sa move_items(), content_info(), copy_contents()
       */
--    bool delete_contents(const Stringlist &content_ids);
++    bool delete_contents(const Stringlist& content_ids);
      /*!
--     * \brief Returns true if a local file \a file_path exists in folder with \a folder_id on cloud,
++     * \brief Returns true if a local file \a file_path exists in folder with \a folder_id on cloud,
       * otherwise return false. Searches root folder if folder_id is empty();
       * \throw std::runtime_error if error occurs.
       */
--    bool exist_on_cloud(const std::string &file_path,
--                        const std::string &folder_id = std::string());
++    bool exist_on_cloud(const std::string& file_path,
++                        const std::string& folder_id = std::string());
      /*!
       * \brief Returns a sync-up manager running on the background.
@@ -233,7 +231,7 @@
      SyncManager::Ptr syncmanager() const;
    private:
--    std::shared_ptr<ClientPriv>  p_;
++    std::unique_ptr<ClientPriv>  p_;
  };
 === modified file 'include/mcloud/api/cloudcontent.h'
 --- include/mcloud/api/cloudcontent.h	2016-09-26 01:43:23 +0000
 +++ include/mcloud/api/cloudcontent.h	2016-10-26 10:36:06 +0000
@@ -23,7 +23,7 @@
  #include <mcloud/api/visibility.h>
  namespace tinyxml2 {
--    class XMLElement;
++class XMLElement;
+ }
  namespace mcloud {
@@ -36,7 +36,7 @@
   */
  class MCLOUD_API_DLL_PUBLIC CloudContent: public CloudResource {
--public:
++  public:
      typedef std::shared_ptr<CloudContent> Ptr;
      /*!
@@ -53,42 +53,42 @@
          PPT         ///< ppt content
      };
--    virtual ~CloudContent() = default;
++    ~CloudContent();
      /*!
       * \brief Returns a unique id of cloud content object.
       */
--    const std::string &id() const override;
++    const std::string& id() const override;
      /*!
       * \brief Returns the name of cloud content object.
       */
--    const std::string &name() const override;
++    const std::string& name() const override;
      /*!
       * \brief Returns the datetime when content was created.
       */
--    const std::time_t &created_date() const override;
++    const std::time_t& created_date() const override;
      /*!
       * \brief Returns the datetime when content was updated.
       */
--    const std::time_t &updated_date() const override;
++    const std::time_t& updated_date() const override;
      /*!
       * \brief Returns a unique parent folder id of cloud content object.
       */
--    const std::string &parent_catalog_id() const override;
++    const std::string& parent_catalog_id() const override;
      /*!
       * \brief Returns etag of a content object.
       */
--    const std::string &etag() const override;
++    const std::string& etag() const override;
      /*!
       * \brief Returns owner id of a content object.
       */
--    const std::string &owner() const override;
++    const std::string& owner() const override;
      /*!
       * \brief Returns resource type of an object.
@@ -98,7 +98,7 @@
      /*!
       * \brief Returns extension of a content object.
       */
--    const std::string &suffix() const;
++    const std::string& suffix() const;
      /*!
       * \brief Returns content type of an object.
@@ -113,33 +113,33 @@
      /*!
       * \brief Returns the description of a content object.
       */
--    const std::string &description() const;
++    const std::string& description() const;
      /*!
       * \brief Returns thumbnail link of a content object.
       * It will be empty if there is no such a field in response.
       */
--    const std::string &thumbnail_url() const;
++    const std::string& thumbnail_url() const;
      /*!
       * \brief Returns big thumbnail link of a content object,
       * It will be empty if there is no such a field in response.
       */
--    const std::string &big_thumbnail_url() const;
++    const std::string& big_thumbnail_url() const;
      /*!
       * \brief Returns a external playable link of a media content object,
       * It will be empty if there is no such a field in response.
       */
--    const std::string &present_url() const;
++    const std::string& present_url() const;
--private:
--    CloudContent(const tinyxml2::XMLElement *root);
++  private:
++    CloudContent(const tinyxml2::XMLElement* root);
      friend class ClientPriv;
      class Priv;
--    std::shared_ptr<Priv> p;
++    std::unique_ptr<Priv> p;
  };
+ }
 === modified file 'include/mcloud/api/cloudfolder.h'
 --- include/mcloud/api/cloudfolder.h	2016-09-26 01:43:23 +0000
 +++ include/mcloud/api/cloudfolder.h	2016-10-26 10:36:06 +0000
@@ -23,7 +23,7 @@
  #include <mcloud/api/visibility.h>
  namespace tinyxml2 {
--    class XMLElement;
++class XMLElement;
+ }
  namespace mcloud {
@@ -35,7 +35,7 @@
   */
  class MCLOUD_API_DLL_PUBLIC CloudFolder : public CloudResource {
--public:
++  public:
      enum class Type {
          Normal = 0,
          Pictures,
@@ -49,42 +49,42 @@
      typedef std::shared_ptr<CloudFolder> Ptr;
--    virtual ~CloudFolder() = default;
++    ~CloudFolder();
      /*!
       * \brief Returns a unique id of cloud folder object.
       */
--    const std::string &id() const override;
++    const std::string& id() const override;
      /*!
       * \brief Returns the name of cloud folder object.
       */
--    const std::string &name() const override;
++    const std::string& name() const override;
      /*!
       * \brief Returns the datetime when folder was created.
       */
--    const std::time_t &created_date() const override;
++    const std::time_t& created_date() const override;
      /*!
       * \brief Returns the datetime when folder was updated.
       */
--    const std::time_t &updated_date() const override;
++    const std::time_t& updated_date() const override;
      /*!
       * \brief Returns a unique id of the parent folder.
       */
--    const std::string &parent_catalog_id() const override;
++    const std::string& parent_catalog_id() const override;
      /*!
       * \brief Returns etag of a folder object.
       */
--    const std::string &etag() const override;
++    const std::string& etag() const override;
      /*!
       * \brief Returns owner id of a folder object.
       */
--    const std::string &owner() const override;
++    const std::string& owner() const override;
      /*!
       * \brief Returns resource property of an object.
@@ -101,15 +101,15 @@
      /*!
       * \brief Returns a current folder's path.
       */
--    const std::string &folder_path() const;
++    const std::string& folder_path() const;
--private:
--    CloudFolder(const tinyxml2::XMLElement *root);
++  private:
++    CloudFolder(const tinyxml2::XMLElement* root);
      friend class ClientPriv;
      class Priv;
--    std::shared_ptr<Priv>   p_;
++    std::unique_ptr<Priv>   p_;
  };
+ }
 === modified file 'include/mcloud/api/cloudresource.h'
 --- include/mcloud/api/cloudresource.h	2016-09-26 01:43:23 +0000
 +++ include/mcloud/api/cloudresource.h	2016-10-26 10:36:06 +0000
@@ -42,19 +42,19 @@
      virtual ~CloudResource() = default;
--    virtual const std::string &id() const = 0;
--
--    virtual const std::string &name() const = 0;
--
--    virtual const std::time_t &created_date() const = 0;
--
--    virtual const std::time_t &updated_date() const = 0;
--
--    virtual const std::string &parent_catalog_id() const = 0;
--
--    virtual const std::string &etag() const = 0;
--
--    virtual const std::string &owner() const = 0;
++    virtual const std::string& id() const = 0;
++
++    virtual const std::string& name() const = 0;
++
++    virtual const std::time_t& created_date() const = 0;
++
++    virtual const std::time_t& updated_date() const = 0;
++
++    virtual const std::string& parent_catalog_id() const = 0;
++
++    virtual const std::string& etag() const = 0;
++
++    virtual const std::string& owner() const = 0;
      virtual Property property() const = 0;
  };
 === modified file 'include/mcloud/api/diskinfo.h'
 --- include/mcloud/api/diskinfo.h	2016-09-26 01:43:23 +0000
 +++ include/mcloud/api/diskinfo.h	2016-10-26 10:36:06 +0000
@@ -24,7 +24,7 @@
  #include <memory>
  namespace tinyxml2 {
--    class XMLElement;
++class XMLElement;
+ }
  namespace mcloud {
@@ -36,8 +36,9 @@
   */
  class MCLOUD_API_DLL_PUBLIC DiskInfo {
--public:
--    virtual ~DiskInfo() = default;
++  public:
++    typedef std::shared_ptr<DiskInfo> Ptr;
++    ~DiskInfo();
      /*!
       * \brief Returns available free disk size of user cloud storage in MB.
@@ -49,13 +50,13 @@
       */
      int disk_size() const;
--private:
--    DiskInfo(const tinyxml2::XMLElement *root);
++  private:
++    DiskInfo(const tinyxml2::XMLElement* root);
      friend class ClientPriv;
      class Priv;
--    std::shared_ptr<Priv>   p_;
++    std::unique_ptr<Priv>   p_;
  };
+ }
 === modified file 'include/mcloud/api/downloadtask.h'
 --- include/mcloud/api/downloadtask.h	2016-09-26 01:43:23 +0000
 +++ include/mcloud/api/downloadtask.h	2016-10-26 10:36:06 +0000
@@ -33,8 +33,7 @@
      \struct DownloadBufferCb
      \brief DownloadBufferCb is a download request object which consists of a content id and writing callback function allows content data can be received in buffering via call back function.
   */
--struct MCLOUD_API_DLL_PUBLIC DownloadBufferCb
--{
++struct MCLOUD_API_DLL_PUBLIC DownloadBufferCb {
      std::string content_id;
      Task::Buffer_Callback write_cb;
  };
@@ -48,45 +47,43 @@
      basic download item information, also it's used for content download by sync manager.
   */
  class MCLOUD_API_DLL_PUBLIC DownloadTask : public Task {
--public:
++  public:
      typedef std::shared_ptr<DownloadTask> Ptr;
--    virtual ~DownloadTask() = default;
--
--    DownloadTask(const DownloadTask& ) = delete;
--
--    DownloadTask& operator=(const DownloadTask& ) = delete;
++    DownloadTask(const DownloadTask&) = delete;
++
++    DownloadTask& operator=(const DownloadTask&) = delete;
      /*!
       * Returns an unique id of download task.
       */
--    const std::string & task_id() const override;
++    const std::string& task_id() const override;
      /*!
       * \brief Returns an unique id of cloud content on mcloud.
       */
--    const std::string & content_id() const override;
++    const std::string& content_id() const override;
      /*!
       * \brief Returns a display name of cloud content on mcloud.
       */
--    const std::string & content_name() const override;
++    const std::string& content_name() const override;
      /*!
       * \brief Returns cloud content local storage file path.
       */
--    const std::string & file_path() const override;
++    const std::string& file_path() const override;
      /*!
       * \brief Returns download url assigned by mcloud for this task.
       * \note this url will be expried after a period of time.
       */
--    const std::string & task_url() const override;
++    const std::string& task_url() const override;
      /*!
       * \brief Contains the error string if an error occurs during content download.
       */
--    const std::string & error_string() const override;
++    const std::string& error_string() const override;
      /*!
       * \brief Returns current sync-up status for this task.
@@ -98,22 +95,22 @@
       * \brief Handler for download progress of a task.
       * \sa Task::ProgressHandler
       */
--    Task::ProgressHandler & progress_changed() override;
++    Task::ProgressHandler& progress_changed() override;
      /*!
       * \brief Handler for download status of a task.
       * \sa Task::StatusHandler
       */
--    Task::StatusHandler & status_changed() override;
++    Task::StatusHandler& status_changed() override;
--    /*!
++    /*!
       * \brief cancel the task.
       * \sa Task::StatusHandler
       */
      void cancel() override;
--private:
--    DownloadTask(std::shared_ptr<DownloadTaskPriv> p);
++  private:
++    DownloadTask(const std::shared_ptr<DownloadTaskPriv>& p);
      friend class SyncManagerPriv;
 === modified file 'include/mcloud/api/exceptions.h'
 --- include/mcloud/api/exceptions.h	2016-08-29 04:15:08 +0000
 +++ include/mcloud/api/exceptions.h	2016-10-26 10:36:06 +0000
@@ -26,55 +26,55 @@
  namespace mcloud {
  namespace api {
--	/**
--	 * \brief Indicates an invalid content id when querying content infomation by an id.
--     * or an invalid folder id when listing or looup content in one specific folder.
--	 */
--
--    class MCLOUD_API_DLL_PUBLIC InvalidIDException : public std::runtime_error {
--		public:
--			using runtime_error::runtime_error;
--	};
--
--    /*
--	 * \brief Indicates a content or folder can not be found on mcloud.
--     */
--    class MCLOUD_API_DLL_PUBLIC NonExistentException : public std::runtime_error {
--		public:
--			using runtime_error::runtime_error;
--	};
--
--    /**
--     * \brief User ran out of space on mcloud storage.
--     */
--    class MCLOUD_API_DLL_PUBLIC OutofSpaceException : public std::runtime_error {
--        public:
--            using runtime_error::runtime_error;
--    };
--
--    /**
--     * \brief Indicates a timeout on HTTP requests.
--     */
--    class  MCLOUD_API_DLL_PUBLIC HttpTimeoutException : public std::runtime_error {
--        public:
--            using runtime_error::runtime_error;
--    };
--
--    /*
--     * \brief Indicates one or more http request parameters are invalid.
--     */
--    class MCLOUD_API_DLL_PUBLIC ParameterInvalidException : public std::runtime_error {
--        public:
--            using runtime_error::runtime_error;
--    };
--
--    /*
--     * \brief Indicates access token is invalid or expired.
--     */
--    class MCLOUD_API_DLL_PUBLIC CredentialException : public std::runtime_error {
--        public:
--            using runtime_error::runtime_error;
--    };
++/**
++ * \brief Indicates an invalid content id when querying content infomation by an id.
++ * or an invalid folder id when listing or looup content in one specific folder.
++ */
++
++class MCLOUD_API_DLL_PUBLIC InvalidIDException : public std::runtime_error {
++  public:
++    using runtime_error::runtime_error;
++};
++
++/*
++ * \brief Indicates a content or folder can not be found on mcloud.
++ */
++class MCLOUD_API_DLL_PUBLIC NonExistentException : public std::runtime_error {
++  public:
++    using runtime_error::runtime_error;
++};
++
++/**
++ * \brief User ran out of space on mcloud storage.
++ */
++class MCLOUD_API_DLL_PUBLIC OutofSpaceException : public std::runtime_error {
++  public:
++    using runtime_error::runtime_error;
++};
++
++/**
++ * \brief Indicates a timeout on HTTP requests.
++ */
++class  MCLOUD_API_DLL_PUBLIC HttpTimeoutException : public std::runtime_error {
++  public:
++    using runtime_error::runtime_error;
++};
++
++/*
++ * \brief Indicates one or more http request parameters are invalid.
++ */
++class MCLOUD_API_DLL_PUBLIC ParameterInvalidException : public std::runtime_error {
++  public:
++    using runtime_error::runtime_error;
++};
++
++/*
++ * \brief Indicates access token is invalid or expired.
++ */
++class MCLOUD_API_DLL_PUBLIC CredentialException : public std::runtime_error {
++  public:
++    using runtime_error::runtime_error;
++};
+ }
+ }
 === modified file 'include/mcloud/api/outlink.h'
 --- include/mcloud/api/outlink.h	2016-09-06 09:12:43 +0000
 +++ include/mcloud/api/outlink.h	2016-10-26 10:36:06 +0000
@@ -25,7 +25,7 @@
  #include <string>
  namespace tinyxml2 {
--    class XMLElement;
++class XMLElement;
+ }
  namespace mcloud {
@@ -33,32 +33,32 @@
  /*!
      \class Outlink
--    \brief Outlink is a cloud extranet link that contains extranet link which can be share by user to others.
++    \brief Outlink is a link object that contains extranet link which can be share by user to others.
   */
  class MCLOUD_API_DLL_PUBLIC Outlink {
--public:
++  public:
      typedef std::shared_ptr<Outlink>  Ptr;
--    virtual ~Outlink() = default;
++    ~Outlink();
      /*!
       * \brief Returns a unique id of extranet object assigned by mcloud.
       */
--    const std::string &id() const;
++    const std::string& id() const;
      /*!
       * \brief Returns a unique id of extranet link assigned by mcloud.
       */
--    const std::string &link() const;
++    const std::string& link() const;
--private:
--    Outlink(const tinyxml2::XMLElement *root);
++  private:
++    Outlink(const tinyxml2::XMLElement* root);
      friend class ClientPriv;
      class Priv;
--    std::shared_ptr<Priv> p_;
++    std::unique_ptr<Priv> p_;
  };
+ }
 === modified file 'include/mcloud/api/syncmanager.h'
 --- include/mcloud/api/syncmanager.h	2016-09-26 01:43:23 +0000
 +++ include/mcloud/api/syncmanager.h	2016-10-26 10:36:06 +0000
@@ -35,8 +35,8 @@
  /*!
      \class SyncManager
--    \brief SyncManager handles all the requests to upload and download.
--    It's constructed around two threads for content synchronization. One for content uploading to cloud, another for cloud item downloading to local.
++    \brief SyncManager handles all the requests to upload and download.
++    It's constructed around two threads for content synchronization. One for content uploading to cloud, another for cloud item downloading to local.
      Both thread are running asynchronously.
      Calls \sa add_download_tasks() by passing a content id list for cloud content download,
      Calls \sa add_upload_tasks() by passing a local file list path for local content upload.
@@ -52,11 +52,11 @@
      typedef std::vector<std::string>    Stringlist;
--    virtual ~SyncManager() = default;
++    ~SyncManager();
      SyncManager(const SyncManager&) = delete;
--    SyncManager& operator=(const SyncManager &) = delete;
++    SyncManager& operator=(const SyncManager&) = delete;
      /*!
       * \brief Starts to run download or upload tasks from sync-up thread.
@@ -85,7 +85,7 @@
       * \throw std::runtime_error if error occurs.
       * \sa add_download_tasks(), DownloadTask
       */
--    DownloadTask::Ptr add_download_task(const std::string &content_id);
++    DownloadTask::Ptr add_download_task(const std::string& content_id);
      /*!
       * \brief Pushes a download buffer callback item \a buffer_cb to sync manager and add regarding upload task into download queue.
@@ -99,7 +99,7 @@
       * \throw std::runtime_error if error occurs.
       * \sa add_download_tasks(), DownloadTask
       */
--    DownloadTask::Ptr add_download_task(const DownloadBufferCb &buffer_cb);
++    DownloadTask::Ptr add_download_task(const DownloadBufferCb& buffer_cb);
      /*!
       * \brief Pushes a upload request item \a request_item to sync manager and add regarding upload task into upload queue.
@@ -116,11 +116,11 @@
       * \throw std::runtime_error if error occurs.
       * \note A file name can not contain any of following characters:
       *      '\', '/', ':', '*', '?', '"', '<', '>', '|'
--     * \note Sync manager will detect if the uploading file is already existing on cloud,
++     * \note Sync manager will detect if the uploading file is already existing on cloud,
       * if so, it simply sets the status of upload task completed to avoid duplicated upload.
       * \sa add_download_tasks(), UploadRequest, UploadTask,
       */
--    UploadTask::Ptr add_upload_task(const UploadRequest &request_item);
++    UploadTask::Ptr add_upload_task(const UploadRequest& request_item);
      /*!
       * \brief Pushes a new upload request object \a buffer_cb to sync manager and add regarding upload task into upload queue.
@@ -141,7 +141,7 @@
       *      '\', '/', ':', '*', '?', '"', '<', '>', '|'
       * \sa add_download_tasks(), UploadRequest, UploadTask,
       */
--    UploadTask::Ptr add_upload_task(const UploadBufferCb &buffer_cb);
++    UploadTask::Ptr add_upload_task(const UploadBufferCb& buffer_cb);
      /*!
       * \brief Returns a download task list hold by sync up manager.
@@ -151,18 +151,18 @@
      DownloadList download_queue();
      /*!
--     * \brief Returns a upload task list hold by sync up manager.
++     * \brief Returns a upload task list hold by sync up manager.
       * Each item in the list contains basic information of associated task.
       * \sa download_queue(), UploadTask
       */
      UploadList   upload_queue();
--private:
++  private:
      SyncManager(ClientPriv* client_priv);
      friend class ClientPriv;
--    std::shared_ptr<SyncManagerPriv> p_;
++    std::unique_ptr<SyncManagerPriv> p_;
  };
+ }
 === modified file 'include/mcloud/api/task.h'
 --- include/mcloud/api/task.h	2016-09-26 01:43:23 +0000
 +++ include/mcloud/api/task.h	2016-10-26 10:36:06 +0000
@@ -32,7 +32,7 @@
   */
  class MCLOUD_API_DLL_PUBLIC Task {
--public:
++  public:
      /*!
       * \brief The Status enum indicates current status of this task.
       */
@@ -49,40 +49,40 @@
      typedef std::function<void(Status)> StatusHandler;
--    typedef std::function<size_t(void *dest, size_t buf_size)> Buffer_Callback;
++    typedef std::function<size_t(void* dest, size_t buf_size)> Buffer_Callback;
      virtual ~Task() = default;
      /*!
       * \brief Returns an unique id of task.
       */
--    virtual const std::string & task_id() const = 0;
++    virtual const std::string& task_id() const = 0;
      /*!
       * \brief Returns an unique id of cloud content on mcloud.
       */
--    virtual const std::string & content_id() const = 0;
++    virtual const std::string& content_id() const = 0;
      /*!
       * \brief Returns a display name of cloud content on mcloud.
       */
--    virtual const std::string & content_name() const = 0;
++    virtual const std::string& content_name() const = 0;
      /*!
       * \brief Returns cloud content local storage file path.
       */
--    virtual const std::string & file_path() const = 0;
++    virtual const std::string& file_path() const = 0;
      /*!
       * \brief Contains the error string if an error occurs during task running.
       */
--    virtual const std::string & error_string() const = 0;
++    virtual const std::string& error_string() const = 0;
      /*!
       * \brief Returns a item url assigned by mcloud.
       * \note the url will be expried after a period of time.
       */
--    virtual const std::string & task_url() const = 0;
++    virtual const std::string& task_url() const = 0;
      /*!
       * \brief Returns current download or upload item sync-up status.
@@ -93,13 +93,13 @@
       * \brief Handler for download or upload progress of a task.
       * \sa Task::ProgressHandler
       */
--    virtual Task::ProgressHandler & progress_changed() = 0;
++    virtual Task::ProgressHandler& progress_changed() = 0;
      /*!
       * \brief Handler for download or upload progress of a task.
       * \sa Task::StatusHandler
       */
--    virtual Task::StatusHandler & status_changed() = 0;
++    virtual Task::StatusHandler& status_changed() = 0;
      /*!
       * \brief Cancels the task.
 === modified file 'include/mcloud/api/taskqueue.h'
 --- include/mcloud/api/taskqueue.h	2016-05-26 10:47:12 +0000
 +++ include/mcloud/api/taskqueue.h	2016-10-26 10:36:06 +0000
@@ -41,17 +41,17 @@
      virtual ~TaskQueue() = default;
--    TaskQueue(TaskQueue &&queue) {
++    TaskQueue(TaskQueue&& queue) {
          std::lock_guard<std::mutex> lock(mutex_);
          tasks_ = std::move(queue.tasks_);
+     }
--    TaskQueue(const TaskQueue &queue) {
++    TaskQueue(const TaskQueue& queue) {
          std::lock_guard<std::mutex> lock(mutex_);
          tasks_ = queue.tasks_;
+     }
--    TaskQueue &operator= (const TaskQueue &queue) {
++    TaskQueue& operator= (const TaskQueue& queue) {
          if (this != &queue) {
              std::lock_guard<std::mutex> lock1(mutex_);
              std::lock_guard<std::mutex> lock2(queue.mutex_);
@@ -91,30 +91,31 @@
          return tasks_.empty();
+     }
--    void push(const T &task) {
++    void push(const T& task) {
          std::lock_guard<std::mutex> lock(mutex_);
          tasks_.push_back(task);
+     }
--    void push(const TaskQueue & queue) {
++    void push(const TaskQueue& queue) {
          std::lock_guard<std::mutex> lock(mutex_);
--        for (const T & task: queue.tasks_){
++        for (const T& task : queue.tasks_) {
              tasks_.push_back(task);
+         }
+     }
--    bool try_pop(T &task) {
++    bool try_pop(T& task) {
          std::lock_guard<std::mutex> lock(mutex_);
--        if (tasks_.empty())
--          return false;
++        if (tasks_.empty()) {
++            return false;
++        }
          task = tasks_.front();
          tasks_.pop_front();
          return true;
+     }
--    const T & operator[](int index) const {
++    const T& operator[](int index) const {
          std::lock_guard<std::mutex> lock(mutex_);
          return tasks_[index];
+     }
 === modified file 'include/mcloud/api/uploadtask.h'
 --- include/mcloud/api/uploadtask.h	2016-09-26 01:43:23 +0000
 +++ include/mcloud/api/uploadtask.h	2016-10-26 10:36:06 +0000
@@ -32,10 +32,9 @@
  /*!
      \struct UploadRequest
--    \brief UploadRequest is a upload request item which consists of a upload folder id, up-front buffer size, upload content name
++    \brief UploadRequest is a upload request item which consists of a upload folder id, up-front buffer size, upload content name
   */
--struct MCLOUD_API_DLL_PUBLIC UploadRequest
--{
++struct MCLOUD_API_DLL_PUBLIC UploadRequest {
      std::string file_path;
      std::string folder_id;
      std::string content_name;
@@ -44,10 +43,9 @@
  /*!
      \struct UploadBufferCb
--    \brief UploadBufferCb is a upload request item which consists of a upload folder id, upload buffer size, upload content name and reading callback function allows content data can be received in buffering via call back function.
++    \brief UploadBufferCb is a upload request item which consists of a upload folder id, upload buffer size, upload content name and reading callback function allows content data can be received in buffering via call back function.
  */
--struct MCLOUD_API_DLL_PUBLIC UploadBufferCb
--{
++struct MCLOUD_API_DLL_PUBLIC UploadBufferCb {
      Task::Buffer_Callback read_cb;
      size_t      buffer_size;
      std::string folder_id;
@@ -64,45 +62,43 @@
      basic upload item information, also it's used for content upload by sync manager.
   */
  class MCLOUD_API_DLL_PUBLIC UploadTask : public Task {
--public:
++  public:
      typedef std::shared_ptr<UploadTask> Ptr;
--    virtual ~UploadTask() = default;
--
--    UploadTask(const UploadTask& ) = delete;
--
--    UploadTask& operator=(const UploadTask& ) = delete;
++    UploadTask(const UploadTask&) = delete;
++
++    UploadTask& operator=(const UploadTask&) = delete;
      /*!
       * \brief Returns an unique id of upload task.
       */
--    const std::string & task_id() const override;
++    const std::string& task_id() const override;
      /*!
       * \brief Returns an unique id of cloud content on mcloud.
       */
--    const std::string & content_id() const override;
++    const std::string& content_id() const override;
      /*!
       * \brief Returns a display name of local content.
       */
--    const std::string & content_name() const override;
++    const std::string& content_name() const override;
      /*!
       * \brief Returns uploaded local content file path.
       */
--    const std::string & file_path() const override;
++    const std::string& file_path() const override;
      /*!
       * \brief Contains the error string if an error occurs during content uploading.
       */
--    const std::string & error_string() const override;
++    const std::string& error_string() const override;
      /*!
       * \brief Returns upload url assigned by mcloud for this task.
       * \note the url will be expired after a period of time.
       */
--    const std::string & task_url() const override;
++    const std::string& task_url() const override;
      /*!
       * \brief Returns current sync-up status for this task.
@@ -113,13 +109,13 @@
       * \brief Handler for upload progress of a task.
       * \sa Task::ProgressHandler
       */
--    Task::ProgressHandler & progress_changed() override;
++    Task::ProgressHandler& progress_changed() override;
      /*!
       * \brief Handler for upload status of a task.
       * \sa Task::StatusHandler
       */
--    Task::StatusHandler & status_changed() override;
++    Task::StatusHandler& status_changed() override;
      /*!
       * \brief cancel the task.
@@ -137,8 +133,8 @@
       */
      bool is_need_upload() const;
--private:
--    UploadTask(std::shared_ptr<UploadTaskPriv> p);
++  private:
++    UploadTask(const std::shared_ptr<UploadTaskPriv>& p);
      friend class SyncManagerPriv;
 === modified file 'provider/CMakeLists.txt'
 --- provider/CMakeLists.txt	2016-09-20 02:39:38 +0000
 +++ provider/CMakeLists.txt	2016-10-26 10:36:06 +0000
@@ -7,9 +7,9 @@
  add_definitions(-DBOOST_THREAD_VERSION=4)
--add_executable(mcloud-provider main.cpp McloudProvider.cpp)
++add_library(mcloud-provider-static STATIC mcloudprovider.cpp)
--add_library(mcloud-provider-static STATIC McloudProvider.cpp)
++add_executable(mcloud-provider main.cpp mcloudprovider.cpp)
  target_link_libraries(
      mcloud-provider
 === removed file 'provider/McloudProvider.cpp'
 --- provider/McloudProvider.cpp	2016-09-26 01:43:23 +0000
 +++ provider/McloudProvider.cpp	1970-01-01 00:00:00 +0000
@@ -1,666 +0,0 @@
--/*
-- * Copyright (C) 2016 Canonical Ltd
-- *
-- * This program is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3 as
-- * published by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Authors: Gary Wang <gary.wang@canonical.com>
-- */
--
--#include "McloudProvider.h"
--#include <unity/storage/provider/ProviderBase.h>
--#include <unity/storage/provider/TempfileUploadJob.h>
--#include <unity/storage/provider/UploadJob.h>
--#include <unity/storage/provider/DownloadJob.h>
--#include <unity/storage/provider/metadata_keys.h>
--#include <unity/storage/provider/Exceptions.h>
--
--#include <boost/thread.hpp>
--#include <boost/thread/future.hpp>
--#include <boost/filesystem.hpp>
--#include <boost/make_shared.hpp>
--
--#include <unistd.h>
--#include <sys/socket.h>
--#include <iostream>
--#include <memory>
--#include <mutex>
--#include <stdexcept>
--
--#include <mcloud/api/client.h>
--#include <mcloud/api/uploadtask.h>
--#include <mcloud/api/syncmanager.h>
--#include <mcloud/api/cloudresource.h>
--#include <mcloud/api/cloudcontent.h>
--#include <mcloud/api/cloudfolder.h>
--#include <mcloud/api/exceptions.h>
--
--using namespace std;
--using namespace unity::storage;
--using namespace unity::storage::provider;
--using namespace mcloud::api;
--
--using boost::make_ready_future;
--using boost::make_exceptional_future;
--
--namespace {
--    static const int   TIME_OUT     = 10;
--    static const int   CLIENT_COUNT = 3;
--
--    static const char *FOLDER_TYPE[]  = {"normal", "pictures", "music", "videos", "message", "docs", "app", "sync"};
--    static const char *CONTENT_TYPE[] = {"all", "image", "audio", "video", "other", "doc", "spreadsheet", "ppt"};
--    static const char *STATUS[]       = {"unstart", "running", "canceled", "paused", "broken", "complete"};
--
--    string make_job_id()
--    {
--        static int last_upload_id = 0;
--        return to_string(++last_upload_id);
--    }
--
--    string status_to_string(Task::Status status)
--    {
--        return STATUS[int(status)];
--    }
--
--    string folder_type_to_string(CloudFolder::Type type)
--    {
--        return FOLDER_TYPE[int(type)];
--    }
--
--    string content_type_to_string(CloudContent::Type type)
--    {
--        return CONTENT_TYPE[int(type)];
--    }
--
--    string time_to_iso(time_t t)
--    {
--        char buf[sizeof "2016-08-11T15:10:07+0000"];
--        strftime(buf, sizeof buf, "%FT%T%z", gmtime(&t));
--        return buf;
--    }
--
--    int pending_jobs_count(Client::Ptr client, McloudProvider::JobMode mode)
--    {
--        int count = 0;
--        auto syncmanager = client->syncmanager();
--        if (mode == McloudProvider::JobMode::Download) {
--            auto download_task_queue = syncmanager->download_queue();
--            for (auto & item_ptr : download_task_queue) {
--                if (item_ptr->status() == Task::Status::Running
--                    || item_ptr->status() == Task::Status::Paused
--                    || item_ptr->status() == Task::Status::Unstart) {
--                    count++;
--                }
--            }
--        } else if (mode == McloudProvider::JobMode::Upload) {
--            auto upload_task_queue = syncmanager->upload_queue();
--            for (auto & item_ptr : upload_task_queue) {
--                if (item_ptr->status() == Task::Status::Running
--                    || item_ptr->status() == Task::Status::Paused
--                    || item_ptr->status() == Task::Status::Unstart) {
--                    count++;
--                }
--            }
--        }
--
--        return count;
--    }
--
--    Item content_to_item(CloudResource::Ptr resource)
--    {
--        Item item;
--        item.item_id = resource->id();
--        item.parent_ids = {resource->parent_catalog_id()};
--        item.name = resource->name();
--        item.etag = resource->etag();
--        item.metadata["owner"] = resource->owner();
--        item.metadata[provider::CREATION_TIME] = time_to_iso(resource->created_date());
--        item.metadata[provider::LAST_MODIFIED_TIME] = time_to_iso(resource->updated_date());
--        if (resource->property() == CloudResource::Property::Folder) {
--            item.type = ItemType::folder;
--            auto folder = std::static_pointer_cast<mcloud::api::CloudFolder>(resource);
--            item.metadata["folder_type"] = folder_type_to_string(folder->folder_type());
--            item.metadata["folder_path"] = folder->folder_path();
--        } else if (resource->property() == CloudResource::Property::Content){
--            item.type = ItemType::file;
--            auto file = std::static_pointer_cast<mcloud::api::CloudContent>(resource);
--            item.metadata["suffix"] = file->suffix();
--            item.metadata["content_type"] = content_type_to_string(file->type());
--
--            item.metadata[provider::SIZE_IN_BYTES] = file->content_size();
--            item.metadata["description"] = file->description();
--            item.metadata["thumbnail_url"] = file->thumbnail_url();
--            item.metadata["big_thumbnail_url"] = file->big_thumbnail_url();
--            item.metadata["present_url"] = file->big_thumbnail_url();
--        }
--
--        return item;
--    }
--}
--
--class McloudUploadJob : public UploadJob
--{
--public:
--    McloudUploadJob(string const& upload_id,
--                    string const& parent_id,
--                    string const& file_name,
--                    int64_t       size,
--                    bool allow_overwrite,
--                    Client::Ptr   client);
--
--    boost::future<void> cancel() override;
--    boost::future<Item> finish() override;
--private:
--    boost::future<tuple<bool, string>> upload_data();
--    void   stop_and_cancel();
--private:
--    ssize_t     feed_size;
--    string  parent_id_;
--    string  file_name_;
--    int64_t  upload_size_;
--    bool    allow_overwrite_;
--
--    boost::future<tuple<bool, string>> upload_future_;
--
--    std::mutex    mutex_;
--
--    UploadTask::Ptr task_;
--    Client::Ptr     client_;
--};
--
--class McloudDownloadJob : public DownloadJob
--{
--public:
--    McloudDownloadJob(string const& download_id,
--                      string const& item_id,
--                      Client::Ptr   client);
--
--    boost::future<void> cancel() override;
--    boost::future<void> finish() override;
--private:
--    boost::future<tuple<bool, string>> download_data();
--    void send_data();
--    void stop_and_cancel();
--private:
--    string  item_id_;
--    boost::future<tuple<bool, string>>  download_future_;
--
--    std::mutex           mutex_;
--
--    DownloadTask::Ptr    task_;
--    Client::Ptr          client_;
--};
--
--McloudProvider::McloudProvider()
--    : client_list_(CLIENT_COUNT, std::make_shared<Client>(TIME_OUT))
--{
--}
--
--boost::future<ItemList> McloudProvider::roots(Context const& ctx)
--{
--    return boost::async([this, ctx](){
--        try {
--            auto client = assign_client(ctx);
--            auto root_folder_id = client->cloud_root_folder_id();
--
--            ItemList roots = {
--                {root_folder_id, {}, "root", "", ItemType::root, {}}
--            };
--
--            return make_ready_future<ItemList>(roots);
--        } catch (runtime_error &e) {
--            return make_exceptional_future<ItemList>(
--                    RemoteCommsException(string("McloudProvider::roots(): failed: ") + e.what()));
--        }
--    });
--}
--
--boost::future<tuple<ItemList,string>> McloudProvider::list(
--    string const& item_id, string const& page_token,
--    Context const& ctx)
--{
--    int page_token_index = 0;
--    if (!page_token.empty()) {
--        try {
--            page_token_index = stoi(page_token);
--        } catch (invalid_argument &e) {
--            return make_exceptional_future<tuple<ItemList,string>>(
--                    InvalidArgumentException(string("McloudProvider::list(): invalid page token: ") + e.what()));
--        }
--    }
--
--    return boost::async([this, item_id, page_token_index, ctx](){
--        try {
--            const int count_per_page = 50;
--            int start_index = 1 + page_token_index * count_per_page;
--            auto client = assign_client(ctx);
--            auto content_list = client->cloud_content_list(start_index, count_per_page,
--                                                           CloudContent::Type::All, item_id);
--
--            ItemList roots;
--            for (const auto & content: content_list) {
--                roots.push_back(content_to_item(content));
--            }
--
--            int offset = 0;
--            boost::promise<tuple<ItemList,string>> prom;
--            if (content_list.size() >= count_per_page) {
--                offset++;
--            }
--            prom.set_value(make_tuple(roots, std::to_string(page_token_index + offset)));
--
--            return prom.get_future();
--        } catch (InvalidIDException &e) {
--            return make_exceptional_future<tuple<ItemList,string>>(
--                    NotExistsException(string("McloudProvider::list(): failed: ") + e.what(), item_id));
--        } catch (runtime_error &e) {
--            return make_exceptional_future<tuple<ItemList,string>>(
--                    RemoteCommsException(string("McloudProvider::list(): failed: ") + e.what()));
--        }
--    });
--}
--
--boost::future<ItemList> McloudProvider::lookup(
--    string const& parent_id, string const& name,
--    Context const& ctx)
--{
--    return boost::async([this, parent_id, name, ctx](){
--        try {
--            const int count_per_page = 50;
--            int page_token_index = 0;
--            int start_index = 0;
--
--            ItemList roots;
--            do {
--                page_token_index++;
--                start_index = 1 + (page_token_index - 1) * count_per_page;
--                auto client = assign_client(ctx);
--                auto content_list = client->cloud_content_list(start_index, count_per_page,
--                                                               CloudContent::Type::All, parent_id);
--
--                for (const auto & content: content_list) {
--                    if (content->name().find(name) != string::npos) {
--                        roots.push_back(content_to_item(content));
--                    }
--                }
--
--                if (content_list.size() < count_per_page)
--                    break;
--            } while (true);
--
--            return make_ready_future<ItemList>(roots);
--        } catch (InvalidIDException &e) {
--            return make_exceptional_future<ItemList>(
--                    NotExistsException(string("McloudProvider::lookup(): folder not exists: ") + e.what(), parent_id));
--        } catch (runtime_error &e) {
--            return make_exceptional_future<ItemList>(
--                    RemoteCommsException(string("McloudProvider::lookup(): failed: ") + e.what()));
--        }
--    });
--}
--
--boost::future<Item> McloudProvider::metadata(string const& item_id,
--                                             Context const& ctx)
--{
--    return boost::async([this, item_id, ctx](){
--        try {
--            auto client = assign_client(ctx);
--            auto content = client->content_info(item_id);
--            return make_ready_future<Item>(content_to_item(content));
--        } catch (NonExistentException &e) {
--            return make_exceptional_future<Item>(
--                    NotExistsException(string("McloudProvider::metadata(): content not exists: ") + e.what(), item_id));
--        } catch (runtime_error &e) {
--            return make_exceptional_future<Item>(
--                    RemoteCommsException(string("McloudProvider::metadata(): failed: ") + e.what()));
--        }
--    });
--}
--
--boost::future<Item> McloudProvider::create_folder(
--        string const& parent_id, string const& name,
--        Context const& ctx)
--{
--    return boost::async([this, parent_id, name, ctx](){
--        try {
--            auto client = assign_client(ctx);
--            auto content = client->create_folder(name, parent_id);
--            return make_ready_future<Item>(content_to_item(content));
--        } catch (NonExistentException &e) {
--            return make_exceptional_future<Item>(
--                    NotExistsException(string("McloudProvider::create_folder(): name: ") + e.what(), name));
--        } catch (runtime_error &e) {
--            return make_exceptional_future<Item>(
--                    RemoteCommsException(string("McloudProvider::create_folder(): failed: ") + e.what()));
--        }
--    });
--}
--
--boost::future<unique_ptr<UploadJob>> McloudProvider::create_file(
--    string const& parent_id, string const& name,
--    int64_t size, string const& /*content_type*/, bool allow_overwrite,
--    Context const& ctx)
--{
--    auto client = assign_client(ctx, JobMode::Upload);
--    return make_ready_future(unique_ptr<UploadJob>(new McloudUploadJob(make_job_id(), parent_id, name,
--                                                                       size, allow_overwrite, client)));
--}
--
--boost::future<unique_ptr<UploadJob>> McloudProvider::update(
--    string const& item_id, int64_t size, string const& /*old_etag*/,
--    Context const& ctx)
--{
--    //mcloud doesn't have update API so do some workarounds.
--    //1.fetch metadata to get the content name and parent folder id;
--    //2.delete that file
--    //3.create a new file in the original folder with the same file name.
--    //side effect: the original item id is changed after updated.
--
--    return boost::async([this, item_id, size, ctx](){
--        try {
--            auto client = assign_client(ctx);
--            auto content = client->content_info(item_id);
--            auto file_name = content->name();
--            auto parent_id = content->parent_catalog_id();
--
--            delete_item(item_id, ctx);
--
--            return create_file(parent_id, file_name, size, "", true, ctx);
--        } catch (runtime_error &e) {
--            return make_exceptional_future<unique_ptr<UploadJob>>(
--                    RemoteCommsException(string("McloudProvider::update(): failed: ") + e.what()));
--        }
--    });
--}
--
--boost::future<unique_ptr<DownloadJob>> McloudProvider::download(
--    string const& item_id, Context const& ctx)
--{
--    auto client = assign_client(ctx, JobMode::Download);
--    return make_ready_future(unique_ptr<DownloadJob>(new McloudDownloadJob(make_job_id(), item_id, client)));
--}
--
--boost::future<void> McloudProvider::delete_item(
--    string const& item_id, Context const& ctx)
--{
--    return boost::async([this, item_id, ctx](){
--        try {
--            auto client = assign_client(ctx);
--            Client::Stringlist content_id_list{{item_id}};
--            client->delete_contents(content_id_list);
--            return make_ready_future();
--        } catch (ParameterInvalidException &e) {
--            return make_exceptional_future<void>(
--                    NotExistsException(string("McloudProvider::delete_item(): failed: ") + e.what(), item_id));
--        } catch (runtime_error &e) {
--            return make_exceptional_future<void>(
--                    RemoteCommsException(string("McloudProvider::delete_item(): failed: ") + e.what()));
--        }
--    });
--}
--
--boost::future<Item> McloudProvider::move(
--    string const& item_id, string const& new_parent_id,
--    string const& /*new_name*/, Context const& ctx)
--{
--    //Mcloud doens't support changing content name when moving content
--    return boost::async([this, item_id, new_parent_id, ctx](){
--        try {
--            auto client = assign_client(ctx);
--            Client::Stringlist folderlist;
--            Client::Stringlist contentlist{{item_id}};
--            client->move_items(folderlist, contentlist, new_parent_id);
--            auto content = client->content_info(item_id);
--            return make_ready_future<Item>(content_to_item(content));
--        } catch (NonExistentException &e) {
--            return make_exceptional_future<Item>(
--                    NotExistsException(string("McloudProvider::move(): content or folder not exist: ") + e.what(), ""));
--        } catch (runtime_error &e) {
--            return make_exceptional_future<Item>(
--                    RemoteCommsException(string("McloudProvider::move(): failed: ") + e.what()));
--        }
--    });
--}
--
--boost::future<Item> McloudProvider::copy(
--    string const& item_id, string const& new_parent_id,
--    string const& /*new_name*/, Context const& ctx)
--{
--    //Mcloud doens't support changing content name when copying content
--    return boost::async([this, item_id, new_parent_id, ctx](){
--        try {
--            Client::Stringlist content_list{{item_id}};
--            auto client = assign_client(ctx);
--            auto content_id = client->copy_contents(content_list, new_parent_id)[0];
--            auto content = client->content_info(content_id);
--            return make_ready_future<Item>(content_to_item(content));
--        } catch (NonExistentException &e) {
--            return make_exceptional_future<Item>(
--                    NotExistsException(string("McloudProvider::copy(): content or folder not exist: ") + e.what(), item_id));
--        } catch (runtime_error &e) {
--            return make_exceptional_future<Item>(
--                    RemoteCommsException(string("McloudProvider::copy(): failed: ") + e.what()));
--        }
--    });
--}
--
--Client::Ptr McloudProvider::assign_client(Context const& ctx, JobMode mode) {
--    auto access_token = boost::get<OAuth2Credentials>(ctx.credentials).access_token;
--    if (getenv("MCLOUD_LOCAL_SERVER_URL")) {
--        access_token = "valid_token";
--    }
--
--    std::cout <<"mcloud access_token:  " << access_token << std::endl;
--
--    int index = 0;
--    if (mode == JobMode::Unknown) {
--        static int c_index = 0; c_index++; c_index %= CLIENT_COUNT;
--        index = c_index;
--    } else {
--        int min_count = 0;
--        for (size_t i = 0; i < client_list_.size(); i++) {
--            auto client_ptr = client_list_[i];
--            auto pending_count = pending_jobs_count(client_ptr, mode);
--            if (i == 0 || pending_count < min_count) {
--                min_count = pending_count;
--                index = i;
--            }
--        }
--    }
--
--    auto client = client_list_[index];
--    client->set_access_token(access_token);
--    return client;
--}
--
--McloudUploadJob::McloudUploadJob(string const &upload_id,
--                                 string const& parent_id,
--                                 string const& file_name,
--                                 int64_t     size,
--                                 bool allow_overwrite,
--                                 Client::Ptr  client)
--    : UploadJob(upload_id)
--    , parent_id_(parent_id)
--    , file_name_(file_name)
--    , upload_size_(size)
--    , allow_overwrite_(allow_overwrite)
--    , task_(nullptr)
--    , client_(client)
--{
--    upload_future_ = upload_data();
--}
--
--boost::future<void> McloudUploadJob::cancel()
--{
--    printf("cancel_upload('%s')\n", upload_id().c_str());
--    stop_and_cancel();
--
--    return make_ready_future();
--}
--
--boost::future<Item> McloudUploadJob::finish()
--{
--    printf("finish_upload('%s')\n", upload_id().c_str());
--    return boost::async([this](){
--        try {
--            auto upload_ctx = upload_future_.get();
--            auto upload_ok = get<0>(upload_ctx);
--            auto error_str = get<1>(upload_ctx);
--            if (upload_ok){
--                auto content = client_->content_info(task_->content_id());
--                return make_ready_future<Item>(content_to_item(content));
--            }
--
--            return make_exceptional_future<Item>(
--                    RemoteCommsException(string("McloudUploadJob::finish(): failed: ") + error_str));
--        } catch (runtime_error &e) {
--            return make_exceptional_future<Item>(
--                    RemoteCommsException(string("McloudUploadJob::finish(): failed: ") + e.what()));
--        }
--    });
--}
--
--boost::future<tuple<bool, string>> McloudUploadJob::upload_data()
--{
--    auto prom = boost::make_shared<boost::promise<tuple<bool, string>>>();
--
--    return boost::async([this, prom](){
--        std::lock_guard<std::mutex> guard(mutex_);
--
--        int socket_fd = read_socket();
--        UploadBufferCb buffer_cb{[socket_fd](void *dest, size_t buf_size) -> size_t {
--            //data reading callback.
--            size_t read_size =  read(socket_fd, dest, buf_size);
--            //explicitly send EOF(-1) if read_size == 0 to notify net-cpp to throw an exception if
--            //sth wrong with data reading to avoid hangs here.
--            if (read_size == 0) {
--                return -1;
--            }
--            return read_size;
--        }, (size_t)upload_size_, parent_id_, file_name_};
--
--        try {
--            task_ = client_->syncmanager()->add_upload_task(buffer_cb);
--            task_->status_changed() = [this, prom](Task::Status status) {
--                std::cout << " status: " << status_to_string(status) << std::endl;
--                if (status == Task::Status::Complete){
--                    prom->set_value(make_tuple(true, string()));
--                } else if (status == Task::Status::Canceled ||
--                        status == Task::Status::Broken) {
--                    prom->set_value(make_tuple(false, task_->error_string()));
--                }
--            };
--            task_->progress_changed() = [this](float percent) {
--                cout<< "uploading: " << task_->content_name() << "  " << percent << endl;
--            };
--        } catch (runtime_error & e) {
--            prom->set_value(make_tuple(false, e.what()));
--        }
--
--        return prom->get_future();
--    });
--}
--
--void McloudUploadJob::stop_and_cancel()
--{
--    std::lock_guard<std::mutex> guard(mutex_);
--
--    if (task_ != nullptr &&
--            (task_->status() != Task::Status::Broken &&
--             task_->status() != Task::Status::Complete)) {
--        task_->cancel();
--    }
--}
--
--McloudDownloadJob::McloudDownloadJob(string const &download_id,
--                                     string const &item_id,
--                                     Client::Ptr  client)
--    : DownloadJob(download_id)
--    , item_id_(item_id)
--    , task_(nullptr)
--    , client_(client)
--{
--    download_future_ = download_data();
--}
--
--boost::future<void> McloudDownloadJob::cancel()
--{
--    stop_and_cancel();
--
--    printf("cancel_download('%s')\n", download_id().c_str());
--    return make_ready_future();
--}
--
--boost::future<void> McloudDownloadJob::finish()
--{
--    return boost::async([this]() {
--        auto download_ctx  = download_future_.get();
--        auto download_ok = get<0>(download_ctx);
--        auto error_str   = get<1>(download_ctx);
--        if (download_ok){
--            return make_ready_future();
--        }
--
--        return make_exceptional_future<void>(
--                RemoteCommsException(string("failed to download from mcloud: ") + error_str));
--    });
--}
--
--boost::future<tuple<bool, string>> McloudDownloadJob::download_data()
--{
--    auto prom = boost::make_shared<boost::promise<tuple<bool, string>>>();
--
--    return boost::async([this, prom](){
--        std::lock_guard<std::mutex> guard(mutex_);
--
--        int socket_fd = write_socket();
--        DownloadBufferCb buffer_cb{item_id_,
--            [socket_fd](void *dest, size_t buf_size) -> size_t {
--                //data writing callback.
--                return write(socket_fd, dest, buf_size);
--            }
--        };
--
--        try {
--            task_ = client_->syncmanager()->add_download_task(buffer_cb);
--            task_->status_changed() = [this, prom](Task::Status status) {
--                std::cout << " status: " << status_to_string(status) << std::endl;
--                if (status == Task::Status::Complete) {
--                    report_complete();
--                    prom->set_value(make_tuple(true, string()));
--                } else if (status == Task::Status::Canceled ||
--                        status == Task::Status::Broken) {
--                    prom->set_value(make_tuple(false, task_->error_string()));
--                }
--            };
--            task_->progress_changed() = [this](float percent) {
--                cout<< "downloading: " << task_->content_name() << "  " << percent << endl;
--            };
--        } catch (runtime_error & e) {
--            prom->set_value(make_tuple(false, e.what()));
--        }
--
--        return prom->get_future();
--    });
--}
--
--void McloudDownloadJob::stop_and_cancel()
--{
--    std::lock_guard<std::mutex> guard(mutex_);
--
--    if (task_ != nullptr &&
--            (task_->status() != Task::Status::Broken &&
--             task_->status() != Task::Status::Complete)) {
--       task_->cancel();
--    }
--}
--
 === removed file 'provider/McloudProvider.h'
 --- provider/McloudProvider.h	2016-09-16 03:38:16 +0000
 +++ provider/McloudProvider.h	1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
--/*
-- * Copyright (C) 2016 Canonical Ltd
-- *
-- * This program is free software: you can redistribute it and/or modify
-- * it under the terms of the GNU Lesser General Public License version 3 as
-- * published by the Free Software Foundation.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU Lesser General Public License for more details.
-- *
-- * You should have received a copy of the GNU Lesser General Public License
-- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-- *
-- * Authors: Gary Wang <gary.wang@canonical.com>
-- */
--
--#pragma once
--
--#include <unity/storage/provider/ProviderBase.h>
--#include <mcloud/api/client.h>
--
--using namespace std;
--using namespace mcloud::api;
--using unity::storage::provider::Context;
--using unity::storage::provider::DownloadJob;
--using unity::storage::provider::ProviderBase;
--using unity::storage::provider::Item;
--using unity::storage::provider::ItemList;
--using unity::storage::provider::UploadJob;
--
--
--class McloudProvider : public ProviderBase {
--public:
--
--    enum class JobMode {
--        Upload,
--        Download,
--        Unknown
--    };
--
--    McloudProvider();
--
--    boost::future<ItemList> roots(Context const& ctx) override;
--    boost::future<tuple<ItemList,string>> list(
--          string const& item_id, string const& page_token,
--          Context const& ctx) override;
--    boost::future<ItemList> lookup(
--          string const& parent_id, string const& name,
--          Context const& ctx) override;
--    boost::future<Item> metadata(
--          string const& item_id, Context const& ctx) override;
--    boost::future<Item> create_folder(
--          string const& parent_id, string const& name,
--          Context const& ctx) override;
--
--    boost::future<unique_ptr<UploadJob>> create_file(
--          string const& parent_id, string const& name,
--          int64_t size, string const& content_type, bool allow_overwrite,
--          Context const& ctx) override;
--    boost::future<unique_ptr<UploadJob>> update(
--          string const& item_id, int64_t size,  string const& old_etag,
--          Context const& ctx) override;
--
--    boost::future<unique_ptr<DownloadJob>> download(
--          string const& item_id, Context const& ctx) override;
--
--    boost::future<void> delete_item(
--          string const& item_id, Context const& ctx) override;
--    boost::future<Item> move(
--          string const& item_id, string const& new_parent_id,
--          string const& new_name, Context const& ctx) override;
--    boost::future<Item> copy(
--          string const& item_id, string const& new_parent_id,
--          string const& new_name, Context const& ctx) override;
--
--private:
--    Client::Ptr assign_client(Context const& ctx, JobMode job = JobMode::Unknown);
--private:
--    vector<Client::Ptr>    client_list_;
--};
 === modified file 'provider/main.cpp'
 --- provider/main.cpp	2016-09-13 06:55:27 +0000
 +++ provider/main.cpp	2016-10-26 10:36:06 +0000
@@ -1,20 +1,18 @@
--#include "McloudProvider.h"
++#include "mcloudprovider.h"
  #include <unity/storage/provider/Server.h>
  using namespace std;
  using namespace unity::storage::provider;
--int main(int argc, char **argv)
++int main(int argc, char** argv)
+ {
--	const string bus_name = "com.canonical.StorageFramework.Provider.McloudProvider";
--	string account_service_id = "com.canonical.scopes.mcloud_mcloud_mcloud";
--	if (argc > 1)
--	{
--		account_service_id = argv[1];
--	}
++    const string bus_name = "com.canonical.StorageFramework.Provider.McloudProvider";
++    string account_service_id = "com.canonical.scopes.mcloud_mcloud_mcloud";
++    if (argc > 1) {
++        account_service_id = argv[1];
++    }
--	Server<McloudProvider> server(bus_name, account_service_id);
--	server.init(argc, argv);
--	server.run();
++    Server<McloudProvider> server(bus_name, account_service_id);
++    server.init(argc, argv);
++    server.run();
+ }
--
 === added file 'provider/mcloudprovider.cpp'
 --- provider/mcloudprovider.cpp	1970-01-01 00:00:00 +0000
 +++ provider/mcloudprovider.cpp	2016-10-26 10:36:06 +0000
@@ -0,0 +1,648 @@
++/*
++ * Copyright (C) 2016 Canonical Ltd
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authors: Gary Wang <gary.wang@canonical.com>
++ */
++
++#include "mcloudprovider.h"
++#include <unity/storage/provider/ProviderBase.h>
++#include <unity/storage/provider/TempfileUploadJob.h>
++#include <unity/storage/provider/UploadJob.h>
++#include <unity/storage/provider/DownloadJob.h>
++#include <unity/storage/provider/metadata_keys.h>
++#include <unity/storage/provider/Exceptions.h>
++
++#include <boost/thread.hpp>
++#include <boost/thread/future.hpp>
++#include <boost/filesystem.hpp>
++#include <boost/make_shared.hpp>
++#include <boost/uuid/uuid_generators.hpp>
++#include <boost/uuid/uuid_io.hpp>
++
++#include <unistd.h>
++#include <sys/socket.h>
++#include <iostream>
++#include <memory>
++#include <mutex>
++#include <stdexcept>
++
++#include <mcloud/api/client.h>
++#include <mcloud/api/uploadtask.h>
++#include <mcloud/api/syncmanager.h>
++#include <mcloud/api/cloudresource.h>
++#include <mcloud/api/cloudcontent.h>
++#include <mcloud/api/cloudfolder.h>
++#include <mcloud/api/exceptions.h>
++
++using namespace std;
++using namespace unity::storage;
++using namespace unity::storage::provider;
++using namespace mcloud::api;
++using namespace boost::uuids;
++
++using boost::make_ready_future;
++using boost::make_exceptional_future;
++
++namespace {
++    static constexpr const int   TIME_OUT     = 10;
++    static constexpr const int   CLIENT_COUNT = 3;
++
++    static const char* FOLDER_TYPE[]  = {"normal", "pictures", "music", "videos", "message", "docs", "app", "sync"};
++    static const char* CONTENT_TYPE[] = {"all", "image", "audio", "video", "other", "doc", "spreadsheet", "ppt"};
++    static const char* STATUS[]       = {"unstart", "running", "canceled", "paused", "broken", "complete"};
++
++    string make_job_id() {
++        auto uuid = random_generator()();
++        return to_string(uuid);
++    }
++
++    string status_to_string(Task::Status status) {
++        return STATUS[int(status)];
++    }
++
++    string folder_type_to_string(CloudFolder::Type type) {
++        return FOLDER_TYPE[int(type)];
++    }
++
++    string content_type_to_string(CloudContent::Type type) {
++        return CONTENT_TYPE[int(type)];
++    }
++
++    string time_to_iso(time_t t) {
++        char buf[sizeof "2016-08-11T15:10:07+0000"];
++        strftime(buf, sizeof buf, "%FT%T%z", gmtime(&t));
++        return buf;
++    }
++
++    int pending_jobs_count(Client::Ptr client, McloudProvider::JobMode mode) {
++        int count = 0;
++        auto syncmanager = client->syncmanager();
++        if (mode == McloudProvider::JobMode::Download) {
++            auto download_task_queue = syncmanager->download_queue();
++            for (auto& item_ptr : download_task_queue) {
++                if (item_ptr->status() == Task::Status::Running
++                        || item_ptr->status() == Task::Status::Paused
++                        || item_ptr->status() == Task::Status::Unstart) {
++                    count++;
++                }
++            }
++        } else if (mode == McloudProvider::JobMode::Upload) {
++            auto upload_task_queue = syncmanager->upload_queue();
++            for (auto& item_ptr : upload_task_queue) {
++                if (item_ptr->status() == Task::Status::Running
++                        || item_ptr->status() == Task::Status::Paused
++                        || item_ptr->status() == Task::Status::Unstart) {
++                    count++;
++                }
++            }
++        }
++
++        return count;
++    }
++
++    Item content_to_item(CloudResource::Ptr resource) {
++        Item item;
++        item.item_id = resource->id();
++        item.parent_ids = {resource->parent_catalog_id()};
++        item.name = resource->name();
++        item.etag = resource->etag();
++        item.metadata["owner"] = resource->owner();
++        item.metadata[provider::CREATION_TIME] = time_to_iso(resource->created_date());
++        item.metadata[provider::LAST_MODIFIED_TIME] = time_to_iso(resource->updated_date());
++        if (resource->property() == CloudResource::Property::Folder) {
++            item.type = ItemType::folder;
++            auto folder = std::static_pointer_cast<mcloud::api::CloudFolder>(resource);
++            item.metadata["folder_type"] = folder_type_to_string(folder->folder_type());
++            item.metadata["folder_path"] = folder->folder_path();
++        } else if (resource->property() == CloudResource::Property::Content) {
++            item.type = ItemType::file;
++            auto file = std::static_pointer_cast<mcloud::api::CloudContent>(resource);
++            item.metadata["suffix"] = file->suffix();
++            item.metadata["content_type"] = content_type_to_string(file->type());
++
++            item.metadata[provider::SIZE_IN_BYTES] = file->content_size();
++            item.metadata["description"] = file->description();
++            item.metadata["thumbnail_url"] = file->thumbnail_url();
++            item.metadata["big_thumbnail_url"] = file->big_thumbnail_url();
++            item.metadata["present_url"] = file->big_thumbnail_url();
++        }
++
++        return item;
++    }
++}
++
++class McloudUploadJob : public UploadJob {
++  public:
++    McloudUploadJob(string const& upload_id,
++                    string const& parent_id,
++                    string const& file_name,
++                    int64_t       size,
++                    bool allow_overwrite,
++                    Client::Ptr   client);
++
++    boost::future<void> cancel() override;
++    boost::future<Item> finish() override;
++  private:
++    boost::future<tuple<bool, string>> upload_data();
++    void   stop_and_cancel();
++  private:
++    ssize_t     feed_size;
++    string  parent_id_;
++    string  file_name_;
++    int64_t  upload_size_;
++    bool    allow_overwrite_;
++
++    std::mutex      mutex_;
++    UploadTask::Ptr task_;
++    Client::Ptr     client_;
++    boost::future<tuple<bool, string>> upload_future_;
++};
++
++class McloudDownloadJob : public DownloadJob {
++  public:
++    McloudDownloadJob(string const& download_id,
++                      string const& item_id,
++                      Client::Ptr   client);
++
++    boost::future<void> cancel() override;
++    boost::future<void> finish() override;
++  private:
++    boost::future<tuple<bool, string>> download_data();
++    void send_data();
++    void stop_and_cancel();
++  private:
++    string  item_id_;
++
++    std::mutex          mutex_;
++    DownloadTask::Ptr   task_;
++    Client::Ptr         client_;
++    boost::future<tuple<bool, string>>  download_future_;
++};
++
++McloudProvider::McloudProvider()
++    : client_list_(CLIENT_COUNT, std::make_shared<Client>(TIME_OUT)) {
++}
++
++boost::future<ItemList> McloudProvider::roots(Context const& ctx) {
++    return boost::async([this, ctx]() {
++        try {
++            auto client = assign_client(ctx);
++            auto root_folder_id = client->cloud_root_folder_id();
++
++            ItemList roots = {
++                {root_folder_id, {}, "root", "", ItemType::root, {}}
++            };
++
++            return make_ready_future<ItemList>(roots);
++        } catch (runtime_error& e) {
++            return make_exceptional_future<ItemList>(
++                       RemoteCommsException(string("McloudProvider::roots() failed: ") + e.what()));
++        }
++    });
++}
++
++boost::future<tuple<ItemList, string>> McloudProvider::list(string const& item_id,
++                                                            string const& page_token,
++                                                            Context const& ctx) {
++    int page_token_index = 0;
++    if (!page_token.empty()) {
++        try {
++            page_token_index = stoi(page_token);
++        } catch (invalid_argument& e) {
++            return make_exceptional_future<tuple<ItemList, string>>(
++                       InvalidArgumentException(string("McloudProvider::list() invalid page token: ") + e.what()));
++        }
++    }
++
++    return boost::async([this, item_id, page_token_index, ctx]() {
++        try {
++            const int count_per_page = 50;
++            int start_index = 1 + page_token_index * count_per_page;
++            auto client = assign_client(ctx);
++            auto content_list = client->cloud_content_list(start_index, count_per_page,
++                                CloudContent::Type::All, item_id);
++
++            ItemList items;
++            for (const auto& content : content_list) {
++                items.push_back(content_to_item(content));
++            }
++
++            int offset = 0;
++            boost::promise<tuple<ItemList, string>> prom;
++            if (content_list.size() >= count_per_page) {
++                offset++;
++            }
++            prom.set_value(make_tuple(items, std::to_string(page_token_index + offset)));
++
++            return prom.get_future();
++        } catch (InvalidIDException& e) {
++            return make_exceptional_future<tuple<ItemList, string>>(
++                       NotExistsException(string("McloudProvider::list() failed: ") + e.what(), item_id));
++        } catch (runtime_error& e) {
++            return make_exceptional_future<tuple<ItemList, string>>(
++                       RemoteCommsException(string("McloudProvider::list() failed: ") + e.what()));
++        }
++    });
++}
++
++boost::future<ItemList> McloudProvider::lookup(string const& parent_id,
++                                               string const& name,
++                                               Context const& ctx) {
++    return boost::async([this, parent_id, name, ctx]() {
++        try {
++            const int count_per_page = 50;
++            int page_token_index = 0;
++            int start_index = 0;
++
++            ItemList items;
++            do {
++                page_token_index++;
++                start_index = 1 + (page_token_index - 1) * count_per_page;
++                auto client = assign_client(ctx);
++                auto content_list = client->cloud_content_list(start_index, count_per_page,
++                                    CloudContent::Type::All, parent_id);
++
++                for (const auto& content : content_list) {
++                    if (content->name().find(name) != string::npos) {
++                        items.push_back(content_to_item(content));
++                    }
++                }
++
++                if (content_list.size() < count_per_page) {
++                    break;
++                }
++            } while (true);
++
++            return make_ready_future<ItemList>(items);
++        } catch (InvalidIDException& e) {
++            return make_exceptional_future<ItemList>(
++                       NotExistsException(string("McloudProvider::lookup() folder not exists: ") + e.what(), parent_id));
++        } catch (runtime_error& e) {
++            return make_exceptional_future<ItemList>(
++                       RemoteCommsException(string("McloudProvider::lookup() failed: ") + e.what()));
++        }
++    });
++}
++
++boost::future<Item> McloudProvider::metadata(string const& item_id,
++                                             Context const& ctx) {
++    return boost::async([this, item_id, ctx]() {
++        try {
++            auto client = assign_client(ctx);
++            auto content = client->content_info(item_id);
++            return make_ready_future<Item>(content_to_item(content));
++        } catch (NonExistentException& e) {
++            return make_exceptional_future<Item>(
++                       NotExistsException(string("McloudProvider::metadata() content not exists: ") + e.what(), item_id));
++        } catch (runtime_error& e) {
++            return make_exceptional_future<Item>(
++                       RemoteCommsException(string("McloudProvider::metadata() failed: ") + e.what()));
++        }
++    });
++}
++
++boost::future<Item> McloudProvider::create_folder(string const& parent_id,
++                                                  string const& name,
++                                                  Context const& ctx) {
++    return boost::async([this, parent_id, name, ctx]() {
++        try {
++            auto client = assign_client(ctx);
++            auto content = client->create_folder(name, parent_id);
++            return make_ready_future<Item>(content_to_item(content));
++        } catch (NonExistentException& e) {
++            return make_exceptional_future<Item>(
++                       NotExistsException(string("McloudProvider::create_folder() failed: ") + e.what(), name));
++        } catch (runtime_error& e) {
++            return make_exceptional_future<Item>(
++                       RemoteCommsException(string("McloudProvider::create_folder() failed: ") + e.what()));
++        }
++    });
++}
++
++boost::future<unique_ptr<UploadJob>> McloudProvider::create_file(string const& parent_id,
++                                                                 string const& name,
++                                                                 int64_t size,
++                                                                 string const& /*content_type*/,
++                                                                 bool allow_overwrite,
++                                                                 Context const& ctx) {
++    auto client = assign_client(ctx, JobMode::Upload);
++    return make_ready_future(unique_ptr<UploadJob>(new McloudUploadJob(make_job_id(), parent_id, name,
++                             size, allow_overwrite, client)));
++}
++
++boost::future<unique_ptr<UploadJob>> McloudProvider::update(string const& item_id,
++                                                            int64_t size,
++                                                            string const& /*old_etag*/,
++                                                            Context const& ctx) {
++    //mcloud doesn't have update API so do some workarounds.
++    //1.fetch metadata to get the content name and parent folder id;
++    //2.delete that file
++    //3.create a new file in the original folder with the same file name.
++    //side effect: the original item id is changed after updated.
++
++    return boost::async([this, item_id, size, ctx]() {
++        try {
++            auto client = assign_client(ctx);
++            auto content = client->content_info(item_id);
++            auto file_name = content->name();
++            auto parent_id = content->parent_catalog_id();
++
++            delete_item(item_id, ctx);
++
++            return create_file(parent_id, file_name, size, "", true, ctx);
++        } catch (runtime_error& e) {
++            return make_exceptional_future<unique_ptr<UploadJob>>(
++                       RemoteCommsException(string("McloudProvider::update() failed: ") + e.what()));
++        }
++    });
++}
++
++boost::future<unique_ptr<DownloadJob>> McloudProvider::download(string const& item_id,
++                                                                Context const& ctx) {
++    auto client = assign_client(ctx, JobMode::Download);
++    return make_ready_future(unique_ptr<DownloadJob>(new McloudDownloadJob(make_job_id(), item_id,
++                             client)));
++}
++
++boost::future<void> McloudProvider::delete_item(string const& item_id,
++                                                Context const& ctx) {
++    return boost::async([this, item_id, ctx]() {
++        try {
++            auto client = assign_client(ctx);
++            Client::Stringlist content_id_list{{item_id}};
++            client->delete_contents(content_id_list);
++            return make_ready_future();
++        } catch (ParameterInvalidException& e) {
++            return make_exceptional_future<void>(
++                       NotExistsException(string("McloudProvider::delete_item() failed: ") + e.what(), item_id));
++        } catch (runtime_error& e) {
++            return make_exceptional_future<void>(
++                       RemoteCommsException(string("McloudProvider::delete_item() failed: ") + e.what()));
++        }
++    });
++}
++
++boost::future<Item> McloudProvider::move(string const& item_id,
++                                         string const& new_parent_id,
++                                         string const& /*new_name*/,
++                                         Context const& ctx) {
++    //Mcloud doens't support changing content name when moving content
++    return boost::async([this, item_id, new_parent_id, ctx]() {
++        try {
++            auto client = assign_client(ctx);
++            Client::Stringlist folderlist;
++            Client::Stringlist contentlist{{item_id}};
++            client->move_items(folderlist, contentlist, new_parent_id);
++            auto content = client->content_info(item_id);
++            return make_ready_future<Item>(content_to_item(content));
++        } catch (NonExistentException& e) {
++            return make_exceptional_future<Item>(
++                       NotExistsException(string("McloudProvider::move() content or folder not exist: ") + e.what(), ""));
++        } catch (runtime_error& e) {
++            return make_exceptional_future<Item>(
++                       RemoteCommsException(string("McloudProvider::move() failed: ") + e.what()));
++        }
++    });
++}
++
++boost::future<Item> McloudProvider::copy(string const& item_id,
++                                         string const& new_parent_id,
++                                         string const& /*new_name*/,
++                                         Context const& ctx) {
++    //Mcloud doens't support changing content name when copying content
++    return boost::async([this, item_id, new_parent_id, ctx]() {
++        try {
++            Client::Stringlist content_list{{item_id}};
++            auto client = assign_client(ctx);
++            auto content_id = client->copy_contents(content_list, new_parent_id)[0];
++            auto content = client->content_info(content_id);
++            return make_ready_future<Item>(content_to_item(content));
++        } catch (NonExistentException& e) {
++            return make_exceptional_future<Item>(
++                       NotExistsException(string("McloudProvider::copy() content or folder not exist: ") + e.what(),
++                                          item_id));
++        } catch (runtime_error& e) {
++            return make_exceptional_future<Item>(
++                       RemoteCommsException(string("McloudProvider::copy() failed: ") + e.what()));
++        }
++    });
++}
++
++Client::Ptr McloudProvider::assign_client(Context const& ctx, JobMode mode) {
++    auto access_token = boost::get<OAuth2Credentials>(ctx.credentials).access_token;
++    if (getenv("MCLOUD_LOCAL_SERVER_URL")) {
++        access_token = "valid_token";
++    }
++
++    std::cout << "mcloud access_token:  " << access_token << std::endl;
++
++    int index = 0;
++    if (mode == JobMode::Unknown) {
++        static int c_index = 0; c_index++; c_index %= CLIENT_COUNT;
++        index = c_index;
++    } else {
++        int min_count = 0;
++        for (size_t i = 0; i < client_list_.size(); i++) {
++            auto client_ptr = client_list_[i];
++            auto pending_count = pending_jobs_count(client_ptr, mode);
++            if (i == 0 || pending_count < min_count) {
++                min_count = pending_count;
++                index = i;
++            }
++        }
++    }
++
++    auto client = client_list_[index];
++    client->set_access_token(access_token);
++    return client;
++}
++
++McloudUploadJob::McloudUploadJob(string const& upload_id,
++                                 string const& parent_id,
++                                 string const& file_name,
++                                 int64_t     size,
++                                 bool allow_overwrite,
++                                 Client::Ptr  client)
++    : UploadJob(upload_id)
++    , parent_id_(parent_id)
++    , file_name_(file_name)
++    , upload_size_(size)
++    , allow_overwrite_(allow_overwrite)
++    , task_(nullptr)
++    , client_(client)
++    , upload_future_(upload_data()) {
++}
++
++boost::future<void> McloudUploadJob::cancel() {
++    printf("cancel_upload('%s')\n", upload_id().c_str());
++    stop_and_cancel();
++
++    return make_ready_future();
++}
++
++boost::future<Item> McloudUploadJob::finish() {
++    printf("finish_upload('%s')\n", upload_id().c_str());
++    return boost::async([this]() {
++        try {
++            auto upload_ctx = upload_future_.get();
++
++            static constexpr const size_t succ_index = 0;
++            static constexpr const size_t err_index  = 1;
++            auto upload_ok = get<succ_index>(upload_ctx);
++            auto error_str = get<err_index>(upload_ctx);
++            if (upload_ok) {
++                auto content = client_->content_info(task_->content_id());
++                return make_ready_future<Item>(content_to_item(content));
++            }
++
++            return make_exceptional_future<Item>(
++                       RemoteCommsException(string("McloudUploadJob::finish() failed: ") + error_str));
++        } catch (runtime_error& e) {
++            return make_exceptional_future<Item>(
++                       RemoteCommsException(string("McloudUploadJob::finish() failed: ") + e.what()));
++        }
++    });
++}
++
++boost::future<tuple<bool, string>> McloudUploadJob::upload_data() {
++    auto prom = boost::make_shared<boost::promise<tuple<bool, string>>>();
++
++    return boost::async([this, prom]() {
++        std::lock_guard<std::mutex> guard(mutex_);
++
++        int socket_fd = read_socket();
++        UploadBufferCb buffer_cb{[socket_fd](void* dest, size_t buf_size) -> size_t {
++                //data reading callback.
++                size_t read_size =  read(socket_fd, dest, buf_size);
++                //explicitly send EOF(-1) if read_size == 0 to notify net-cpp to throw an exception if
++                //sth wrong with data reading to avoid hangs here.
++                if (read_size == 0) {
++                    return -1;
++                }
++                return read_size;
++            }, (size_t)upload_size_, parent_id_, file_name_};
++
++        try {
++            task_ = client_->syncmanager()->add_upload_task(buffer_cb);
++            task_->status_changed() = [this, prom](Task::Status status) {
++                std::cout << " status: " << status_to_string(status) << std::endl;
++                if (status == Task::Status::Complete) {
++                    prom->set_value(make_tuple(true, string()));
++                } else if (status == Task::Status::Canceled ||
++                           status == Task::Status::Broken) {
++                    prom->set_value(make_tuple(false, task_->error_string()));
++                }
++            };
++            task_->progress_changed() = [this](float percent) {
++                cout << "uploading: " << task_->content_name() << "  " << percent << endl;
++            };
++        } catch (runtime_error& e) {
++            prom->set_value(make_tuple(false, e.what()));
++        }
++
++        return prom->get_future();
++    });
++}
++
++void McloudUploadJob::stop_and_cancel() {
++    std::lock_guard<std::mutex> guard(mutex_);
++
++    if (task_ != nullptr &&
++            (task_->status() != Task::Status::Broken &&
++             task_->status() != Task::Status::Complete)) {
++        task_->cancel();
++    }
++}
++
++McloudDownloadJob::McloudDownloadJob(string const& download_id,
++                                     string const& item_id,
++                                     Client::Ptr  client)
++    : DownloadJob(download_id)
++    , item_id_(item_id)
++    , task_(nullptr)
++    , client_(client)
++    , download_future_(download_data()) {
++}
++
++boost::future<void> McloudDownloadJob::cancel() {
++    stop_and_cancel();
++
++    printf("cancel_download('%s')\n", download_id().c_str());
++    return make_ready_future();
++}
++
++boost::future<void> McloudDownloadJob::finish() {
++    return boost::async([this]() {
++        auto download_ctx  = download_future_.get();
++
++        static constexpr const size_t succ_index = 0;
++        static constexpr const size_t err_index  = 1;
++        auto download_ok = get<succ_index>(download_ctx);
++        auto error_str   = get<err_index>(download_ctx);
++        if (download_ok) {
++            return make_ready_future();
++        }
++
++        return make_exceptional_future<void>(
++                   RemoteCommsException(string("failed to download from mcloud: ") + error_str));
++    });
++}
++
++boost::future<tuple<bool, string>> McloudDownloadJob::download_data() {
++    auto prom = boost::make_shared<boost::promise<tuple<bool, string>>>();
++
++    return boost::async([this, prom]() {
++        std::lock_guard<std::mutex> guard(mutex_);
++
++        int socket_fd = write_socket();
++        DownloadBufferCb buffer_cb{item_id_,
++        [socket_fd](void* dest, size_t buf_size) -> size_t {
++            //data writing callback.
++            return write(socket_fd, dest, buf_size);
++        }
++                                  };
++
++        try {
++            task_ = client_->syncmanager()->add_download_task(buffer_cb);
++            task_->status_changed() = [this, prom](Task::Status status) {
++                std::cout << " status: " << status_to_string(status) << std::endl;
++                if (status == Task::Status::Complete) {
++                    report_complete();
++                    prom->set_value(make_tuple(true, string()));
++                } else if (status == Task::Status::Canceled ||
++                           status == Task::Status::Broken) {
++                    prom->set_value(make_tuple(false, task_->error_string()));
++                }
++            };
++            task_->progress_changed() = [this](float percent) {
++                cout << "downloading: " << task_->content_name() << "  " << percent << endl;
++            };
++        } catch (runtime_error& e) {
++            prom->set_value(make_tuple(false, e.what()));
++        }
++
++        return prom->get_future();
++    });
++}
++
++void McloudDownloadJob::stop_and_cancel() {
++    std::lock_guard<std::mutex> guard(mutex_);
++
++    if (task_ != nullptr &&
++            (task_->status() != Task::Status::Broken &&
++             task_->status() != Task::Status::Complete)) {
++        task_->cancel();
++    }
++}
 === added file 'provider/mcloudprovider.h'
 --- provider/mcloudprovider.h	1970-01-01 00:00:00 +0000
 +++ provider/mcloudprovider.h	2016-10-26 10:36:06 +0000
@@ -0,0 +1,82 @@
++/*
++ * Copyright (C) 2016 Canonical Ltd
++ *
++ * This program is free software: you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 3 as
++ * published by the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU Lesser General Public License for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
++ *
++ * Authors: Gary Wang <gary.wang@canonical.com>
++ */
++
++#pragma once
++
++#include <unity/storage/provider/ProviderBase.h>
++#include <mcloud/api/client.h>
++
++using namespace std;
++using namespace mcloud::api;
++
++using unity::storage::provider::Context;
++using unity::storage::provider::DownloadJob;
++using unity::storage::provider::ProviderBase;
++using unity::storage::provider::Item;
++using unity::storage::provider::ItemList;
++using unity::storage::provider::UploadJob;
++
++
++class McloudProvider : public ProviderBase {
++  public:
++
++    enum class JobMode {
++        Upload,
++        Download,
++        Unknown
++    };
++
++    McloudProvider();
++
++    boost::future<ItemList> roots(Context const& ctx) override;
++    boost::future<tuple<ItemList, string>> list(
++        string const& item_id, string const& page_token,
++        Context const& ctx) override;
++    boost::future<ItemList> lookup(
++        string const& parent_id, string const& name,
++        Context const& ctx) override;
++    boost::future<Item> metadata(
++        string const& item_id, Context const& ctx) override;
++    boost::future<Item> create_folder(
++        string const& parent_id, string const& name,
++        Context const& ctx) override;
++
++    boost::future<unique_ptr<UploadJob>> create_file(
++        string const& parent_id, string const& name,
++        int64_t size, string const& content_type,
++        bool allow_overwrite, Context const& ctx) override;
++    boost::future<unique_ptr<UploadJob>> update(
++        string const& item_id, int64_t size,
++        string const& old_etag,Context const& ctx) override;
++
++    boost::future<unique_ptr<DownloadJob>> download(
++        string const& item_id, Context const& ctx) override;
++    boost::future<void> delete_item(
++        string const& item_id, Context const& ctx) override;
++    boost::future<Item> move(
++        string const& item_id, string const& new_parent_id,
++        string const& new_name, Context const& ctx) override;
++    boost::future<Item> copy(
++        string const& item_id, string const& new_parent_id,
++        string const& new_name, Context const& ctx) override;
++
++  private:
++    Client::Ptr assign_client(Context const& ctx, JobMode job = JobMode::Unknown);
++  private:
++    vector<Client::Ptr>    client_list_;
++};
 === modified file 'src/mcloud/api/client.cpp'
 --- src/mcloud/api/client.cpp	2016-09-26 01:43:23 +0000
 +++ src/mcloud/api/client.cpp	2016-10-26 10:36:06 +0000
@@ -18,103 +18,95 @@
  #include <mcloud/api/client.h>
--#include <core/net/error.h>
--#include <core/net/uri.h>
--#include <core/net/http/client.h>
--#include <core/net/http/request.h>
--#include <core/net/http/response.h>
--
--#include <boost/filesystem.hpp>
--#include <boost/algorithm/string.hpp>
--
  #include "client_priv.h"
  using namespace mcloud::api;
  using namespace std;
  Client::Client(int request_timeout)
--    : p_(std::make_shared<ClientPriv>(request_timeout)) {
++    : p_(new ClientPriv(request_timeout)) {
+ }
  Client::~Client() {
      p_->sync_manager()->cancel();
+ }
--void Client::set_access_token(const string &access_token) {
++void Client::set_access_token(const string& access_token) {
      p_->set_access_token(access_token);
+ }
++bool Client::refresh_token(const string& refresh_token) {
++    return p_->refersh_token(refresh_token);
++}
++
  string Client::cloud_root_folder_id() {
      return p_->cloud_sync_folder_id();
+ }
--bool Client::exist_on_cloud(const string &file_path, const string &folder_id) {
--    return p_->exist_on_cloud(file_path, folder_id);
--}
--
--DiskInfo Client::disk_info() {
++DiskInfo::Ptr Client::disk_info() {
      return p_->disk_info();
+ }
  Client::ResourceList Client::cloud_content_list(int start_index,
                                                  int count,
                                                  CloudContent::Type type,
--                                                const std::string & folder_id) {
++                                                const string& folder_id) {
      return p_->cloud_content_list(start_index, count, type, folder_id);
+ }
--CloudContent::Ptr Client::content_info(const string &content_id) {
++CloudContent::Ptr Client::content_info(const string& content_id) {
      return p_->content_info(content_id);
+ }
--CloudFolder::Ptr Client::create_folder(const string &folder_name,
--                                       const string &folder_id) {
++CloudFolder::Ptr Client::create_folder(const string& folder_name,
++                                       const string& folder_id) {
      return p_->create_folder(folder_name, folder_id);
+ }
--Client::ResourceList Client::look_up(const string &name,
--                                     const string &folder_id,
++Client::ResourceList Client::look_up(const string& name,
++                                     const string& folder_id,
                                       CloudResource::Property property) {
      return p_->look_up(name, folder_id, property);
+ }
--bool Client::move_items(const Client::Stringlist &folder_ids,
--                        const Client::Stringlist &content_ids,
--                        const std::string &folder_id) {
++Client::OutlinkList Client::create_folder_sharing_url(const Stringlist& folder_ids) {
++    return p_->create_folder_sharing_url(folder_ids);
++}
++
++Client::OutlinkList Client::create_content_sharing_url(const Stringlist& content_ids) {
++    return p_->create_content_sharing_url(content_ids);
++}
++
++Client::Stringlist Client::copy_folders(const Stringlist& folder_ids,
++                                        const string& folder_id) {
++    return p_->copy_folders(folder_ids, folder_id);
++}
++
++Client::Stringlist Client::copy_contents(const Stringlist& contents_ids,
++                                         const string& folder_id) {
++    return p_->copy_contents(contents_ids, folder_id);
++}
++
++bool Client::move_items(const Stringlist& folder_ids,
++                        const Stringlist& content_ids,
++                        const string& folder_id) {
      return p_->move_items(folder_ids, content_ids, folder_id);
+ }
--bool Client::update_folder(const std::string &folder_id,
--                           const std::string &new_folder_name) {
++bool Client::update_folder(const string& folder_id,
++                           const string& new_folder_name) {
      return p_->update_folder(folder_id, new_folder_name);
+ }
++bool Client::delete_contents(const vector<string>& content_ids) {
++    return p_->delete_contents(content_ids);
++}
++
++bool Client::exist_on_cloud(const string& file_path,
++                            const string& folder_id) {
++    return p_->exist_on_cloud(file_path, folder_id);
++}
++
  SyncManager::Ptr Client::syncmanager() const {
      return p_->sync_manager();
+ }
--
--bool Client::delete_contents(const vector<string> &content_ids) {
--    return p_->delete_contents(content_ids);
--}
--
--Client::OutlinkList Client::create_folder_extranet_link(const Stringlist &folder_ids) {
--    return p_->create_folder_extranet_link(folder_ids);
--}
--
--Client::OutlinkList Client::create_content_extranet_link(const Stringlist &content_ids) {
--    return p_->create_content_extranet_link(content_ids);
--}
--
--Client::Stringlist Client::copy_folders(const Client::Stringlist &folder_ids,
--                                        const std::string &folder_id) {
--    return p_->copy_folders(folder_ids, folder_id);
--}
--
--Client::Stringlist Client::copy_contents(const Client::Stringlist &contents_ids,
--                                         const string &folder_id) {
--    return p_->copy_contents(contents_ids, folder_id);
--}
--
--bool Client::refresh_token(const string &refresh_token) {
--    return p_->refersh_token(refresh_token);
--}
 === modified file 'src/mcloud/api/client_priv.cpp'
 --- src/mcloud/api/client_priv.cpp	2016-09-26 01:43:23 +0000
 +++ src/mcloud/api/client_priv.cpp	2016-10-26 10:36:06 +0000
@@ -27,7 +27,6 @@
  #include <mcloud/api/uploadtask.h>
  #include <mcloud/api/cloudresource.h>
  #include <mcloud/api/outlink.h>
--#include <mcloud/api/syncmanager.h>
  #include <mcloud/api/exceptions.h>
  #include <core/net/error.h>
@@ -56,422 +55,424 @@
  namespace alg = boost::algorithm;
  using namespace mcloud::api;
++using namespace boost::archive::iterators;
  using namespace std;
  namespace {
--
--void log(const std::string &info) {
++    void log(const string& info) {
  #ifndef NDEBUG
--    cout << info << endl;
++        cout << info << endl;
  #else
--    (void)(info);
++        (void)(info);
  #endif
--}
--
--static constexpr const char * content_type = "text/xml;UTF-8";
--static constexpr const char * register_app_name = "和彩云ubuntu";
--static constexpr const char * thirdparty_anonymous_account = "thirdparty_anonymous_account";
--
--std::string encode64(const string& val) {
--    using namespace boost::archive::iterators;
--    typedef base64_from_binary<transform_width<std::string::const_iterator, 6, 8>> iter;
--    auto tmp = std::string(iter(std::begin(val)), iter(std::end(val)));
--    return tmp.append((3 - val.size() % 3) % 3, '=');
--}
--
--static std::string md5sum(std::string filepath) {
--    std::ifstream  ifs(filepath, std::ios::binary);
--
--    if (!ifs.good()) {
--        std::cerr << "file is invalid: " << filepath << std::endl;
--        return std::string();
--    }
--
--    unsigned char hash[MD5_DIGEST_LENGTH];
--    MD5_CTX mdContext;
--    char data[1024];
--
--    MD5_Init(&mdContext);
--    while(ifs.good()) {
--        ifs.read(data, sizeof(data));
--        MD5_Update (&mdContext, data, ifs.gcount());
--    }
--    MD5_Final (hash,&mdContext);
--
--    std::stringstream stream;
--    for(int i = 0; i < MD5_DIGEST_LENGTH; i++) {
--        stream << std::hex << std::setw(2) << std::setfill('0') << (int)hash[i];
--    }
--
--    return stream.str();
--}
--
--static void append_child(tinyxml2::XMLPrinter &printer,
--                         const std::string & field,
--                         const std::string & value) {
--    printer.OpenElement(field.c_str());
--    printer.PushText(value.c_str());
--    printer.CloseElement();
--}
--
--static string generate_diskinfo_body() {
--    tinyxml2::XMLPrinter printer;
--    printer.OpenElement("getDiskInfo");
--    append_child(printer, "MSISDN", thirdparty_anonymous_account);
--    printer.CloseElement();
--
--    return string(printer.CStr());
--}
--
--static string generate_content_list_body(int start_index = -1,
++    }
++
++    static constexpr const char* content_type = "text/xml;UTF-8";
++    static constexpr const char* register_app_name = "和彩云ubuntu";
++    static constexpr const char* thirdparty_anonymous_account = "thirdparty_anonymous_account";
++
++    string encode64(const string& val) {
++        typedef base64_from_binary<transform_width<string::const_iterator, 6, 8>> iter;
++        auto tmp = string(iter(std::begin(val)), iter(std::end(val)));
++        return tmp.append((3 - val.size() % 3) % 3, '=');
++    }
++
++    static string md5sum(string filepath) {
++        std::ifstream  ifs(filepath, std::ios::binary);
++
++        if (!ifs.good()) {
++            std::cerr << "file is invalid: " << filepath << std::endl;
++            return string();
++        }
++
++        unsigned char hash[MD5_DIGEST_LENGTH];
++        MD5_CTX mdContext;
++        char data[1024];
++
++        MD5_Init(&mdContext);
++        while (ifs.good()) {
++            ifs.read(data, sizeof(data));
++            MD5_Update(&mdContext, data, ifs.gcount());
++        }
++        MD5_Final(hash, &mdContext);
++
++        stringstream stream;
++        for (int i = 0; i < MD5_DIGEST_LENGTH; i++) {
++            stream << std::hex << std::setw(2) << std::setfill('0') << (int)hash[i];
++        }
++
++        return stream.str();
++    }
++
++    static void append_child(tinyxml2::XMLPrinter& printer,
++                             const string& field,
++                             const string& value) {
++        printer.OpenElement(field.c_str());
++        printer.PushText(value.c_str());
++        printer.CloseElement();
++    }
++
++    static string generate_diskinfo_body() {
++        tinyxml2::XMLPrinter printer;
++        printer.OpenElement("getDiskInfo");
++        append_child(printer, "MSISDN", thirdparty_anonymous_account);
++        printer.CloseElement();
++
++        return string(printer.CStr());
++    }
++
++    static string generate_contents_body(int start_index = -1,
                                           int count = 200,
                                           CloudContent::Type content_type = CloudContent::Type::All,
--                                         const std::string & shared_folder_id = std::string()) {
--    tinyxml2::XMLPrinter printer;
--    printer.OpenElement("getDisk");
--
--    //index on mcloud starts from 1, not 0
--    if (start_index == 0)
--        start_index = 1;
--
--    append_child(printer, "MSISDN", thirdparty_anonymous_account);
--    append_child(printer, "catalogID", shared_folder_id.empty() ? "root" : shared_folder_id.c_str());
--    append_child(printer, "filterType", "0");
--    append_child(printer, "catalogSortType", "0");
--    append_child(printer, "contentType", std::to_string((int)content_type).c_str());
--    append_child(printer, "contentSortType", "0");
--    append_child(printer, "sortDirection", "1");
--    append_child(printer, "startNumber",std::to_string(start_index).c_str());
--    append_child(printer, "endNumber",  std::to_string(start_index + count - 1).c_str());
--    append_child(printer, "catalogType", "-1");
--
--    printer.CloseElement();
--
--    return string(printer.CStr());
--}
--
--static string generate_content_body(const std::string &content_id) {
--    tinyxml2::XMLPrinter printer;
--    printer.OpenElement("getContentInfo");
--    append_child(printer, "ContentID", content_id);
--    append_child(printer, "CatalogID", "");
--    append_child(printer, "ownerMSISDN", thirdparty_anonymous_account);
--    printer.CloseElement();
--
--    return string(printer.CStr());
--}
--
--static string generate_delete_body(const std::vector<std::string> &item_ids) {
--    tinyxml2::XMLPrinter printer;
--    printer.OpenElement("delCatalogContent");
--
--    append_child(printer, "MSISDN", thirdparty_anonymous_account);
--    printer.OpenElement("catalogIDs");
--    printer.PushAttribute("length", std::to_string(item_ids.size()).c_str());
--    for (auto & item_id: item_ids) {
--        append_child(printer, "ID", item_id.c_str());
--    }
--    printer.CloseElement();
--
--    printer.OpenElement("contentIDs");
--    printer.PushAttribute("length", std::to_string(item_ids.size()).c_str());
--    for (auto & content_id: item_ids) {
--        append_child(printer, "ID", content_id.c_str());
--    }
--    printer.CloseElement();
--
--    printer.CloseElement();
--
--    return string(printer.CStr());
--}
--
--static string generate_copy_body(const std::vector<std::string> &dir_ids,
--                                 const std::vector<std::string> &content_ids,
--                                 const std::string &new_folder_id) {
--    tinyxml2::XMLPrinter printer;
--    printer.OpenElement("copyContentCatalog");
--
--    append_child(printer, "MSISDN", thirdparty_anonymous_account);
--    printer.OpenElement("contentInfoList");
--    printer.PushAttribute("length", std::to_string(content_ids.size()).c_str());
--    for (auto & content_id: content_ids) {
--        append_child(printer, "ID", content_id.c_str());
--    }
--    printer.CloseElement();
--
--    printer.OpenElement("catalogInfoList");
--    printer.PushAttribute("length", std::to_string(dir_ids.size()).c_str());
--    for (auto & dir_id: dir_ids) {
--        append_child(printer, "ID", dir_id.c_str());
--    }
--    printer.CloseElement();
--
--    append_child(printer, "newCatalogID", new_folder_id);
--
--    printer.CloseElement();
--
--    return string(printer.CStr());
--}
--
--static string generate_update_folder_body(const std::string &folder_id,
--                                          const std::string &new_folder_name) {
--    tinyxml2::XMLPrinter printer;
--    printer.OpenElement("updateCatalogInfo");
--    append_child(printer, "MSISDN", thirdparty_anonymous_account);
--    append_child(printer, "catalogID", folder_id);
--    append_child(printer, "catalogName", new_folder_name);
--    printer.CloseElement();
--
--    return string(printer.CStr());
--}
--
--static string generate_create_folder_body(const std::string &folder_name,
--                                          const std::string &folder_id) {
--    tinyxml2::XMLPrinter printer;
--    printer.OpenElement("createCatalogExt");
--    printer.OpenElement("createCatalogExtReq");
--
--    append_child(printer, "parentCatalogID", folder_id);
--    append_child(printer, "newCatalogName", folder_name);
--    append_child(printer, "ownerMSISDN", thirdparty_anonymous_account);
--    append_child(printer, "catalogType", "0");
--
--    printer.CloseElement();
--    printer.CloseElement();
--
--    return string(printer.CStr());
--}
--
--static string generate_look_up_body(const std::string &name,
--                                    const std::string &folder_id,
--                                    CloudResource::Property property) {
++                                         const string& shared_folder_id = string()) {
++        tinyxml2::XMLPrinter printer;
++        printer.OpenElement("getDisk");
++
++        //index on mcloud starts from 1, not 0
++        if (start_index == 0) {
++            start_index = 1;
++        }
++
++        append_child(printer, "MSISDN", thirdparty_anonymous_account);
++        append_child(printer, "catalogID", shared_folder_id.empty() ? "root" : shared_folder_id.c_str());
++        append_child(printer, "filterType", "0");
++        append_child(printer, "catalogSortType", "0");
++        append_child(printer, "contentType", std::to_string((int)content_type).c_str());
++        append_child(printer, "contentSortType", "0");
++        append_child(printer, "sortDirection", "1");
++        append_child(printer, "startNumber", std::to_string(start_index).c_str());
++        append_child(printer, "endNumber",  std::to_string(start_index + count - 1).c_str());
++        append_child(printer, "catalogType", "-1");
++
++        printer.CloseElement();
++
++        return string(printer.CStr());
++    }
++
++    static string generate_content_body(const string& content_id) {
++        tinyxml2::XMLPrinter printer;
++        printer.OpenElement("getContentInfo");
++        append_child(printer, "ContentID", content_id);
++        append_child(printer, "CatalogID", "");
++        append_child(printer, "ownerMSISDN", thirdparty_anonymous_account);
++        printer.CloseElement();
++
++        return string(printer.CStr());
++    }
++
++    static string generate_delete_body(const std::vector<string>& item_ids) {
++        tinyxml2::XMLPrinter printer;
++        printer.OpenElement("delCatalogContent");
++
++        append_child(printer, "MSISDN", thirdparty_anonymous_account);
++        printer.OpenElement("catalogIDs");
++        printer.PushAttribute("length", std::to_string(item_ids.size()).c_str());
++        for (auto& item_id : item_ids) {
++            append_child(printer, "ID", item_id.c_str());
++        }
++        printer.CloseElement();
++
++        printer.OpenElement("contentIDs");
++        printer.PushAttribute("length", std::to_string(item_ids.size()).c_str());
++        for (auto& content_id : item_ids) {
++            append_child(printer, "ID", content_id.c_str());
++        }
++        printer.CloseElement();
++
++        printer.CloseElement();
++
++        return string(printer.CStr());
++    }
++
++    static string generate_copy_body(const vector<string>& dir_ids,
++                                     const vector<string>& content_ids,
++                                     const string& new_folder_id) {
++        tinyxml2::XMLPrinter printer;
++        printer.OpenElement("copyContentCatalog");
++
++        append_child(printer, "MSISDN", thirdparty_anonymous_account);
++        printer.OpenElement("contentInfoList");
++        printer.PushAttribute("length", std::to_string(content_ids.size()).c_str());
++        for (auto& content_id : content_ids) {
++            append_child(printer, "ID", content_id.c_str());
++        }
++        printer.CloseElement();
++
++        printer.OpenElement("catalogInfoList");
++        printer.PushAttribute("length", std::to_string(dir_ids.size()).c_str());
++        for (auto& dir_id : dir_ids) {
++            append_child(printer, "ID", dir_id.c_str());
++        }
++        printer.CloseElement();
++
++        append_child(printer, "newCatalogID", new_folder_id);
++
++        printer.CloseElement();
++
++        return string(printer.CStr());
++    }
++
++    static string generate_update_folder_body(const string& folder_id,
++                                              const string& new_folder_name) {
++        tinyxml2::XMLPrinter printer;
++        printer.OpenElement("updateCatalogInfo");
++        append_child(printer, "MSISDN", thirdparty_anonymous_account);
++        append_child(printer, "catalogID", folder_id);
++        append_child(printer, "catalogName", new_folder_name);
++        printer.CloseElement();
++
++        return string(printer.CStr());
++    }
++
++    static string generate_create_folder_body(const string& folder_name,
++                                              const string& folder_id) {
++        tinyxml2::XMLPrinter printer;
++        printer.OpenElement("createCatalogExt");
++        printer.OpenElement("createCatalogExtReq");
++
++        append_child(printer, "parentCatalogID", folder_id);
++        append_child(printer, "newCatalogName", folder_name);
++        append_child(printer, "ownerMSISDN", thirdparty_anonymous_account);
++        append_child(printer, "catalogType", "0");
++
++        printer.CloseElement();
++        printer.CloseElement();
++
++        return string(printer.CStr());
++    }
++
++    static string generate_look_up_body(const string& name,
++                                        const string& folder_id,
++                                        CloudResource::Property property) {
  #if 1
--    tinyxml2::XMLPrinter printer;
--    printer.OpenElement("advanceSearch");
--    printer.OpenElement("advanceSearchReq");
--
--    append_child(printer, "account", thirdparty_anonymous_account);
--    append_child(printer, "scope", std::to_string((int)property));
--
--    printer.OpenElement("fileCond");
--
--    append_child(printer, "prtCtlgID", folder_id);
--    append_child(printer, "name", name);
--
--    printer.CloseElement();
--
--    printer.CloseElement();
--    printer.CloseElement();
++        tinyxml2::XMLPrinter printer;
++        printer.OpenElement("advanceSearch");
++        printer.OpenElement("advanceSearchReq");
++
++        append_child(printer, "account", thirdparty_anonymous_account);
++        append_child(printer, "scope", std::to_string((int)property));
++
++        printer.OpenElement("fileCond");
++
++        append_child(printer, "prtCtlgID", folder_id);
++        append_child(printer, "name", name);
++
++        printer.CloseElement();
++
++        printer.CloseElement();
++        printer.CloseElement();
  #else
--    tinyxml2::XMLPrinter printer;
--    printer.OpenElement("simpleSearch");
--    printer.OpenElement("simpleSearchReq");
--
--    append_child(printer, "account", thirdparty_anonymous_account);
--    append_child(printer, "scope", "1100000000000000");
--    append_child(printer, "keyword", name);
--
--    printer.CloseElement();
--    printer.CloseElement();
++        tinyxml2::XMLPrinter printer;
++        printer.OpenElement("simpleSearch");
++        printer.OpenElement("simpleSearchReq");
++
++        append_child(printer, "account", thirdparty_anonymous_account);
++        append_child(printer, "scope", "1100000000000000");
++        append_child(printer, "keyword", name);
++
++        printer.CloseElement();
++        printer.CloseElement();
  #endif
--    return string(printer.CStr());
--}
--
--static string generate_move_body(const Client::Stringlist &dir_ids,
--                                 const Client::Stringlist &content_ids,
--                                 const std::string &folder_id) {
--    tinyxml2::XMLPrinter printer;
--    printer.OpenElement("moveContentCatalog");
--
--    append_child(printer, "MSISDN", thirdparty_anonymous_account);
--
--    printer.OpenElement("contentInfoList");
--    printer.PushAttribute("length", std::to_string(content_ids.size()).c_str());
--    for (auto & content_id: content_ids) {
--        append_child(printer, "ID", content_id.c_str());
--    }
--    printer.CloseElement();
--
--    printer.OpenElement("catalogInfoList");
--    printer.PushAttribute("length", std::to_string(dir_ids.size()).c_str());
--    for (auto & dir_id: dir_ids) {
--        append_child(printer, "ID", dir_id.c_str());
--    }
--    printer.CloseElement();
--
--    append_child(printer, "newCatalogID", folder_id);
--
--    printer.CloseElement();
--
--    return string(printer.CStr());
--}
--
--static string generate_extranet_body(const Client::Stringlist &dir_ids,
--                                     const Client::Stringlist &content_ids) {
--    tinyxml2::XMLPrinter printer;
--    printer.OpenElement("getOutLink");
--    printer.OpenElement("getOutLinkReq");
--
--    append_child(printer, "account", thirdparty_anonymous_account);
--    printer.OpenElement("caIDLst");
--    printer.PushAttribute("length", std::to_string(dir_ids.size()).c_str());
--    for (auto & dir_id: dir_ids) {
--        append_child(printer, "item", dir_id.c_str());
--    }
--    printer.CloseElement();
--
--    printer.OpenElement("coIDLst");
--    printer.PushAttribute("length", std::to_string(content_ids.size()).c_str());
--    for (auto & content_id: content_ids) {
--        append_child(printer, "item", content_id.c_str());
--    }
--    printer.CloseElement();
--
--    append_child(printer, "pubType", "1");
--
--    printer.CloseElement();
--    printer.CloseElement();
--
--    return string(printer.CStr());
--}
--
--static string generate_download_body(const std::string &content_id) {
--    tinyxml2::XMLPrinter printer;
--    printer.OpenElement("downloadRequest");
--    append_child(printer, "appName", register_app_name);
--    append_child(printer, "MSISDN", thirdparty_anonymous_account);
--
--    vector<string> content_ids = {{content_id}};
--    string content_list = alg::join(content_ids, "|");
--
--    append_child(printer, "contentID", content_list.c_str());
--    append_child(printer, "OwnerMSISDN", "");
--    append_child(printer, "entryShareCatalogID", "");
--    append_child(printer, "operation", "0");
--    append_child(printer, "fileVersion", "-1");
--
--    printer.CloseElement();
--
--    return string(printer.CStr());
--}
--
--static string generate_upload_body(const UploadRequest & request_item) {
--    tinyxml2::XMLPrinter printer;
--    printer.OpenElement("pcUploadFileRequest");
--    append_child(printer, "ownerMSISDN", thirdparty_anonymous_account);
--    append_child(printer, "fileCount", "1");
--
--    int64_t file_size = 0;
--    if (fs::exists(request_item.file_path)) {
--        file_size = fs::file_size(request_item.file_path);
--    } else {
--        throw std::runtime_error("file not exists");
--    }
--    append_child(printer, "totalSize", std::to_string(file_size).c_str());
--
--    printer.OpenElement("uploadContentList");
--    printer.PushAttribute("length", "1");
--
--    printer.OpenElement("uploadContentInfo");
--    append_child(printer, "contentName", request_item.content_name.empty() ?
--                            fs::path(request_item.file_path).filename().c_str() : request_item.content_name);
--    append_child(printer, "contentSize", std::to_string(file_size).c_str());
--    append_child(printer, "contentDesc", "");
--    append_child(printer, "contentTAGList", "");
--
--    //The parameter to check upload files' md5sum
--    //"isNeedupload" field in response body will indicate if the file exists in mcloud.
--    append_child(printer, "digest", md5sum(request_item.file_path));
--
--    printer.CloseElement();
--    printer.CloseElement();
--
--    append_child(printer, "newCatalogName", "");
--    append_child(printer, "parentCatalogID", request_item.folder_id);
--    printer.CloseElement();
--
--    return string(printer.CStr());
--}
--
--static string generate_upload_body(const UploadBufferCb & buffer_cb) {
--    tinyxml2::XMLPrinter printer;
--    printer.OpenElement("pcUploadFileRequest");
--    append_child(printer, "ownerMSISDN", thirdparty_anonymous_account);
--    append_child(printer, "fileCount", "1");
--
--    append_child(printer, "totalSize", std::to_string(buffer_cb.buffer_size).c_str());
--
--    printer.OpenElement("uploadContentList");
--    printer.PushAttribute("length", "1");
--
--    printer.OpenElement("uploadContentInfo");
--    append_child(printer, "contentName", buffer_cb.content_name);
--    append_child(printer, "contentSize", std::to_string(buffer_cb.buffer_size).c_str());
--    append_child(printer, "contentDesc", "");
--    append_child(printer, "contentTAGList", "");
--
--    printer.CloseElement();
--
--    printer.CloseElement();
--
--    append_child(printer, "newCatalogName", "");
--    append_child(printer, "parentCatalogID", buffer_cb.folder_id);
--    printer.CloseElement();
--
--    return string(printer.CStr());
--}
--
--template<typename T>
--static void set_auth_exception(std::shared_ptr<std::promise<T>> prom,
--                               const std::string json_data) {
--
--    std::string error_info = json_data;
--	boost::cmatch cap;
--    const boost::regex exp("{\"error\":\"(.*?)\".*");
--	if(boost::regex_match(json_data.c_str(), cap, exp)){
--        error_info = cap[1];
--    }
--
--    prom->set_exception(make_exception_ptr(CredentialException(error_info)));
--}
--
--template<typename T>
--static void set_exception(std::shared_ptr<std::promise<T>> prom,
--                          const tinyxml2::XMLElement *root) {
--    ClientPriv::ServerCode err_code= (ClientPriv::ServerCode)stoi(root->Attribute("resultCode"));
--    switch(err_code) {
--        case ClientPriv::ServerCode::CATALOGID_INVALID:
--        case ClientPriv::ServerCode::CONTENTID_INVALID:
--            prom->set_exception(make_exception_ptr(InvalidIDException(root->Attribute("desc"))));
--        break;
--        case ClientPriv::ServerCode::CATALOG_NOT_EXIST:
--        case ClientPriv::ServerCode::CONTENT_AND_CATALOG_NOT_EXIST:
--        case ClientPriv::ServerCode::CONTENT_NOT_EXIST:
--            prom->set_exception(make_exception_ptr(NonExistentException(root->Attribute("desc"))));
--        break;
--        case ClientPriv::ServerCode::USER_SPACE_LACKED:
--            prom->set_exception(make_exception_ptr(OutofSpaceException(root->Attribute("desc"))));
--        break;
--        case ClientPriv::ServerCode::PARAMETER_INVALID:
--            prom->set_exception(make_exception_ptr(ParameterInvalidException(root->Attribute("desc"))));
--        break;
--        case ClientPriv::ServerCode::CREDENTIAL_FAILED:
--            prom->set_exception(make_exception_ptr(CredentialException(root->Attribute("desc"))));
--        break;
--        default:
--            prom->set_exception(make_exception_ptr(runtime_error(root->Attribute("desc"))));
--        break;
--    }
--}
++        return string(printer.CStr());
++    }
++
++    static string generate_move_body(const Client::Stringlist& dir_ids,
++                                     const Client::Stringlist& content_ids,
++                                     const string& folder_id) {
++        tinyxml2::XMLPrinter printer;
++        printer.OpenElement("moveContentCatalog");
++
++        append_child(printer, "MSISDN", thirdparty_anonymous_account);
++
++        printer.OpenElement("contentInfoList");
++        printer.PushAttribute("length", std::to_string(content_ids.size()).c_str());
++        for (auto& content_id : content_ids) {
++            append_child(printer, "ID", content_id.c_str());
++        }
++        printer.CloseElement();
++
++        printer.OpenElement("catalogInfoList");
++        printer.PushAttribute("length", std::to_string(dir_ids.size()).c_str());
++        for (auto& dir_id : dir_ids) {
++            append_child(printer, "ID", dir_id.c_str());
++        }
++        printer.CloseElement();
++
++        append_child(printer, "newCatalogID", folder_id);
++
++        printer.CloseElement();
++
++        return string(printer.CStr());
++    }
++
++    static string generate_extranet_body(const Client::Stringlist& dir_ids,
++                                         const Client::Stringlist& content_ids) {
++        tinyxml2::XMLPrinter printer;
++        printer.OpenElement("getOutLink");
++        printer.OpenElement("getOutLinkReq");
++
++        append_child(printer, "account", thirdparty_anonymous_account);
++        printer.OpenElement("caIDLst");
++        printer.PushAttribute("length", std::to_string(dir_ids.size()).c_str());
++        for (auto& dir_id : dir_ids) {
++            append_child(printer, "item", dir_id.c_str());
++        }
++        printer.CloseElement();
++
++        printer.OpenElement("coIDLst");
++        printer.PushAttribute("length", std::to_string(content_ids.size()).c_str());
++        for (auto& content_id : content_ids) {
++            append_child(printer, "item", content_id.c_str());
++        }
++        printer.CloseElement();
++
++        append_child(printer, "pubType", "1");
++
++        printer.CloseElement();
++        printer.CloseElement();
++
++        return string(printer.CStr());
++    }
++
++    static string generate_download_body(const string& content_id) {
++        tinyxml2::XMLPrinter printer;
++        printer.OpenElement("downloadRequest");
++        append_child(printer, "appName", register_app_name);
++        append_child(printer, "MSISDN", thirdparty_anonymous_account);
++
++        vector<string> content_ids = {{content_id}};
++        string content_list = alg::join(content_ids, "|");
++
++        append_child(printer, "contentID", content_list.c_str());
++        append_child(printer, "OwnerMSISDN", "");
++        append_child(printer, "entryShareCatalogID", "");
++        append_child(printer, "operation", "0");
++        append_child(printer, "fileVersion", "-1");
++
++        printer.CloseElement();
++
++        return string(printer.CStr());
++    }
++
++    static string generate_upload_body(const UploadRequest& request_item) {
++        tinyxml2::XMLPrinter printer;
++        printer.OpenElement("pcUploadFileRequest");
++        append_child(printer, "ownerMSISDN", thirdparty_anonymous_account);
++        append_child(printer, "fileCount", "1");
++
++        int64_t file_size = 0;
++        if (fs::exists(request_item.file_path)) {
++            file_size = fs::file_size(request_item.file_path);
++        } else {
++            throw std::runtime_error("file not exists");
++        }
++        append_child(printer, "totalSize", std::to_string(file_size).c_str());
++
++        printer.OpenElement("uploadContentList");
++        printer.PushAttribute("length", "1");
++
++        printer.OpenElement("uploadContentInfo");
++        append_child(printer, "contentName", request_item.content_name.empty() ?
++                     fs::path(request_item.file_path).filename().c_str() : request_item.content_name);
++        append_child(printer, "contentSize", std::to_string(file_size).c_str());
++        append_child(printer, "contentDesc", "");
++        append_child(printer, "contentTAGList", "");
++
++        //The parameter to check upload files' md5sum
++        //"isNeedupload" field in response body will indicate if the file exists in mcloud.
++        append_child(printer, "digest", md5sum(request_item.file_path));
++
++        printer.CloseElement();
++        printer.CloseElement();
++
++        append_child(printer, "newCatalogName", "");
++        append_child(printer, "parentCatalogID", request_item.folder_id);
++        printer.CloseElement();
++
++        return string(printer.CStr());
++    }
++
++    static string generate_upload_body(const UploadBufferCb& buffer_cb) {
++        tinyxml2::XMLPrinter printer;
++        printer.OpenElement("pcUploadFileRequest");
++        append_child(printer, "ownerMSISDN", thirdparty_anonymous_account);
++        append_child(printer, "fileCount", "1");
++
++        append_child(printer, "totalSize", std::to_string(buffer_cb.buffer_size).c_str());
++
++        printer.OpenElement("uploadContentList");
++        printer.PushAttribute("length", "1");
++
++        printer.OpenElement("uploadContentInfo");
++        append_child(printer, "contentName", buffer_cb.content_name);
++        append_child(printer, "contentSize", std::to_string(buffer_cb.buffer_size).c_str());
++        append_child(printer, "contentDesc", "");
++        append_child(printer, "contentTAGList", "");
++
++        printer.CloseElement();
++
++        printer.CloseElement();
++
++        append_child(printer, "newCatalogName", "");
++        append_child(printer, "parentCatalogID", buffer_cb.folder_id);
++        printer.CloseElement();
++
++        return string(printer.CStr());
++    }
++
++    template<typename T>
++    static void set_auth_exception(const shared_ptr<std::promise<T>>& prom,
++                                   const string json_data) {
++
++        string error_info = json_data;
++        boost::cmatch cap;
++        const boost::regex exp("{\"error\":\"(.*?)\".*");
++        if (boost::regex_match(json_data.c_str(), cap, exp)) {
++            error_info = cap[1];
++        }
++
++        prom->set_exception(make_exception_ptr(CredentialException(error_info)));
++    }
++
++    template<typename T>
++    static void set_exception(const shared_ptr<std::promise<T>>& prom,
++                              const tinyxml2::XMLElement* root) {
++        ClientPriv::ServerCode err_code = (ClientPriv::ServerCode)stoi(root->Attribute("resultCode"));
++        switch (err_code) {
++            case ClientPriv::ServerCode::CATALOGID_INVALID:
++            case ClientPriv::ServerCode::CONTENTID_INVALID:
++                prom->set_exception(make_exception_ptr(InvalidIDException(root->Attribute("desc"))));
++                break;
++            case ClientPriv::ServerCode::CATALOG_NOT_EXIST:
++            case ClientPriv::ServerCode::CONTENT_AND_CATALOG_NOT_EXIST:
++            case ClientPriv::ServerCode::CONTENT_NOT_EXIST:
++                prom->set_exception(make_exception_ptr(NonExistentException(root->Attribute("desc"))));
++                break;
++            case ClientPriv::ServerCode::USER_SPACE_LACKED:
++                prom->set_exception(make_exception_ptr(OutofSpaceException(root->Attribute("desc"))));
++                break;
++            case ClientPriv::ServerCode::PARAMETER_INVALID:
++                prom->set_exception(make_exception_ptr(ParameterInvalidException(root->Attribute("desc"))));
++                break;
++            case ClientPriv::ServerCode::CREDENTIAL_FAILED:
++                prom->set_exception(make_exception_ptr(CredentialException(root->Attribute("desc"))));
++                break;
++            default:
++                prom->set_exception(make_exception_ptr(runtime_error(root->Attribute("desc"))));
++                break;
++        }
++    }
+ }
  class ClientPriv::HttpClient {
--public:
++  public:
      HttpClient(int request_timeout) :
          client_(http::make_client()),
--        worker_ { [this]() {client_->run();} },
--        cancelled_(false) {
++        cancelled_(false),
++        worker_ {[this]() {
++        client_->run();
++    }} {
          config_.request_timeout = request_timeout;
+     }
@@ -482,9 +483,7 @@
+         }
+     }
--    std::shared_ptr<core::net::http::Client> client_;
--
--    std::thread worker_;
++    std::shared_ptr<http::Client> client_;
      Config config_;
@@ -492,9 +491,11 @@
      std::atomic<bool> cancelled_;
--    void get(const net::Uri::Path &path,
--            const net::Uri::QueryParameters &parameters,
--            http::Request::Handler &handler) {
++    std::thread worker_;
++
++    void get(const net::Uri::Path& path,
++             const net::Uri::QueryParameters& parameters,
++             http::Request::Handler& handler) {
          auto configuration = net_config(path, parameters);
          configuration.header.add("User-Agent", config_.user_agent);
@@ -502,11 +503,11 @@
          request->async_execute(handler);
+     }
--    void post(const net::Uri::Path &path,
--            const net::Uri::QueryParameters &parameters,
--            const std::string &postbody,
--            const std::string &content_type,
--            http::Request::Handler &handler) {
++    void post(const net::Uri::Path& path,
++              const net::Uri::QueryParameters& parameters,
++              const string& postbody,
++              const string& content_type,
++              http::Request::Handler& handler) {
          std::lock_guard<std::mutex> lock(config_mutex_);
          http::Request::Configuration configuration = net_config(path, parameters);
          configuration.header.add("User-Agent", config_.user_agent);
@@ -517,16 +518,16 @@
          request->async_execute(handler);
+     }
--    http::Request::Configuration net_config(const net::Uri::Path &path,
--                                            const net::Uri::QueryParameters &parameters) {
++    http::Request::Configuration net_config(const net::Uri::Path& path,
++                                            const net::Uri::QueryParameters& parameters) {
          http::Request::Configuration configuration;
          net::Uri::QueryParameters complete_parameters(parameters);
          if (!config_.access_token.empty()) {
              configuration.header.add("Authorization",
--                    "Bearer " + config_.access_token);
++                                     "Bearer " + config_.access_token);
          } else {
              configuration.header.add("Authorization",
--                    "Basic " + encode64(config_.client_id + ":" + config_.client_password));
++                                     "Basic " + encode64(config_.client_id + ":" + config_.client_password));
+         }
          if (getenv("MCLOUD_LOCAL_SERVER_URL")) {
@@ -535,48 +536,42 @@
+         }
          net::Uri uri = net::make_uri(config_.apiroot, path,
--                complete_parameters);
++                                     complete_parameters);
          configuration.uri = client_->uri_to_string(uri);
          return configuration;
+     }
--    http::Request::Progress::Next progress_changed(
--            const http::Request::Progress&) {
--        return cancelled_ ?
--                http::Request::Progress::Next::abort_operation :
--                http::Request::Progress::Next::continue_operation;
--    }
--
      template<typename T>
--    future<T> async_get(const net::Uri::Path &path,
--            const net::Uri::QueryParameters &parameters,
--            const function<T(const tinyxml2::XMLElement *root)> &func) {
++    future<T> async_get(const net::Uri::Path& path,
++                        const net::Uri::QueryParameters& parameters,
++                        const function<T(const tinyxml2::XMLElement* root)>& func) {
          auto prom = make_shared<promise<T>>();
          http::Request::Handler handler;
          handler.on_progress(
--                bind(&ClientPriv::HttpClient::progress_changed, this, placeholders::_1));
--        handler.on_error([prom](const net::Error& e)
--        {
++        [this](const http::Request::Progress& /*progress*/) {
++            return cancelled_ ?
++                   http::Request::Progress::Next::abort_operation :
++                   http::Request::Progress::Next::continue_operation;
++        });
++        handler.on_error([prom](const net::Error & e) {
              prom->set_exception(make_exception_ptr(runtime_error(e.what())));
          });
          handler.on_response(
--            [prom,func](const http::Response& response)
--            {
--                tinyxml2::XMLDocument doc;
--                tinyxml2::XMLError error = doc.Parse(response.body.c_str());
--                const tinyxml2::XMLElement *root = doc.FirstChildElement();
++        [prom, func](const http::Response & response) {
++            tinyxml2::XMLDocument doc;
++            tinyxml2::XMLError error = doc.Parse(response.body.c_str());
++            const tinyxml2::XMLElement* root = doc.FirstChildElement();
--                if (error != tinyxml2::XML_SUCCESS) {
--                    prom->set_exception(make_exception_ptr(runtime_error("xml parse failed")));
--                } else if (response.status != http::Status::ok) {
--                    prom->set_exception(make_exception_ptr(runtime_error(root->GetText())));
--                } else {
--                    prom->set_value(func(root));
--                }
++            if (error != tinyxml2::XML_SUCCESS) {
++                prom->set_exception(make_exception_ptr(runtime_error("xml parse failed")));
++            } else if (response.status != http::Status::ok) {
++                prom->set_exception(make_exception_ptr(runtime_error(root->GetText())));
++            } else {
++                prom->set_value(func(root));
+             }
--        );
++        });
          get(path, parameters, handler);
@@ -584,53 +579,54 @@
+     }
      template<typename T>
--    future<T> async_post(const net::Uri::Path &path,
--            const net::Uri::QueryParameters &parameters,
--            const std::string &postmsg,
--            const std::string &content_type,
--            const function<T(const tinyxml2::XMLElement *root)> &func) {
++    future<T> async_post(const net::Uri::Path& path,
++                         const net::Uri::QueryParameters& parameters,
++                         const string& postmsg,
++                         const string& content_type,
++                         const function<T(const tinyxml2::XMLElement* root)>& func) {
          auto prom = make_shared<promise<T>>();
          http::Request::Handler handler;
          handler.on_progress(
--                bind(&ClientPriv::HttpClient::progress_changed, this, placeholders::_1));
--        handler.on_error([prom](const net::Error& e)
--        {
++        [this](const http::Request::Progress& /*progress*/) {
++            return cancelled_ ?
++                   http::Request::Progress::Next::abort_operation :
++                   http::Request::Progress::Next::continue_operation;
++        });
++        handler.on_error([prom](const net::Error & e) {
              prom->set_exception(make_exception_ptr(runtime_error(e.what())));
          });
          handler.on_response(
--            [path, prom,func](const http::Response& response)
--            {
--                auto iter = std::find_if(path.cbegin(), path.cend(), [=](const string & pathitem){
--                    return (pathitem == "OAuth2");
--                });
--
--                //mcloud seperate authentication server and content server,
--                //1.if authentication failed, responses server gives it back are json-based data.
--                //2.for generaic content access, responses server gives it back are xml-based data,
--                //just as API document mentioned.
--                tinyxml2::XMLDocument doc;
--                tinyxml2::XMLError error = tinyxml2::XML_SUCCESS;
--                if (iter != path.end()) {
--                    std::string xml_response = "<result resultCode=\"0\"><![CDATA[" + response.body + "]]></result>";
--                    error = doc.Parse(xml_response.c_str());
--                } else {
--                    error = doc.Parse(response.body.c_str());
--                }
--                const tinyxml2::XMLElement *result = doc.FirstChildElement();
--
--                if (error != tinyxml2::XML_SUCCESS) {
--                    set_auth_exception(prom, response.body);
--                } else if ((response.status != http::Status::created &&
--                       response.status != http::Status::ok &&
--                       response.status != http::Status::no_content ) ||
++        [path, prom, func](const http::Response & response) {
++            auto iter = std::find_if(path.cbegin(), path.cend(), [ = ](const string & pathitem) {
++                return (pathitem == "OAuth2");
++            });
++
++            //mcloud seperate authentication server and content server,
++            //1.if authentication failed, responses server gives it back are json-based data.
++            //2.for generaic content access, responses server gives it back are xml-based data,
++            //just as API document mentioned.
++            tinyxml2::XMLDocument doc;
++            tinyxml2::XMLError error = tinyxml2::XML_SUCCESS;
++            if (iter != path.end()) {
++                string xml_response = "<result resultCode=\"0\"><![CDATA[" + response.body + "]]></result>";
++                error = doc.Parse(xml_response.c_str());
++            } else {
++                error = doc.Parse(response.body.c_str());
++            }
++            const tinyxml2::XMLElement* result = doc.FirstChildElement();
++
++            if (error != tinyxml2::XML_SUCCESS) {
++                set_auth_exception(prom, response.body);
++            } else if ((response.status != http::Status::created &&
++                        response.status != http::Status::ok &&
++                        response.status != http::Status::no_content) ||
                         strcmp(result->Attribute("resultCode"), "0") != 0) {
--                    set_exception(prom, result);
--                } else {
--                    prom->set_value(func(result));
--                }
++                set_exception(prom, result);
++            } else {
++                prom->set_value(func(result));
+             }
--        );
++        });
          post(path, parameters, postmsg, content_type, handler);
@@ -639,8 +635,8 @@
  };
  ClientPriv::ClientPriv(int request_timeout)
--    : httpclient_(std::make_shared<HttpClient>(request_timeout))
--    , sync_manager_(std::shared_ptr<SyncManager>(new SyncManager(this))) {
++    : httpclient_(new HttpClient(request_timeout))
++    , sync_manager_(new SyncManager(this)) {
+ }
  ClientPriv::~ClientPriv() {
@@ -649,24 +645,25 @@
  string ClientPriv::cloud_sync_folder_id() {
      Client::ResourceList folderlist = cloud_root_folder_list();
--    for (auto &folder: folderlist) {
--        mcloud::api::CloudFolder::Ptr cloudfolder = std::static_pointer_cast<mcloud::api::CloudFolder>(folder);
--        if (cloudfolder->folder_type() == mcloud::api::CloudFolder::Type::Sync){
++    for (auto& folder : folderlist) {
++        CloudFolder::Ptr cloudfolder = std::static_pointer_cast<CloudFolder>(folder);
++        if (cloudfolder->folder_type() == CloudFolder::Type::Sync) {
              return cloudfolder->id();
+         }
+     }
--    return std::string();
++    return string();
+ }
--void ClientPriv::set_access_token(const string &access_token) {
++void ClientPriv::set_access_token(const string& access_token) {
      httpclient_->config_.access_token = access_token;
+ }
--bool ClientPriv::exist_on_cloud(const std::string &file_path,
--                                const std::string &folder_id) {
--    if (!fs::exists(file_path))
++bool ClientPriv::exist_on_cloud(const string& file_path,
++                                const string& folder_id) {
++    if (!fs::exists(file_path)) {
          throw std::runtime_error(string("file not exists: ").append(file_path));
++    }
      UploadRequest request_item{file_path, folder_id, ""};
      string postbody = generate_upload_body(request_item);
@@ -674,107 +671,105 @@
      return exist_on_cloud_internal(postbody);
+ }
--DiskInfo ClientPriv::disk_info() {
--    std::string postbody = generate_diskinfo_body();
++DiskInfo::Ptr ClientPriv::disk_info() {
++    string postbody = generate_diskinfo_body();
      log(postbody);
--    auto disk_future = httpclient_->async_post<DiskInfo>(
++    auto disk_future = httpclient_->async_post<DiskInfo::Ptr>(
      { "richlifeApp", "devapp", "IUser" }, { }, postbody, content_type,
--                [](const tinyxml2::XMLElement *root) {
--        return DiskInfo(root);
++    [](const tinyxml2::XMLElement * root) {
++        return std::shared_ptr<DiskInfo>(new DiskInfo(root));
      });
      return get_or_throw(disk_future);
+ }
  Client::ResourceList ClientPriv::cloud_content_list(int start_index,
--                                                int count,
--                                                CloudContent::Type type,
--                                                const std::string & folder_id) {
--    std::string postbody = generate_content_list_body(start_index,
--                                                      count,
--                                                      type,
--                                                      folder_id);
++                                                    int count,
++                                                    CloudContent::Type type,
++                                                    const string& folder_id) {
++    string postbody = generate_contents_body(start_index,
++                      count,
++                      type,
++                      folder_id);
      return cloud_content_list_internal(postbody);
+ }
--CloudContent::Ptr ClientPriv::content_info(const string &content_id) {
++CloudContent::Ptr ClientPriv::content_info(const string& content_id) {
      string postbody = generate_content_body(content_id);
      return content_item_internal(postbody);
+ }
--CloudFolder::Ptr ClientPriv::create_folder(const string &folder_name,
--                                           const string &folder_id) {
++CloudFolder::Ptr ClientPriv::create_folder(const string& folder_name,
++        const string& folder_id) {
      string postbody = generate_create_folder_body(folder_name, folder_id);
      return create_folder_internal(postbody);
+ }
--Client::ResourceList ClientPriv::look_up(const string &name,
--                                         const string &folder_id,
++Client::ResourceList ClientPriv::look_up(const string& name,
++                                         const string& folder_id,
                                           CloudResource::Property property) {
      string postbody = generate_look_up_body(name, folder_id, property);
      return look_up_internal(postbody);
+ }
--bool ClientPriv::move_items(const Client::Stringlist &folder_ids,
--                            const Client::Stringlist &content_ids,
--                            const std::string &folder_id) {
++bool ClientPriv::move_items(const Client::Stringlist& folder_ids,
++                            const Client::Stringlist& content_ids,
++                            const string& folder_id) {
      string postbody = generate_move_body(folder_ids, content_ids,
                                           folder_id);
      return move_items_internal(postbody);
+ }
--bool ClientPriv::update_folder(const string &folder_id,
--                               const string &new_folder_name) {
++bool ClientPriv::update_folder(const string& folder_id,
++                               const string& new_folder_name) {
      string postbody = generate_update_folder_body(folder_id, new_folder_name);
      return update_internal(postbody);
+ }
--bool ClientPriv::delete_contents(const Client::Stringlist &content_ids) {
++bool ClientPriv::delete_contents(const Client::Stringlist& content_ids) {
      string postbody = generate_delete_body(content_ids);
      return delete_internal(postbody);
+ }
--Client::Stringlist ClientPriv::copy_folders(const Client::Stringlist &folder_ids,
--                                            const std::string &folder_id) {
--    string postbody = generate_copy_body(folder_ids, vector<string>{},
--                                         folder_id);
--    return copy_internal(postbody);
--}
--
--Client::Stringlist ClientPriv::copy_contents(const Client::Stringlist &content_ids,
--                                             const std::string &folder_id) {
--    string postbody = generate_copy_body(vector<string>{}, content_ids,
--                                         folder_id);
--    return copy_internal(postbody);
--}
--
--Client::OutlinkList ClientPriv::create_folder_extranet_link(
--        const Client::Stringlist &folder_ids) {
++Client::Stringlist ClientPriv::copy_folders(const Client::Stringlist& folder_ids,
++                                            const string& folder_id) {
++    string postbody = generate_copy_body(folder_ids, vector<string> {},
++                                         folder_id);
++    return copy_internal(postbody);
++}
++
++Client::Stringlist ClientPriv::copy_contents(const Client::Stringlist& content_ids,
++                                             const string& folder_id) {
++    string postbody = generate_copy_body(Client::Stringlist{}, content_ids,
++                                         folder_id);
++    return copy_internal(postbody);
++}
++
++Client::OutlinkList ClientPriv::create_folder_sharing_url(const Client::Stringlist& folder_ids) {
      string postbody = generate_extranet_body(folder_ids, Client::Stringlist{});
--    return create_extranet_internal(postbody);
++    return create_url_internal(postbody);
+ }
--Client::OutlinkList ClientPriv::create_content_extranet_link(
--        const Client::Stringlist &content_ids) {
++Client::OutlinkList ClientPriv::create_content_sharing_url(const Client::Stringlist& content_ids) {
      string postbody = generate_extranet_body(Client::Stringlist{}, content_ids);
--    return create_extranet_internal(postbody);
++    return create_url_internal(postbody);
+ }
--DownloadTaskPriv::Ptr ClientPriv::create_download_link(const string &content_id) {
++DownloadTaskPriv::Ptr ClientPriv::create_download_link(const string& content_id) {
      string postbody = generate_download_body({{content_id}});
      log(postbody);
      auto future = httpclient_->async_post<DownloadTaskPriv::Ptr>(
--            { "richlifeApp", "devapp", "IUploadAndDownload" }, { }, postbody, content_type,
--            [](const tinyxml2::XMLElement *root) {
++    { "richlifeApp", "devapp", "IUploadAndDownload" }, { }, postbody, content_type,
++    [](const tinyxml2::XMLElement * root) {
          auto link_list = root->FirstChildElement("String");
          if (link_list) {
              auto link = link_list->FirstChildElement();
--            while(link) {
++            while (link) {
                  return std::make_shared<DownloadTaskPriv>(link);
+             }
@@ -788,19 +783,19 @@
      return get_or_throw(future);
+ }
--DownloadTaskPriv::Ptr ClientPriv::create_download_link(const DownloadBufferCb &buffer_cb) {
++DownloadTaskPriv::Ptr ClientPriv::create_download_link(const DownloadBufferCb& buffer_cb) {
      string postbody = generate_download_body(buffer_cb.content_id);
      log(postbody);
      auto future = httpclient_->async_post<DownloadTaskPriv::Ptr>(
--            { "richlifeApp", "devapp", "IUploadAndDownload" }, { }, postbody, content_type,
--            [buffer_cb](const tinyxml2::XMLElement *root) {
++    { "richlifeApp", "devapp", "IUploadAndDownload" }, { }, postbody, content_type,
++    [buffer_cb](const tinyxml2::XMLElement * root) {
          auto link_list = root->FirstChildElement("String");
          if (link_list) {
              auto link = link_list->FirstChildElement();
--            while(link) {
++            while (link) {
                  return std::make_shared<DownloadTaskPriv>(link, buffer_cb.write_cb);
+             }
@@ -814,20 +809,21 @@
      return get_or_throw(future);
+ }
--UploadTaskPriv::Ptr ClientPriv::create_upload_link(const UploadRequest &request_item) {
--    if (!fs::exists(request_item.file_path))
++UploadTaskPriv::Ptr ClientPriv::create_upload_link(const UploadRequest& request_item) {
++    if (!fs::exists(request_item.file_path)) {
          throw std::runtime_error(string("file not exists: ").append(request_item.file_path));
--
++    }
++
      string postbody = generate_upload_body(request_item);
      log(postbody);
      auto future = httpclient_->async_post<UploadTaskPriv::Ptr>(
--            { "richlifeApp", "devapp", "IUploadAndDownload" }, { }, postbody, content_type,
--            [request_item](const tinyxml2::XMLElement *root) {
++    { "richlifeApp", "devapp", "IUploadAndDownload" }, { }, postbody, content_type,
++    [request_item](const tinyxml2::XMLElement * root) {
          auto upload_res = root->FirstChildElement("uploadResult");
--        std::string task_id = upload_res->FirstChildElement("uploadTaskID")->GetText();
--        std::string redirection_url;
++        string task_id = upload_res->FirstChildElement("uploadTaskID")->GetText();
++        string redirection_url;
          if (upload_res->FirstChildElement("redirectionUrl")) {
              redirection_url = upload_res->FirstChildElement("redirectionUrl")->GetText();
+         }
@@ -835,7 +831,7 @@
          auto content_list = upload_res->FirstChildElement("newContentIDList");
          if (content_list) {
              auto content = content_list->FirstChildElement();
--            while(content) {
++            while (content) {
                  return std::make_shared<UploadTaskPriv>(content,
                                                          task_id,
                                                          redirection_url,
@@ -849,20 +845,20 @@
      return get_or_throw(future);
+ }
--UploadTaskPriv::Ptr ClientPriv::create_upload_link(const UploadBufferCb &buffer_cb) {
++UploadTaskPriv::Ptr ClientPriv::create_upload_link(const UploadBufferCb& buffer_cb) {
      string postbody = generate_upload_body(buffer_cb);
      log(postbody);
      auto future = httpclient_->async_post<UploadTaskPriv::Ptr>(
--            { "richlifeApp", "devapp", "IUploadAndDownload" }, { }, postbody, content_type,
--            [buffer_cb](const tinyxml2::XMLElement *root) {
++    { "richlifeApp", "devapp", "IUploadAndDownload" }, { }, postbody, content_type,
++    [buffer_cb](const tinyxml2::XMLElement * root) {
          SyncManager::UploadList results;
          auto upload_res = root->FirstChildElement("uploadResult");
--        std::string task_id = upload_res->FirstChildElement("uploadTaskID")->GetText();
++        string task_id = upload_res->FirstChildElement("uploadTaskID")->GetText();
--        std::string redirection_url;
++        string redirection_url;
          if (upload_res->FirstChildElement("redirectionUrl")) {
              redirection_url = upload_res->FirstChildElement("redirectionUrl")->GetText();
+         }
@@ -870,12 +866,12 @@
          auto content_list = upload_res->FirstChildElement("newContentIDList");
          if (content_list) {
              auto content = content_list->FirstChildElement();
--            while(content) {
++            while (content) {
                  return std::make_shared<UploadTaskPriv>(content,
--                                                       task_id,
--                                                       redirection_url,
--                                                       buffer_cb.buffer_size,
--                                                       buffer_cb.read_cb);
++                                                        task_id,
++                                                        redirection_url,
++                                                        buffer_cb.buffer_size,
++                                                        buffer_cb.read_cb);
+             }
+         }
@@ -886,20 +882,20 @@
+ }
  Client::ResourceList ClientPriv::cloud_root_folder_list() {
--    std::string postbody = generate_content_list_body();
++    string postbody = generate_contents_body();
      log(postbody);
      auto future = httpclient_->async_post<Client::ResourceList>(
--            { "richlifeApp", "devapp", "ICatalog" }, { }, postbody, content_type,
--            [](const tinyxml2::XMLElement *res) {
++    { "richlifeApp", "devapp", "ICatalog" }, { }, postbody, content_type,
++    [](const tinyxml2::XMLElement * res) {
          auto root = res->FirstChildElement();
          Client::ResourceList results;
          auto folder_list = root->FirstChildElement("catalogList");
          if (folder_list) {
              auto folder = folder_list->FirstChildElement();
--            while(folder) {
++            while (folder) {
                  results.emplace_back(std::shared_ptr<CloudFolder>(new CloudFolder(folder)));
                  folder = folder->NextSiblingElement();
+             }
@@ -911,19 +907,19 @@
      return get_or_throw(future);
+ }
--Client::ResourceList ClientPriv::cloud_content_list_internal(const string &postbody) {
++Client::ResourceList ClientPriv::cloud_content_list_internal(const string& postbody) {
      log(postbody);
      auto future = httpclient_->async_post<Client::ResourceList>(
--            { "richlifeApp", "devapp", "ICatalog" }, { }, postbody, content_type,
--            [](const tinyxml2::XMLElement *root) {
++    { "richlifeApp", "devapp", "ICatalog" }, { }, postbody, content_type,
++    [](const tinyxml2::XMLElement * root) -> Client::ResourceList {
          Client::ResourceList results;
          auto res = root->FirstChildElement();
          auto folder_list = res->FirstChildElement("catalogList");
          if (folder_list) {
              auto folder_ele = folder_list->FirstChildElement();
--            while(folder_ele) {
++            while (folder_ele) {
                  results.emplace_back(std::shared_ptr<CloudFolder>(
                                           new CloudFolder(folder_ele)));
                  folder_ele = folder_ele->NextSiblingElement();
@@ -933,9 +929,8 @@
          auto content_list = res->FirstChildElement("contentList");
          if (content_list) {
              auto content = content_list->FirstChildElement();
--            while(content) {
--                results.emplace_back(std::shared_ptr<CloudContent>(
--                                         new CloudContent(content)));
++            while (content) {
++                results.emplace_back(std::shared_ptr<CloudContent>(new CloudContent(content)));
                  content = content->NextSiblingElement();
+             }
+         }
@@ -946,12 +941,12 @@
      return get_or_throw(future);
+ }
--CloudContent::Ptr ClientPriv::content_item_internal(const string &postbody) {
++CloudContent::Ptr ClientPriv::content_item_internal(const string& postbody) {
      log(postbody);
      auto future = httpclient_->async_post<CloudContent::Ptr>(
--            { "richlifeApp", "devapp", "IContent" }, { }, postbody, content_type,
--            [](const tinyxml2::XMLElement *root) -> CloudContent::Ptr {
++    { "richlifeApp", "devapp", "IContent" }, { }, postbody, content_type,
++    [](const tinyxml2::XMLElement * root) -> CloudContent::Ptr {
          if (strcmp(root->Attribute("resultCode"), "0"))
              return nullptr;
@@ -962,12 +957,12 @@
      return get_or_throw(future);
+ }
--CloudFolder::Ptr ClientPriv::create_folder_internal(const string &postbody) {
++CloudFolder::Ptr ClientPriv::create_folder_internal(const string& postbody) {
      log(postbody);
      auto future =  httpclient_->async_post<CloudFolder::Ptr>(
--            { "richlifeApp", "devapp", "ICatalog" }, { }, postbody, content_type,
--            [](const tinyxml2::XMLElement *root) -> CloudFolder::Ptr {
++    { "richlifeApp", "devapp", "ICatalog" }, { }, postbody, content_type,
++    [](const tinyxml2::XMLElement * root) -> CloudFolder::Ptr {
          if (strcmp(root->Attribute("resultCode"), "0"))
              return nullptr;
@@ -978,19 +973,19 @@
      return get_or_throw(future);
+ }
--Client::ResourceList ClientPriv::look_up_internal(const string &postbody) {
++Client::ResourceList ClientPriv::look_up_internal(const string& postbody) {
      log(postbody);
      auto future =  httpclient_->async_post<Client::ResourceList>(
--            { "richlifeApp", "devapp", "ISearch" }, { }, postbody, content_type,
--            [](const tinyxml2::XMLElement *root) {
++    { "richlifeApp", "devapp", "ISearch" }, { }, postbody, content_type,
++    [](const tinyxml2::XMLElement * root) -> Client::ResourceList {
          Client::ResourceList results;
          auto res = root->FirstChildElement();
          auto folder_list = res->FirstChildElement("srchCtlgList");
          if (folder_list) {
              auto folder_ele = folder_list->FirstChildElement();
--            while(folder_ele) {
++            while (folder_ele) {
                  results.emplace_back(std::shared_ptr<CloudFolder>(
                                           new CloudFolder(folder_ele)));
                  folder_ele = folder_ele->NextSiblingElement();
@@ -1000,9 +995,8 @@
          auto content_list = res->FirstChildElement("srchCntList");
          if (content_list) {
              auto content_ele = content_list->FirstChildElement();
--            while(content_ele) {
--                results.emplace_back(std::shared_ptr<CloudContent>(
--                                         new CloudContent(content_ele)));
++            while (content_ele) {
++                results.emplace_back(std::shared_ptr<CloudContent>(new CloudContent(content_ele)));
                  content_ele = content_ele->NextSiblingElement();
+             }
+         }
@@ -1013,19 +1007,19 @@
      return get_or_throw(future);
+ }
--bool ClientPriv::exist_on_cloud_internal(const string &postbody) {
++bool ClientPriv::exist_on_cloud_internal(const string& postbody) {
      log(postbody);
      auto future = httpclient_->async_post<bool>(
--            { "richlifeApp", "devapp", "IUploadAndDownload" }, { }, postbody, content_type,
--            [](const tinyxml2::XMLElement *root) {
++    { "richlifeApp", "devapp", "IUploadAndDownload" }, { }, postbody, content_type,
++    [](const tinyxml2::XMLElement * root) {
          bool is_exists = false;
          auto upload_ele = root->FirstChildElement("uploadResult");
          auto new_content_list = upload_ele->FirstChildElement("newContentIDList");
          if (new_content_list) {
              auto new_content_ele = new_content_list->FirstChildElement();
--            if(new_content_ele) {
++            if (new_content_ele) {
                  is_exists = strcmp(new_content_ele->FirstChildElement("isNeedUpload")->GetText(), "1");
+             }
+         }
@@ -1036,43 +1030,44 @@
      return get_or_throw(future);
+ }
--bool ClientPriv::move_items_internal(const string &postbody) {
++bool ClientPriv::move_items_internal(const string& postbody) {
      return update_internal(postbody);
+ }
--bool ClientPriv::update_internal(const string &postbody) {
--    log(postbody);
--
--    auto future =  httpclient_->async_post<bool>(
--            { "richlifeApp", "devapp", "ICatalog" }, { }, postbody, content_type,
--            [](const tinyxml2::XMLElement *root) {
--        return !strcmp(root->Attribute("resultCode"), "0");
--    });
--
--    return get_or_throw(future);
--}
--
--bool ClientPriv::delete_internal(const string &postbody) {
--    log(postbody);
--
--    auto future =  httpclient_->async_post<bool>(
--            { "richlifeApp", "devapp", "IContent" }, { }, postbody, content_type,
--            [](const tinyxml2::XMLElement *root) {
--        return !strcmp(root->Attribute("resultCode"), "0");
--    });
--
--    return get_or_throw(future);
--}
--
--Client::Stringlist ClientPriv::copy_internal(const string &postbody) {
++bool ClientPriv::update_internal(const string& postbody) {
++    log(postbody);
++
++    auto future =  httpclient_->async_post<bool>(
++    { "richlifeApp", "devapp", "ICatalog" }, { }, postbody, content_type,
++    [](const tinyxml2::XMLElement * root) {
++        return !strcmp(root->Attribute("resultCode"), "0");
++    });
++
++    return get_or_throw(future);
++}
++
++bool ClientPriv::delete_internal(const string& postbody) {
++    log(postbody);
++
++    auto future =  httpclient_->async_post<bool>(
++    { "richlifeApp", "devapp", "IContent" }, { }, postbody, content_type,
++    [](const tinyxml2::XMLElement * root) {
++        return !strcmp(root->Attribute("resultCode"), "0");
++    });
++
++    return get_or_throw(future);
++}
++
++Client::Stringlist ClientPriv::copy_internal(const string& postbody) {
      log(postbody);
      auto future =  httpclient_->async_post<Client::Stringlist>(
--            { "richlifeApp", "devapp", "ICatalog" }, { }, postbody, content_type,
--            [](const tinyxml2::XMLElement *root) {
++    { "richlifeApp", "devapp", "ICatalog" }, { }, postbody, content_type,
++    [](const tinyxml2::XMLElement * root) -> Client::Stringlist {
          Client::Stringlist results;
--        if (strcmp(root->Attribute("resultCode"), "0"))
++        if (strcmp(root->Attribute("resultCode"), "0")) {
              return results;
++        }
          auto new_item = root->FirstChildElement("array")->FirstChildElement("item");
          while (new_item) {
@@ -1086,18 +1081,18 @@
      return get_or_throw(future);
+ }
--Client::OutlinkList ClientPriv::create_extranet_internal(const string &postbody) {
++Client::OutlinkList ClientPriv::create_url_internal(const string& postbody) {
      log(postbody);
      auto future = httpclient_->async_post<Client::OutlinkList>(
--            { "richlifeApp", "devapp", "IOutLink" }, { }, postbody, content_type,
--            [](const tinyxml2::XMLElement *root) {
++    { "richlifeApp", "devapp", "IOutLink" }, { }, postbody, content_type,
++    [](const tinyxml2::XMLElement * root) {
          Client::OutlinkList results;
          auto link_list = root->FirstChildElement("getOutLinkRes")->FirstChildElement("getOutLinkResSet");
          if (link_list) {
              auto link = link_list->FirstChildElement();
--            while(link) {
++            while (link) {
                  results.emplace_back(new Outlink(link));
                  link = link->NextSiblingElement();
+             }
@@ -1109,15 +1104,15 @@
      return get_or_throw(future);
+ }
--bool ClientPriv::refersh_token(const string &refresh_token) {
--    const std::string content_type = "application/x-www-form-urlencoded";
--    const std::string postbody = "grant_type=refresh_token&refresh_token="
--                                    + refresh_token;
++bool ClientPriv::refersh_token(const string& refresh_token) {
++    const string content_type = "application/x-www-form-urlencoded";
++    const string postbody     = "grant_type=refresh_token&refresh_token="
++                                + refresh_token;
      log(postbody);
      auto future = httpclient_->async_post<bool>(
--            { "oauthApp", "OAuth2", "refreshToken" }, { }, postbody, content_type,
--            [this](const tinyxml2::XMLElement *root) {
++    { "oauthApp", "OAuth2", "refreshToken" }, { }, postbody, content_type,
++    [this](const tinyxml2::XMLElement * root) {
          boost::cmatch cap;
          const boost::regex exp(".*\"(.*?)\"\\}");
          if (boost::regex_match(root->GetText(), cap, exp)) {
@@ -1130,16 +1125,17 @@
      return get_or_throw(future);
+ }
--void ClientPriv::cancel() {
--    httpclient_->cancelled_ = true;
--}
--
  SyncManager::Ptr ClientPriv::sync_manager() {
      return sync_manager_;
+ }
--template<typename T> T ClientPriv::get_or_throw(std::future<T> &f) {
--    if (f.wait_for(std::chrono::seconds(httpclient_->config_.request_timeout)) != std::future_status::ready) {
++void ClientPriv::cancel() {
++    httpclient_->cancelled_ = true;
++}
++
++template<typename T> T ClientPriv::get_or_throw(std::future<T>& f) {
++    if (f.wait_for(std::chrono::seconds(httpclient_->config_.request_timeout)) !=
++            std::future_status::ready) {
          throw HttpTimeoutException("HTTP request timeout");
+     }
 === modified file 'src/mcloud/api/client_priv.h'
 --- src/mcloud/api/client_priv.h	2016-09-26 01:43:23 +0000
 +++ src/mcloud/api/client_priv.h	2016-10-26 10:36:06 +0000
@@ -53,94 +53,94 @@
      virtual ~ClientPriv();
--    DiskInfo disk_info();
++    DiskInfo::Ptr disk_info();
      std::string cloud_sync_folder_id();
--    void set_access_token(const std::string &access_token);
--
--    CloudContent::Ptr   content_info(const std::string &content_id);
--
--    CloudFolder::Ptr    create_folder(const std::string &folder_name,
--                                      const std::string &folder_id);
--
--    Client::ResourceList look_up(const std::string &name,
--                                 const std::string &folder_id,
++    void set_access_token(const std::string& access_token);
++
++    CloudContent::Ptr   content_info(const std::string& content_id);
++
++    CloudFolder::Ptr    create_folder(const std::string& folder_name,
++                                      const std::string& folder_id);
++
++    Client::ResourceList look_up(const std::string& name,
++                                 const std::string& folder_id,
                                   CloudResource::Property property = CloudResource::Property::Content);
--    bool refersh_token(const std::string &refresh_token);
--
--    bool move_items(const Client::Stringlist &folder_ids,
--                    const Client::Stringlist &content_ids,
--                    const std::string &folder_id);
--
--    bool exist_on_cloud(const std::string &file_path, const std::string &folder_id);
--
--    bool update_folder(const std::string &folder_id,
--                       const std::string &new_name);
--
--    bool delete_contents(const Client::Stringlist &content_ids);
--
--    Client::Stringlist copy_folders(const Client::Stringlist &folder_ids,
--                                    const std::string &folder_id);
--
--    Client::Stringlist copy_contents(const Client::Stringlist &content_ids,
--                                     const std::string &folder_id);
++    bool refersh_token(const std::string& refresh_token);
++
++    bool move_items(const Client::Stringlist& folder_ids,
++                    const Client::Stringlist& content_ids,
++                    const std::string& folder_id);
++
++    bool exist_on_cloud(const std::string& file_path, const std::string& folder_id);
++
++    bool update_folder(const std::string& folder_id,
++                       const std::string& new_name);
++
++    bool delete_contents(const Client::Stringlist& content_ids);
++
++    Client::Stringlist copy_folders(const Client::Stringlist& folder_ids,
++                                    const std::string& folder_id);
++
++    Client::Stringlist copy_contents(const Client::Stringlist& content_ids,
++                                     const std::string& folder_id);
      Client::ResourceList cloud_content_list(int start_index,
                                              int count,
                                              CloudContent::Type content_type = CloudContent::Type::All,
--                                            const std::string &folder_id = std::string());
--
--    Client::OutlinkList create_folder_extranet_link(const Client::Stringlist &folder_ids);
--
--    Client::OutlinkList create_content_extranet_link(const Client::Stringlist &content_ids);
--
--    DownloadTaskPriv::Ptr create_download_link(const std::string  &content_id);
--
--    DownloadTaskPriv::Ptr create_download_link(const DownloadBufferCb  &buffer_cb);
++                                            const std::string& folder_id = std::string());
++
++    Client::OutlinkList create_folder_sharing_url(const Client::Stringlist& folder_ids);
++
++    Client::OutlinkList create_content_sharing_url(const Client::Stringlist& content_ids);
++
++    DownloadTaskPriv::Ptr create_download_link(const std::string&  content_id);
++
++    DownloadTaskPriv::Ptr create_download_link(const DownloadBufferCb&  buffer_cb);
      //Same name files in different directories are not allowed to upload to mcloud because of file names conflicts.
--    UploadTaskPriv::Ptr create_upload_link(const UploadRequest &reqeust_item);
++    UploadTaskPriv::Ptr create_upload_link(const UploadRequest& reqeust_item);
--    UploadTaskPriv::Ptr create_upload_link(const UploadBufferCb &buffer_cb);
++    UploadTaskPriv::Ptr create_upload_link(const UploadBufferCb& buffer_cb);
      void cancel();
--    std::shared_ptr<SyncManager> sync_manager();
++    SyncManager::Ptr sync_manager();
    private:
      Client::ResourceList cloud_root_folder_list();
--    Client::ResourceList cloud_content_list_internal(const std::string &postbody);
--
--    CloudContent::Ptr content_item_internal(const std::string &postbody);
--
--    CloudFolder::Ptr create_folder_internal(const std::string &postbody);
--
--    Client::ResourceList look_up_internal(const std::string &postbody);
--
--    bool exist_on_cloud_internal(const std::string &postbody);
--
--    bool move_items_internal(const std::string &postbody);
--
--    bool update_internal(const std::string &postbody);
--
--    bool delete_internal(const std::string &postbody);
--
--    Client::Stringlist copy_internal(const std::string &postbody);
--
--    Client::OutlinkList create_extranet_internal(const std::string &postbody);
--
--    template<typename T> T get_or_throw(std::future<T> &f);
++    Client::ResourceList cloud_content_list_internal(const std::string& postbody);
++
++    CloudContent::Ptr content_item_internal(const std::string& postbody);
++
++    CloudFolder::Ptr create_folder_internal(const std::string& postbody);
++
++    Client::ResourceList look_up_internal(const std::string& postbody);
++
++    bool exist_on_cloud_internal(const std::string& postbody);
++
++    bool move_items_internal(const std::string& postbody);
++
++    bool update_internal(const std::string& postbody);
++
++    bool delete_internal(const std::string& postbody);
++
++    Client::Stringlist copy_internal(const std::string& postbody);
++
++    Client::OutlinkList create_url_internal(const std::string& postbody);
++
++    template<typename T> T get_or_throw(std::future<T>& f);
    private:
      class HttpClient;
--    std::shared_ptr<HttpClient>  httpclient_;
++    std::unique_ptr<HttpClient>  httpclient_;
--    std::shared_ptr<SyncManager> sync_manager_;
++    SyncManager::Ptr sync_manager_;
  };
+ }
 === modified file 'src/mcloud/api/cloudcontent.cpp'
 --- src/mcloud/api/cloudcontent.cpp	2016-09-26 01:43:23 +0000
 +++ src/mcloud/api/cloudcontent.cpp	2016-10-26 10:36:06 +0000
@@ -23,12 +23,12 @@
  using namespace mcloud::api;
  using namespace std;
--extern std::time_t string_to_time(const std::string dt);
++extern time_t string_to_time(const string& dt);
  class CloudContent::Priv {
--public:
--    Priv(const tinyxml2::XMLElement *root) {
--        name_= root->FirstChildElement("contentName")->GetText();
++  public:
++    Priv(const tinyxml2::XMLElement* root) {
++        name_ = root->FirstChildElement("contentName")->GetText();
          id_ = root->FirstChildElement("contentID")->GetText();
          created_date_ = string_to_time(root->FirstChildElement("uploadTime")->GetText());
          updated_date_ = string_to_time(root->FirstChildElement("updateTime")->GetText());
@@ -67,69 +67,72 @@
              etag_ = etag_ele->GetText();
+         }
--    #ifndef NDEBUG
--        cout << "id: "<< id_ << " name: " << name_ << "  etag: "<< etag_ << endl;
--    #endif
++#ifndef NDEBUG
++        cout << "id: " << id_ << " name: " << name_ << "  etag: " << etag_ << endl;
++#endif
+     }
--  std::string id_;
--
--  std::string name_;
--
--  std::time_t created_date_;
--
--  std::time_t updated_date_;
--
--  std::string etag_;
--
--  std::string owner_;
--
--  std::string suffix_;
--
--  CloudContent::Type type_;
--
--  int64_t     content_size_;
--
--  std::string description_;
--
--  std::string thumbnail_url_;
--
--  std::string big_thumbnail_url_;
--
--  std::string present_url_;
--
--  std::string parent_catalog_id_;
++    string id_;
++
++    string name_;
++
++    time_t created_date_;
++
++    time_t updated_date_;
++
++    string etag_;
++
++    string owner_;
++
++    string suffix_;
++
++    CloudContent::Type type_;
++
++    int64_t     content_size_;
++
++    string description_;
++
++    string thumbnail_url_;
++
++    string big_thumbnail_url_;
++
++    string present_url_;
++
++    string parent_catalog_id_;
  };
--CloudContent::CloudContent(const tinyxml2::XMLElement *root)
--    : p(std::make_shared<Priv>(root)){
--}
--
--const string &CloudContent::id() const {
++CloudContent::CloudContent(const tinyxml2::XMLElement* root)
++    : p(new Priv(root)) {
++}
++
++CloudContent::~CloudContent() {
++}
++
++const string& CloudContent::id() const {
      return p->id_;
+ }
--const string &CloudContent::name() const {
++const string& CloudContent::name() const {
      return  p->name_;
+ }
--const time_t &CloudContent::created_date() const {
++const time_t& CloudContent::created_date() const {
      return p->created_date_;
+ }
--const time_t &CloudContent::updated_date() const {
++const time_t& CloudContent::updated_date() const {
      return p->updated_date_;
+ }
--const string &CloudContent::parent_catalog_id() const {
++const string& CloudContent::parent_catalog_id() const {
      return p->parent_catalog_id_;
+ }
--const string &CloudContent::etag() const {
++const string& CloudContent::etag() const {
      return p->etag_;
+ }
--const string &CloudContent::owner() const {
++const string& CloudContent::owner() const {
      return p->owner_;
+ }
@@ -137,7 +140,7 @@
      return CloudResource::Property::Content;
+ }
--const string &CloudContent::suffix() const {
++const string& CloudContent::suffix() const {
      return p->suffix_;
+ }
@@ -149,18 +152,18 @@
      return p->content_size_;
+ }
--const string &CloudContent::description() const {
++const string& CloudContent::description() const {
      return p->description_;
+ }
--const string &CloudContent::thumbnail_url() const {
++const string& CloudContent::thumbnail_url() const {
      return p->thumbnail_url_;
+ }
--const string &CloudContent::big_thumbnail_url() const {
++const string& CloudContent::big_thumbnail_url() const {
      return p->big_thumbnail_url_;
+ }
--const string &CloudContent::present_url() const {
++const string& CloudContent::present_url() const {
      return p->present_url_;
+ }
 === modified file 'src/mcloud/api/cloudfolder.cpp'
 --- src/mcloud/api/cloudfolder.cpp	2016-09-26 01:43:23 +0000
 +++ src/mcloud/api/cloudfolder.cpp	2016-10-26 10:36:06 +0000
@@ -27,17 +27,17 @@
  using namespace mcloud::api;
  using namespace std;
--std::time_t string_to_time(const std::string dt) {
--    struct std::tm tm;
--    std::istringstream ss(dt);
--    strptime(dt.c_str(), "%Y%m%d%H%M%S",&tm); // std::get std::put only available in GCC 5
--    return std::mktime(&tm);
++time_t string_to_time(const string& dt) {
++    struct tm tm;
++    istringstream ss(dt);
++    strptime(dt.c_str(), "%Y%m%d%H%M%S", &tm); // get put only available in GCC 5
++    return mktime(&tm);
+ }
  class CloudFolder::Priv {
--public:
--    Priv(const tinyxml2::XMLElement *root) {
--        name_= root->FirstChildElement("catalogName")->GetText();
++  public:
++    Priv(const tinyxml2::XMLElement* root) {
++        name_ = root->FirstChildElement("catalogName")->GetText();
          id_ = root->FirstChildElement("catalogID")->GetText();
          created_date_ = string_to_time(root->FirstChildElement("createTime")->GetText());
          update_date_ = string_to_time(root->FirstChildElement("updateTime")->GetText());
@@ -72,64 +72,67 @@
          folder_type_ = (Type)atoi(root->FirstChildElement("catalogType")->GetText());
--    #ifndef NDEBUG
--        cout << "id: "<< id_ << " name: " << name_ << "  etag: "<< etag_ << endl;
--    #endif
++#ifndef NDEBUG
++        cout << "id: " << id_ << " name: " << name_ << "  etag: " << etag_ << endl;
++#endif
+     }
--    std::string id_;
--
--    std::string name_;
--
--    std::time_t created_date_;
--
--    std::time_t update_date_;
--
--    std::string parent_catalog_id_;
--
--    std::string etag_;
--
--    std::string owner_;
++    string id_;
++
++    string name_;
++
++    time_t created_date_;
++
++    time_t update_date_;
++
++    string parent_catalog_id_;
++
++    string etag_;
++
++    string owner_;
      CloudFolder::Type folder_type_;
--    std::string folder_path_;
++    string folder_path_;
  };
--CloudFolder::CloudFolder(const tinyxml2::XMLElement *root)
--    :p_(std::make_shared<Priv>(root)){
--}
--
--const string &CloudFolder::id() const {
++CloudFolder::CloudFolder(const tinyxml2::XMLElement* root)
++    : p_(new Priv(root)) {
++}
++
++CloudFolder::~CloudFolder() {
++}
++
++const string& CloudFolder::id() const {
      return p_->id_;
+ }
--const string &CloudFolder::name() const {