ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-13 07:47:14 +03:00
Code Issues Projects Releases Wiki Activity
5,252 Commits 16 Branches 276 Tags
Commit Graph

5252 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Athanasius
468a9effe5
companion.py: Minor typing cleanup 2022-12-30 16:47:02 +00:00
Athanasius
6b9ec285fd
plug.py: Use x if x else y not or , & small type cleanup 2022-12-30 16:43:58 +00:00
Athanasius
3f91e57c7c
plugins/eddb: Fix journal_entry() and new_data types 
plug.py does `dict(entry)` before calling a plugin's `journal_entry()`, so
`dict` is correct for `data`.  Thus also use that for `new_data`'s type.
 2022-12-30 16:34:17 +00:00
Athanasius
0fe5e17b65
CAPI: Fix dump_capi_data() for /fleetcarrier 
Still produces the system/station:

    `HIP 10792.Crimson Exchange.2022-12-30T16.22.39.json`

But now also the FC:

    `FleetCarrier.X3F-N5Z.2022-12-30T16.24.01.json`
 2022-12-30 16:25:25 +00:00
Athanasius
74b070ffe9
Merge pull request #1773 from aussig/feature/847/capi-fleetcarrier 
Feature/847/capi fleetcarrier
 2022-12-30 16:15:37 +00:00
aussig
933520c5af Switch to using a bool config value for fleetcarrier CAPI instead of int 2022-12-30 15:39:32 +00:00
aussig
4a2401983d Add preference for enabling / disabling CAPI fleetcarrier endpoint 2022-12-29 14:50:34 +00:00
Athanasius
0b2b29f21b
Merge pull request #1785 from EDCD/dependabot/pip/develop/coverage-toml--7.0.1 
build(deps-dev): bump coverage[toml] from 7.0.0 to 7.0.1
 2022-12-28 12:16:41 +00:00
Athanasius
29022a3214
Merge pull request #1784 from EDCD/dependabot/pip/develop/pre-commit-2.21.0 
build(deps-dev): bump pre-commit from 2.20.0 to 2.21.0
 2022-12-28 12:16:34 +00:00
Athanasius
92f41f034b
Merge pull request #1787 from EDCD/submodule-change/3793869747 
[Auto-generated] Submodule Updates 3793869747
 2022-12-28 12:16:21 +00:00
github-actions
72c57900d2 updating submodules 2022-12-28 12:11:52 +00:00
Athanasius
18833c5e36
plugins: Comment *why* the "load plugins that are packages" first is there 
It's *NOT* that it will actually load the plugin *as* a package, as the code
explicitly only loads `load.py` still.
 2022-12-26 19:48:38 +00:00
dependabot[bot]
95f6e0f7a0
build(deps-dev): bump coverage[toml] from 7.0.0 to 7.0.1 
Bumps [coverage[toml]](https://github.com/nedbat/coveragepy) from 7.0.0 to 7.0.1.
- [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.0...7.0.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-26 17:01:13 +00:00
dependabot[bot]
20166f402f
build(deps-dev): bump pre-commit from 2.20.0 to 2.21.0 
Bumps [pre-commit](https://github.com/pre-commit/pre-commit) from 2.20.0 to 2.21.0.
- [Release notes](https://github.com/pre-commit/pre-commit/releases)
- [Changelog](https://github.com/pre-commit/pre-commit/blob/main/CHANGELOG.md)
- [Commits](https://github.com/pre-commit/pre-commit/compare/v2.20.0...v2.21.0)

---
updated-dependencies:
- dependency-name: pre-commit
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-12-26 17:01:07 +00:00
aussig
16055a311f Typo in plugins docs 2022-12-26 11:23:44 +00:00
aussig
f6f122072b Tweaks to plugins docs for fleetcarrier CAPI, including headings, typos and clarity on legacy galaxy 2022-12-26 11:20:37 +00:00
aussig
1c39ca5eb9 Merge branch 'develop' into feature/847/capi-fleetcarrier 2022-12-24 10:38:22 +00:00
aussig
fc80d8ffd6 Revert "Fix for exceptions thrown on journal events" 
This reverts commit 754367618ff273b94ae459544a7c73b86a182499.
 2022-12-24 10:18:37 +00:00
Athanasius
81a8122c59
Indent if err: check after plugin dashboard invocation 
Adding a mypy-make-happy conditional on the call above means `err` needs
to be inside that as well.
 2022-12-24 10:15:41 +00:00
Athanasius
5d1eb9e3b1
Fix "could be None" conditional for call to plug.notify_journal_entry() 
In testing the *first* hit on this does have `monitor.cmdr` set, but neither
`monitor.system` or `monitor.station`.  So:

1. Allow those to be `None` in the function signature,
2. Guard against only `monitor.cmdr` being falsey before the call.
3. Move the `if err:` to the same scope.
 2022-12-24 10:11:11 +00:00
aussig
e22fa7c23b Store cmdr name at request time in CAPIData instead of passing into EDMCCAPIRequest and EDMCCAPIResponse 2022-12-24 09:32:45 +00:00