Removed downloader.sh

tijko · tijko · commit 2a5edd42238f · 2016-06-06T22:27:46.000-04:00
diff --git a/bashplotlib/histogram.py b/bashplotlib/histogram.py
@@ -12,10 +12,23 @@
 import sys
 import math
 import optparse
+import requests
 from os.path import dirname
+from multiprocessing import Pool
+
 from .utils.helpers import *
 from .utils.commandhelp import hist
 
+sample_files = [('exp.txt', 'yuxlaj8okcjta9t', ''),
+                ('lower48.txt', 'cbf5skx34grlwy6', ''),
+                ('x_test.txt', 'gsu2y9vqnx5ps5i', ''),
+                ('y_test.txt', 'mlt4gfqr6n24kxj', ''),
+                ('texas.txt', 'gsu2y9vqnx5ps5i', ''),
+                ('million.txt', 'jjeubxlxuqkzkeq/5W6zkUZXww/', 'h')]
+
+download_base = 'https://dl.dropbox.com/s{}/{}/{}?dl=1'
+download_dir = os.path.join(os.environ['HOME'], 'bashplotlib/examples/data')
+
 
 def calc_bins(n, min_val, max_val, h=None, binwidth=None):
     """
@@ -46,12 +59,22 @@ def read_numbers(numbers):
             yield float(number.strip())
 
 
+def sample_data_downloader(filename, fileid, prefix):
+    req = requests.get(download_base.format(prefix, fileid, filename))
+    filepath = os.path.join(download_dir, filename)
+    with open(filepath, 'w') as f:
+        f.write(req.text)
+
+
 def run_demo():
     """
     Run a demonstration
     """
-    module_dir = dirname(dirname(os.path.realpath(__file__)))
-    demo_file = os.path.join(module_dir, 'examples/data/exp.txt')
+    if not os.path.exists(download_dir):
+        os.mkdir(download_dir)
+        with Pool() as pool:
+            pool.starmap(sample_data_downloader, sample_files)
+    demo_file = os.path.join(download_dir, 'exp.txt')
 
     if not os.path.isfile(demo_file):
         sys.stderr.write("demo input file not found!\n")
diff --git a/bin/texas b/bin/texas
@@ -3,7 +3,5 @@
 from __future__ import print_function
 import os
 
-_ROOT = os.path.abspath(os.path.dirname(__file__))
-
-texas = os.path.join(_ROOT, "../bashplotlib", "data", "texas.txt")
+texas = os.path.join(os.environ["HOME"], "bashplotlib/examples/data/texas.txt")
 print(open(texas).read().strip())
diff --git a/examples/downloaddata.sh b/examples/downloaddata.sh
diff --git a/examples/sample.sh b/examples/sample.sh
@@ -3,8 +3,9 @@
 dir=$(dirname "$0")
 
 if [ ! -d "${dir}/data" ]; then 
-    echo 'downloading data'
-    "${dir}/downloaddata.sh"
+    echo 'Sample data is needed'
+    echo 'Run "hist --demo" to download'
+    exit 1
 fi
 
 echo 'plotting coordinates'
diff --git a/setup.py b/setup.py
@@ -26,5 +26,7 @@
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
     ],
+    install_requires={'requests':'examples'},
+    dependency_links=['https://github.com/kennethreitz/requests'],
 )
 

Original file line number	Diff line number	Diff line change
`@@ -26,5 +26,7 @@`
`26`	`26`	`'Programming Language :: Python :: 2.7',`
`27`	`27`	`'Programming Language :: Python :: 3',`
`28`	`28`	`],`
	`29`	`+ install_requires={'requests':'examples'},`
	`30`	`+ dependency_links=['https://github.com/kennethreitz/requests'],`
`29`	`31`	`)`
`30`	`32`