# HG changeset patch
# User bebatut
# Date 1493997468 14400
# Node ID 36b38629191bf7d6f0fadfaab804b55d78c72c33
# Parent a34f082f9debed39f46df80ce44b06d7cda3bd1b
planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/data_managers/data_manager_qiime_database_downloader commit 6ec84085fd45b933ed8af2d46da4cd6c14be9bf2-dirty
diff -r a34f082f9deb -r 36b38629191b data_manager/data_manager_qiime_download.py
--- a/data_manager/data_manager_qiime_download.py Fri May 05 09:33:42 2017 -0400
+++ b/data_manager/data_manager_qiime_download.py Fri May 05 11:17:48 2017 -0400
@@ -161,7 +161,22 @@
return filepath
-def extract_archive(filepath, ext):
+def find_archive_content_path(archive_content_path):
+ """
+ """
+ content = os.listdir(archive_content_path)
+ archive_content = []
+ for x in content:
+ if not x.startswith(".") and not x.startswith("_"):
+ archive_content.append(x)
+ if len(archive_content) == 1:
+ archive_content_path = os.path.join(
+ archive_content_path,
+ archive_content[0])
+ return archive_content_path
+
+
+def extract_archive(filepath, ext, db):
"""
"""
archive_content_path = "tmp"
@@ -169,19 +184,12 @@
tar = tarfile.open(filepath)
tar.extractall(path=archive_content_path)
tar.close()
- content = os.listdir(archive_content_path)
- archive_content = []
- for x in content:
- if not x.startswith("."):
- archive_content.append(x)
- if len(archive_content) == 1:
- archive_content_path = os.path.join(
- archive_content_path,
- archive_content[0])
+ archive_content_path = find_archive_content_path(archive_content_path)
elif ext == "zip":
zip_ref = zipfile.ZipFile(filepath, 'r')
zip_ref.extractall(archive_content_path)
zip_ref.close()
+ archive_content_path = find_archive_content_path(archive_content_path)
return archive_content_path
@@ -306,7 +314,7 @@
filepath = download_archive(db, version, ext)
print("Extract archive %s" % filepath)
- archive_content_path = extract_archive(filepath, ext)
+ archive_content_path = extract_archive(filepath, ext, db)
print("Moving file from %s" % archive_content_path)
filename_prefix = "%s_%s" % (db, version)
diff -r a34f082f9deb -r 36b38629191b data_manager/data_manager_qiime_download.xml
--- a/data_manager/data_manager_qiime_download.xml Fri May 05 09:33:42 2017 -0400
+++ b/data_manager/data_manager_qiime_download.xml Fri May 05 11:17:48 2017 -0400
@@ -32,14 +32,13 @@
-
+