ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-23 04:10:29 +03:00
Code Issues Projects Releases Wiki Activity
3,172 Commits 16 Branches 276 Tags
Commit Graph

3172 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Athanasius
27cd46e23d
Merge pull request #1004 from EDCD/enhancement/odyssey-suits 
Add support for Odyssey Suit/Loadout data
 2021-04-15 18:15:36 +01:00
Athanasius
53f8209820 Move AppWindow.dump_capi_data() to be in companion.Session instead 
It's writing CAPI data to a file, so it should be in companion.py.

Also:

* Use companion.CAPIData as type, not a Mapping.
 2021-04-15 16:56:03 +01:00
Athanasius
f6611148e6 Suits: Add Artemis (ExplorationSuit_Class1) suit to ON_FOOT regex 2021-04-15 16:38:56 +01:00
Athanasius
8e8e57024d Suits: Location Ship "TacticalSuit_Class1" is also on-foot 
This is the 'Dominator' suit.
 2021-04-15 14:20:00 +01:00
Athanasius
4cf86047eb .gitignore: ChangeLog.html 2021-04-15 13:44:57 +01:00
Athanasius
d9d36dd12b Suits: Comments about suit/weapon events not having instance ID 2021-04-15 10:55:51 +01:00
Athanasius
d095e8b054 Suits: We can't do anything on SellSuit yet, placeholder. 2021-04-15 10:43:42 +01:00
Athanasius
550ca61e44 Suits: Support DeleteSuitLoadout event 
* Factored "find CAPI slot id from journal LoadoutID" into its own
  function.
 2021-04-14 10:16:34 +01:00
Athanasius
1509bcde2b Suits: Placeholders for DeleteSuitLoadout and CreateSuitLoadout 2021-04-14 10:01:36 +01:00
Athanasius
bd61cda6fa Add translation for 'Unknown', e.g. suit loadout. 2021-04-13 17:15:25 +01:00
Athanasius
bb90d0fb59 Suits: If user switches to an unknown loadout, say so 2021-04-13 16:56:48 +01:00
Athanasius
c28dd8c55d Suits: Set/update suit text as necessary. 
* After any Journal event we might as well set it.
* Attempt to update on a `SwitchSuitLoadout` event, assuming the new
  slot is one we heard about in the last CAPI data.
 2021-04-13 16:48:16 +01:00
Athanasius
29c059c275 Suit: Label and text now properly aligned, and toggling 
* There was a 'hidden' padx/pady thing going on, not applying because we
  were hidden/not gridded, so apply in toggle/show.
* Make that padx=5 all over use a common constant.
* Set Suit text if most recent CAPI data contains the relevant data.  If
  it's not present then hide the Suit row.
 2021-04-13 15:26:41 +01:00
Athanasius
9ca55e7af7 Suit: Implement auto-toggle of Suit line based on CAPI data 
* There's a 'visible' argument to force it, default None to ignore.
  That flag is checked first in the function, and then it sets the
  'current' state to the opposite so the following conditional will do
  the right thing.
* Toggling is triggered in AppWindow.getandsend().
 2021-04-13 14:15:45 +01:00
Athanasius
3baf92706d Suits: Initially don't show 'Suit' row of UI 
* Don't grid to start with, but store the row it would be on.
* `toggle_suit_row()` to toggle it on/off.  NB: Might implement a "force
  to" `visible` argument, but going to test without for now.
 2021-04-13 13:59:41 +01:00
Athanasius
0382e4b451 Suits: Add basic UI for suit label and name 
Currently this will always be there, next commit(s) will sort out it
being dynamic.
 2021-04-13 12:48:13 +01:00
Athanasius
29473de031 PLUGINS.md: Update for all added Odyssey monitor.state fields 2021-04-13 12:26:33 +01:00
Athanasius
2246278286 Odyssey Suits: Store available data from CAPI. 
I've gone with 'None' for when there's no data, rather than {}.  That
makes for simpler checks on if there is data (a dict.get('foo') only
checks for that, not the dict structure otherwise).

If no 'suit' in the data we assume no Odyssey, but otherwise plough on
with dict.get() statements as they'll default to None if it's not
present.

*Users* of this monitor.state[] extra data get to choose what to do if
some data is present but not other.
 2021-04-13 12:12:51 +01:00
Athanasius
a70da4a522
Merge pull request #1003 from A-UNDERSCORE-D/fix/1002-linux-config-flush 
Make sure that config is flushed to disk on set on linux
 2021-04-13 11:20:41 +01:00
A_D
f99b0445ca
Also save on delete 2021-04-13 00:35:01 +02:00
A_D
3341800f71
Added missing save to test 2021-04-13 00:32:03 +02:00
A_D
d4e7395a44
Ensured all sets are flushed to disk on linux 
Fixes 1002
 2021-04-13 00:31:58 +02:00
Athanasius
c2dec59e78
Merge pull request #1001 from A-UNDERSCORE-D/fix/unicode-error-error 
Fixed edge case with reading old ship loadout
 2021-04-12 19:04:32 +01:00
A_D
1a9983f331
Fixed edge case with reading old ship loadout 2021-04-12 19:58:23 +02:00
Athanasius
2da92c1f39
Merge pull request #1000 from EDCD/enhancement/CL-force-edmc-protocol 
EDMarketConnector: Add CL arg to force use of edmc:// protocol
 2021-04-12 18:05:41 +01:00
Athanasius
4b456b402b EDMarketConnector: Mutually exclude --force-localserver-for-auth --force-edmc-protocol 2021-04-12 16:35:39 +01:00
Athanasius
cf1655894b protocol: Pay attention to config.auth_force_edmc_protocol 2021-04-12 16:32:58 +01:00
Athanasius
ae2bbc8929 Set config flag for --force-edmc-protocol so protocol.py can test it 2021-04-12 16:25:53 +01:00
Athanasius
c466d17553 EDMarketConnector: Add CL arg to force use of edmc:// protocol 
This will be useful when running from source, i.e. in debugger, and
wanting to work on the protocol code.
 2021-04-12 16:20:12 +01:00
Athanasius
c18ffe4f3b
Merge pull request #999 from EDCD/enhancement/additional-translations 
translations: Re-order as per l10n.py output & some added
 2021-04-12 15:19:35 +01:00
Athanasius
99d90b52b1 translations: Re-order as per l10n.py output & some added 
* Generic 'Error'.
* Strings for Access Token customer_id != FID.
* Other strings in companion.py now translating.
* Missing colon on Plugins string.
 2021-04-12 14:58:03 +01:00
Athanasius
6532a0f0ed Release 5.0.0-beta5: appversion and changelog Release/5.0.0-beta5 2021-04-12 13:51:26 +01:00
Athanasius
b4a95b85fd
Merge pull request #998 from EDCD/enhancement/companion-check-FID-versus-response 
companion: /decode access token and check customer_id matches FID
 2021-04-12 12:53:25 +01:00
Athanasius
ffc8d2fcb8 Add comment about assuming FID always starts 'F'. 2021-04-12 12:52:05 +01:00
Athanasius
671db91547
Merge pull request #997 from EDCD/fix/996-init-all-monitor-self 
monitor.py: Initialise EDLogs self.systempopulation
 2021-04-12 12:40:33 +01:00
Athanasius
0575c3ff43 companion: Don't over-write all CredentialsError with generic one 2021-04-12 12:38:23 +01:00
Athanasius
ca08339dfe companion: /decode access token and check customer_id matches FID 2021-04-12 12:37:17 +01:00
Athanasius
5c7aa4dfa9 companion: commented-out example of requests/http debug logging 2021-04-12 12:03:11 +01:00
Athanasius
2686500d65 companion: Split Frontier Auth URL string over lines 
This way a change to one part is an easier to read diff.
 2021-04-12 11:05:11 +01:00
Athanasius
9a6b59fbd3 monitor.py: Initialise EDLogs self.systempopulation 
This is the *one* field that wasn't always initialised.
 2021-04-12 09:10:25 +01:00
Athanasius
79729d683e CQC game mode LoadGame has fewer fields, no Ship 2021-04-12 08:45:10 +01:00
Athanasius
dc7f4bdd1c Update bug report template for GitHub no longer having that button 
You just drag & drop files into the input area now.
 2021-04-12 08:37:16 +01:00
Athanasius
13824c53bc monitor: Only forget station on Disembark if not from own ship 2021-04-12 08:31:48 +01:00
Athanasius
06568aeb2e pr-checks: No 'with:' if the body is empty 2021-04-12 08:31:48 +01:00
Athanasius
51f5cc3a31 pr-checks: Try without setting checkout ref 
Going to test this with new PR from Athanasius account, with a 'behind'
develop.
 2021-04-12 08:31:48 +01:00
Athanasius
ed8b573090 pr-checks: Use github.head.sha for checkout ref 2021-04-12 08:31:48 +01:00
Athanasius
c599a486d6 Restore showing the github context 2021-04-12 08:31:48 +01:00
Athanasius
c2fdd0a319 pr-checks: Try not changing options to actions/checkout@v2 2021-04-12 08:31:48 +01:00
A_D
1a7bfc8a60 Updated gitignore 2021-04-12 08:31:48 +01:00
A_D
efebdfdfed Ensured that emitter is always bound, even if None 2021-04-12 08:31:48 +01:00