From 53c1f3a5794f02e92dc59aa885db7d263370b2af Mon Sep 17 00:00:00 2001
From: Reuben Morais <reuben.morais@gmail.com>
Date: Sun, 9 Apr 2017 16:49:51 -0300
Subject: [PATCH] Move importer scripts to bin/

---
 util/importers/fisher.py => bin/import_fisher.py     | 2 +-
 util/importers/ldc93s1.py => bin/import_ldc93s1.py   | 2 +-
 util/importers/librivox.py => bin/import_librivox.py | 2 +-
 util/importers/LDC97S62.py => bin/import_swb.py      | 2 +-
 util/importers/ted.py => bin/import_ted.py           | 2 +-
 bin/run-fisher.sh                                    | 2 +-
 bin/run-ldc93s1.sh                                   | 2 +-
 bin/run-librivox.sh                                  | 2 +-
 bin/run-swb.sh                                       | 2 +-
 bin/run-ted.sh                                       | 2 +-
 util/importers/__init__.py                           | 0
 11 files changed, 10 insertions(+), 10 deletions(-)
 rename util/importers/fisher.py => bin/import_fisher.py (99%)
 rename util/importers/ldc93s1.py => bin/import_ldc93s1.py (95%)
 rename util/importers/librivox.py => bin/import_librivox.py (99%)
 rename util/importers/LDC97S62.py => bin/import_swb.py (99%)
 rename util/importers/ted.py => bin/import_ted.py (98%)
 delete mode 100644 util/importers/__init__.py

diff --git a/util/importers/fisher.py b/bin/import_fisher.py
similarity index 99%
rename from util/importers/fisher.py
rename to bin/import_fisher.py
index df4aa19630..ae3327e34f 100644
--- a/util/importers/fisher.py
+++ b/bin/import_fisher.py
@@ -5,7 +5,7 @@
 # This script needs to be run from the root of the DeepSpeech repository
 import sys
 import os
-sys.path.insert(1, os.path.join(sys.path[0], '..', '..'))
+sys.path.insert(1, os.path.join(sys.path[0], '..'))
 
 import codecs
 import fnmatch
diff --git a/util/importers/ldc93s1.py b/bin/import_ldc93s1.py
similarity index 95%
rename from util/importers/ldc93s1.py
rename to bin/import_ldc93s1.py
index 077c389687..3d9c787311 100644
--- a/util/importers/ldc93s1.py
+++ b/bin/import_ldc93s1.py
@@ -5,7 +5,7 @@
 # This script needs to be run from the root of the DeepSpeech repository
 import sys
 import os
-sys.path.insert(1, os.path.join(sys.path[0], '..', '..'))
+sys.path.insert(1, os.path.join(sys.path[0], '..'))
 
 import pandas
 
diff --git a/util/importers/librivox.py b/bin/import_librivox.py
similarity index 99%
rename from util/importers/librivox.py
rename to bin/import_librivox.py
index e749076512..5684e61b6b 100644
--- a/util/importers/librivox.py
+++ b/bin/import_librivox.py
@@ -5,7 +5,7 @@
 # This script needs to be run from the root of the DeepSpeech repository
 import sys
 import os
-sys.path.insert(1, os.path.join(sys.path[0], '..', '..'))
+sys.path.insert(1, os.path.join(sys.path[0], '..'))
 
 import codecs
 import fnmatch
diff --git a/util/importers/LDC97S62.py b/bin/import_swb.py
similarity index 99%
rename from util/importers/LDC97S62.py
rename to bin/import_swb.py
index 27e762a911..cd06ddb1dc 100644
--- a/util/importers/LDC97S62.py
+++ b/bin/import_swb.py
@@ -5,7 +5,7 @@
 # This script needs to be run from the root of the DeepSpeech repository
 import sys
 import os
-sys.path.insert(1, os.path.join(sys.path[0], '..', '..'))
+sys.path.insert(1, os.path.join(sys.path[0], '..'))
 
 import fnmatch
 import pandas
diff --git a/util/importers/ted.py b/bin/import_ted.py
similarity index 98%
rename from util/importers/ted.py
rename to bin/import_ted.py
index 8dff6443af..9679d2097e 100644
--- a/util/importers/ted.py
+++ b/bin/import_ted.py
@@ -5,7 +5,7 @@
 # This script needs to be run from the root of the DeepSpeech repository
 import sys
 import os
-sys.path.insert(1, os.path.join(sys.path[0], '..', '..'))
+sys.path.insert(1, os.path.join(sys.path[0], '..'))
 
 import codecs
 import pandas
diff --git a/bin/run-fisher.sh b/bin/run-fisher.sh
index 7d849f3bd0..d2cb014461 100755
--- a/bin/run-fisher.sh
+++ b/bin/run-fisher.sh
@@ -14,7 +14,7 @@ if [ ! -f "${ds_dataroot}/fisher-train.csv" ]; then
     echo "Warning: It looks like you don't have the Fisher corpus"            \
          "downloaded and preprocessed. Make sure \$ds_dataroot points to the" \
          "folder where the Fisher data is located, and that you ran the"      \
-         "importer script at util/importers/fisher.py before running this script."
+         "importer script at bin/import_fisher.py before running this script."
 fi;
 
 checkpoint_dir=$(python -c 'from xdg import BaseDirectory as xdg; print(xdg.save_data_path("deepspeech/fisher"))')
diff --git a/bin/run-ldc93s1.sh b/bin/run-ldc93s1.sh
index 141b3bc42f..34066a8503 100755
--- a/bin/run-ldc93s1.sh
+++ b/bin/run-ldc93s1.sh
@@ -7,7 +7,7 @@ fi;
 
 if [ ! -f "data/ldc93s1/ldc93s1.csv" ]; then
     echo "Downloading and preprocessing LDC93S1 example data, saving in ./data/ldc93s1."
-    python -u util/importers/ldc93s1.py ./data/ldc93s1
+    python -u bin/import_ldc93s1.py ./data/ldc93s1
 fi;
 
 checkpoint_dir=$(python -c 'from xdg import BaseDirectory as xdg; print(xdg.save_data_path("deepspeech/ldc93s1"))')
diff --git a/bin/run-librivox.sh b/bin/run-librivox.sh
index 8beffecf43..a8dd038fea 100755
--- a/bin/run-librivox.sh
+++ b/bin/run-librivox.sh
@@ -14,7 +14,7 @@ if [ ! -f "${ds_dataroot}/librivox-train-clean-100.csv" ]; then
     echo "Warning: It looks like you don't have the LibriSpeech corpus"       \
          "downloaded and preprocessed. Make sure \$ds_dataroot points to the" \
          "folder where the LibriSpeech data is located, and that you ran the" \
-         "importer script at util/importers/librivox.py before running this script."
+         "importer script at bin/import_librivox.py before running this script."
 fi;
 
 checkpoint_dir=$(python -c 'from xdg import BaseDirectory as xdg; print(xdg.save_data_path("deepspeech/librivox"))')
diff --git a/bin/run-swb.sh b/bin/run-swb.sh
index f3abec7a35..ceb7dc0fdf 100755
--- a/bin/run-swb.sh
+++ b/bin/run-swb.sh
@@ -14,7 +14,7 @@ if [ ! -f "${ds_dataroot}/swb-train.csv" ]; then
     echo "Warning: It looks like you don't have the Switchboard corpus"       \
          "downloaded and preprocessed. Make sure \$ds_dataroot points to the" \
          "folder where the Switchboard data is located, and that you ran the" \
-         "importer script at util/importers/LDC97S62.py before running this script."
+         "importer script at bin/import_swb.py before running this script."
 fi;
 
 checkpoint_dir=$(python -c 'from xdg import BaseDirectory as xdg; print(xdg.save_data_path("deepspeech/swb"))')
diff --git a/bin/run-ted.sh b/bin/run-ted.sh
index 65fe5800de..26eb5cce69 100755
--- a/bin/run-ted.sh
+++ b/bin/run-ted.sh
@@ -14,7 +14,7 @@ if [ ! -f "${ds_dataroot}/ted-train.csv" ]; then
     echo "Warning: It looks like you don't have the TED-LIUM corpus downloaded"\
          "and preprocessed. Make sure \$ds_dataroot points to the folder where"\
          "folder where the TED-LIUM data is located, and that you ran the" \
-         "importer script at util/importers/ted.py before running this script."
+         "importer script at bin/import_ted.py before running this script."
 fi;
 
 checkpoint_dir=$(python -c 'from xdg import BaseDirectory as xdg; print(xdg.save_data_path("deepspeech/ted"))')
diff --git a/util/importers/__init__.py b/util/importers/__init__.py
deleted file mode 100644
index e69de29bb2..0000000000