Merge pull request #117 from SergioBertolinSG/extra_args_sharing_with_link

Extra args sharing with link

Author: Vincent Petry

owncloud/owncloud.py

@@ -652,25 +652,41 @@ def copy(self, remote_path_source, remote_path_target):
         """
         return self.__webdav_move_copy(remote_path_source,remote_path_target,"COPY")
 
-    def share_file_with_link(self, path):
+    def share_file_with_link(self, path, **kwargs):
         """Shares a remote file with link
 
         :param path: path to the remote file to share
+        :param perms (optional): permission of the shared object
+        defaults to read only (1)
+        :param public_upload (optional): allows users to upload files or folders
+        :param password (optional): sets a password
+        http://doc.owncloud.org/server/6.0/admin_manual/sharing_api/index.html
         :returns: instance of :class:`PublicShare` with the share info
             or False if the operation failed
         :raises: HTTPResponseError in case an HTTP error status was returned
         """
+        perms = kwargs.get('perms', None)
+        public_upload = kwargs.get('public_upload', 'false')
+        password = kwargs.get('password', None)        
+
+
         path = self.__normalize_path(path)
         post_data = {
             'shareType': self.OCS_SHARE_TYPE_LINK,
-            'path': self.__encode_string(path)
+            'path': self.__encode_string(path),
         }
+        if (public_upload is not None) and (isinstance(public_upload, bool)):
+            post_data['publicUpload'] = str(public_upload).lower()
+        if isinstance(password, basestring):
+            post_data['password'] = password
+        if perms:
+            post_data['permissions'] = perms
 
         res = self.__make_ocs_request(
             'POST',
             self.OCS_SERVICE_SHARE,
             'shares',
-            data=post_data
+            data = post_data
         )
         if res.status_code == 200:
             tree = ET.fromstring(res.content)

owncloud/test/test.py

@@ -562,7 +562,7 @@ def test_share_with_link(self, file_name):
         path = self.test_root + file_name
         self.assertTrue(self.client.put_file_contents(path, 'hello world!'))
 
-        share_info = self.client.share_file_with_link(path)
+        share_info = self.client.share_file_with_link(path, public_upload=True, password='1234')
 
         self.assertTrue(self.client.is_shared(path))
         self.assertTrue(isinstance(share_info, owncloud.PublicShare))
@@ -571,6 +571,8 @@ def test_share_with_link(self, file_name):
         self.assertTrue(type(share_info.link) is str)
         self.assertTrue(type(share_info.token) is str)
 
+
+
     def test_share_with_link_non_existing_file(self):
         """Test sharing a file with link"""
         with self.assertRaises(owncloud.ResponseError) as e:
@@ -592,6 +594,8 @@ def test_share_with_user(self, file_name):
         self.assertTrue(type(share_info.share_id) is int)
         self.assertTrue(share_info.perms, 31)
         self.assertTrue(self.client.delete(path))
+    
+
 
     @data_provider(files)
     def test_delete_share(self, file_name):