From 40b2046518957d3a1c2b41e032edf01af15c05b5 Mon Sep 17 00:00:00 2001
From: Raphael Roberts <raphael.roberts48@gmail.com>
Date: Wed, 16 Oct 2019 10:44:58 -0500
Subject: [PATCH] Made disk_cache work properly and fixed missing import

---
 ctabus/__main__.py | 11 +++++------
 ctabus/ui/util.py  |  3 +++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ctabus/__main__.py b/ctabus/__main__.py
index 47ee919..12416d4 100644
--- a/ctabus/__main__.py
+++ b/ctabus/__main__.py
@@ -19,8 +19,7 @@ from ctabus.internal.config import log_dir, recent_list, CHICAGO_TZ
 notification_module = lazy_import.lazy_module("ctabus.ui.notification")
 toast_module = lazy_import.lazy_module("ctabus.ui.toast")
 
-disk_cache = lazy_import.lazy_class("ctabus.internal.disk_cache.disk_cache")
-make_key = lazy_import.lazy_function("ctabus.internal.disk_cache.make_key")
+disk_cache = lazy_import.lazy_module("ctabus.internal.disk_cache")
 fetch = lazy_import.lazy_module("ctabus.fetch")
 
 _picker = lazy_import.lazy_function("ctabus.ui.picker._picker")
@@ -166,9 +165,6 @@ def main(args=None):
     if args is None:
         args = parser.parse_args()
     sys.stderr = open(osp.join(log_dir, "stderr.log"), "w")
-    if args.kill_cache:
-        for cache_obj in disk_cache.caches:
-            cache_obj.delete_cache()
     args.arg = " ".join(args.arg)
     from_recent = False
     if args.arg.isdecimal():
@@ -182,9 +178,12 @@ def main(args=None):
     if not from_recent:
         recent_list.add(stop_id)
     data = fetch.get_times(stop_id)
+    if args.kill_cache:
+        for cache_obj in disk_cache.disk_cache.caches:
+            cache_obj.delete_cache()
     fetch.get_data_from_stop_id(stop_id, __setup__=data)
     info = data["prd"][0]
-    key = make_key(info["rt"], info["rtdir"], fetch.api, None)
+    key = disk_cache.make_key(info["rt"], info["rtdir"], fetch.api, None)
     if key not in fetch.get_name_from_direction.cache.keys():
         fetch.get_name_from_direction.cache[key] = info["des"]
         fetch.get_name_from_direction.fresh = True
diff --git a/ctabus/ui/util.py b/ctabus/ui/util.py
index e7501be..069bb12 100644
--- a/ctabus/ui/util.py
+++ b/ctabus/ui/util.py
@@ -1,3 +1,6 @@
+import re
+
+
 def atoi(text):
     return int(text) if text.isdigit() else text