Merge pull request #11 from cesterlizi/master

pycurl speed  & verbose options

Author: designerror

.gitignore

@@ -0,0 +1,2 @@
+*.pyc
+/**/*.pyc

README.md

@@ -89,6 +89,20 @@ options = {
 client = wc.Client(options)
 ```
 
+Other options for pycurl
+
+```python
+options = {
+ 'recv_speed' : 3000000,
+ 'send_speed' : 3000000,
+ 'verbose' :True
+}
+```
+
+recv_speed: rate limit data download speed in Bytes per second. Defaults to unlimited speed.  
+send_speed: rate limit data upload speed in Bytes per second.  Defaults to unlimited speed.  
+verbose: set verbose mode on/off.  
+
 **Synchronous methods**
 
 ```python

README.rst

@@ -91,6 +91,21 @@ is defined as follows:
     }
     client = wc.Client(options)
 
+Other options for pycurl
+
+.. code:: python
+
+    options = {
+     'recv_speed' : 3000000,
+     'send_speed' : 3000000,
+     'verbose' :True
+    }
+
+| *recv_speed: rate limit data download speed in Bytes per second. Defaults to unlimited speed.*
+| *send_speed: rate limit data upload speed in Bytes per second. Defaults to unlimited speed.*
+| *verbose: set verbose mode on/off.*
+| 
+
 **Synchronous methods**
 
 .. code:: python

setup.py

@@ -7,7 +7,7 @@
 from setuptools.command.test import test as TestCommand
 from setuptools.command.install import install as InstallCommand
 
-version = "1.0.7"
+version = "1.0.8"
 requirements = "libxml2-dev libxslt-dev python-dev libcurl4-openssl-dev python-pycurl"
 
 class Install(InstallCommand):

webdav/client.py

@@ -16,7 +16,7 @@
 except ImportError:
     from urllib import unquote
 
-__version__ = "1.0.7"
+__version__ = "1.0.8"
 
 
 def listdir(directory):
@@ -71,7 +71,7 @@ class Client(object):
         'move': ["Accept: */*"],
         'mkdir': ["Accept: */*", "Connection: Keep-Alive"],
         'clean': ["Accept: */*", "Connection: Keep-Alive"],
-        'check': ["Accept: */*", "Depth: 0"],
+        'check': ["Accept: */*"],
         'info': ["Accept: */*", "Depth: 1"],
         'get_metadata': ["Accept: */*", "Depth: 1", "Content-Type: application/x-www-form-urlencoded"],
         'set_metadata': ["Accept: */*", "Depth: 1", "Content-Type: application/x-www-form-urlencoded"]
@@ -98,7 +98,7 @@ def get_header(self, method):
         'move': "MOVE",
         'mkdir': "MKCOL",
         'clean': "DELETE",
-        'check': "PROPFIND",
+        'check': "HEAD",
         'list': "PROPFIND",
         'free': "PROPFIND",
         'info': "PROPFIND",
@@ -164,6 +164,15 @@ def Request(self, options=None):
         if self.webdav.key_path:
             self.default_options['SSLKEY'] = self.webdav.key_path
 
+        if self.webdav.recv_speed:
+            self.default_options['MAX_RECV_SPEED_LARGE'] = self.webdav.recv_speed
+
+        if self.webdav.send_speed:
+            self.default_options['MAX_SEND_SPEED_LARGE'] = self.webdav.send_speed
+
+        if self.webdav.verbose:
+            self.default_options['VERBOSE'] = self.webdav.verbose
+        
         if self.default_options:
             add_options(curl, self.default_options)
 
@@ -266,52 +275,29 @@ def data():
 
     def check(self, remote_path=root):
 
-        def parse(response, path):
-
-            try:
-                response_str = response.getvalue()
-                tree = etree.fromstring(response_str)
-
-                resps = tree.findall("{DAV:}response")
-
-                for resp in resps:
-                    href = resp.findtext("{DAV:}href")
-                    urn = unquote(href)
-
-                    if path.endswith(Urn.separate):
-                        if path == urn or path[:-1] == urn:
-                            return True
-                    else:
-                        if path == urn:
-                            return True
-
-                return False
-
-            except etree.XMLSyntaxError:
-                return False
-                
         try:
             urn = Urn(remote_path)
-            parent_urn = Urn(urn.parent())
             response = BytesIO()
 
-            url = {'hostname': self.webdav.hostname, 'root': self.webdav.root, 'path': parent_urn.quote()}
+            url = {'hostname': self.webdav.hostname, 'root': self.webdav.root, 'path': urn.quote()}
             options = {
                 'URL': "{hostname}{root}{path}".format(**url),
-                'CUSTOMREQUEST': Client.requests['info'],
-                'HTTPHEADER': self.get_header('info'),
+                'CUSTOMREQUEST': Client.requests['check'],
+                'HTTPHEADER': self.get_header('check'),
                 'WRITEDATA': response,
-                'NOBODY': 0
+                'NOBODY': 1
             }
 
             request = self.Request(options=options)
 
             request.perform()
+            code = request.getinfo(pycurl.HTTP_CODE)
             request.close()
 
-            path = "{root}{path}".format(root=self.webdav.root, path=urn.path())
-
-            return parse(response, path)
+            if int(code) == 200:
+                return True
+        
+            return False
 
         except pycurl.error:
             raise NotConnection(self.webdav.hostname)
@@ -514,9 +500,6 @@ def upload_file(self, remote_path, local_path, progress=None):
             if os.path.isdir(local_path):
                 raise OptionNotValid(name="local_path", value=local_path)
 
-            if not os.path.exists(local_path):
-                raise LocalResourceNotFound(local_path)
-
             if not self.check(urn.parent()):
                 raise RemoteParentNotFound(urn.path())
 

webdav/connection.py

@@ -21,7 +21,7 @@ class WebDAVSettings(ConnectionSettings):
 
     ns = "webdav:"
     prefix = "webdav_"
-    keys = {'hostname', 'login', 'password', 'token', 'root', 'cert_path', 'key_path'}
+    keys = {'hostname', 'login', 'password', 'token', 'root', 'cert_path', 'key_path', 'recv_speed', 'send_speed', 'verbose'}
 
     def __init__(self, options):
 
@@ -78,4 +78,4 @@ def is_valid(self):
 
         if self.login or self.password:
             if not self.hostname:
-                raise OptionNotValid(name="hostname", value=self.hostname, ns=self.ns)
+                raise OptionNotValid(name="hostname", value=self.hostname, ns=self.ns)