mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-15 00:30:33 +03:00

Go to file

Inara: Do not update credits from CAPI data

CAPI only has the Cmdr wallet value (and loan if applicable), without anything
for 'total assets'.  If we send Inara setCommanderCredits without
`commanderAssets` then Inara makes a bad judgement on it and sets an
incorrect total assets value.

Also:

> Do NOT set credits/assets unless you are absolutely sure they are correct. The journals currently doesn't contain crew wage cuts, so credit gains are very probably off for most of the players. Also, please, do not send each minor credits change, as it will spam player's credits log with unusable data and they won't be most likely very happy about it. It may be good to set credits just on the session start, session end and on the big changes or in hourly intervals.

So, let's just not.

2022-02-11 12:20:06 +00:00

.github

github: submodules-update: Port in all the releasehub code & tweak

2022-02-07 17:31:47 +00:00

config

develop: Bump appversion to 5.3.0-beta11

2022-02-09 16:36:22 +00:00

coriolis-data @ 5ac8a2474e

github: Add submodule-updates workflow

2022-02-07 14:45:00 +00:00

docs

python version: Some docs updates

2022-01-31 18:29:08 +00:00

FDevIDs @ 9ca62008e9

updating submodules

2022-02-07 15:19:49 +00:00

img

img/: Add annotated UI image (well, labelled).

2021-05-12 16:09:55 +01:00

L10n

fix mercenary rank, add some comments

2022-01-25 19:23:22 +02:00

plugins

Inara: Do not update credits from CAPI data

2022-02-11 12:20:06 +00:00

scripts

resolved bug in wildcard detection

2021-08-23 12:46:57 +02:00

tests

docs: Pass for config.py -> config/__init__.py and related changes

2022-01-31 15:41:25 +00:00

util

change module doc comment for text.py

2022-01-26 18:58:33 +02:00

wix

WiX: Add/update comments in template.wxs about auto-generation

2021-12-07 17:36:51 +00:00

.coveragerc

tests: Add .coveragerc (excludes tests/ and venv/)

2021-04-01 14:45:52 +01:00

.editorconfig

.editorconfig: Fix the EOL comment

2022-01-27 17:01:49 +00:00

.flake8

Added noqa, docstring, and fstring linters

2020-09-09 17:13:13 +02:00

.gitattributes

Also fixup rare commodities

2018-08-01 00:23:47 +01:00

.gitignore

WiX: Rename to wix/static-EDMarketConnector.wxs and .gitignore generated

2021-12-07 17:20:44 +00:00

.gitmodules

fdevids: Add FDevIDs repo as a submodule

2021-12-16 17:34:46 +00:00

.mypy.ini

add configs for switching platforms

2022-01-26 18:51:49 +02:00

.pre-commit-config.yaml

.pre-commit-config: .mypy.ini sets these options

2022-02-09 14:48:56 +00:00

.python-version

python: Bump to 3.10.2

2022-01-20 13:32:01 +00:00

ChangeLog.md

Pre-Release 5.3.0-beta10: appversion and changelog

2022-02-08 16:31:31 +00:00

collate.py

Document use of *local* outfitting.csv instead of FDevIDs version

2021-12-17 12:23:20 +00:00

commodity.py

Fix market CSV output filenames format

2021-05-19 00:00:54 +01:00

companion.py

FDevIDs: Switch code to using FDevIDs/ files

2021-12-17 11:08:14 +00:00

constants.py

app version: Write a .gitversion file with short hash from setup.py

2021-04-01 14:45:52 +01:00

Contributing.md

Contributing: Add new section about plugin-only imports

2022-02-01 15:26:10 +00:00

coriolis.py

Document use of *local* outfitting.csv instead of FDevIDs version

2021-12-17 12:23:20 +00:00

dashboard.py

Update to use sys.platform over platform

2022-01-26 18:51:49 +02:00

debug_webserver.py

fix bugs that were hidden

2022-01-27 19:52:51 +02:00

EDMarketConnector - localserver-auth.bat

Add .bat file for using --force-localserver-for-auth

2021-03-18 11:26:56 +00:00

EDMarketConnector - reset-ui.bat

Added reset UI flag

2021-04-01 14:45:47 +01:00

EDMarketConnector - TRACE.bat

Add a BAT file to run with --trace

2020-09-25 16:17:17 +01:00

EDMarketConnector-dpiaware.manifest

Add specific manifest files for different configurations.

2020-09-25 15:33:18 +01:00

EDMarketConnector-dpiaware+gdiscaling.manifest

Add specific manifest files for different configurations.

2020-09-25 15:33:18 +01:00

EDMarketConnector-gdiscaling.manifest

Add specific manifest files for different configurations.

2020-09-25 15:33:18 +01:00

EDMarketConnector.icns

Initial version.

2015-06-02 20:14:04 +01:00

EDMarketConnector.ico

Initial version.

2015-06-02 20:14:04 +01:00

EDMarketConnector.manifest

Remove gdiScaling from EDMarketConnector.manifest

2020-10-07 18:07:43 +01:00

EDMarketConnector.png

Support for running from source on Linux.

2015-06-04 17:42:12 +01:00

EDMarketConnector.py

Update to use sys.platform over platform

2022-01-26 18:51:49 +02:00

EDMarketConnector.VisualElementsManifest.xml

Improve tile appearance on Windows 8.1 start screen.

2015-06-23 19:42:44 +01:00

EDMarketConnector.xcf

Initial version.

2015-06-02 20:14:04 +01:00

edmarketconnector.xml

Update main copy of edmarketconnector.xml to match releases.

2021-03-21 11:08:13 +00:00

edmc_data.py

updated comment

2021-07-05 11:17:19 +02:00

EDMC.manifest

Add a manifest for EDMC.exe so that it also runs UTF-8

2020-09-22 15:34:35 +01:00

EDMC.py

EDMC: Attempt to handle CAPI exceptions as per EDMarketConnector.py

2021-08-28 15:34:41 +01:00

EDMCLogging.py

EDMCLogging: Fix minor MAGIC comment format issue

2022-01-20 14:59:46 +00:00

edshipyard.py

edshipyard: cast mod_guidance instead of type ignore

2021-04-12 08:31:48 +01:00

EUROCAPS.TTF

Actually add the Euro Caps font to repo

2019-04-26 13:09:33 +01:00

hotkey.py

hotkey: Final mypy lints

2021-04-12 08:31:48 +01:00

journal_lock.py

Update to use sys.platform over platform

2022-01-26 18:51:49 +02:00

killswitch.py

additional info in docstrings

2021-08-22 21:45:51 +02:00

l10n.py

Update to use sys.platform over platform

2022-01-26 18:51:49 +02:00

LICENSE

Initial commit

2015-06-02 20:17:34 +01:00

loadout.py

CAPIData: Make JSON encodable, and use that elsewhere

2021-08-24 13:22:13 +01:00

modules.p

coriolis: .p files update, and slight Releasing.md tweak about this.

2021-04-01 14:45:52 +01:00

monitor.py

eddn: Fix up approachsettlement & adjust other such function signatures

2022-02-09 16:07:16 +00:00

myNotebook.py

Update to use sys.platform over platform

2022-01-26 18:51:49 +02:00

outfitting.py

outfitting.py: Improve function docstrings

2021-04-12 08:31:48 +01:00

plug.py

plug.py: Use logger.trace_if(...)

2021-08-13 15:14:02 +01:00

PLUGINS.md

PLUGINS.md: We don't currently include all of Python stdlib

2021-11-16 11:07:32 +00:00

prefs.py

Update to use sys.platform over platform

2022-01-26 18:51:49 +02:00

PRIVACY.md

PRIVACY.md: This is all on the wiki

2020-07-06 16:31:04 +01:00

protocol.py

Remove protocol.protocolhandler singleton auto-init

2021-09-24 16:39:30 +02:00

py2exe.cmd

Packaging cleanups

2020-06-21 16:31:42 +01:00

pyproject.toml

add configs for switching platforms

2022-01-26 18:51:49 +02:00

README.md

docs: General update for main now using Python 3.9 & misc

2021-04-01 14:45:51 +01:00

requirements-dev.txt

build(deps-dev): bump types-requests from 2.27.8 to 2.27.9

2022-02-10 17:21:15 +00:00

requirements.txt

requirements.txt: Revert semantic_version to 2.8.5

2022-02-08 16:28:50 +00:00

setup.py

setup.py: Add util/ to win32 packages

2022-02-01 14:14:43 +00:00

ships.p

coriolis: .p files update, and slight Releasing.md tweak about this.

2021-04-01 14:45:52 +01:00

shipyard.py

Move util_ships.py ship_map to data.py ship_name_map

2021-04-12 08:31:47 +01:00

snd_bad.wav

Add hotkey/shortcut support.

2015-09-12 04:03:12 +01:00

snd_good.wav

Add hotkey/shortcut support.

2015-09-12 04:03:12 +01:00

stats.py

Update to use sys.platform over platform

2022-01-26 18:51:49 +02:00

td.py

Cleaned up imports, removed incase imports

2021-05-28 14:46:51 +02:00

theme.py

Update to use sys.platform over platform

2022-01-26 18:51:49 +02:00

timeout_session.py

user_agent: Set this once in config.py and use it everywhere

2021-11-29 18:04:56 +00:00

ttkHyperlinkLabel.py

Update to use sys.platform over platform

2022-01-26 18:51:49 +02:00

update.py

Fix semantic_version appversion issues in update.py and setup.py

2021-04-01 14:46:43 +01:00

util_ships.py

Move util_ships.py ship_map to data.py ship_name_map

2021-04-12 08:31:47 +01:00

README.md

Any questions or offers of help can be directed to the EDCD Discord #edmc channel:

Elite: Dangerous Market Connector (EDMC)

This application is only of use to PC players of the game Elite Dangerous (and its expansions). It won't work with PS4 or Xbox accounts.

It utilises the Journal files written by the game on the user's computer, together with data from the API Frontier Developments supplies in order to feed this data to various third party sites that the user may find useful.

See the Wiki documentation for more details.

Installation & Uninstall

Please see the Installation & Setup wiki page.

Running from source

Please see the Running from source wiki page.

Plugins

Plugins extend the behaviour of this app. See the Plugins wiki page for more information.

If you would like to write a plugin please see PLUGINS.md.

Troubleshooting

Please see the Troubleshooting wiki page.

Reporting a problem

Please report a problem as a new GitHub issue. See Reporting a problem for further guidance, including how to find the necessary log files to attach to the report.

Packaging for distribution

Please see docs/Releasing.md.

Disclaimer

This app uses the “Companion” web API that Frontier originally supplied for their Elite Dangerous iOS app and now support for third-party apps. If that API ceases to function in the future then much of this application's functionality will be curtailed (although it could still utilise Journal files).

Acknowledgements

Please see the Acknowledgements wiki page.

License

Licensed under the GNU Public License (GPL) version 2 or later.