From 6434ba8a6a12d382a7b25508835a0e843c0ed6d3 Mon Sep 17 00:00:00 2001
From: Richard Bronkhorst <richmans@users.noreply.github.com>
Date: Mon, 12 Jun 2023 22:36:58 +0200
Subject: [PATCH] Update api.py, jumpgate.py and four other files

---
 nullptr/api.py                | 2 +-
 nullptr/models/jumpgate.py    | 4 ++--
 nullptr/models/marketplace.py | 4 ++--
 nullptr/models/system.py      | 2 +-
 nullptr/models/waypoint.py    | 4 ++--
 nullptr/store.py              | 8 ++++++++
 6 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/nullptr/api.py b/nullptr/api.py
index 88c09df..26a3320 100644
--- a/nullptr/api.py
+++ b/nullptr/api.py
@@ -79,7 +79,7 @@ class Api:
   
   def list_waypoints(self, system):
     data = self.request('get', f'systems/{system}/waypoints/')
-    # pprintz(self.last_meta)
+    # pprint(data)
     return self.store.update_list(Waypoint, data)
   
   def marketplace(self, waypoint):
diff --git a/nullptr/models/jumpgate.py b/nullptr/models/jumpgate.py
index 33da32e..01b46c5 100644
--- a/nullptr/models/jumpgate.py
+++ b/nullptr/models/jumpgate.py
@@ -16,5 +16,5 @@ class Jumpgate(Base):
     return 'jmp'
   
   def path(self):
-    sector, system, symbol = self.symbol.split('-')
-    return f'atlas/{sector}/{system[0:1]}/{system}/{symbol}.{self.ext()}'
+    sector, system, _ = self.symbol.split('-')
+    return f'atlas/{sector}/{system[0:1]}/{system}/{self.symbol}.{self.ext()}'
diff --git a/nullptr/models/marketplace.py b/nullptr/models/marketplace.py
index 96f8b33..6421681 100644
--- a/nullptr/models/marketplace.py
+++ b/nullptr/models/marketplace.py
@@ -17,5 +17,5 @@ class Marketplace(Base):
     return 'mkt'
   
   def path(self):
-    sector, system, symbol = self.symbol.split('-')
-    return f'atlas/{sector}/{system[0:1]}/{system}/{symbol}.{self.ext()}'
+    sector, system, _ = self.symbol.split('-')
+    return f'atlas/{sector}/{system[0:1]}/{system}/{self.symbol}.{self.ext()}'
diff --git a/nullptr/models/system.py b/nullptr/models/system.py
index e4b8b67..98f6b55 100644
--- a/nullptr/models/system.py
+++ b/nullptr/models/system.py
@@ -18,4 +18,4 @@ class System(Base):
   
   def path(self):
     sector, symbol = self.symbol.split('-')
-    return f'atlas/{sector}/{symbol[0:1]}/{symbol}.{self.ext()}'
+    return f'atlas/{sector}/{symbol[0:1]}/{self.symbol}.{self.ext()}'
diff --git a/nullptr/models/waypoint.py b/nullptr/models/waypoint.py
index 967a597..e6ae923 100644
--- a/nullptr/models/waypoint.py
+++ b/nullptr/models/waypoint.py
@@ -21,8 +21,8 @@ class Waypoint(Base):
     return 'way'
     
   def path(self):
-    sector, system, symbol = self.symbol.split('-')
-    return f'atlas/{sector}/{system[0:1]}/{system}/{symbol}.{self.ext()}'
+    sector, system, _ = self.symbol.split('-')
+    return f'atlas/{sector}/{system[0:1]}/{system}/{self.symbol}.{self.ext()}'
   
   def system(self):
     p = self.symbol.split('-')
diff --git a/nullptr/store.py b/nullptr/store.py
index 52964e3..edfab92 100644
--- a/nullptr/store.py
+++ b/nullptr/store.py
@@ -3,6 +3,8 @@ from nullptr.models.waypoint import Waypoint
 from nullptr.models.sector import Sector
 from nullptr.models.system import System
 from nullptr.models.agent import Agent
+from nullptr.models.marketplace import Marketplace
+from nullptr.models.jumpgate import Jumpgate
 from os.path import isfile, dirname, isdir
 import os
 import json
@@ -11,10 +13,16 @@ from time import time
 
 class Store:
   def __init__(self, data_dir):
+    self.init_models()
     self.data_dir = data_dir
     self.data = {}
     self.dirty_objects = set()
   
+  def init_models(self):
+    self.models = Base.__subclasses__()
+    self.extensions = {c.ext(): c for c in self.models}
+    
+  
   def dirty(self, obj):
     self.dirty_objects.add(obj)