All appropriate Profile accessors pointing down to ProfileData's

Author: emersonrp

Models/ProfileData.py

@@ -18,6 +18,7 @@ class ProfileData(dict):
     def __init__(self, config, filename = None, newname = None, profiledata : dict|None = None, editdefault : bool = False) -> None:
         profiledata = profiledata or {}
 
+        # things as attributes are things we don't save into the JSON / save file.
         self.Config                      = config # wx.Config object
         self.Filepath        : Path|None = Path(filename) if filename else None
         self.LastModTime     : int       = 0

Profile.py

@@ -1,6 +1,6 @@
 import re
 from functools import partial
-from pathlib import PurePath, Path, PureWindowsPath
+from pathlib import PurePath, Path
 from typing import TYPE_CHECKING
 import wx
 import wx.lib.colourselect as csel
@@ -100,21 +100,17 @@ def CreatePage(self, page):
 
     #####
     # Convenience / JIT accessors
-    def ProfileName(self)     : return self.Data.Filepath.stem if self.Data.Filepath else ''
+    def ProfileName(self)     : return self.Data.ProfileName()
     def Archetype(self)       : return self.Data['General']['Archetype']
     def Primary(self)         : return self.Data['General']['Primary']
     def Secondary(self)       : return self.Data['General']['Secondary']
     def ResetFile(self)       : return self.GetBindFile("reset.txt")
-    def ProfileIDFile(self)   : return self.BindsDir() / 'bcprofileid.txt'
+    def ProfileIDFile(self)   : return self.Data.ProfileIDFile()
     def Server(self)          : return self.Data['General']['Server']
     def Filepath(self)        : return self.Data.Filepath
     def ProfileBindsDir(self) : return self.Data['ProfileBindsDir']
-    def BindsDir(self)        : return Path(wx.ConfigBase.Get().Read('BindPath')) / self.Data['ProfileBindsDir']
-    def GameBindsDir(self)    :
-        if gbp := wx.ConfigBase.Get().Read('GameBindPath'):
-            return PureWindowsPath(gbp) / self.Data['ProfileBindsDir']
-        else:
-            return self.BindsDir()
+    def BindsDir(self)        : return self.Data.BindsDir()
+    def GameBindsDir(self)    : return self.Data.GameBindsDir()
 
     def HasPowerPool(self, poolname):
         for picker in ['Pool1', 'Pool2', 'Pool3', 'Pool4']: