Parámetro -d en borme_json_all.py

PabloCastellano · Jul 15, 2016 · b43faeb · b43faeb
1 parent 7939d82
commit b43faeb
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-Version 0.24 [unreleased]
+Version 0.2.4 [unreleased]
 ------------------------
 
 - BormeXML: get_url_pdfs, get_cves y get_sizes ahora permiten especificar sección y provincia

diff --git a/README.md b/README.md
@@ -66,11 +66,12 @@ Instalación desde Pip
 
 Scripts
 =======
+
     python scripts/download_borme_pdfs.py -f init -p VALENCIA
     python scripts/check_bormes.py -f init -p VALENCIA
     python scripts/download_borme_pdfs.py -d /tmp/bormemadrid -p MADRID -f 2016-06-01
     python scripts/check_bormes.py -d /tmp/bormemadrid -p MADRID -f 2016-06-01
-    python scripts/borme_json_all.py
+    python scripts/borme_json_all.py -d /tmp/bormemadrid
 
 
 Tests

diff --git a/scripts/borme_json_all.py b/scripts/borme_json_all.py
@@ -34,11 +34,6 @@
 
 THREADS = 6
 
-bormes_root = os.path.expanduser(DEFAULT_BORME_ROOT)
-pdf_root = os.path.join(bormes_root, 'pdf')
-json_root = os.path.join(bormes_root, 'json')
-
-
 class ThreadConvertJSON(Thread):
     def __init__(self, queue):
         super(ThreadConvertJSON, self).__init__()
@@ -59,8 +54,12 @@ def run(self):
 
 if __name__ == '__main__':
     parser = argparse.ArgumentParser(description='Convert all BORME PDF files to JSON.')
+    parser.add_argument('-d', '--directory', default=DEFAULT_BORME_ROOT, help='Directory to download files (default is {})'.format(DEFAULT_BORME_ROOT))
     args = parser.parse_args()
 
+    pdf_root = os.path.join(args.directory, 'pdf')
+    json_root = os.path.join(args.directory, 'json')
+
     q = Queue()
     for i in range(THREADS):
         t = ThreadConvertJSON(q)