Updated for cache module

Author: intendednull

src/__init__.py

@@ -1,9 +1,9 @@
 from pathlib import Path
 
-SRC = Path(__file__).parent
-ROOT = SRC.parent
-RES = ROOT / 'res'
+SRC: Path = Path(__file__).parent
+ROOT: Path = SRC.parent
+RES: Path = ROOT / 'res'
 
-SETTINGS = RES / 'settings.ini'
-IMAGES = RES / 'images'
-SOUNDS = RES / 'sounds'
+SETTINGS: Path = RES / 'settings.ini'
+IMAGES: Path = RES / 'images'
+SOUNDS: Path = RES / 'sounds'

src/cache.py

@@ -1,10 +1,11 @@
 import aiohttp
 from random import randint, choice, sample
 from PIL import Image, ImageTk
-import os
 import io
 import configparser
 
+from . import SETTINGS, IMAGES
+
 
 class Cache:
     '''Class used for caching images and data about the cats'''
@@ -20,9 +21,8 @@ def __init__(self, root):
         self.session = None
 
         # get settings
-        self.dir = os.path.dirname(os.path.realpath(__file__))
         cp = configparser.ConfigParser()
-        cp.read(os.path.join(self.dir, 'settings.ini'))
+        cp.read(str(SETTINGS))
         cp.read('settings.ini')
 
         # for now, let's just look up the DEV settings
@@ -54,8 +54,8 @@ async def refill(self):
                 # get a random number for an image
                 image_number = randint(1, 10)
                 # open and resize the image using Pillow
-                im = Image.open(os.path.join(self.dir, os.path.join("res",
-                                os.path.join("images", f"{image_number}.jpg"))))
+                imagepath = IMAGES / f"{image_number}.jpg"
+                im = Image.open(imagepath)
                 im = im.resize((self.screen_x, self.screen_y - 150), Image.NEAREST)
                 # make the image a tkinter image
                 image = ImageTk.PhotoImage(im)

src/mainwindow.py

@@ -2,10 +2,9 @@
 import tkinter as tk
 import asyncio
 from pygame import mixer
-import os
-from cache import Cache
+from .cache import Cache
 
-from . import SETTINGS, IMAGES, SOUNDS
+from . import SETTINGS
 
 
 class Tinder:
@@ -16,9 +15,8 @@ def __init__(self):
         mixer.init()
 
         # get settings
-        self.dir = os.path.dirname(os.path.realpath(__file__))
         cp = configparser.ConfigParser()
-        cp.read(os.path.join(self.dir, 'settings.ini'))
+        cp.read(SETTINGS)
 
         # for now, let's just look up the DEV settings
         # can change this later