Changeset 11

Timestamp:

07/18/07 03:23:54 (1 year ago)

Author:

devja..@anarkystic.com

Message:

reorg

Files:

• aws/aws/__init__.py (added)
• aws/aws/client.py (added)
• aws/aws/s3.py (moved) (moved from aws/s3.py) (9 diffs)

aws/aws/s3.py

@@ -1 @@
-
-
+
-import httplib
-import re
-import sha
-import time
-from StringIO import StringIO
-import xml.sax
-import urllib
-import mimetypes
+import os, os.path
+import cPickle as pickle
-
-from twisted.internet import task, reactor, defer, protocol
@@ -18 +16 @@
-from twisted.web2 import stream, http_headers
-
+from aws.client import getPage, addAuthHeader
-
-class Options(usage.Options):
@@ -26 +25 @@
-        ]
-    
-
-
-
-
-
+
-    def __init__(self, config):
-        self.config = config
@@ -170 +165 @@
-
-        d = self.getPage(**params)
-
-
+
+
+
+
+
+
+
+
+
+
-        return d
-    def headObject(self, bucket, name, headers=None):
@@ -201 +204 @@
-        return getPage(**kw)
-
+
+class CachedS3(S3):
+    def __init__(self, config, cache):
+        S3.__init__(self, config)
+        self.cache = cache
+
+    def getObject(self, *args, **kw):
+        item = self.cache.get(*args, **kw)
+        if not item:
+            item = S3.getObject(self, *args, **kw)
+            self.cache.set(*args, **kw)
+        return item
+
+    def putObject(self, *args, **kw):
+        rv = S3.putObject(self, *args, **kw)
+        self.cache.clear(*args, **kw)
+        return rv
+
+    def deleteObject(self, *args, **kw):
+        rv = S3.deleteObject(self, *args, **kw)
+        self.cache.clear(*args, **kw)
+        return rv
+
-def makeService(config):
-    s = S3(config)
@@ -206 +232 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-### Support for Amazon S3 example code
@@ -242 +273 @@
-    def read(self, *args, **kw):
-        return self.body.read(*args, **kw)
-
+
+
+
-    buf = []
-    def _buffer(s):
@@ -248 +281 @@
-            return "".join(buf)
-        buf.append(s)
-response.stream
+s
-        next.addCallback(_buffer)
-        return next
-        
+    d = defer.maybeDeferred(response.stream.read)
+    d.addCallback(_buffer)
+    return d
+
+def build_old_response(response):
-    def _assemble(b):
-        headers = dict(response.headers.getAllRawHeaders())
-        o = OldResponse(response.code, headers, b)
-        return o
-
-
+
-    d.addCallback(_assemble)
-    return d
@@ -264 +301 @@
-### not my favorite interface but using SAX is probably faster than 
-### whatever I was going to do
-def add_auth_header(method, path, headers, access_key, secret_access_key):
-    headers.setdefault("Date", time.strftime("%a, %d %b %Y %X GMT", time.gmtime()))
-
-    interesting_headers = {}
-    for key in headers:
-        lk = key.lower()
-        if lk in ['content-md5', 'content-type', 'date'] or lk.startswith(AMAZON_HEADER_PREFIX):
-            interesting_headers[lk] = headers[key]
-
-    # these keys get empty strings if they don't exist
-    interesting_headers.setdefault('content-type', '')
-    interesting_headers.setdefault('content-md5', '')
-
-    # just in case someone used this.  it's not necessary in this lib.
-    if interesting_headers.has_key('x-amz-date'):
-        interesting_headers['date'] = ''
-
-    sorted_header_keys = interesting_headers.keys()
-    sorted_header_keys.sort()
-    
-    canonical_string = "%s\n" % method
-    for key in sorted_header_keys:
-        if key.startswith(AMAZON_HEADER_PREFIX):
-            canonical_string += "%s:%s\n" % (key, interesting_headers[key])
-        else:
-            canonical_string += "%s\n" % interesting_headers[key]
-    
-    
-    # don't include anything after the first ? in the resource...
-    canonical_string += path.split('?')[0]
-    
-    # ...unless there is an acl or torrent parameter
-    if re.search("[&?]acl($|=|&)", path):
-        canonical_string += "?acl"
-    elif re.search("[&?]torrent($|=|&)", path):
-        canonical_string += "?torrent"
-    
-    encoded_canonical = base64.encodestring(hmac.new(secret_access_key, canonical_string, sha).digest()).strip()
-    headers['Authorization'] = "AWS %s:%s" % (access_key, encoded_canonical) 
-    return headers
-class S3Object:
-    def __init__(self, data, metadata={}):