1
0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-19 18:37:39 +03:00

3211 Commits

Author SHA1 Message Date
Athanasius
2253e45c18 Suits: Add some paranoia around Loadouts
* Initialise to empty dict.
* try/except in case CAPI pull hasn't happened yet when parsing Journal
  events.
2021-04-29 11:45:06 +01:00
Athanasius
e796684fc6 Suits: Handle RenameSuitLoadout 2021-04-29 11:40:59 +01:00
Athanasius
e24e0b3547 Suits: Update DeleteSuitLoadout code with alpha4 example
Also slightly simplified this.  Leaving the try/except for now, although
it should no longer be necessary.
2021-04-29 11:34:29 +01:00
Athanasius
bd1b86d3a3 Suits/Loadouts: Always convert to dict form for simpler downstream code. 2021-04-29 11:30:55 +01:00
Athanasius
addb178d3d Suits: Handle 'CreateSuitLoadout'
This entails converting the Journal supplied data into CAPI form.
2021-04-29 11:23:14 +01:00
Athanasius
29a517ce11 Suits: Note that we need an 'UpgradeSuit' example still
The journal document has to be mistaken about cost being in credits.
2021-04-29 10:34:03 +01:00
Athanasius
aeca211a88 Suits: Handle 'SellSuit' 2021-04-29 10:26:55 +01:00
Athanasius
c8d98bba2e suits: Guard against "no CAPI pull yet" on BuySuit 2021-04-29 10:23:39 +01:00
Athanasius
7b8c113962 suits: Record a newly bought suit in monitor.state['Suits']
We can't fill in the 'id' field, but this is likely the FDevID of the
suit type ?
2021-04-29 10:12:49 +01:00
Athanasius
96d9a80956 odyssey-4: Add outlines/comments for all upcoming events 2021-04-27 11:54:15 +01:00
Athanasius
f8f4fa6bb3 L10n: Add 'Suit' to en.template 2021-04-26 23:09:22 +01:00
Athanasius
77e6b64c64 L10n: Move "Minimize to system tray" to correct position 2021-04-26 23:08:08 +01:00
Athanasius
f8a001459f
Merge pull request #1011 from SayakMukhopadhyay/enhancement/126-minimize-tray
EDMarketConnector: Added minimize to tray on close functionality
2021-04-26 17:19:18 +01:00
Sayak Mukhopadhyay
a52472d6e0 Fix for tray icon not stopping on app stop when minimize to tray option is disabled 2021-04-26 19:18:47 +05:30
Sayak Mukhopadhyay
fc83dcf090 Added annotations for systray 2021-04-26 16:05:40 +05:30
Sayak Mukhopadhyay
b377199119 Changed logic to handle minimize too system tray 2021-04-26 15:36:43 +05:30
Sayak Mukhopadhyay
2dddf02f9b Comments to describe the hack 2021-04-26 14:40:11 +05:30
Sayak Mukhopadhyay
fa58d2f0c2 Added windows OS checks 2021-04-26 14:23:08 +05:30
Sayak Mukhopadhyay
6c0437642e Formatting fixes 2021-04-26 14:03:22 +05:30
Sayak Mukhopadhyay
ecf16762d0 Fixed linting issues with EDMarketConnector.py 2021-04-26 13:37:27 +05:30
Athanasius
d0a6322458
Merge pull request #1012 from EDCD/dependabot/pip/develop/py2exe-0.10.4.0
build(deps-dev): bump py2exe from 0.10.3.1 to 0.10.4.0
2021-04-26 08:20:16 +01:00
dependabot[bot]
94c296a9da
build(deps-dev): bump py2exe from 0.10.3.1 to 0.10.4.0
Bumps [py2exe](https://github.com/py2exe/py2exe) from 0.10.3.1 to 0.10.4.0.
- [Release notes](https://github.com/py2exe/py2exe/releases)
- [Changelog](https://github.com/py2exe/py2exe/blob/master/ChangeLog)
- [Commits](https://github.com/py2exe/py2exe/compare/v0.10.3.1...v0.10.4.0)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-26 07:15:37 +00:00
Sayak Mukhopadhyay
df31aed6c5 Added appearance config option and implementation for minimize to tray on close functionality 2021-04-26 01:22:01 +05:30
Athanasius
e4e97f4642
Merge pull request #1010 from EDCD/dependabot/pip/develop/watchdog-2.0.3
build(deps): bump watchdog from 2.0.2 to 2.0.3
2021-04-23 08:37:20 +01:00
dependabot[bot]
f7154d8e78
build(deps): bump watchdog from 2.0.2 to 2.0.3
Bumps [watchdog](https://github.com/gorakhargosh/watchdog) from 2.0.2 to 2.0.3.
- [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.0.2...v2.0.3)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-23 06:01:10 +00:00
Athanasius
806ac63c38 ChangeLog: Call out that Python 3.9 means no more Windows 7 support 2021-04-21 10:10:14 +01:00
Athanasius
e363e1d0ae Pre-Release 5.0.0-beta6: appversion and changelog Release/5.0.0-beta6 2021-04-19 12:40:18 +01:00
Athanasius
dfc58e0d92 Translations: Updated with latest from OneSky 2021-04-19 12:34:34 +01:00
Athanasius
eb04673751 PLUGINS.md: Document dual-type of Suits, and helper functions. 2021-04-19 12:30:24 +01:00
Athanasius
6f6ace9856
Merge pull request #1007 from A-UNDERSCORE-D/fix/pts-capi-loadouts-list
CAPI loadouts is a sparse list, added index function
2021-04-17 08:19:29 +01:00
A_D
0913cff472
fixed import order 2021-04-16 17:46:22 +02:00
A_D
6f86e173cd
indexed sparse list rather than guessing 2021-04-16 17:41:31 +02:00
A_D
a3e0823701
Added utility sparse list index function
Frontier sometimes uses dicts as sparse lists, this should work to index
them either way. Doctests included do pass.
2021-04-16 17:36:53 +02:00
A_D
98c946fa31
CAPI loadouts changed from dict to list 2021-04-16 17:11:05 +02:00
Athanasius
f95a258597
Merge pull request #1006 from EDCD/dependabot/pip/develop/flake8-3.9.1
build(deps-dev): bump flake8 from 3.9.0 to 3.9.1
2021-04-16 08:18:57 +01:00
Athanasius
2163db2993
Merge pull request #1005 from EDCD/fix/capi-new-system-empty-laststarport
Be more paranoid about companion.Session.station() queries
2021-04-16 08:18:44 +01:00
dependabot[bot]
11082f557b
build(deps-dev): bump flake8 from 3.9.0 to 3.9.1
Bumps [flake8](https://gitlab.com/pycqa/flake8) from 3.9.0 to 3.9.1.
- [Release notes](https://gitlab.com/pycqa/flake8/tags)
- [Commits](https://gitlab.com/pycqa/flake8/compare/3.9.0...3.9.1)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-16 06:03:48 +00:00
Athanasius
e4f7c998cd companion: Improve station() checks and documentation
* Expand on the docstring to point out extra queries might be made.
* Add checks for lastStarport and then name within that being properly
  present and set.
2021-04-15 19:39:40 +01:00
Athanasius
74a3bea619 CAPI: catch lastStarport->services being an empty list (not dict)o
This is caused, at least on Odyssey Alpha Phase 3, 4.0.0.20, by:

1. Jump to a new system.
2. Don't dock yet.
3. Cause CAPI pull with 'Update' button.
4. The PTS CAPI server is returning:

  "lastStarport": {
    "faction": "",
    "id": 3221604096,
    "minorfaction": "",
    "name": "",
    "services": []
  },

So actually we need to decide it's not sane at all.
2021-04-15 18:16:41 +01:00
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