# HG changeset patch
# User estrain
# Date 1653863150 0
# Node ID 0e06e944120b76f8ddad1562307d8b701ff7a269
# Parent  8897c156df99647e0fde941afe1004bed05bc54a
Uploaded

diff -r 8897c156df99 -r 0e06e944120b data_manager_fastani/data_manager/data_manager_fastani.py
--- a/data_manager_fastani/data_manager/data_manager_fastani.py	Sun May 29 21:44:36 2022 +0000
+++ b/data_manager_fastani/data_manager/data_manager_fastani.py	Sun May 29 22:25:50 2022 +0000
@@ -24,15 +24,12 @@
       r = requests.get(url)
       f.write(r.content)
  
-    tarcmd="tar xvzf D1.tar.gz; rm -Rf D1.tar.gz"
+    tarcmd="tar xvzf D1.tar.gz; mv D1/* .; rm -Rf D1 D1.tar.gz"
     os.system(tarcmd)
 
-    cmd="mv D1 " + argsname
-    os.system(cmd)
-
     os.chdir(cwd)    
    
-    return output_directory + "/" + argsname 
+    return 
 
 def download_VL(output_directory):
 
@@ -55,7 +52,7 @@
       ecmd = "efetch -db nuccore -id " + acc + " -format fasta > " + accdict[acc] + ".fna"
 
     os.chdir(cwd)    
-    return output_directory 
+    return 
 
 
 def print_json (version,argspath,argsname,argsout):
@@ -93,11 +90,11 @@
 
     #Fetch the files and build blast databases
     if(args.type[0]=="D1"):
-      output_directory=download_D1(output_directory,args.name[0])    
+      download_D1(output_directory)    
       version="FastANI D1"
     elif(args.type[0]=="VL"): 
-      output_directory=download_D1(output_directory,args.name[0])    
-      output_directory=download_VL(output_directory)    
+      download_D1(output_directory)    
+      download_VL(output_directory)    
       version="FastANI D1 + VetLIRN"
       
     print_json(version,output_directory,args.name[0],args.out[0])