1
0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-16 01:00:42 +03:00

5273 Commits

Author SHA1 Message Date
Athanasius
b1308e4f28
PLUGINS.md: Document addition of Bodt(ID|Type) and the caveats about use 2023-01-11 19:43:24 +00:00
Athanasius
fafe9a5f7b
eddn: Remove un-necessary 'music'/'MainMenu' body tracking clearance
monitor.py does this for `state` passed in, which *this* code then uses
to set `this` values.
2023-01-11 19:43:23 +00:00
Athanasius
427a238dee
eddn: Remove un-necessary 'leavebody' state clearing
This is now handled in monitor.py, and *this* code explicitly sets the
'this' values to those in `state` as passed in.
2023-01-11 19:43:22 +00:00
Athanasius
edc23081b1
monitor: Extend 'approachbody' comment to call out use in plugins/eddn.py
We're setting `self.state['BodyType']` specifically so plugins/eddn.py's
'docked' handling can use it as a check.
2023-01-11 19:43:21 +00:00
Athanasius
386ea1636e
eddn: For 'docked' only set entry Body(Type) if latter is 'Planet'
We explicitly must not set this for other BodyType, e.g. 'Station'.
2023-01-11 19:43:20 +00:00
Athanasius
6f3967fb7f
eddn/tracking: Tweak commenting about coordinates
* `entry_augment_system_data()` will now always be passed starpos based
  on state['StarPos'].
* Removed TODO about deprecating in-plugin tracking.
2023-01-11 19:43:19 +00:00
Athanasius
e6abc137ce
monitor/tracking: Shift .coordinates to state['StarPos']
* Some additional commenting for future clarity.
* Remove the old eddn.py tracking.
2023-01-11 19:43:18 +00:00
Athanasius
232e91ebfc
monitor/Body: Tweak & comment, and remove defunct tracking from eddn.py
* Typod '.status' instead of 'state'.
* Bring in some sanity-checks and comments from eddn.py to monitor.py.
* Have a 'pass' elif for 'supercruiseentry' so as to comment why we do NOT
  use this to blank out body state.
* Bring in the 'if we exit to main menu, blank body state' from eddn.py.
* Remove checks from eddn.py that are now in monitor.py.
* Have a disctinct 'docked' event check in eddn.py for triggering the
  "Now we're docked, so the Delay sending until docked is satisfied"
  sending of messages.
2023-01-11 19:43:17 +00:00
Athanasius
e3254aec31
monitor: Minor cleanup on 'Location'->'Docked' handling
* All my recent Location events *have* the 'Docked' flag.
* If any don't, then just use a default on .get() to set it False.
2023-01-11 19:43:16 +00:00
Athanasius
0177fc4d69
monitor: Remove .planet in favour of state['Body']
This had mostly been done already, now it's complete.

*If* any plugin is, still, using `monitor.planet` then they get to keep
the broken pieces because it's not included in PLUGINS.md#Available-imports.
2023-01-11 19:43:16 +00:00
Athanasius
9ccd0c3b7d
monitor: Remove EDLogs.systemaddress in favour of .state version
This was literally only used within this file.
2023-01-11 19:43:15 +00:00
Athanasius
86b0aa4550
monitor: Track all System and Body state in monitor.state
* Minor grammar edit only in PLUGINS.md (I was checking if it explicitly
  stated what data is expected in the synthetic 'StartUp' event, it doesn't).
* First changes to move some monitor properties into the monitor.state
  dictionary.  This is for system or body data.
* Re-factored the generation of 'StartUp' event into
  `EDLogs.synthesize_startup_event()`.  It's done in two places, so was
  anti-DRY.
* In general any bulk setting of system & body data is now done in the
  same order for comparison clarity.
* A little of the location tracking has been duplicated from plugins/eddn.py.
  This is with a view to switching *it* to using the state version.
2023-01-11 19:43:14 +00:00
Athanasius
6bd0b042b1
monitor.py: typing: Don't use List or Dict 2023-01-11 19:43:13 +00:00
Athanasius
6d6f3b057f
typing: Use | None, not Optional[...] 2023-01-11 19:43:12 +00:00
Athanasius
1c1329ca17
Merge pull request #1803 from EDCD/dependabot/pip/develop/coverage-toml--7.0.5
build(deps-dev): bump coverage[toml] from 7.0.4 to 7.0.5
2023-01-11 18:11:06 +00:00
Athanasius
a37be45343
Merge pull request #1800 from EDCD/enhancement/1041/desktop-file
.desktop: Add a file, and adjust icon filename to suit
2023-01-11 18:09:55 +00:00
dependabot[bot]
5713a2e11c
build(deps-dev): bump coverage[toml] from 7.0.4 to 7.0.5
Bumps [coverage[toml]](https://github.com/nedbat/coveragepy) from 7.0.4 to 7.0.5.
- [Release notes](https://github.com/nedbat/coveragepy/releases)
- [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst)
- [Commits](https://github.com/nedbat/coveragepy/compare/7.0.4...7.0.5)

---
updated-dependencies:
- dependency-name: coverage[toml]
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-11 17:01:28 +00:00
Athanasius
bc610f618d
sub-modules: Change coriolis-data to an https URL, not git@
Someone cloning shouldn't *need* a github account in order to get the
sub-modules.
2023-01-11 11:24:30 +00:00
Athanasius
5473c62104
Merge pull request #1799 from EDCD/dependabot/pip/develop/coverage-toml--7.0.4
build(deps-dev): bump coverage[toml] from 7.0.3 to 7.0.4
2023-01-10 15:48:01 +00:00
Athanasius
b630445315
Linux: Add install/setup and startup script
This *should* allow for easy setup to work on any XDG-compliant desktop
environment.  Just run `scripts/linux-setup.sh` and it will:

1. Determine the 'root' directory of the EDMarketConnector source you're
  using.
2. Check you have `${HOME}/bin` in PATH and it exists as a directory.
3. Copy `scripts/edmarketconnector.sh` to there, replacing the string
  `EDMC_PATH` with the 'root' directory.
4. Copy .png (icon) and .desktop files into ~/.local/share/... locations.

Then the desktop environment should have a menu entry for
"E:D Market Connector", which attempts to run `edmarketconnector`, which
should now be the shell script present in ${HOME}/bin.
2023-01-10 14:59:54 +00:00
Athanasius
6b38de1080
.desktop: Add a file, and adjust icon filename to suit
1. `io.edcd.EDMarketConnector.desktop` based on the flathub one, but with
  reference to v1.5 of the spec (linked in a file comment).
2. As the Icon is specified using `io.edcd.EDMarketConnector`, not only
  `EDMarketConnector`, renamed the .png file and updated the single code
  reference to it.
2023-01-10 14:04:41 +00:00
Athanasius
596df0f987
CAPI 'Save Raw Data': Add '.' between system and station names in filename
It's apparently *always* just mushed them together, but that's really crap.
2023-01-10 11:49:58 +00:00
dependabot[bot]
881d689331
build(deps-dev): bump coverage[toml] from 7.0.3 to 7.0.4
Bumps [coverage[toml]](https://github.com/nedbat/coveragepy) from 7.0.3 to 7.0.4.
- [Release notes](https://github.com/nedbat/coveragepy/releases)
- [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst)
- [Commits](https://github.com/nedbat/coveragepy/compare/7.0.3...7.0.4)

---
updated-dependencies:
- dependency-name: coverage[toml]
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-09 17:01:28 +00:00
Athanasius
f8a2e6916d
Merge pull request #1796 from EDCD/dependabot/pip/develop/coverage-toml--7.0.3
build(deps-dev): bump coverage[toml] from 7.0.2 to 7.0.3
2023-01-04 17:03:22 +00:00
dependabot[bot]
5e84205e32
build(deps-dev): bump coverage[toml] from 7.0.2 to 7.0.3
Bumps [coverage[toml]](https://github.com/nedbat/coveragepy) from 7.0.2 to 7.0.3.
- [Release notes](https://github.com/nedbat/coveragepy/releases)
- [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst)
- [Commits](https://github.com/nedbat/coveragepy/compare/7.0.2...7.0.3)

---
updated-dependencies:
- dependency-name: coverage[toml]
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-04 17:01:34 +00:00
Athanasius
5daabc57ef
translations: Updated l10n/en.template via script 2023-01-04 15:08:55 +00:00
Athanasius
71c553e033
Merge pull request #1794 from aussig/feature/additional-localised-strings
Add some string localisations and improve lang comments.
2023-01-04 15:06:54 +00:00
Athanasius
efd701c03e
Merge pull request #1795 from EDCD/dependabot/pip/develop/coverage-toml--7.0.2
build(deps-dev): bump coverage[toml] from 7.0.1 to 7.0.2
2023-01-04 15:03:57 +00:00
dependabot[bot]
4096fa1429
build(deps-dev): bump coverage[toml] from 7.0.1 to 7.0.2
Bumps [coverage[toml]](https://github.com/nedbat/coveragepy) from 7.0.1 to 7.0.2.
- [Release notes](https://github.com/nedbat/coveragepy/releases)
- [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst)
- [Commits](https://github.com/nedbat/coveragepy/compare/7.0.1...7.0.2)

---
updated-dependencies:
- dependency-name: coverage[toml]
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-03 17:00:58 +00:00
aussig
c6ec7cc362 Add some string localisations and improve lang comments. 2023-01-03 15:07:52 +00:00
Athanasius
fe38367e19
Translations: Update en.template with latest script output
Yes, we're just trusting it this time.
2023-01-03 11:48:18 +00:00
Athanasius
7d4118738b
Add some missing LANG comments, as per script output 2023-01-03 11:46:27 +00:00
Athanasius
a4cd407b89
Add Help > Troubleshooting / Report A Bug 2023-01-03 11:39:47 +00:00
Athanasius
3b61e8aeef
Merge pull request #1793 from EDCD/dependabot/pip/develop/watchdog-2.2.1
build(deps): bump watchdog from 2.2.0 to 2.2.1
2023-01-02 18:03:47 +00:00
dependabot[bot]
dffb9c4e24
build(deps): bump watchdog from 2.2.0 to 2.2.1
Bumps [watchdog](https://github.com/gorakhargosh/watchdog) from 2.2.0 to 2.2.1.
- [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.2.0...v2.2.1)

---
updated-dependencies:
- dependency-name: watchdog
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-02 17:01:01 +00:00
Athanasius
7b8130ba35
Merge pull request #1791 from EDCD/enhancement/ui/name-widgets
UI: Properly name main widgets & put each plugin in its own Frame
2023-01-02 14:51:39 +00:00
Athanasius
7bfeb5ec62
Actually uncomment plugin_frame.columnconfigure(1, weight=1)
It had been commented to test that it made a difference.
2023-01-02 14:05:07 +00:00
Athanasius
61ad75d52a
Configure per-plugin Frame the same as main Frame
It was observed that some text in the EDMC-Canonn plugin was wrapping in
this branch when the same text doesn't in `develop.  So, tweaked the
plugin_frame setup to match the main UI frame setup:

* `tk.NSEW` not `tk.EW` - didn't fix the problem, but we should match this.
* `.columnconfigure(1, weight=1)` - this actually fixed the problem.
2023-01-02 13:02:22 +00:00
Athanasius
5fd4a68226
copyright: Bump end year to 2023 2023-01-01 10:53:15 +00:00
Athanasius
991f69044c
PLUGINS.md: Avoid an example implying plugins can set main status text
The 'Error messages' section lays out how to get a message into the main
UI status area, and it does *not* say to try setting it directly.
2022-12-31 17:20:30 +00:00
Athanasius
963b115e0e
UI: Name the extra 'alternate' frames: titlebar and menubar
These are used in the non-default themes, as the OS ones are hidden and
replaced by them.

They're created after the rest of the main UI, so come last in the 'children'
list.
2022-12-31 17:12:29 +00:00
Athanasius
a842ce28c6
UI: Create a per-plugin frame in the main UI
* This means all actual plugin UI will be children of this frame, rather than
  the main frame.
2022-12-31 16:52:36 +00:00
Athanasius
0fd835e9ac
core plugins: A little more 'children' fixup
* eddn: Needs to find status text, although really there should be a helper
  function for this.
* Removed commented out references to same in edsm and inara.
2022-12-31 16:49:29 +00:00
Athanasius
f2de70bad6
core plugins: Use nametowidget() to find system/station widgets
As we're experimenting with per-plugin frames up a level `parent.children`
would need to be `parent.parent.children`, but this way it will Just Work
without knowledge of the hierarchy.
2022-12-31 16:27:22 +00:00
Athanasius
ce1303e9e6
UI: Make a frame to hold each plugin's UI
NB: Currently breaks some core/internal plugin code, due to use of
`parent.children` and the like.  That will get addressed in subsequent
commits.
2022-12-31 16:16:52 +00:00
Athanasius
0705d56bb4
Properly name the main UI tk widgets
Unfortunately we can't name the plugin ones, as that's entirely up to their
`plugin_app()` code, and widget names can't be changed after creation.

NB: Each `plugin_hr_X` frame is `grid()`'d to be *before* the plugin in
question, despite being listed *after* in:

    >>> self.w.children['edmarketconnector'].children
2022-12-31 16:08:39 +00:00
Athanasius
80e2aee6bb
updates: Add comment about 'early' import update working after all
Tested both under PyCharm debugging for 'internal', and py2exe-build .exe
for 'external'.  In both cases the 'Help' > 'Check for updates...' works.
2022-12-30 18:17:01 +00:00
Athanasius
449e3e4ddc
update.py: Log when internal check finds no new version
It just makes quick debugging easier.
2022-12-30 18:13:57 +00:00
Athanasius
ce4ae74434
update checks: Move setup of self.updater before menu entry
Typing this as `update.Updater | None` and having the check
`if self.updater is not None:` causes the menu entry to not even get added,
because `import update` was coming later.

I can't recall why that import/setup was later, but I might be about to find
out again....
2022-12-30 18:10:36 +00:00
Athanasius
7e6f3251bb
Merge pull request #1703 from EDCD/enhancement/64-bit
Make runnable under 64-bit Python
2022-12-30 16:57:29 +00:00