From 5db62e48a3346fcba5f6ce322e51637580db2ede Mon Sep 17 00:00:00 2001
From: Athanasius <github@miggy.org>
Date: Sat, 3 Apr 2021 10:24:13 +0100
Subject: [PATCH] Move companion.py category_map into data.py

---
 collate.py   |  5 +++--
 companion.py | 11 +----------
 data.py      | 10 ++++++++++
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/collate.py b/collate.py
index 3a0aa824..10bb24b6 100755
--- a/collate.py
+++ b/collate.py
@@ -11,6 +11,7 @@ from os.path import isfile
 from traceback import print_exc
 
 import companion
+import data
 import outfitting
 import util_ships
 
@@ -54,13 +55,13 @@ def addcommodities(data):
         new = {
             'id'       : commodity['id'],
             'symbol'   : commodity['name'],
-            'category' : companion.category_map.get(commodity['categoryname']) or commodity['categoryname'],
+            'category' : data.companion_category_map.get(commodity['categoryname']) or commodity['categoryname'],
             'name'     : commodity.get('locName') or 'Limpets',
         }
 
         old = commodities.get(key)
 
-        if old and companion.category_map.get(commodity['categoryname'], True):
+        if old and data.companion_category_map.get(commodity['categoryname'], True):
             if new['symbol'] != old['symbol'] or new['name'] != old['name']:
                 raise ValueError('{}: {!r} != {!r}'.format(key, new, old))
 
diff --git a/companion.py b/companion.py
index e5afb40d..c8b3e015 100644
--- a/companion.py
+++ b/companion.py
@@ -27,6 +27,7 @@ from typing import TYPE_CHECKING, Any, Dict, List, Union, cast
 import requests
 
 from config import appname, appversion, config
+from data import companion_category_map as category_map
 from EDMCLogging import get_main_logger
 from monitor import monitor
 from protocol import protocolhandler
@@ -64,16 +65,6 @@ URL_QUERY = '/profile'
 URL_MARKET = '/market'
 URL_SHIPYARD = '/shipyard'
 
-
-# Map values reported by the Companion interface to names displayed in-game
-# May be imported by plugins
-category_map = {
-    'Narcotics':      'Legal Drugs',
-    'Slaves':         'Slavery',
-    'Waste ':         'Waste',
-    'NonMarketable':  False,  # Don't appear in the in-game market so don't report
-}
-
 commodity_map: Dict = {}
 
 
diff --git a/data.py b/data.py
index 058bf1c1..3688f8c9 100644
--- a/data.py
+++ b/data.py
@@ -5,9 +5,19 @@ For easy reference any variable should be prefixed with the name of the file it
 was either in originally, or where the primary code utilising it is.
 """
 
+# Map numeric 'demand/supply brackets' to the names as shown in-game.
 commodity_bracketmap = {
     0: '',
     1: 'Low',
     2: 'Med',
     3: 'High',
 }
+
+# Map values reported by the Companion interface to names displayed in-game.
+# May be imported by plugins.
+companion_category_map = {
+    'Narcotics':      'Legal Drugs',
+    'Slaves':         'Slavery',
+    'Waste ':         'Waste',
+    'NonMarketable':  False,  # Don't appear in the in-game market so don't report
+}