libcloud-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From to...@apache.org
Subject svn commit: r1090613 - in /incubator/libcloud/trunk/libcloud/storage: base.py drivers/cloudfiles.py
Date Sat, 09 Apr 2011 15:50:41 GMT
Author: tomaz
Date: Sat Apr  9 15:50:41 2011
New Revision: 1090613

URL: http://svn.apache.org/viewvc?rev=1090613&view=rev
Log:
Move _put_object method from the CloudFiles driver to the base StorageDriver
class, refactor it and make ClouFiles driver use this method.

Modified:
    incubator/libcloud/trunk/libcloud/storage/base.py
    incubator/libcloud/trunk/libcloud/storage/drivers/cloudfiles.py

Modified: incubator/libcloud/trunk/libcloud/storage/base.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/storage/base.py?rev=1090613&r1=1090612&r2=1090613&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/storage/base.py (original)
+++ incubator/libcloud/trunk/libcloud/storage/base.py Sat Apr  9 15:50:41 2011
@@ -481,6 +481,51 @@ class StorageDriver(object):
 
         return True
 
+    def _upload_object(self, object_name, content_type, upload_func,
+                       upload_func_kwargs, request_path, request_method='PUT',
+                       headers=None, file_path=None, iterator=None):
+        """
+        Helper function for setting common request headers and calling the
+        passed in callback which uploads an object.
+        """
+        headers = headers or {}
+        if not content_type:
+            if file_path:
+                name = file_path
+            else:
+                name = object_name
+            content_type, _ = utils.guess_file_mime_type(name)
+
+            if not content_type:
+                raise AttributeError(
+                    'File content-type could not be guessed and' +
+                    ' no content_type value provided')
+
+        headers = {}
+        if iterator:
+            headers['Transfer-Encoding'] = 'chunked'
+            upload_func_kwargs['chunked'] = True
+        else:
+            file_size = os.path.getsize(file_path)
+            headers['Content-Length'] = file_size
+            upload_func_kwargs['chunked'] = False
+
+        headers['Content-Type'] = content_type
+        response = self.connection.request(request_path,
+                                           method=request_method, data=None,
+                                           headers=headers, raw=True)
+
+        upload_func_kwargs['response'] = response
+        success, data_hash, bytes_transferred = upload_func(**upload_func_kwargs)
+
+        if not success:
+            raise LibcloudError(value='Object upload failed, Perhaps a timeout?',
+                                driver=self)
+
+        result_dict = { 'response': response.response, 'data_hash': data_hash,
+                        'bytes_transferred': bytes_transferred }
+        return result_dict
+
     def _stream_data(self, response, iterator, chunked=False,
                      calculate_hash=True, chunk_size=None):
         """

Modified: incubator/libcloud/trunk/libcloud/storage/drivers/cloudfiles.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/storage/drivers/cloudfiles.py?rev=1090613&r1=1090612&r2=1090613&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/storage/drivers/cloudfiles.py (original)
+++ incubator/libcloud/trunk/libcloud/storage/drivers/cloudfiles.py Sat Apr  9 15:50:41 2011
@@ -278,12 +278,13 @@ class CloudFilesStorageDriver(StorageDri
         Note: This will override file with a same name if it already exists.
         """
         upload_func = self._upload_file
-        upload_func_args = { 'file_path': file_path }
+        upload_func_kwargs = { 'file_path': file_path }
 
-        return self._put_object(container=container, file_path=file_path,
-                                object_name=object_name, extra=extra,
+        return self._put_object(container=container, object_name=object_name,
                                 upload_func=upload_func,
-                                upload_func_args=upload_func_args)
+                                upload_func_kwargs=upload_func_kwargs,
+                                extra=extra, file_path=file_path,
+                                file_hash=file_hash)
 
     def upload_object_via_stream(self, iterator,
                                  container, object_name, extra=None):
@@ -291,12 +292,12 @@ class CloudFilesStorageDriver(StorageDri
             iterator = iter(iterator)
 
         upload_func = self._stream_data
-        upload_func_args = { 'iterator': iterator }
+        upload_func_kwargs = { 'iterator': iterator }
 
-        return self._put_object(container=container, iterator=iterator,
-                                object_name=object_name, extra=extra,
+        return self._put_object(container=container, object_name=object_name,
                                 upload_func=upload_func,
-                                upload_func_args=upload_func_args)
+                                upload_func_kwargs=upload_func_kwargs,
+                                extra=extra, iterator=iterator)
 
     def delete_object(self, obj):
         container_name = self._clean_container_name(obj.container.name)
@@ -313,61 +314,40 @@ class CloudFilesStorageDriver(StorageDri
 
         raise LibcloudError('Unexpected status code: %s' % (response.status))
 
-    def _put_object(self, upload_func, upload_func_args, container, object_name,
-                    extra=None, file_path=None, iterator=None, file_hash=None):
+    def _put_object(self, container, object_name, upload_func,
+                    upload_func_kwargs, extra=None, file_path=None,
+                    iterator=None, file_hash=None):
+        extra = extra or {}
         container_name_cleaned = self._clean_container_name(container.name)
         object_name_cleaned = self._clean_object_name(object_name)
-
-        extra = extra or {}
         content_type = extra.get('content_type', None)
         meta_data = extra.get('meta_data', None)
 
-        if not content_type:
-            if file_path:
-                name = file_path
-            else:
-                name = object_name
-            content_type, _ = utils.guess_file_mime_type(name)
-
-            if not content_type:
-                raise AttributeError(
-                    'File content-type could not be guessed and' +
-                    ' no content_type value provided')
-
         headers = {}
-        if iterator:
-            headers['Transfer-Encoding'] = 'chunked'
-            upload_func_args['chunked'] = True
-        else:
-            file_size = os.path.getsize(file_path)
-            headers['Content-Length'] = file_size
-            upload_func_args['chunked'] = False
-
-            if file_hash:
-                headers['ETag'] = file_hash
-
-        headers['Content-Type'] = content_type
+        if not iterator and file_hash:
+            headers['ETag'] = file_hash
 
         if meta_data:
             for key, value in meta_data.iteritems():
                 key = 'X-Object-Meta-%s' % (key)
                 headers[key] = value
 
-        response = self.connection.request('/%s/%s' % (container_name_cleaned,
-                                                       object_name_cleaned),
-                                           method='PUT', data=None,
-                                           headers=headers, raw=True)
-
-        upload_func_args['response'] = response
-        success, data_hash, bytes_transferred = upload_func(**upload_func_args)
-
-        if not success:
-            raise LibcloudError('Object upload failed, Perhaps a timeout?')
+        request_path = '/%s/%s' % (container_name_cleaned, object_name_cleaned)
+        result_dict = self._upload_object(object_name=object_name,
+                                          content_type=content_type,
+                                          upload_func=upload_func,
+                                          upload_func_kwargs=upload_func_kwargs,
+                                          request_path=request_path,
+                                          request_method='PUT',
+                                          headers=headers, file_path=file_path,
+                                          iterator=iterator)
 
-        response = response.response
+        response = result_dict['response']
+        bytes_transferred = result_dict['bytes_transferred']
 
         if response.status == httplib.EXPECTATION_FAILED:
-            raise LibcloudError('Missing content-type header')
+            raise LibcloudError(value='Missing content-type header',
+                                driver=self)
         elif response.status == httplib.UNPROCESSABLE_ENTITY:
             raise ObjectHashMismatchError(
                 value='MD5 hash checksum does not match',



Mime
View raw message