--- a/data_manager_gene_annotation/data_manager/data_manager.py	Thu Apr 28 16:16:31 2016 -0400
+++ b/data_manager_gene_annotation/data_manager/data_manager.py	Fri Jun 17 16:20:54 2016 -0400
@@ -1,76 +1,76 @@
+import os
+import sys
+import uuid
+import json
 import argparse
 import datetime
-import json
-import os
-import shutil
-import sys
-import tarfile
-import urllib2
-import zipfile
+import requests
+from requests.exceptions import ContentDecodingError
 
 parser = argparse.ArgumentParser(description='Create data manager json.')
-parser.add_argument('--out', dest='output', action='store', help='JSON filename')
-parser.add_argument('--name', dest='name', action='store', default=str(datetime.date.today()), help='Data table entry unique ID')
-parser.add_argument('--url', dest='url', action='store', help='Download URL')
+parser.add_argument('--out',
+                    dest='output',
+                    action='store',
+                    help='JSON filename',
+                    default="gene_annotation.json"
+                    )
+parser.add_argument('--name',
+                    dest='name',
+                    action='store',
+                    default=uuid.uuid4(),
+                    help='Data table entry unique ID'
+                    )
+parser.add_argument('--url',
+                    dest='url',
+                    action='store',
+                    help='Download URL',
+                    default="http://www.scott-ouellette.com/gene_annotations/chr1-hg19_genes.gtf")
 
 args = parser.parse_args()
 
-def url_download(url, workdir):
-    if not os.path.exists(workdir):
-        os.makedirs(workdir)
-    file_path = os.path.join(workdir, 'download.dat')
+
+def url_download(url, name,  workdir):
+    # Create path if it doesn't exist
     if not os.path.exists(workdir):
         os.makedirs(workdir)
-    src = None
-    dst = None
-    hdr = {'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.11 (KHTML, like Gecko) Chrome/23.0.1271.64 Safari/537.11',
-       'Accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8',
-       'Accept-Charset': 'ISO-8859-1,utf-8;q=0.7,*;q=0.3',
-       'Accept-Encoding': 'none',
-       'Accept-Language': 'en-US,en;q=0.8',
-       'Connection': 'keep-alive'}
-    try:
-        req = urllib2.Request(url, headers=hdr)
-        src = urllib2.urlopen(req)
-        dst = open(file_path, 'wb')
-        while True:
-            chunk = src.read(2**10)
-            if chunk:
-                dst.write(chunk)
-            else:
-                break
-    except Exception as e:
-        print e
-    finally:
-        if src:
-            src.close()
-        if dst:
-            dst.close()
-    if tarfile.is_tarfile(file_path):
-        fh = tarfile.open(file_path, 'r:*')
-    elif zipfile.is_zipfile(file_path):
-        fh = zipfile.ZipFile(file_path, 'r')
-    else:
-        return
-    fh.extractall(workdir)
-    os.remove(file_path)
+
+    response = requests.get(url=url, stream=True)
+
+    # Create path that we will write the file to
+    file_path = os.path.join(workdir, 'download_{}.dat'.format(name))
+
+    block_size = 10 * 1024 * 1024  # 10MB chunked download
+    with open(file_path, 'w+') as f:
+        try:
+            for buf in response.iter_content(block_size):
+                f.write(buf)
+        except (ContentDecodingError, IOError) as e:
+            sys.stderr.write("Error occured downloading reference file: %s"
+                             % e)
+            os.remove(file_path)
+
+    return file_path
 
 
 def main(args):
     workdir = os.path.join(os.getcwd(), 'gene_annotation')
-    url_download(args.url, workdir)
-    data_manager_entry = {}
-    data_manager_entry['value'] = args.name.lower()
-    data_manager_entry['name'] = args.name
-    data_manager_entry['path'] = args.output
-    data_manager_json = dict(data_tables=dict(gene_annotation=data_manager_entry))
-    params = json.loads(open(args.output).read())
-    target_directory = params['output_data'][0]['extra_files_path']
-    os.mkdir(target_directory)
-    output_path = os.path.abspath(os.path.join(os.getcwd(), 'gene_annotation'))
-    for filename in os.listdir(workdir):
-        shutil.move(os.path.join(output_path, filename), target_directory)
-    file(args.output, 'w').write(json.dumps(data_manager_json))
+
+    # Attempt to download gene annotation file from given url
+    gene_annotation_file_path = url_download(args.url, args.name, workdir)
+
+    # Update Data Manager Json and write out
+    data_manager_entry = {
+        'data_tables': {
+            'gene_annotation': {
+                'date': str(datetime.datetime.now()),
+                'name': str(args.name),
+                'path': gene_annotation_file_path
+            }
+        }
+    }
+
+    with open(os.path.join(workdir, args.output), "w+") as f:
+        f.write(json.dumps(data_manager_entry))
 
 if __name__ == '__main__':
-    main(args)
\ No newline at end of file
+    main(args)