Commit Graph
143 Commits
Author SHA1 Message Date
David Sangrey f69a45584f Linter Fixes from #2553 2026-01-02 22:42:39 -05:00
David Sangrey ecff305ef8 Merge branch 'develop' into develop 2026-01-02 22:24:18 -05:00
David Sangrey f61b319fcd [#2570] Datafile Updater 2025-12-25 02:27:12 -05:00
David Sangrey beb68efae8 [2568] Fix Ships JSON Typo 2025-12-25 01:36:24 -05:00
TwokSSEi eff8d7f947 Merge branch 'develop' into develop 2025-12-12 23:28:05 -05:00
TwokSSEi 738b968daa Change default market export type to CSV
Edited to make COMMODITY_CSV the default option unless there is a suitable mkt_export_type in the configuration.
2025-12-12 23:25:28 -05:00
David Sangrey e6143bc21b [#2558] Continue Using , not ; 2025-12-11 23:01:07 -05:00
TwokSSEi f6ea33c8bb [Proposal ]Market Export Choice of Text Data format 2025-12-07 21:51:37 +00:00
David Sangrey 8dbd5cae69 [Minor] Add Custom Config Path, Add Additional Logging 2025-11-19 20:57:41 -05:00
David Sangrey e8d4b95bd2 [579] Alter Logging 2025-04-27 16:29:04 -04:00
David Sangrey 7a5635b3fb [#579] Allow EDMC to Iterate Known CMDRs 2025-04-27 16:26:33 -04:00
David Sangrey 08bfbe1582 [2406] Refactor Non-Plugin Modules 2025-04-14 21:33:54 -04:00
David Sangrey 5ad7fcfa62 [2303] Attempt Reversion 2024-09-30 18:42:09 -04:00
David Sangrey 348ad1d75f [#2297] Temporary Fix for max() arg empty 2024-09-29 11:03:33 -04:00
David Sangrey da5d317797 [2114] Additional Cleanup 2024-06-10 18:16:11 -04:00
David Sangrey fe8818d187 [2114] Apply PathLib Handover 2024-06-10 17:21:06 -04:00
David Sangrey 2686b23b3b Merge branch 'develop' into enhancement/1801/FDEV-ID-Updater 2024-05-13 20:21:42 -04:00
David Sangrey af207f60e8 [1801] FDEV ID Local Updater
This removes the FDEV ID Submodule, and instead hands over responsibility for maintaining the fdev id files to the internal system updater. Instead of the full submodule, we only pull the two files we need.
2024-04-27 20:10:09 -04:00
David Sangrey 080d9f98f2 [1812] Handover Translations 2024-04-22 17:33:28 -04:00
David Sangrey 29c4bd4028 [Minor] Update Type Hint 2024-01-05 15:35:25 -05:00
David Sangrey e531db8d48 [Flake8] Ignore Type Hint Missing
It's not missing. They're there.
2024-01-04 15:30:02 -05:00
David Sangrey 881c94a619 [Lang] Update Lang Comment 2024-01-04 15:22:57 -05:00
David Sangrey 41b879716f [2140] Translate Newver Str 2024-01-04 15:22:50 -05:00
David Sangrey 9c9ca42c13 [Fix] Re-Add Shebangs
Required for some Unix and Mac distributions
2023-12-16 21:04:33 -05:00
David Sangrey 960b00efbc [2051] We need that else 2023-11-17 18:35:32 -05:00
David Sangrey ff1f931afd [2051] EDMC Pass + Readd LANG 2023-11-17 18:07:37 -05: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 fa1c072d9e monitor: Change .system to state['SystemName']
1. EDDB plugin needs to track the system name, but we're moving all of that
  into monitor.py.
2. monitor.py was tracking this in monitor.system, but it needs to be in
  monitor.state['SystemName'] in order for plugins to access it.

So, move monitor.system to monitor.state['SystemName'] and update all uses.
2023-01-11 19:44:08 +00:00
Athanasius 9e605d31c7 EDMC.py: Fix up other call to companion.session.station()
* Opening of latest journal file didn't match how done in monitor.py.
  This caused `str` instead of `bytes` being passed to `monitor.parse_entry()`.
* It was assuming pre-threaded return of data.  Now properly gets it from
  the queue.
2022-12-23 14:47:19 +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 556ace5306 .
* 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 7430a42bdd EDMC: Use specific sys.exit codes, not a generic one
* "Can't read journal"
* When we don't know the commander.
2022-03-23 08:29:58 +00:00
Athanasius 43bae13418 EDMC.py: Use monitor.journal_newest_filename() 2022-03-18 09:42:04 +00:00
Athanasius 50db6c528a EDMC: Attempt to handle CAPI exceptions as per EDMarketConnector.py
* Moved most of the exception handling/message output down to the
  outermost try's except clauses.
2021-08-28 15:34:41 +01:00
Athanasius e1c6a0e9f8 CAPI: Create response queue in companion.Session
No need to create in callers and then use setter.
2021-08-25 11:50:56 +01:00
Athanasius 69d0d03b9b CAPI: Rename to EDMCCAPIFailedRequest & comment queues
* The 'EDMC' prefix on all these classes is to make it clear they're for
  internal passing around of requests/responses, rather than holding the
  literal raw CAPI request and response.

* The request and response queues are now commented, including the
  detail that the response queue is created by the caller and then set
  'here' by Session.set_capi_response_queue().
2021-08-25 11:42:53 +01:00
Athanasius 030d79c9da EDMC: De-indent CAPI response checks 2021-08-25 11:31:08 +01:00
Athanasius c9d478222a EDMC: Provide EDDN Odyssey flag from monitor state
This should have been set from the latest Journal file, and the
key/value is in LoadGame in Odyssey.  It's only documented as:

	"Whether the sending Cmdr has an Odyssey expansion."

in the current EDDN Journal schema.  Thus sending this as False if the
Cmdr last logged into Horizons/base game should be OK.
2021-08-24 13:52:48 +01:00
Athanasius f12b8be74c EDMC: Fix -d file export of CAPI data 2021-08-24 13:04:25 +01:00
Athanasius 332d4cf975 CAPI: EDMC - converted to the queue request/response format 2021-08-24 12:56:12 +01:00
Athanasius 021d3a25fa EDMC: Actually set config.trace_on from CL args
Else they won't work, duh!
2021-08-13 15:20:21 +01:00
Athanasius 647364c1ee EDMC: Add --trace-on, --trace-all & use monitor.currentdir
In testing `EDMC.py --trace` I ran into issues with NavRoute and
ShipLocker events wanting to open the auxilary files, but it failing.
This turned out to be because that code assumes `monitor.currentdir` is
set and EDMC.py was using a local variable rather than setting and using
it.
2021-08-13 15:14:01 +01:00
Athanasius f449e85c0b CAPI: 'SKUError' exception was never used - removed
Also LANG comments added.
2021-06-13 12:42:50 +01:00
A_D fe90f1f0b3 Cleaned up imports, removed incase imports
closes EDCD/EDMarketConnector#569
2021-05-28 14:46:51 +02:00
Athanasius 9ff936165d EDMC.py: Quieten remaining flake8/mypy output 2021-04-12 08:31:48 +01:00
Athanasius 2f9789afdd Update all code to use config.appversion() as a function
This *also* caught some instances where appversion_nobuild should
already have been used, so those were both changed and updated to a
function call.
2021-04-01 14:45:52 +01:00
A_D 051245cf90 Renamed various config values to be backwards compatible 2021-04-01 14:45:48 +01:00
A_D 00629b7420 use _str versions of paths for string ops 2021-04-01 14:45:48 +01:00
A_D e3def21683 Made sure to handle an empty journal dir in the config 2021-04-01 14:45:46 +01:00
A_D 278480b99f replaced ors with defaults in config usage 2021-04-01 14:45:46 +01:00
Athanasius 25852997c5 Updated all source to use new config methods
# Conflicts:
#	monitor.py
2021-04-01 14:45:46 +01:00