Commit Graph
3761 Commits
Author SHA1 Message Date
norohind 0bb06232b8 monitor.py: add default value to entry.get('GameMode') in CQC detection 2021-08-11 14:24:27 +03:00
norohind 97998e6de9 EDMarketConnector.py: clarify comments about CQC 2021-08-11 14:00:32 +03:00
norohind c08c1a574e plug.py: reorder notify* functions 2021-08-11 13:55:46 +03:00
norohind bd32b44903 monitor.py: fix CQC to lower case 2021-08-11 13:50:09 +03:00
norohind ba38b5f02d plug.py: more verbose log message on failed while handling CQC mode journal entry 2021-08-10 16:16:01 +03:00
norohind 7b39b0fda0 plug.py: use copy.deepcopy() instead of dict() in cqc_callback
To create deepcopy for passing data to cqc_callback
2021-08-10 15:55:14 +03:00
norohind 42ce2ad414 monitor.py: trace loadgames to CQC only if in trace_on 2021-08-10 14:27:47 +03:00
norohind 030713f5b9 plug.py: rename journal_entry to cqc_callback in notify_journal_entry_cqc 2021-08-10 13:55:10 +03:00
norohind 6e2f49a63c plug.py: remove useless 'as e' in notify_journal_entry_cqc 2021-08-10 13:51:22 +03:00
norohind 7b823dd64d Remove commented out logger.debug() 2021-08-10 03:16:57 +03:00
norohind e9ee65da14 Code style fix 2021-08-10 03:15:50 +03:00
norohind 3283439485 Code style fixes 2021-08-10 03:00:36 +03:00
norohindandA_D 84500b775a More paranoia about is journal_entry_cqc callable
Co-authored-by: A_D <A-UNDERSCORE-D@users.noreply.github.com>
2021-08-10 02:52:39 +03:00
norohind a00a677746 monitor.py: use trace instead debug to log CQC loadgames 2021-08-10 02:49:58 +03:00
norohind ad4304a184 Be more paranoid with empty events when in CQC 2021-08-09 17:23:57 +03:00
norohind d7dd8c8990 Be more paranoid with GameMode and CQC 2021-08-09 17:15:54 +03:00
norohind 291fbf2908 Use both Ship and GameMode fields of LoadGame event to detect CQC
And freeze update button when in CQC
2021-08-09 15:59:30 +03:00
norohind 27fe43bf8c WIP: implement journal_entry_cqc()
journal_entry_cqc function in plugin's api allow plugins to recieve
journal events when player are in CQC
2021-08-09 04:37:23 +03:00
Athanasius 1a0b4ae480 ChangeLog: Grammer tweaks Release/5.1.3 2021-08-08 15:09:42 +01:00
Athanasius e3d55420d4 Release 5.1.3: changelog & appversion 2021-08-08 14:45:28 +01:00
Athanasius 98d812fa79 Merge branch 'release-5.1.3-beta1' into release-5.1.3 2021-08-08 14:31:17 +01:00
Athanasius 99b221fe6c Merge pull request #1223 from A-UNDERSCORE-D/fix/1222/configget_bool-doesnt-return-custom-default-value
Fixed get_bool on windows not returning defaults in some cases
2021-08-08 11:40:01 +01:00
A_D 942088bb8c Fixed get_bool on windows not returning defaults in some cases 2021-08-08 12:02:58 +02:00
Athanasius 5a65a44848 windows-build: Change trigger tag pattern to our "Release/*" 2021-08-08 10:18:06 +01:00
Athanasius 9a393af430 Merge pull request #1183 from A-UNDERSCORE-D/fix/1182/Option-to-hide-private-group-name
Add options to hide private group name and multicrew commander name from UI
2021-08-07 19:30:42 +01:00
A_D a0c1854818 fixed letter transposition
I hate the word captain.
2021-08-07 20:20:48 +02:00
Athanasius 9cf71113ca Merge pull request #1221 from EDCD/fix/1216-shiplocker-load-failure
monitor: Retry on ShipLocker.json load/decode failure
2021-08-07 15:03:11 +01:00
Athanasius cc6b52a9ed Shiplocker: while/else a failure logging 2021-08-07 14:45:46 +01:00
Athanasius dc953b49a6 shiplocker: Implement ShipLocker.json load/decoding retries
* Currently a maximum of 5 attempts, 10ms apart.
* I was going to blank `entry = {}` for this, but there's a chance the
  file load would fail when at startup and Embark the in-Journal event
  actually has all the data.  So we cross our fingers and hope that's
  the case if loading fails.
* Changed the "not all the categories" logging to WARN to call out the
  failure.
* Removed old comment about not touching Backpack here.
2021-08-07 14:38:03 +01:00
Athanasius 292b508985 monitor: Prepare for more-paranoid Shiplocker.json loading 2021-08-07 14:20:05 +01:00
Athanasius bb54bc25b4 companion: Clean up some flake8 and mypy gripes 2021-08-07 14:08:16 +01:00
Athanasius bd4145c2b3 Merge pull request #1220 from inorton/1198-inb-work-around-capi-lag
re #1198 work around +size suffixes in CAPI responses
2021-08-07 14:03:10 +01:00
inbandA_D f1ef557dee re #1198 work around +size suffixes in CAPI responses
Co-authored-by: A_D <A-UNDERSCORE-D@users.noreply.github.com>
2021-08-06 20:59:04 +01:00
Athanasius 2efa32cf86 Pre-Release 5.1.3-beta1: appversion & ChangeLog Release/5.1.3-beta1 2021-08-06 15:16:31 +01:00
Athanasius 6e7ef6d80d logging: Don't force DEBUG if not TRACE
This was overriding the user-configured log level for the plain log
output.  The debug output still has DEBUG or TRACE as requested.
2021-08-06 09:06:54 +01:00
Athanasius c4c859e2d2 Merge pull request #1217 from EDCD/fix/1134/edsm-wrong-balance
Investigate & fix wrong-commander EDSM data
2021-08-05 18:20:57 +01:00
Athanasius c398be9b5c Contributing: Document --debug-send ... code and usage 2021-08-05 17:04:44 +01:00
Athanasius ca87c061a1 Contributing: Document --trace-on code and usage 2021-08-05 16:50:02 +01:00
Athanasius 7a71fc8e14 plugins/edsm: Protect discarded_events loop against shutdown 2021-08-05 16:40:11 +01:00
Athanasius 64f97accc0 plugins/edsm: Only try to send if pending isn't empty
This prevents literally sending an empty data to EDSM if we trigger
sending due to Shutdown.
2021-08-05 16:22:46 +01:00
Athanasius f2d7f6a5df plugins/edsm: Change discarded_events setup, check latest event in should_send()
* Ensure we have the discarded_events list *before* starting to consume
  events.  There's the *same* risk as before with EDSM just being down
  and us queueing up more and more, just now it will be in the worker
  queue rather than pending.

* We need to test for some events in should_send() that are in the
  discard list, and thus will never be in the `entries` (pending) passwd
  in, so pass in the name of the latest event as well.
2021-08-05 16:13:41 +01:00
Athanasius a794d6088f plugins/edsm: cmdr & entry declared & set early, so types now OK 2021-08-05 15:23:15 +01:00
Athanasius ddc9286903 plugins/edsm: Queue *all* events to worker
We need to trigger off ShutDown and Commander/LoadGame to empty pending,
so need to *see* them in the worker.
2021-08-05 15:20:03 +01:00
Athanasius 53da204ffd plugins/edsm: Empty pending on Shutdown & 2021-08-05 15:19:43 +01:00
Athanasius 26115a14f0 plugins/edsm: should_send() == True for any Shutdown event
We MUST attempt flushing pending events in case of commander change.
2021-08-05 15:01:33 +01:00
Athanasius ba7c2de593 plugins/edsm: 'class This' the file & flake8/mypy cleanup 2021-08-05 14:40:41 +01:00
Athanasius 56d7ee64be plugins/edsm: Add trace-on support & cleanup some mypy changes
* trace-on 'edsm-cmdr-events' for how Commanders, their API keys and
  using them are handled.  See #1134
* trace-on 'edsm-locations' for what was commented-out logging to do
  with ensuring code reacted correctly to any change of system.
* mypy/types-* seem to have had changes causing extra carping, so
  addressing that.
2021-08-05 14:06:42 +01:00
Athanasius ea88a57e18 monitor: Gate Commander/LoadGame TRACE on trace_on 'startup' 2021-08-05 13:46:20 +01:00
Athanasius 40b76d40cc Add --trace-on ... to activate specific trace logging
This is just the parsing and storage of the options for now.
2021-08-05 13:43:15 +01:00
Athanasius 9cb3bb1b69 Merge pull request #1215 from A-UNDERSCORE-D/fix/1214/Re-Order-monitorpyworker()-to-ensure-old-journal-fully-drained-before-switching-to-new
Reorder new journal file checks
2021-08-04 14:59:06 +01:00