1
0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-13 15:57:14 +03:00

326 Commits

Author SHA1 Message Date
David Sangrey
6bc29f07d6
Merge pull request #2276 from HansAcker/eddn-nowip
pass Horizons/Odyssey flags in NavRoute
2024-08-26 18:26:58 -04:00
David Sangrey
6a3691d755
[2278] Fix Incomplete OrderedDict 2024-07-29 18:58:30 -04:00
Hans Acker
ee0f317791
pass Horizons/Odyssey flags in NavRoute
The old workaround appears to be not needed anymore. EDDN accepts NavRoute with Horizons/Odyssey flags now.

EDDiscovery, EDO Materials Helper and others also set these flags.
2024-07-13 06:35:21 +02:00
David Sangrey
080d9f98f2
[1812] Handover Translations 2024-04-22 17:33:28 -04:00
David Sangrey
d9c7a79155
[Minor] Update Type Hintings
No Content Changes, Shuts Up MyPy
2024-04-06 16:59:49 -04:00
David Sangrey
ccb103242c
Merge branch 'develop' into enhancement/2186/remove-darwin 2024-04-05 17:17:51 -04:00
David Sangrey
b5a4ee6ed2
[Nit] Cleanup some Flake8 2024-03-28 10:49:01 -04:00
David Sangrey
57cd75e75e
[2186] Additional Files 2024-03-27 19:39:51 -04:00
David Sangrey
14a38688e1
[2155] Add DockingDenied and DockingGranted Schemas
I love the schema system. It's so simple!
2024-03-23 14:42:18 -04:00
David Sangrey
110f9efd07
[#635] Properly Convert Message
Message should have been updated for the new format. It got missed here.
2024-03-04 18:37:00 -05:00
David Sangrey
4a4010ad7b
[#2157] Add Station and Docking Information When Available 2024-02-09 13:32:59 -05:00
David Sangrey
7cac00b2e8
[635] Remove Ordered Dict 2024-01-03 23:55:12 -05:00
David Sangrey
170b86b5dc
[2051] Remove More Old Types 2023-11-30 21:45:04 -05:00
David Sangrey
a169fb5a18
[Minor] Suppress Errant MyPy Error 2023-11-17 10:54:00 -05:00
Phoebe
a3c1763f4a [2095] Standardize horizontal Padding
- Standardizes horizontal Padding.
- Fixes further padding issues.
- Part of #2095
2023-11-17 03:05:42 +01:00
Phoebe
fc9775b910 [Minor] flake8 2023-11-17 01:57:13 +01:00
Phoebe
8063cf099b [2095] Standardize vertical Padding
- Standardizes vertical Padding.
- Fixes issues with the disabled and outdated Plugin list.
- Part of #2095
2023-11-17 01:39:52 +01:00
Phoebe
07ae14be5a [2088] fix UI bugs, introduce standard
- Fixes #2088 and #2089.
- Adds usage of ``row=`` for ``.grid()`` for all config entries in included plugins.
- Changes all config pages to start at row 0.
- Starts introducing a standard for config panel layouts.
2023-11-16 22:21:57 +01:00
David Sangrey
070a3989a0
[2051] Prevent Typing Reversion
Thanks to @norohind for catching this one! I'm not up to date on my PEP585.
2023-11-10 11:33:04 -05:00
David Sangrey
2c803d7f4c
[2051] Core Plugin Audit
Broken out of #2068
2023-10-19 17:44:33 -04:00
David Sangrey
247d632cc6
#2040 First Pass - Update Build System 2023-07-26 22:49:03 -04:00
David Sangrey
86d4d89b94
#2031 Remove EDDB and Bump Version 2023-07-22 09:39:05 -04:00
Athanasius
dbb471f2c2
eddn/tracking: Add BodyType to tracking UI
This helps demonstrate that a 'spurious' Station BodyName/ID is actually OK,
because BodyType makes it clear.
2023-01-16 19:32:44 +00:00
Athanasius
46fd129d3e
eddn: Expand the tracking UI for all system, body & station location data
* Also renamed This.systemaddress to this.system_address, which impacted
  misc. other lines of code.
2023-01-16 18:10:57 +00:00
Athanasius
b5bb9657d8
eddn: Move tracking_ui_update() nearer top of journal_entry()
With the tracking now being in monitor.py this needs to be ASAP after the
local copies of the tracking have been updated.

Below the possible `this.status_body_name` blanking, in case that's hit.
2023-01-15 21:54:02 +00:00
Athanasius
dde0cf876c
monitor/tracking: Move .station to state['StationName']
1. EDDB tracks this.

* So move monitor.station to monitor.state['StationName'].
* PLUGINS.md updated to cite this.
2023-01-11 19:44:41 +00:00
Athanasius
fafe9a5f7b
eddn: Remove un-necessary 'music'/'MainMenu' body tracking clearance
monitor.py does this for `state` passed in, which *this* code then uses
to set `this` values.
2023-01-11 19:43:23 +00:00
Athanasius
427a238dee
eddn: Remove un-necessary 'leavebody' state clearing
This is now handled in monitor.py, and *this* code explicitly sets the
'this' values to those in `state` as passed in.
2023-01-11 19:43:22 +00:00
Athanasius
386ea1636e
eddn: For 'docked' only set entry Body(Type) if latter is 'Planet'
We explicitly must not set this for other BodyType, e.g. 'Station'.
2023-01-11 19:43:20 +00:00
Athanasius
6f3967fb7f
eddn/tracking: Tweak commenting about coordinates
* `entry_augment_system_data()` will now always be passed starpos based
  on state['StarPos'].
* Removed TODO about deprecating in-plugin tracking.
2023-01-11 19:43:19 +00:00
Athanasius
e6abc137ce
monitor/tracking: Shift .coordinates to state['StarPos']
* Some additional commenting for future clarity.
* Remove the old eddn.py tracking.
2023-01-11 19:43:18 +00:00
Athanasius
232e91ebfc
monitor/Body: Tweak & comment, and remove defunct tracking from eddn.py
* Typod '.status' instead of 'state'.
* Bring in some sanity-checks and comments from eddn.py to monitor.py.
* Have a 'pass' elif for 'supercruiseentry' so as to comment why we do NOT
  use this to blank out body state.
* Bring in the 'if we exit to main menu, blank body state' from eddn.py.
* Remove checks from eddn.py that are now in monitor.py.
* Have a disctinct 'docked' event check in eddn.py for triggering the
  "Now we're docked, so the Delay sending until docked is satisfied"
  sending of messages.
2023-01-11 19:43:17 +00:00
Athanasius
86b0aa4550
monitor: Track all System and Body state in monitor.state
* Minor grammar edit only in PLUGINS.md (I was checking if it explicitly
  stated what data is expected in the synthetic 'StartUp' event, it doesn't).
* First changes to move some monitor properties into the monitor.state
  dictionary.  This is for system or body data.
* Re-factored the generation of 'StartUp' event into
  `EDLogs.synthesize_startup_event()`.  It's done in two places, so was
  anti-DRY.
* In general any bulk setting of system & body data is now done in the
  same order for comparison clarity.
* A little of the location tracking has been duplicated from plugins/eddn.py.
  This is with a view to switching *it* to using the state version.
2023-01-11 19:43:14 +00:00
Athanasius
0fd835e9ac
core plugins: A little more 'children' fixup
* eddn: Needs to find status text, although really there should be a helper
  function for this.
* Removed commented out references to same in edsm and inara.
2022-12-31 16:49:29 +00:00
aussig
41962663d8 Merge branch 'develop' into feature/847/capi-fleetcarrier 2022-12-24 08:21:18 +00:00
Athanasius
5e19d3e9aa
plugins/eddn: No need for typing.(Dict|List) usage 2022-12-23 14:47:40 +00:00
Athanasius
ce4a6ff898
plugins/eddn: Remove the 'default values' from should_retrn & new_data
In *this* case the variables *are* used in the scope so become bound, so
we can get away with bare type declaration.
2022-12-23 14:47:26 +00:00
Athanasius
2c11aef1be
plugins/eddn: Use correct logging function & new_data typing
* `logger.INFO` will, at best, be a constant, it should be `logger.info()`.
* When we're not interested in the `new_data` 2nd part of the tuple from
  `killswitches.check_killswitch()` we can't use `_` as there's a potential
  class with the `l10n.py` injection of `_()` as a builtin.

  And you can't declare types withing first-use in a return-tuple. So, declare
  them on their own lines, with throwaway default values instead.
2022-12-23 14:47:25 +00:00
aussig
3e295db061 Typing of return values from killswitch.check_killswitch() 2022-12-22 17:39:20 +00:00
Athanasius
868c1d8e57
docs: Fix up references to setup.py to be to Build-exe-and-msi.py 2022-12-20 16:51:58 +00:00
Athanasius
ba68397b3f
CAPI killswitches: endpoint killswitches & eddn export ones too
* Added `capi.request.<endpoint>` killswitches at appropriate call points.
* Added `eddn.capi_export.<type>` killswitches.  This allows for killing
  just the EDDN export of such CAPI-derived data, without stopping the actual
  queries, as other plugins/functionality might still have harmless use of
  the data.
* PLUGINS.md: Actually describe the contents of `data` passed to plugins, and
  point out it might not always contain market or shipyard data.  This is
  not only because of the new killswitches, but could already have happened
  if the station/port docked at didn't have the services.
* Some misc typing cleanups.
2022-12-16 15:06:01 +00:00
Athanasius
e245a75e61
EDMC: Get -n working again
* eddn: Don't schedule `queue_check_and_send()` if EDMC_NO_UI.
* `export_(commodites|outfitting|shipyard)` lost the `is_odyssey` argument
 in 556ace5306bebbcf34c1a56a9023a822218a73f1 .
* EDDNSender: Helper `set_ui_status()` in which the check for EDMC_NO_UI
  is performed.  Used in `send_message()`.  In the EDMC_NO_UI case it will
  INFO log the text instead.
2022-12-14 11:15:20 +00:00
Athanasius
0915bad95d
CAPI/EDDN: Enable sending of Legacy data
As we already took some care in the EDDN code we can just make
`cmdr_data_legacy()` call through to `cmdr_data()`.
2022-12-08 12:10:15 +00:00
Athanasius
38c2f19474
eddn: Suppress "converted file" for legacy if no file
This was a total brainfart, `finally:` is never what was wanted here.
So, just `return` if `FileNotFoundError`.
2022-12-05 16:40:44 +00:00
Athanasius
6bd48a163c
eddn: Ensure CAPI-sourced messages have uploaderID set
If no 'live' Journal events yet, plugins/eddn won't have had an event to set
this from.
2022-12-05 15:53:27 +00:00
Athanasius
b4c4e44cb7
eddn/CAPI: Use a common function for game_version strings
* This did, however, remind me that the `data` passed into `cmdr_data()`
  is an amalgam of `/profile`, `/market` and `/shipyard` queries.

  This means that the data.source_endpoint is **not correct for all of
  the data and its use**.  As such I had to pass 'hard coded' values into
  the function from the various CAPI export functions.  They know what it
  is they're exporting.

* As this reminded me that "CAPI `data` is actually a `CAPIDATA`", I've
  documented that in PLUGINS.md, but with a dire warning against relying on
  any of the extra properties.
2022-12-01 16:42:06 +00:00
Athanasius
b40d3b889f
CAPI: Use CAPI-Live-<endpoint> game_version for market & shipyard 2022-12-01 16:42:05 +00:00
Athanasius
3f0aefd671
eddn: Fix spelling mistake in a log message 2022-11-28 15:38:34 +00:00
Athanasius
2ac8026e3e
eddn: Allow for '' in standard_header()
`''` is Falsey, but a valid value, so we need an explicit `is not None`
test for these.
2022-11-27 17:01:28 +00:00
Athanasius
d902093f0b
Merge pull request #1682 from EDCD/fix/1431/eddn-replay-enhancements
Change EDDN 'replay' to using an sqlite3 DB & otherwise improve
2022-11-27 15:24:28 +00:00