X-Git-Url: http://git.vrable.net/?p=cumulus.git;a=blobdiff_plain;f=python%2Fcumulus%2Fstore%2F__init__.py;h=f32ff9fe4f47efc1d9693528b675813b56e88a9a;hp=35de0ee153ed57187f83a7d7ebf48b7ebee5f51a;hb=65edb87a0b8a578b4a7221478a851d71df21fab0;hpb=fe6bbd9d0b49d6b6e43451f7703894ab02aee73e

diff --git a/python/cumulus/store/__init__.py b/python/cumulus/store/__init__.py
index 35de0ee..f32ff9f 100644
--- a/python/cumulus/store/__init__.py
+++ b/python/cumulus/store/__init__.py
@@ -11,23 +11,46 @@ class NotFoundError(exceptions.KeyError):
 
     pass
 
-class Store:
+class Store (object):
     """Base class for all cumulus storage backends."""
 
+    def __new__ (cls, url, **kw):
+        """ Return the correct sub-class depending on url,
+        pass parsed url parameters to object
+        """
+        if cls != Store:
+            return super(Store, cls).__new__(cls, url, **kw)
+        (scheme, netloc, path, params, query, fragment) \
+            = urlparse.urlparse(url)
+
+        try:
+            cumulus = __import__('cumulus.store.%s' % scheme, globals())
+            subcls = getattr (cumulus.store, scheme).Store
+            obj = super(Store, cls).__new__(subcls, url, **kw)
+            obj.scheme = scheme
+            obj.netloc = netloc
+            obj.path = path
+            obj.params = params
+            obj.query = query
+            obj.fragment = fragment
+            return obj
+        except ImportError:
+            raise NotImplementedError, "Scheme %s not implemented" % scheme
+
     def list(self, type):
-        raise NotImplementedException
+        raise NotImplementedError
 
     def get(self, type, name):
-        raise NotImplementedException
+        raise NotImplementedError
 
     def put(self, type, name, fp):
-        raise NotImplementedException
+        raise NotImplementedError
 
     def delete(self, type, name):
-        raise NotImplementedException
+        raise NotImplementedError
 
     def stat(self, type, name):
-        raise NotImplementedException
+        raise NotImplementedError
 
     def scan(self):
         """Cache file information stored in this backend.
@@ -38,16 +61,4 @@ class Store:
         pass
 
 def open(url):
-    (scheme, netloc, path, params, query, fragment) \
-        = urlparse.urlparse(url)
-
-    if scheme == "file":
-        import cumulus.store.file
-        return cumulus.store.file.FileStore(path)
-    elif scheme == "s3":
-        import cumulus.store.s3
-        while path.startswith("/"): path = path[1:]
-        (bucket, path) = path.split("/", 1)
-        return cumulus.store.s3.S3Store(bucket, path)
-    else:
-        raise NotImplementedException
+    return Store(url)