Removed cache debugging changes

Author: intendednull

src/cache.py

@@ -72,7 +72,7 @@ def mainloop(self, queue):
             profile = self.get_profile()
             if profile is not None:
                 queue.put(profile)
-            time.sleep(5)
+            time.sleep(self.ratelimit)
 
     def next(self):
         return self.queue.get()

src/front.py

@@ -36,14 +36,13 @@ def __next(self, direction: Direction = None):
             self.window.change_view(self.image, direction)
 
         else:
-            loadscreen = Loading(
+            self.loadscreen = Loading(
                 self.window,
                 width=self.window.winfo_width(),
                 height=self.window.winfo_height()
             )
-            self.window.change_view(View(loadscreen, 'widget'), direction)
-            loadscreen.waitfor(self.cache.ready, self.__next, ('up',))
-            self.update()
+            self.window.change_view(View(self.loadscreen, 'widget'), direction)
+            self.loadscreen.waitfor(self.cache.ready, self.__next, ('up',))
 
     def __load(self, name, image, data):
         self.title.config(text=name)
@@ -61,6 +60,7 @@ def init(self):
 
         self.bio = None
         self.image = None
+        self.loading = None
 
         self.btn_dislike = widget.PrimaryButton(
             self.commandbar, text='Nope', bg='red', command=self.cmd_dislike
@@ -81,6 +81,7 @@ def init(self):
 
         self.cache = ImageCache(self.cachesize)
         self.cache.start()
+        self.start()
 
     def start(self):
         self.after(0, self.__next)

src/loading.py

@@ -17,20 +17,20 @@ def generate_frames(im: Image):
 
 class Loading(PrimaryCanvas):
     image = IMAGES / "loading.gif"
-    last = 0
     limit = 1 / 20
+    active = True
 
     def init(self):
         self.frames = generate_frames(Image.open(self.image))
 
     def waitfor(self, condition: Callable, cmd: Callable = None, args=()):
         for im in cycle(self.frames):
+            if not self.active:
+                break
             if condition():
                 if cmd is not None:
                     cmd(*args)
                 break
-            if self.last:
-                self.delete(self.last)
-            self.last = self.create_image(-42, 0, image=im, anchor='nw')
-            self.update()
+            self.last = self.create_image(-40.5, 0, image=im, anchor='nw')
+            self.update_idletasks()
             sleep(self.limit)

src/main.py

@@ -1,7 +1,9 @@
 import configparser
 import tkinter as tk
+from contextlib import suppress
 from pygame import mixer
 
+
 from .front import Front
 from . import SETTINGS
 
@@ -25,8 +27,8 @@ def __init__(self, *args, **kwds):
 
         self.front = Front(self)
         self.front.pack(fill='both', expand=True)
-        self.front.start()
 
     def cleanup(self):
-        self.front.cleanup()
-        self.destroy()
+        with suppress(Exception):
+            self.front.cleanup()
+            self.destroy()