projects
/
osm
/
common.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Jenkins refresh
[osm/common.git]
/
osm_common
/
fslocal.py
diff --git
a/osm_common/fslocal.py
b/osm_common/fslocal.py
index
4a82c4f
..
5bae0e9
100644
(file)
--- a/
osm_common/fslocal.py
+++ b/
osm_common/fslocal.py
@@
-15,12
+15,13
@@
# See the License for the specific language governing permissions and
# limitations under the License.
# See the License for the specific language governing permissions and
# limitations under the License.
-import os
-import logging
-
-# import tarfile
from http import HTTPStatus
from http import HTTPStatus
+import logging
+import os
from shutil import rmtree
from shutil import rmtree
+import tarfile
+import zipfile
+
from osm_common.fsbase import FsBase, FsException
__author__ = "Alfonso Tierno <alfonso.tiernosepulveda@telefonica.com>"
from osm_common.fsbase import FsBase, FsException
__author__ = "Alfonso Tierno <alfonso.tiernosepulveda@telefonica.com>"
@@
-116,10
+117,10
@@
class FsLocal(FsBase):
f = "/".join(storage)
return os.path.getsize(self.path + f)
f = "/".join(storage)
return os.path.getsize(self.path + f)
- def file_extract(self,
tar
_object, path):
+ def file_extract(self,
compressed
_object, path):
"""
extract a tar file
"""
extract a tar file
- :param
tar_object: object of type tar
+ :param
compressed_object: object of type tar or zip
:param path: can be a str or a str list, or a tar object where to extract the tar_object
:return: None
"""
:param path: can be a str or a str list, or a tar object where to extract the tar_object
:return: None
"""
@@
-127,7
+128,13
@@
class FsLocal(FsBase):
f = self.path + path
else:
f = self.path + "/".join(path)
f = self.path + path
else:
f = self.path + "/".join(path)
- tar_object.extractall(path=f)
+
+ if type(compressed_object) is tarfile.TarFile:
+ compressed_object.extractall(path=f)
+ elif (
+ type(compressed_object) is zipfile.ZipFile
+ ): # Just a check to know if this works with both tar and zip
+ compressed_object.extractall(path=f)
def file_open(self, storage, mode):
"""
def file_open(self, storage, mode):
"""