used and implemented the location module

Author: linluk

animations.py

@@ -6,8 +6,8 @@
 import pygame
 
 import animation
+import locations
 
-DIRECTORY = os.path.join('res', 'export')
 
 _surfaces = {}
 class Surfaces(enum.Enum):
@@ -95,7 +95,7 @@ def get_filename(self):
         elif self == Surfaces.COFFEE_BROKEN: fn = 'coffee-broken.png'
         elif self == Surfaces.EXPLOSION: fn = 'bug-explode.png'
         else: raise Exception('Unknown Surface Type: {}'.format(str(self)))
-        return os.path.join(DIRECTORY, fn)
+        return locations.image(fn)
 
     def get_surface(self):
         global _surfaces

bugreport.py

@@ -8,6 +8,8 @@
 
 import build_info
 
+import locations
+
 # keep those trailing whites!!
 TEXT = """
 Sorry!
@@ -56,15 +58,15 @@
 def bugreport(exc_info=None) -> str:
     typ, value, frames = exc_info if exc_info is not None else sys.exc_info()
     trace = []
-    path_to_strip = os.path.dirname(__file__)
+    path_to_strip = locations.get_root()
     strip_path = lambda s: s[len(path_to_strip) + 1:] if s.startswith(path_to_strip) else s
     for frame in traceback.extract_tb(frames, 32):
         fn = strip_path(frame[0])
         ln = frame[1]
         fu = frame[2]
         tx = frame[3]
         t = '{}:{}  {}  {}'.format(fn, ln, fu, tx)
-        trace.append(t)
+        trace.insert(0, t)
 
     def prepare(value):
         iterable = None
@@ -94,8 +96,7 @@ def prepare(value):
             system_system=prepare(system),
             system_command=prepare(' '.join(sys.argv)))
 
-    report_directory = os.path.expanduser('~')
-    report_file = os.path.join(report_directory, 'coder-bug.txt')
+    report_file = locations.user('bugreport.txt')
 
     # with 'w' we override,... but i dont want to grow the file uncontrolled,
     # so maybe i rewrite it later to append,.. but then we need some kind of
@@ -112,7 +113,8 @@ def prepare(value):
     except:
         pass
 
-    print(report)
+    if not getattr(sys, 'frozen', False):
+        print(report)
 
 
     return report_file

coder.py

@@ -10,33 +10,6 @@
 import splash
 import highscore
 
-if not pygame.font: print ('Warning, fonts disabled')
-if not pygame.mixer: print ('Warning, sound disabled')
-
-def load_image(name, colorkey=None):
-    fullname = os.path.join('data', name)
-    try:
-        image = pygame.image.load(fullname)
-    except pygame.error:
-        print ('Cannot load image:', name)
-    image = image.convert()
-    if colorkey is not None:
-        if colorkey is -1:
-            colorkey = image.get_at((0,0))
-        image.set_colorkey(colorkey, RLEACCEL)
-    return image, image.get_rect()
-
-def load_sound(name):
-    class NoneSound:
-        def play(self): pass
-    if not pygame.mixer:
-        return NoneSound()
-    fullname = os.path.join('data', name)
-    try:
-        sound = pygame.mixer.Sound(fullname)
-    except pygame.error:
-        print ('Cannot load sound:', wav)
-    return sound
 
 def init():
     pygame.mixer.pre_init(44100, -16, 2, 4096)

highscore.py

@@ -9,6 +9,7 @@
 import quit_
 
 import background
+import locations
 
 from collections import namedtuple
 
@@ -30,7 +31,7 @@ def __init__(self, new_entry: Entry = None) -> None:
         self._new_entry_font = pygame.font.Font('DejaVuSansMono-Bold.ttf', 20)
         self._entry_surfaces = None
         self._background = None
-        self._filename = os.path.join(os.path.expanduser('~'), '.coder-game', 'highscore.dat')
+        self._filename = locations.user('highscore.dat')
 
     def _load(self):
         if os.path.exists(self._filename):
@@ -44,9 +45,6 @@ def _load(self):
                     raise Exception('Unknown Highscore Data Version')
 
     def _save(self):
-        d = os.path.dirname(self._filename)
-        if not os.path.exists(d):
-            os.mkdir(d)
         with open(self._filename, 'wb') as f:
             data = {
                 'version': 1,

quit_.py

@@ -2,13 +2,14 @@
 import state_manager
 import pygame
 import os
+import locations
 
 class Quit(state_manager.State):
     def __init__(self) -> None:
         super().__init__()
         self._tick = 3000
         self._skip = False
-        self._surface = pygame.image.load(os.path.join('res', 'export', 'quit.png')).convert_alpha()
+        self._surface = pygame.image.load(locations.image('quit.png')).convert_alpha()
 
 
     def render(self) -> None:

sound.py

@@ -5,6 +5,7 @@
 from enum import auto
 
 import pygame
+import locations
 
 class Sounds(enum.Enum):
     MUSIC = auto()
@@ -27,7 +28,7 @@ def get_filename(self):
         elif self == Sounds.MENU_HOVER: fn = 'menu-hover.ogg'
         elif self == Sounds.MENU_SELECT: fn = 'menu-select.ogg'
         else: raise Exception('Unknown Sound: {}'.format(str(self)))
-        return os.path.join('res', 'sounds', fn)
+        return locations.sound(fn)
 
 _sounds = None
 class Sound(object):

splash.py

@@ -9,6 +9,7 @@
 import quit_
 import about
 import consts
+import locations
 
 import pygame
 
@@ -21,7 +22,7 @@ def __init__(self) -> None:
         self._tick = 2500
         self._idx = 0
         self._splashs_loaded = False
-        self._surfaces = [pygame.image.load(os.path.join('res', 'export', 'metagamejam-splash.png')).convert_alpha()]
+        self._surfaces = [pygame.image.load(locations.image('metagamejam-splash.png')).convert_alpha()]
 
 
 
@@ -48,8 +49,8 @@ def update(self, delta: int, fps: float) -> None:
         if self._was_rendered:
             if not self._splashs_loaded:
                 self._surfaces += [
-                    pygame.image.load(os.path.join('res', 'export', 'coder-splash.png')).convert_alpha(),
-                    pygame.image.load(os.path.join('res', 'export', 'thinkdownstairs-splash.png')).convert_alpha()]
+                    pygame.image.load(locations.image('coder-splash.png')).convert_alpha(),
+                    pygame.image.load(locations.image('thinkdownstairs-splash.png')).convert_alpha()]
                 self._splashs_loaded = True
                 return
             if self._initialized: