simplifying progress, because I will remove the parallel stuff

This commit is contained in:
2019-07-03 10:23:18 +02:00
parent 577983427e
commit a07d14011d
3 changed files with 21 additions and 31 deletions

View File

@@ -22,7 +22,7 @@ from database import Database
def match_file(words, structures):
matches = {s: [] for s in structures}
for s in progress(structures, "matching", infile=True):
for s in progress(structures, "matching"):
for w in words:
mhere = s.match(w)
for match in mhere:
@@ -153,11 +153,9 @@ if __name__ == '__main__':
parser.add_argument('--match-to-file', help='Do not use!')
parser.add_argument('--pickled-structures', help='Do not use!', action='store_true')
parser.add_argument('--hide-inner-progress', help='Do not use!', action='store_true')
args = parser.parse_args()
logging.basicConfig(stream=sys.stderr, level=args.verbose.upper())
progress.init(args)
start = time.time()
main(args)