0 Fork 0

mirror of https://github.com/EDCD/EDMarketConnector.git synced 2026-10-29 01:26:08 +03:00

T

Athanasius 7ac248be7a inara: Utilise Statistics Current_Wealth for commanderAssets

Inara itself seems to be doing this if it has access to CAPI-sourced
Journals.  If we don't send commanderAssets as part of
setCommanderCredits then it does ... something else ... and ends up with
your total assets value bouncing between what EDMC is causing and what
it sees from the CAPI-sourced journals.

So, don't send this from LoadGame any more, instead wait for Statistics,
and if it has the relevant data, also send commanderAssets.

2022-01-20 17:45:23 +00:00

.github

python: Bump to 3.10.2

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

coriolis-data @ e499f68469

coriolis-data: Fresh pull, script caused no change to {ships,modules}.p

2021-05-12 14:11:15 +01:00

docs

click_counter: Cast value to int() for saving

2021-11-22 10:57:46 +00:00

FDevIDs @ f4677fffe6

fdevids: Add FDevIDs repo as a submodule

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

img

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

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

L10n

Updated translations

2021-11-22 11:06:57 +00:00

plugins

inara: Utilise Statistics Current_Wealth for commanderAssets

2022-01-20 17:45:23 +00:00

scripts

resolved bug in wildcard detection

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

tests

removed redundant test

2021-08-22 22:18:50 +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

.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 .mypy.ini and .pre-commit-config.yaml files

2020-09-28 11:16:25 +01:00

.pre-commit-config.yaml

Python 3.10: Change version number in most of our local files

2021-12-03 11:17:18 +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-beta1: appversion & changelog

2021-12-07 11:28:11 +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

config.py

config.py: Bump to 5.3.0-beta4 to ensure I'm testing 3.10.2 build

2022-01-20 13:28:47 +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

companion: Rename Auth.session to requests_session

2021-08-28 14:18:49 +01:00

coriolis.py

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

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

dashboard.py

Ensured that emitter is always bound, even if None

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

debug_webserver.py

Applied requested changes

2021-06-20 17:44:29 +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

dont explode if a key doesnt exist when resetting

2022-01-20 16:02:23 +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

journal_lock: Convert to logger.trace_if(...)

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

killswitch.py

additional info in docstrings

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

l10n.py

l10n: Make the zh-CN -> zh-Hans comment a HACK

2021-12-11 14:15:30 +00: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

monitor: Don't re-init Enginers/Rank/Reputation on LoadGame

2021-11-21 11:24:18 +00:00

myNotebook.py

Document allowed imports for PLUGINS

2020-07-12 19:25:47 +01: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

systray: Add LANG comment

2021-11-13 12:37:31 +00: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

Missing newline

2021-04-01 14:45:46 +01: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.6 to 2.27.7

2022-01-14 17:06:26 +00:00

requirements.txt

build(deps): bump requests from 2.27.0 to 2.27.1

2022-01-05 17:03:51 +00:00

setup.py

setup.py: Properly include FDevIDs files

2021-12-17 12:00:49 +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

Notify user when 'File' > 'Status' fails

2021-10-20 14:32:04 +01:00

td.py

Cleaned up imports, removed incase imports

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

theme.py

Translations: Final LANG comments

2021-06-07 16:02:39 +01: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

Translations: Final LANG comments

2021-06-07 16:02:39 +01: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.