mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-22 03:40:46 +03:00

Go to file

Athanasius 60c67723ca Change JournalLock.obtain_lock() return to an Enum.

This way we can tell the difference between:

1. This process obtained the lock.
2. Another process has the lock.
3. We couldn't get the lock due to not being able to open the lock file
   read-write.

Case 3 is currently also returned if the configured journal directory
doesn't exist.  This will be the case on any MacOS system that never had
the game running.  Likely given the OS hasn't been supported for the
game in years now.

2021-03-13 22:32:33 +00:00

.github

Replace python checks with jq in workflow

2021-01-05 17:20:21 +02:00

coriolis-data @ bb1e5ba89a

Sync coriolis-data

2020-06-21 16:28:29 +01:00

docs

Fixed github capitialization

2020-12-08 20:17:12 +02:00

img

Add Transparent theme on Windows

2017-01-30 15:40:34 +00:00

L10n

CAPI: Handle when we get no 'commander' in returned data.

2021-03-06 18:54:18 +00:00

plugins

config: Make config.shutting_down() a property, and change 'callers'

2021-01-11 16:54:09 +00:00

scripts

Add some notes on using GitHub API to get changelogs

2020-06-27 01:38:46 +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

ignore editor and virtual enviroment directories

2020-07-26 23:08:47 +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

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

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

ChangeLog.md

4.2.0: Additional changelog entry about "CAPI: No commander data returned"

2021-03-12 12:44:39 +00:00

collate.py

clarified docs

2020-07-24 13:45:17 +01:00

commodity.csv

Fixed Void Opal name

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

commodity.py

Remove last traces of 'BPC' output code

2020-07-10 10:25:08 +01:00

companion.py

CAPI: Log if no commander in profile() data

2021-03-06 18:54:24 +00:00

config.py

Release 4.2.0: appversion and changelog

2021-03-12 12:39:42 +00:00

constants.py

Move the 'duplicate' constants into a new constants.py

2021-01-18 14:43:45 +00:00

Contributing.md

fixed some sentence construction

2020-09-09 23:23:15 +02:00

coriolis.py

All executable files invoked with #!/usr/bin/env python3

2020-06-21 16:28:30 +01:00

dashboard.py

config: Make config.shutting_down() a property, and change 'callers'

2021-01-11 16:54:09 +00:00

eddb.py

Revert some non-Python3 related changes

2020-06-21 16:31:40 +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

Change JournalLock.obtain_lock() return to an Enum.

2021-03-13 22:32:33 +00:00

EDMarketConnector.VisualElementsManifest.xml

Improve tile appearance on Windows 8.1 start screen.

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

EDMarketConnector.wxs

Add TRACE bat file to the installer configuration.

2020-09-28 14:37:25 +01:00

EDMarketConnector.xcf

Initial version.

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

edmarketconnector.xml

4.1.5: appcast file update

2020-12-15 20:02:24 +00: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

Explanation comment on try/except

2020-12-02 16:08:06 +02:00

EDMCLogging.py

Fix logging from mangled methods where class name starts with "_"

2021-01-08 15:32:42 +00:00

edshipyard.py

Removed broken link, fixed interpolation key name

2020-07-10 23:44:56 +02:00

EUROCAPS.TTF

Actually add the Euro Caps font to repo

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

hotkey.py

config: Make config.shutting_down() a property, and change 'callers'

2021-01-11 16:54:09 +00:00

journal_lock.py

Change JournalLock.obtain_lock() return to an Enum.

2021-03-13 22:32:33 +00:00

l10n.py

All executable files invoked with #!/usr/bin/env python3

2020-06-21 16:28:30 +01:00

LICENSE

Initial commit

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

loadout.py

Cleanup of EDMC.py and related code. All flags tested.

2020-06-21 16:23:01 +01:00

modules.p

modules.p update from latest coriolis-data

2020-07-02 17:19:45 +01:00

monitor.py

Backport of fix/891/force-localserver-for-auth_fix-journallock-import

2021-03-09 12:37:59 +00:00

myNotebook.py

Document allowed imports for PLUGINS

2020-07-12 19:25:47 +01:00

outfitting.py

Revert some non-Python3 related changes

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

plug.py

config: Make config.shutting_down() a property, and change 'callers'

2021-01-11 16:54:09 +00:00

PLUGINS.md

PLUGINS.md: Correct and expand on monitor.game_running() documentation

2021-02-18 09:29:52 +00:00

prefs.py

config: Make config.shutting_down() a property, and change 'callers'

2021-01-11 16:54:09 +00:00

PRIVACY.md

PRIVACY.md: This is all on the wiki

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

protocol.py

protocol: Don't use win32-specific edmc://auth if --force-localserver-for-auth

2021-01-22 13:11:42 +00:00

py2exe.cmd

Packaging cleanups

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

pyproject.toml

renamed pyproject.toml, added flake8-isort

2020-08-06 02:21:27 +02:00

rare_commodity.csv

Fix line endings (#343 )

2018-08-29 23:40:37 +01:00

README.md

Docs: Reference Bug Report Template if applicable, not general issue URL.

2020-09-06 10:24:30 +01:00

requirements-dev.txt

Change all requirements to latest tested and use '==' on all.

2021-01-11 19:28:56 +00:00

requirements.txt

Add MacOS pyobjc to requirements.txt

2021-03-13 22:30:24 +00:00

setup.py

Added missing newline

2020-12-08 18:53:23 +02:00

ships.p

Updated coriolis data files

2020-06-21 16:23:01 +01:00

shipyard.py

Cleanup of EDMC.py and related code. All flags tested.

2020-06-21 16:23:01 +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

stations.p

Update eddb database

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

stats.py

Cleanup of EDMC.py and related code. All flags tested.

2020-06-21 16:23:01 +01:00

systems.p

Update eddb database

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

td.py

Remove all use of defunct 'anonymous' option

2020-07-10 08:36:13 +01:00

theme.py

UI Scaling: Size the Scale bar as per our startup value

2020-09-11 11:14:19 +01:00

timeout_session.py

Made sure to return super().send()

2020-07-31 15:53:20 +02:00

ttkHyperlinkLabel.py

Added a config to use the new file based shipyard

2020-07-23 14:36:02 +01:00

update.py

update.py: Need to from config import config to access shutting_down

2021-01-11 17:48:47 +00: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. Please wait for the error to occur and zip up and attach this app's log file to the new issue:

Mac:

$TMPDIR/EDMarketConnector.log

Windows:

%TMP%\EDMarketConnector.log

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.