get_db_files_base_dir

Author: antgonza

qiita_db/util.py

@@ -410,7 +410,11 @@ def get_db_files_base_dir():
     """
     with qdb.sql_connection.TRN:
         qdb.sql_connection.TRN.add("SELECT base_data_dir FROM settings")
-        return qdb.sql_connection.TRN.execute_fetchlast()
+        basedir = qdb.sql_connection.TRN.execute_fetchlast()
+        # making sure that it never ends in a "/" as most tests expect this
+        if basedir.endswith("/"):
+            basedir = basedir[:-1]
+        return basedir
 
 
 def get_work_base_dir():

qiita_pet/handlers/download.py

@@ -76,9 +76,7 @@ def _list_dir_files_nginx(self, dirpath):
             directory
         """
         basedir = get_db_files_base_dir()
-        basedir_len = len(basedir)
-        if not basedir.endswith('/'):
-            basedir_len += 1
+        basedir_len = len(basedir) + 1
         to_download = []
         for dp, _, fps in walk(dirpath):
             for fn in fps:
@@ -103,9 +101,7 @@ def _list_artifact_files_nginx(self, artifact):
             The path information needed by nginx for each file in the artifact
         """
         basedir = get_db_files_base_dir()
-        basedir_len = len(basedir)
-        if not basedir.endswith('/'):
-            basedir_len += 1
+        basedir_len = len(basedir) + 1
         to_download = []
         for i, x in enumerate(artifact.filepaths):
             # ignore if tgz as they could create problems and the
@@ -432,9 +428,7 @@ def get(self):
                 sort='descending')[0]
 
             basedir = get_db_files_base_dir()
-            basedir_len = len(basedir)
-            if not basedir.endswith('/'):
-                basedir_len += 1
+            basedir_len = len(basedir) + 1
             fp = x['fp'][basedir_len:]
             to_download.append((fp, fp, '-', str(x['fp_size'])))
             self._write_nginx_file_list(to_download)