X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_common%2Ffslocal.py;h=45ae828f5cf83fb58a410bef8fb3764ecc72b57f;hb=refs%2Fchanges%2F75%2F8875%2F4;hp=61600ec96e1b8918c25e5ebc485172a2b06ffd6e;hpb=1e9a329ca0085be33665e35d123394905bc46d74;p=osm%2Fcommon.git

diff --git a/osm_common/fslocal.py b/osm_common/fslocal.py
index 61600ec..45ae828 100644
--- a/osm_common/fslocal.py
+++ b/osm_common/fslocal.py
@@ -60,6 +60,24 @@ class FsLocal(FsBase):
         """
         try:
             os.mkdir(self.path + folder)
+        except FileExistsError:  # make it idempotent
+            pass
+        except Exception as e:
+            raise FsException(str(e), http_code=HTTPStatus.INTERNAL_SERVER_ERROR)
+
+    def dir_rename(self, src, dst):
+        """
+        Rename one directory name. If dst exist, it replaces (deletes) existing directory
+        :param src: source directory
+        :param dst: destination directory
+        :return: None or raises and exception
+        """
+        try:
+            if os.path.exists(self.path + dst):
+                rmtree(self.path + dst)
+
+            os.rename(self.path + src, self.path + dst)
+
         except Exception as e:
             raise FsException(str(e), http_code=HTTPStatus.INTERNAL_SERVER_ERROR)
 
@@ -75,6 +93,8 @@ class FsLocal(FsBase):
         else:
             f = "/".join(storage)
         if os.path.exists(self.path + f):
+            if not mode:
+                return True
             if mode == "file" and os.path.isfile(self.path + f):
                 return True
             if mode == "dir" and os.path.isdir(self.path + f):
@@ -143,17 +163,22 @@ class FsLocal(FsBase):
 
     def file_delete(self, storage, ignore_non_exist=False):
         """
-        Delete storage content recursivelly
+        Delete storage content recursively
         :param storage: can be a str or list of str
         :param ignore_non_exist: not raise exception if storage does not exist
         :return: None
         """
-
-        if isinstance(storage, str):
-            f = self.path + storage
-        else:
-            f = self.path + "/".join(storage)
-        if os.path.exists(f):
-            rmtree(f)
-        elif not ignore_non_exist:
-            raise FsException("File {} does not exist".format(storage), http_code=HTTPStatus.NOT_FOUND)
+        try:
+            if isinstance(storage, str):
+                f = self.path + storage
+            else:
+                f = self.path + "/".join(storage)
+            if os.path.exists(f):
+                rmtree(f)
+            elif not ignore_non_exist:
+                raise FsException("File {} does not exist".format(storage), http_code=HTTPStatus.NOT_FOUND)
+        except (IOError, PermissionError) as e:
+            raise FsException("File {} cannot be deleted: {}".format(f, e), http_code=HTTPStatus.INTERNAL_SERVER_ERROR)
+
+    def sync(self, from_path=None):
+        pass  # Not needed in fslocal