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

3392 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Athanasius
00469384b4 Suits: Keep using CAPI-source Suit name if we have it. 
* We were referring to *suit* 'slot id', when that's only for the
  loadouts.  For suits we have a full id, from Frontier, that we use.
* Comment that creating a suit loadout does *not* automatically equip
  it.

Now, **if we have CAPI data** we will use the CAPI-sourced localised
name for the suit display.  Where we don't (yet) have CAPI data we still
use the badly localised journal name for the suit.
 2021-05-25 14:26:01 +01:00
Athanasius
a710f97c29
Merge pull request #1066 from A-UNDERSCORE-D/enhancement/1060-copy-status-page 
Add the ability to copy entries from the status page
 2021-05-25 13:35:31 +01:00
Athanasius
69d8270e8f config: Rework 'git but dirty?' check to handle 'no git' 
`shorthash` was still `None` if no git, so we then tried to concatenate
`NoneType` and `str` which is verbotten.

There's no point using git to detect dirtyness if `shorthash` is None
because that itself indicates no git available.
 2021-05-21 16:55:10 +01:00
Athanasius
eb4cbded7a Post-release appversion bump 
I'm trying out a new policy of bumping to patch+1 and -beta0 after a
stable release.  Makes it more obvious when I was testing, especially
over EDDN (which doesn't get sent the +buildmeta).
 2021-05-21 15:36:53 +01:00
Athanasius
a04a31dc04 Translations: Updated from OneSky Release/5.0.2 2021-05-21 15:03:35 +01:00
Athanasius
fd5a721b81 Release 5.0.2: appversion and changelog 2021-05-21 14:57:27 +01:00
Athanasius
74560c369d
Merge pull request #1098 from EDCD/enhancement/status-message_CAPI-down 
CAPI: Make user-visible error text more obvious
 2021-05-21 14:36:41 +01:00
Athanasius
431d83b5ca companion: Tweak 'server returned an error' message & translate 2021-05-21 14:32:26 +01:00
Athanasius
89c486401e Translations: companion.py "Frontier CAPI query failure" 2021-05-21 14:25:51 +01:00
Athanasius
9cfa60ae26 CAPI: Make user-visible error text more obvious 
Mostly call out this is 'Frontier CAPI' related.
 2021-05-21 14:23:35 +01:00
Athanasius
da6b4a16d9
Merge pull request #1097 from EDCD/fix/suit-line_visibility_etc 
Ensure UI 'Suit' line is shown when it should be, and not otherwise
 2021-05-21 13:26:11 +01:00
Athanasius
da94b729bd Suits: Log if we try to set unknown suit/loadout 2021-05-21 12:31:08 +01:00
Athanasius
7e064374d2 Suits: Refactor suit/loadout set-current away from store 
This way we can have common code for SuitLoadout, SwitchSuitLoadout and
CreateSuitLoadout, with the first two then calling the new
`self.suit_and_loadout_setcurrent()` to set the seen data as also the
currently in use suit/loadout.
 2021-05-21 12:27:16 +01:00
Athanasius
43d261f290 CreateSuitLoadout: 4.0.0.101 example comment 2021-05-21 12:14:18 +01:00
Athanasius
f923ef64ca Suits: Refactor 'SuitLoadout' to also be used in 'SwitchSuitLoadout' 2021-05-21 12:08:22 +01:00
Athanasius
3a92ff9f96 SwitchSuitLoadout: Example from 4.0.0.101 added in comments 2021-05-21 11:42:59 +01:00
Athanasius
0219098d05 UI Suit: Keep line hidden if Odyssey not detected 
Else we'll show the line with '<Unknown>' always in Horizons
 2021-05-21 11:42:03 +01:00
Athanasius
5e0bcb29a9
Merge pull request #1084 from EDCD/fix/1078/odyssey-partial-engineerprogress-event 
EngineerProgress: Extra validation paranoia
 2021-05-21 11:01:26 +01:00
Athanasius
bd56948f7d
Merge pull request #1086 from EDCD/enhancement/1083/edsm-backpack 
Fix BackPack event support to actually work.
 2021-05-21 11:00:07 +01:00
Athanasius
f6e23476ff
Merge pull request #1091 from A-UNDERSCORE-D/fix/1079-suit-upgrade-costs 
Update credits on UpgradeSuit
 2021-05-21 10:56:31 +01:00
Athanasius
6ad7093d7e
Merge pull request #1092 from A-UNDERSCORE-D/fix/1073-show-dirty-wdir-git 
Show whether or not the git wdir is dirty in version
 2021-05-21 10:55:41 +01:00
A_D
a89d4f1901
Fixed line too long 2021-05-21 11:02:51 +02:00
A_D
924221f063
Show whether or not the git wdir is dirty in version 
Closes #1073
 2021-05-21 08:39:13 +02:00
A_D
be100d97de
Update credits on SuitUpdate 
Closes #1079
 2021-05-21 08:24:00 +02:00
Athanasius
e5909e9024 EDSM: Use loaded BackPack data, not the empty event. 2021-05-20 18:26:51 +01:00
Athanasius
143a205fb9 Backpack: event name is CamelCase, stored in monitor.state, doc 
* Surprise!  The new event is `BackPack`, not `Backpack`, although the
  filename *is* `Backpack.json`.
* Store the loaded JSON dict in `monitor.state['BackpackJSON']`.  That
  `p` is lower case to match with the filename, not the event name.
* Document this in PLUGINS.md.

Unless EDSM is telling us to discard this we should now be sending it.
 2021-05-20 18:13:51 +01:00
Athanasius
278a78c09a plugins/inara: Don't try to send None-system location 
I'm not sure normal use can cause this, but it's an easy obvious check.
 2021-05-20 17:34:09 +01:00
Athanasius
2184afba9b EngineerProgress: Rank/RankProgress is complicated. 
And, yes, flake8 checks, validating these events *is* complex.
 2021-05-20 15:51:28 +01:00
Athanasius
a82099fe53 EngineerProgress: Don't need f=, just f here. 2021-05-20 15:38:06 +01:00
Athanasius
e650308e3d EngineerProgress: Extra validation paranoia 
This is an example of just how icky it gets validating an event by hand.

Technically we need a function, many would probably be lengthier and
more complex than this one, for **every   single   journal   event
  type**.
 2021-05-20 15:28:52 +01:00
Athanasius
0b9991b092
Merge pull request #1071 from EDCD/enhancement/odyssey-launch-journal-v31 
Adjust Odyssey support re: Journal v31
 2021-05-20 14:42:30 +01:00
Athanasius
35a0edde58 Use pass for "no code intended" 
`...` is better suited to "under construction, more to come".
 2021-05-20 11:28:15 +01:00
Athanasius
0fd2264d53 UseConsumable: Rely on BackpackChange instead, to avoid double-accounting 2021-05-20 11:26:04 +01:00
Athanasius
8b3094dd6b SuitLoadout: Now showing Suit UI if set 2021-05-20 11:09:32 +01:00
Athanasius
652fecc3e8 SuitLoadout: Attempt to get all state set correctly. 
I think this is now correct, but not yet triggering the unhide of the
'Suit' UI line, will check that next.
 2021-05-20 10:51:49 +01:00
Athanasius
94d16df3c1
Merge pull request #1075 from A-UNDERSCORE-D/fix/unset-shipyard-provider-false 
Fixed showing unset shipyard provider as False
 2021-05-20 09:58:51 +01:00
Athanasius
a9aad9db10
Merge pull request #1081 from EDCD/dependabot/pip/develop/watchdog-2.1.2 
build(deps): bump watchdog from 2.1.1 to 2.1.2
 2021-05-20 06:56:40 +01:00
dependabot[bot]
5a929b4c0b
build(deps): bump watchdog from 2.1.1 to 2.1.2 
Bumps [watchdog](https://github.com/gorakhargosh/watchdog) from 2.1.1 to 2.1.2.
- [Release notes](https://github.com/gorakhargosh/watchdog/releases)
- [Changelog](https://github.com/gorakhargosh/watchdog/blob/master/changelog.rst)
- [Commits](https://github.com/gorakhargosh/watchdog/compare/v2.1.1...v2.1.2)

Signed-off-by: dependabot[bot] <support@github.com>
 2021-05-20 05:39:22 +00:00
Athanasius
29c8739432
Merge pull request #1077 from EDCD/fix/market-export-csv-filename 
Fix market CSV output filenames format
 2021-05-19 18:29:15 +01:00
Athanasius
ea1882d312 loadout.py: Pre-empt the 'dangling commas' brainfart when this gets refactored/cleaned 2021-05-19 18:12:45 +01:00
Athanasius
af2effb317 td.py: Pre-empty the 'dangling commas' brainfart when this gets refactored/cleaned 2021-05-19 18:06:02 +01:00
Athanasius
d58eea293f
Merge pull request #1072 from EDCD/enhancement/plugin-external-modules 
PLUGINS.md: Document packaging extra modules
 2021-05-19 17:59:29 +01:00
A_D
ecd6518730
Fixed showing unset shipyard provider as False 
The code around the dropdown menu in prefs for shipyard providers was a
bit too clever for its own good.

This brings it in line with the behaviour of the other two
 2021-05-19 18:19:57 +02:00
Athanasius
56f016604c Fix market CSV output filenames format 
I must have had a brainfart when refactoring this, leaving the trailing
commas when I split this out into multi-statement rather than one big
f-string.
 2021-05-19 00:00:54 +01:00
Athanasius
9c4058da60 PLUGINS.md: Actually have something in Avoiding pitfalls about dir name 2021-05-18 23:21:05 +01:00
Athanasius
6448d03ab3 PLUGINS.md: Document packaging extra modules 2021-05-18 23:18:30 +01:00
Athanasius
eeed2cf7af Initial attempt at SuitLoadout event support 
Need to see examples to be sure.
 2021-05-18 22:42:27 +01:00
Athanasius
a50ed31450 Add note about maybe not wanting to use UseConsumable to track Backpack 
*Hopefully* `BackpackChange` will be 100% reliable in place of this.
Test once live Odyssey is available!
 2021-05-18 22:42:27 +01:00
Athanasius
bcbf37599e Odyssey Backpack: Add support for v31 Backpack and BackpackChange 
Leaving the, meant to be defunct, `BackPackMaterials` code in for now,
as it's only one extra conditional that will never be stepped into if
the event never happens.

Yes, Frontier now uses 'Backpack' not 'BackPack', but we've already
published our plugin API as using the CamelCase version, so not changing
the monitor.state key.
 2021-05-18 22:42:27 +01:00
Athanasius
58619a499f edmc_data: Add Jounal v31 extra Flags2 values 2021-05-18 22:42:27 +01:00