switch to walkIndex

1 files changed, 2 insertions, 21 deletions

diff --git a/populatebigram.py b/populatebigram.py
index cad54ca..a71fe72 100644
--- a/populatebigram.py
+++ b/populatebigram.py
@@ -5,7 +5,7 @@ import sqlite3
 from argparse import ArgumentParser
 import utils
 from myconfig import MyConfig
-
+from dirwalk import walkIndex
 
 CREATE_BIGRAM_DDL = '''
 CREATE TABLE bigram (
@@ -32,10 +32,6 @@ os.chdir(words_dir)
 #chdir done
 
 
-def handleError(error):
-    sys.exit(error)
-
-
 def createBigramSqlite(indexpath, workdir):
     print(indexpath, workdir, 'create bigram')
 
@@ -116,21 +112,6 @@ def handleOneIndex(indexpath, subdir, indexname):
     utils.store_status(indexstatuspath, indexstatus)
 
 
-def walkThroughIndex(path):
-    for root, dirs, files in os.walk(path, topdown=True, onerror=handleError):
-        for onefile in files:
-            filepath = os.path.join(root, onefile)
-            indexpostfix = config.getIndexPostfix()
-            if onefile.endswith(indexpostfix):
-                subdir = os.path.relpath(root, path)
-                indexname = onefile[:-len(indexpostfix)]
-                handleOneIndex(filepath, subdir, indexname)
-            elif onefile.endswith(config.getStatusPostfix()):
-                pass
-            else:
-                print('Unexpected file:' + filepath)
-
-
 if __name__ == '__main__':
     parser = ArgumentParser(description='Populate bi-gram.')
     parser.add_argument('--indexdir', action='store', \
@@ -139,5 +120,5 @@ if __name__ == '__main__':
 
     args = parser.parse_args()
     print(args)
-    walkThroughIndex(args.indexdir)
+    walkIndex(handleOneIndex, args.indexdir)
     print('done')