X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_common%2Ffslocal.py;h=b90b25e7c07f0173c6f9269d97646feb49f7827b;hb=e458cd8c564e13a04656e6a8337b7d5225cb1f8d;hp=bd243f025ee75df2080848df86d6ea757cb22585;hpb=d4378aa85f33bffbf3ef303dbd66513562cbe8f2;p=osm%2Fcommon.git diff --git a/osm_common/fslocal.py b/osm_common/fslocal.py index bd243f0..b90b25e 100644 --- a/osm_common/fslocal.py +++ b/osm_common/fslocal.py @@ -60,6 +60,8 @@ 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) @@ -91,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): @@ -164,12 +168,17 @@ class FsLocal(FsBase): :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): + pass # Not needed in fslocal