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

diff --git a/python/cumulus/store/__init__.py b/python/cumulus/store/__init__.py
index f32ff9f..0899d70 100644
--- a/python/cumulus/store/__init__.py
+++ b/python/cumulus/store/__init__.py
@@ -1,9 +1,27 @@
+# Cumulus: Efficient Filesystem Backup to the Cloud
+# Copyright (C) 2008-2010 The Cumulus Developers
+# See the AUTHORS file for a list of contributors.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
 import exceptions, re, urlparse
 
 type_patterns = {
     'checksums': re.compile(r"^snapshot-(.*)\.(\w+)sums$"),
     'segments': re.compile(r"^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})(\.\S+)?$"),
-    'snapshots': re.compile(r"^snapshot-(.*)\.lbs$")
+    'snapshots': re.compile(r"^snapshot-(.*)\.(cumulus|lbs)$")
 }
 
 class NotFoundError(exceptions.KeyError):
@@ -37,19 +55,19 @@ class Store (object):
         except ImportError:
             raise NotImplementedError, "Scheme %s not implemented" % scheme
 
-    def list(self, type):
+    def list(self, path):
         raise NotImplementedError
 
-    def get(self, type, name):
+    def get(self, path):
         raise NotImplementedError
 
-    def put(self, type, name, fp):
+    def put(self, path, fp):
         raise NotImplementedError
 
-    def delete(self, type, name):
+    def delete(self, path):
         raise NotImplementedError
 
-    def stat(self, type, name):
+    def stat(self, path):
         raise NotImplementedError
 
     def scan(self):
@@ -60,5 +78,15 @@ class Store (object):
 
         pass
 
+    def close(self):
+        """Tear down the connection explicitly if needed
+
+        Currently needed for sftp to be able to end the program."""
+
+        pass
+
+    def __del__(self):
+        self.close()
+
 def open(url):
     return Store(url)