mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-15 16:50:34 +03:00

Go to file

Remove protocol.protocolhandler singleton auto-init

In general, doing things like this on import is bad, but this was
changed specifically to remove a bug that causes
--force-localserver-auth to do nothing.

That is caused because while we were careful not to import protocol
until after we were done doing arg things, we did not check to make sure
something else didn't. Companion imports protocol, which thus always
instantiates WindowsProtocolHandler before we can modify some config
state to indicate that we want LinuxProtocolHandler.

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

.github

Python version: 3.9.7

2021-08-31 10:49:04 +01: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

updated docs

2021-08-23 12:50:07 +02:00

img

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

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

L10n

CAPI: Status text when aborting due to CQC (& en.template updated)

2021-08-24 14:06:12 +01:00

plugins

EDDN: Make use of new CL arg to use custom upload URL

2021-09-24 10:59:15 +01: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

.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

.gitignore: ChangeLog.html

2021-04-15 13:44:57 +01:00

.gitmodules

Switch coriolis-data to EDCD fork

2016-10-07 14:12:36 +01:00

.mypy.ini

Add .mypy.ini and .pre-commit-config.yaml files

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

.pre-commit-config.yaml

pre-commit: *Ensure* the LANG_comments always runs

2021-06-07 16:39:19 +01:00

.python-version

Python version: 3.9.7

2021-08-31 10:49:04 +01:00

ChangeLog.md

Python version: 3.9.7

2021-08-31 10:49:04 +01:00

collate.py

collate: docstring addships()

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

commodity.csv

Fixed Void Opal name

2020-12-02 17:19:27 +02:00

commodity.py

Fix market CSV output filenames format

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

companion.py

Remove protocol.protocolhandler singleton auto-init

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

config.py

EDDN: Make use of new CL arg to use custom upload URL

2021-09-24 10:59:15 +01: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

coriolis: docstrings, formatting, return type

2021-04-12 08:31:48 +01: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

Remove protocol.protocolhandler singleton auto-init

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

EDMarketConnector.VisualElementsManifest.xml

Improve tile appearance on Windows 8.1 start screen.

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

EDMarketConnector.wxs

5.0.0: Include --reset-ui .bat, and mention killswitches docs

2021-05-12 14:41:06 +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 import order

2021-08-13 15:22:35 +01: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.py: LANG comment pass

2021-06-07 15:34:14 +01: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: Use trace_if('journal.startup', ...) for game load-in

2021-08-13 15:14:03 +01: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: General PyCharm alerts pass

2021-08-13 13:50:46 +01:00

prefs.py

Output > 'File Location' should always be available

2021-08-17 18:12:16 +03: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

2019-09-30 03:08:07 +01:00

pyproject.toml

Missing newline

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

rare_commodity.csv

Fix line endings (#343 )

2018-08-29 23:40:37 +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

Merge pull request #1279 from EDCD/dependabot/pip/develop/types-requests-2.25.8

2021-09-23 19:45:25 +01:00

requirements.txt

build(deps): bump watchdog from 2.1.4 to 2.1.5

2021-08-23 17:03:20 +00:00

setup.py

Removed threading

2021-05-28 14:58:13 +02: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

CAPI: Convert StatsDialog.showstats() to using cached CAPI data

2021-08-25 14:08:36 +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

Made sure to return super().send()

2020-07-31 15:53:20 +02: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.