#2031 Remove EDDB and Bump Version

Build-exe-and-msi.py

@@ -70,7 +70,6 @@ APP = 'EDMarketConnector.py'
 APPCMD = 'EDMC.py'
 PLUGINS = [
     'plugins/coriolis.py',
-    'plugins/eddb.py',
     'plugins/eddn.py',
     'plugins/edsm.py',
     'plugins/edsy.py',

EDMarketConnector.py

@@ -67,7 +67,7 @@ if __name__ == '__main__':  # noqa: C901
         description="Utilises Elite Dangerous Journal files and the Frontier "
                     "Companion API (CAPI) service to gather data about a "
                     "player's state and actions to upload to third-party sites "
-                    "such as EDSM, Inara.cz and EDDB."
+                    "such as EDSM and Inara.cz."
     )
 
     ###########################################################################
@@ -534,7 +534,7 @@ class AppWindow(object):
         self.station_label = tk.Label(frame, name='station_label')
         self.station = HyperlinkLabel(frame, compound=tk.RIGHT, url=self.station_url, name='station')
         # system and station text is set/updated by the 'provider' plugins
-        # eddb, edsm and inara.  Look for:
+        # edsm and inara.  Look for:
         #
         # parent.nametowidget(f".{appname.lower()}.system")
         # parent.nametowidget(f".{appname.lower()}.station")
@@ -1737,7 +1737,7 @@ class AppWindow(object):
     def station_url(self, station: str) -> str | None:
         """Despatch a station URL to the configured handler."""
         return plug.invoke(
-            config.get_str('station_provider'), 'eddb', 'station_url',
+            config.get_str('station_provider'), 'edsm', 'station_url',
             monitor.state['SystemName'], monitor.state['StationName']
         )
 

config/__init__.py

@@ -52,7 +52,7 @@ appcmdname = 'EDMC'
 # <https://semver.org/#semantic-versioning-specification-semver>
 # Major.Minor.Patch(-prerelease)(+buildmetadata)
 # NB: Do *not* import this, use the functions appversion() and appversion_nobuild()
-_static_appversion = '5.8.2-alpha0'
+_static_appversion = '5.9.0-alpha0'
 _cached_version: Optional[semantic_version.Version] = None
 copyright = '© 2015-2019 Jonathan Harris, 2020-2023 EDCD'
 

plugins/eddb.py

@@ -1,255 +0,0 @@
-"""Station display and eddb.io lookup."""
-# Tests:
-#
-# As there's a lot of state tracking in here, need to ensure (at least)
-# the URL text and link follow along correctly with:
-#
-#  1) Game not running, EDMC started.
-#  2) Then hit 'Update' for CAPI data pull
-#  3) Login fully to game, and whether #2 happened or not:
-#      a) If docked then update Station
-#      b) Either way update System
-#  4) Undock, SupercruiseEntry, FSDJump should change Station text to 'x'
-#    and link to system one.
-#  5) RequestDocking should populate Station, no matter if the request
-#    succeeded or not.
-#  6) FSDJump should update System text+link.
-#  7) Switching to a different provider and then back... combined with
-#    any of the above in the interim.
-#
-
-
-# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $#
-# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $#
-#
-# This is an EDMC 'core' plugin.
-#
-# All EDMC plugins are *dynamically* loaded at run-time.
-#
-# We build for Windows using `py2exe`.
-#
-# `py2exe` can't possibly know about anything in the dynamically loaded
-# core plugins.
-#
-# Thus you **MUST** check if any imports you add in this file are only
-# referenced in this file (or only in any other core plugin), and if so...
-#
-#     YOU MUST ENSURE THAT PERTINENT ADJUSTMENTS ARE MADE IN
-#     `Build-exe-and-msi.py` SO AS TO ENSURE THE FILES ARE ACTUALLY PRESENT IN
-#     AN END-USER INSTALLATION ON WINDOWS.
-#
-#
-# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $#
-# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $# ! $#
-import tkinter
-from typing import TYPE_CHECKING, Any, Mapping
-
-import requests
-
-import EDMCLogging
-import killswitch
-import plug
-from companion import CAPIData
-from config import appname, config
-
-if TYPE_CHECKING:
-    from tkinter import Tk
-
-    def _(x: str) -> str:
-        return x
-
-logger = EDMCLogging.get_main_logger()
-
-
-class This:
-    """Holds module globals."""
-
-    STATION_UNDOCKED: str = '×'  # "Station" name to display when not docked = U+00D7
-
-    def __init__(self) -> None:
-        # Main window clicks
-        self.system_link: tkinter.Widget
-        self.system_name: str | None = None
-        self.system_address: str | None = None
-        self.system_population: int | None = None
-        self.station_link: tkinter.Widget
-        self.station_name: str | None = None
-        self.station_marketid: int | None = None
-        self.on_foot = False
-
-
-this = This()
-
-
-def system_url(system_name: str) -> str:
-    """
-    Construct an appropriate EDDB.IO URL for the provided system.
-
-    :param system_name: Will be overridden with `this.system_address` if that
-      is set.
-    :return: The URL, empty if no data was available to construct it.
-    """
-    if this.system_address:
-        return requests.utils.requote_uri(f'https://eddb.io/system/ed-address/{this.system_address}')
-
-    if system_name:
-        return requests.utils.requote_uri(f'https://eddb.io/system/name/{system_name}')
-
-    return ''
-
-
-def station_url(system_name: str, station_name: str) -> str:
-    """
-    Construct an appropriate EDDB.IO URL for a station.
-
-    Ignores `station_name` in favour of `this.station_marketid`.
-
-    :param system_name: Name of the system the station is in.
-    :param station_name: **NOT USED**
-    :return: The URL, empty if no data was available to construct it.
-    """
-    if this.station_marketid:
-        return requests.utils.requote_uri(f'https://eddb.io/station/market-id/{this.station_marketid}')
-
-    return system_url(system_name)
-
-
-def plugin_start3(plugin_dir: str) -> str:
-    """
-    Start the plugin.
-
-    :param plugin_dir: NAme of directory this was loaded from.
-    :return: Identifier string for this plugin.
-    """
-    return 'eddb'
-
-
-def plugin_app(parent: 'Tk'):
-    """
-    Construct this plugin's main UI, if any.
-
-    :param parent: The tk parent to place our widgets into.
-    :return: See PLUGINS.md#display
-    """
-    # system label in main window
-    this.system_link = parent.nametowidget(f".{appname.lower()}.system")
-    this.system_name = None
-    this.system_address = None
-    this.station_name = None
-    this.station_marketid = None  # Frontier MarketID
-    # station label in main window
-    this.station_link = parent.nametowidget(f".{appname.lower()}.station")
-    this.station_link['popup_copy'] = lambda x: x != this.STATION_UNDOCKED
-
-
-def prefs_changed(cmdr: str, is_beta: bool) -> None:
-    """
-    Update any saved configuration after Settings is closed.
-
-    :param cmdr: Name of Commander.
-    :param is_beta: If game beta was detected.
-    """
-    # Do *NOT* set 'url' here, as it's set to a function that will call
-    # through correctly.  We don't want a static string.
-    pass
-
-
-def journal_entry(
-    cmdr: str, is_beta: bool, system: str, station: str,
-    entry: dict[str, Any],
-    state: Mapping[str, Any]
-):
-    """
-    Handle a new Journal event.
-
-    :param cmdr: Name of Commander.
-    :param is_beta: Whether game beta was detected.
-    :param system: Name of current tracked system.
-    :param station: Name of current tracked station location.
-    :param entry: The journal event.
-    :param state: `monitor.state`
-    :return: None if no error, else an error string.
-    """
-    should_return: bool
-    new_entry: dict[str, Any] = {}
-
-    should_return, new_entry = killswitch.check_killswitch('plugins.eddb.journal', entry)
-    if should_return:
-        # LANG: Journal Processing disabled due to an active killswitch
-        plug.show_error(_('EDDB Journal processing disabled. See Log.'))
-        return
-
-    should_return, new_entry = killswitch.check_killswitch(f'plugins.eddb.journal.event.{entry["event"]}', new_entry)
-    if should_return:
-        return
-
-    this.on_foot = state['OnFoot']
-    this.system_address = state['SystemAddress']
-    this.system_name = state['SystemName']
-    this.system_population = state['SystemPopulation']
-    this.station_name = state['StationName']
-    this.station_marketid = state['MarketID']
-
-    # Only change URL text if we are current provider.
-    if config.get_str('station_provider') == 'eddb':
-        this.system_link['text'] = this.system_name
-        # Do *NOT* set 'url' here, as it's set to a function that will call
-        # through correctly.  We don't want a static string.
-        this.system_link.update_idletasks()
-
-        if this.station_name:
-            this.station_link['text'] = this.station_name
-
-        else:
-            if this.system_population is not None and this.system_population > 0:
-                this.station_link['text'] = this.STATION_UNDOCKED
-
-            else:
-                this.station_link['text'] = ''
-
-        # Do *NOT* set 'url' here, as it's set to a function that will call
-        # through correctly.  We don't want a static string.
-        this.station_link.update_idletasks()
-
-
-def cmdr_data(data: CAPIData, is_beta: bool) -> str | None:
-    """
-    Process new CAPI data.
-
-    :param data: The latest merged CAPI data.
-    :param is_beta: Whether game beta was detected.
-    :return: Optional error string.
-    """
-    # Always store initially, even if we're not the *current* system provider.
-    if not this.station_marketid and data['commander']['docked']:
-        this.station_marketid = data['lastStarport']['id']
-
-    # Only trust CAPI if these aren't yet set
-    if not this.system_name:
-        this.system_name = data['lastSystem']['name']
-
-    if not this.station_name and data['commander']['docked']:
-        this.station_name = data['lastStarport']['name']
-
-    # Override standard URL functions
-    if config.get_str('system_provider') == 'eddb':
-        this.system_link['text'] = this.system_name
-        # Do *NOT* set 'url' here, as it's set to a function that will call
-        # through correctly.  We don't want a static string.
-        this.system_link.update_idletasks()
-
-    if config.get_str('station_provider') == 'eddb':
-        if data['commander']['docked'] or this.on_foot and this.station_name:
-            this.station_link['text'] = this.station_name
-
-        elif data['lastStarport']['name'] and data['lastStarport']['name'] != "":
-            this.station_link['text'] = this.STATION_UNDOCKED
-
-        else:
-            this.station_link['text'] = ''
-
-        # Do *NOT* set 'url' here, as it's set to a function that will call
-        # through correctly.  We don't want a static string.
-        this.station_link.update_idletasks()
-
-    return ''

plugins/eddn.py

@@ -692,8 +692,8 @@ class EDDN:
         # not send an empty commodities list, as the EDDN Schema doesn't allow
         # it (as of 2020-09-28).
         # BUT, Fleet Carriers can go from having buy/sell orders to having
-        # none and that really does need to be recorded over EDDN so that, e.g.
+        # none and that really does need to be recorded over EDDN so that
-        # EDDB can update in a timely manner.
+        # tools can update in a timely manner.
         if this.commodities != commodities:
             message: OrderedDictT[str, Any] = OrderedDict([
                 ('timestamp',   data['timestamp']),
@@ -929,8 +929,8 @@ class EDDN:
         # not send an empty commodities list, as the EDDN Schema doesn't allow
         # it (as of 2020-09-28).
         # BUT, Fleet Carriers can go from having buy/sell orders to having
-        # none and that really does need to be recorded over EDDN so that, e.g.
+        # none and that really does need to be recorded over EDDN so that
-        # EDDB can update in a timely manner.
+        # tools can update in a timely manner.
         if this.commodities != commodities:
             self.send_message(cmdr, {
                 '$schemaRef': f'https://eddn.edcd.io/schemas/commodity/3{"/test" if is_beta else ""}',

prefs.py

@@ -625,7 +625,7 @@ class PreferencesDialog(tk.Toplevel):
         with row as cur_row:
             station_provider = config.get_str('station_provider')
             self.station_provider = tk.StringVar(
-                value=str(station_provider if station_provider in plug.provides('station_url') else 'eddb')
+                value=str(station_provider if station_provider in plug.provides('station_url') else 'edsm')
             )
 
             # LANG: Configuration - Label for selection of 'Station' provider website

scripts/killswitch_test.py

@@ -23,10 +23,6 @@ KNOWN_KILLSWITCH_NAMES: list[str] = [
     'plugins.eddn.send',
     'plugins.eddn.journal',
     'plugins.eddn.journal.event.$event',
-
-    # eddb
-    'plugins.eddb.journal',
-    'plugins.eddb.journal.event.$event'
 ]
 
 SPLIT_KNOWN_NAMES = [x.split('.') for x in KNOWN_KILLSWITCH_NAMES]