ED/EDMarketConnector
1
0 Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2026-10-29 01:26:08 +03:00
Code Issues Projects Releases Wiki Activity
3,413 Commits 12 Branches 299 Tags
d982fc44af0eb4e437c166c268edb402deb62703
Commit Graph
3413 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Athanasius d982fc44af Merge pull request #1112 from EDCD/fix/1111/engineerprogress-with-one-engineer 
EngineerProgress: Progress can be for a single engineer, no array
 2021-05-27 11:26:19 +01:00
Athanasius aed1a22245 Merge pull request #1108 from EDCD/fix/1102/frontier-non-localised-suit-names 
Suits: Ensure a succinct and sane name for Suits in UI
 2021-05-27 11:22:19 +01:00
Athanasius e9973d239a Suits: Comment out 'duplicate' PT-BR shortnames 
They're the same key, and value, as the ES ones.  PyCharm highlighted
this, flake8 did not complain.  There's a comment as to why they're
commented out, but still present in that form.
 2021-05-27 11:09:52 +01:00
Athanasius 4d5d9ae645 config: appversion: Use +DIRTY to ensure SemVer compliance. 
It's also more succinct.  We know what it means.
 2021-05-27 09:21:13 +01:00
Athanasius 6f100a3ebf EngineerProgress: Duh, we already checked for the array, this is the array-less form 
This was never properly edited after copy/paste from the "we have an
array" form.
 2021-05-26 16:17:20 +01:00
Athanasius af5ffabd30 EngineerProgress: Cope with no Rank/RankProgress in 'single engineer' form 
Yes, this isn't DRY, if we do the check a third time I'll pull it out
into a helper function.
 2021-05-26 16:10:36 +01:00
Athanasius c3b87df1b0 EngineerProgress: Progress can be for a single engineer, no array 
This tweak means we'll look in the event itself instead, but still won't
cope with missing expected keys.  That's up next....
 2021-05-26 16:07:34 +01:00
Athanasius 04c3b20c99 Suits: Portugese (Brazil) (short)names localisation 
Also aligned all of the languages in the shortnames dict.
 2021-05-26 15:28:35 +01:00
Athanasius a38834c8eb Suits: French name localisations and short names 
Also re-arranged/re-formatted the shortnames to be grouped by language,
rather than suit.
 2021-05-26 15:15:27 +01:00
Athanasius 7b613b6124 Suits: Russian name localisation and short names 2021-05-26 15:07:28 +01:00
Athanasius e93ab9033e Suits: Spanish localisation and short names. 
The full string for the Flightsuit is 'Traje de vuelo', and we indeed
have 'Traje' as the translation for 'Suit', so the UI comes out as
'Traje:  de vuelo' for this.
 2021-05-26 14:58:55 +01:00
Athanasius f46618b61c Suits: Added German localisations/short forms for names. 2021-05-26 14:49:17 +01:00
Athanasius 033cfb7577 Suits: Prepare for Russian localisation of names 2021-05-25 19:09:55 +01:00
Athanasius 20f373a37d Suits: Localise out suit symbol name -> display name (stage1) lookup 
We'll need to localise the following 'shortname' lookup as well.
 2021-05-25 18:27:10 +01:00
Athanasius bac718aeff Store Fileheader language, gameversion and build in monitor.state 2021-05-25 17:56:11 +01:00
Athanasius e9e5352e37 Suits: Set edmcName in BuySuit handling 2021-05-25 16:30:23 +01:00
Athanasius 43a7974da5 Suits: Make suit name regex's case-insensitive (and tweak a comment) 2021-05-25 16:05:34 +01:00
Athanasius dba3fba8e3 Suits: Fully implement mapping to sane (English only for now) names 2021-05-25 15:24:21 +01:00
Athanasius f85213b318 Suits: Initial stab at grabbing a usable name out of a $symbol; version 2021-05-25 14:52:43 +01:00
Athanasius 48c852ec1d Suits: Code scaffolding for sanitising suit names 2021-05-25 14:45:18 +01:00
Athanasius 68a0e6c7af Test for if suit is None rather than a boolean test. 
This matches the explicit default in the .get()
 2021-05-25 14:31:27 +01:00
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