ED/EDMarketConnector
1
0 Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2026-11-10 02:12:41 +03:00
Code Issues Projects Releases Wiki Activity
5,331 Commits 17 Branches 299 Tags
650b43cc3c7693e8ee2eae08bfef8c6aecc2e75d
Commit Graph
5331 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Athanasius 650b43cc3c PLUGINS: Document monitor.is_live_galaxy() as sanctioned for use 2023-01-18 11:30:28 +00:00
Athanasius d576cb6611 develop: Post (pre-)release appversion bump to 5.8.1-alpha0 2023-01-18 11:16:13 +00:00
Athanasius 9efcc19c73 Pre-Release 5.8.0-rc3: appversion & changelog Release/5.8.0-rc3 2023-01-17 18:57:56 +00:00
Athanasius 9e57bda8f8 requirements: We also need charset_normalizer now 2023-01-17 18:46:45 +00:00
Athanasius 70f5f30f1c Pre-Release 5.8.0-rc2: appversion & changelog Release/5.8.0-rc2 2023-01-17 18:25:16 +00:00
Athanasius fad4690200 Build-exe: pkg_resources now has .vendor/platformdirs as well 
For now we can manually add this to `packages`.  Will open an issue with
py2exe.
 2023-01-17 18:14:29 +00:00
Athanasius 5b9464b8c4 Pre-Release 5.8.0-rc1: appversion & changelog Release/5.8.0-rc1 2023-01-17 17:05:30 +00:00
Athanasius 63b14f5cae Translations: Latest imported from OneSky 2023-01-17 16:41:11 +00:00
Athanasius 5bd14ddd78 monitor: Don't synthesize StartUp if current event is ShutDown 2023-01-17 16:40:58 +00:00
Athanasius 9f0edc5a29 Merge pull request #1798 from EDCD/fix/1042/centralise-plugin-tracking 
Move core plugin 'location' tracking into monitor.py
 2023-01-17 11:31:13 +00:00
Athanasius dbb471f2c2 eddn/tracking: Add BodyType to tracking UI 
This helps demonstrate that a 'spurious' Station BodyName/ID is actually OK,
because BodyType makes it clear.
 2023-01-16 19:32:44 +00:00
Athanasius 2f2ee885c8 monitor/tracking: *Do* clear supercruisentry/body state if Station type 2023-01-16 19:30:02 +00:00
Athanasius 46fd129d3e eddn: Expand the tracking UI for all system, body & station location data 
* Also renamed This.systemaddress to this.system_address, which impacted
  misc. other lines of code.
 2023-01-16 18:10:57 +00:00
Athanasius a3409bb6d1 Merge pull request #1811 from EDCD/dependabot/pip/develop/pytest-7.2.1 
build(deps-dev): bump pytest from 7.2.0 to 7.2.1
 2023-01-16 17:08:06 +00:00
Athanasius 12530451fb Merge pull request #1810 from EDCD/dependabot/pip/develop/setuptools-66.0.0 
build(deps-dev): bump setuptools from 65.7.0 to 66.0.0
 2023-01-16 17:08:01 +00:00
dependabot[bot] 357bdb92fb build(deps-dev): bump pytest from 7.2.0 to 7.2.1 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.2.0 to 7.2.1.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/7.2.0...7.2.1)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-16 17:01:08 +00:00
dependabot[bot] 93acfd0582 build(deps-dev): bump setuptools from 65.7.0 to 66.0.0 
Bumps [setuptools](https://github.com/pypa/setuptools) from 65.7.0 to 66.0.0.
- [Release notes](https://github.com/pypa/setuptools/releases)
- [Changelog](https://github.com/pypa/setuptools/blob/main/CHANGES.rst)
- [Commits](https://github.com/pypa/setuptools/compare/v65.7.0...v66.0.0)

---
updated-dependencies:
- dependency-name: setuptools
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-16 17:01:02 +00:00
Athanasius b5bb9657d8 eddn: Move tracking_ui_update() nearer top of journal_entry() 
With the tracking now being in monitor.py this needs to be ASAP after the
local copies of the tracking have been updated.

Below the possible `this.status_body_name` blanking, in case that's hit.
 2023-01-15 21:54:02 +00:00
Athanasius 309845dcf2 Merge pull request #1807 from EDCD/dependabot/pip/develop/setuptools-65.7.0 
build(deps-dev): bump setuptools from 65.6.3 to 65.7.0
 2023-01-12 19:31:57 +00:00
Athanasius baf723f042 Merge pull request #1806 from EDCD/dependabot/pip/develop/requests-2.28.2 
build(deps): bump requests from 2.28.1 to 2.28.2
 2023-01-12 19:31:51 +00:00
dependabot[bot] 60b14999be build(deps-dev): bump setuptools from 65.6.3 to 65.7.0 
Bumps [setuptools](https://github.com/pypa/setuptools) from 65.6.3 to 65.7.0.
- [Release notes](https://github.com/pypa/setuptools/releases)
- [Changelog](https://github.com/pypa/setuptools/blob/main/CHANGES.rst)
- [Commits](https://github.com/pypa/setuptools/compare/v65.6.3...v65.7.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-12 17:03:03 +00:00
dependabot[bot] b39d669ce7 build(deps): bump requests from 2.28.1 to 2.28.2 
Bumps [requests](https://github.com/psf/requests) from 2.28.1 to 2.28.2.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](https://github.com/psf/requests/compare/v2.28.1...v2.28.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-01-12 17:02:49 +00:00
Athanasius 085159f8cb When it's a StartUp event say *that*, not Startup 
This check in EDMarketConnector.py is explicitly for StartUp (and Loadgame),
not Startup, so have the logging say that.
 2023-01-12 15:03:43 +00:00
Athanasius 3d41be7651 monitor: log INFO when for-plugins StartUp event synthesized 
This is actually to do with a reported issue around the ctypes code in
`EDLogs.gamerunning()` causing:

```python
exception ignored on calling ctypes callback function: <function EDLogs.game_running.<locals>.callback at 0x0000020E9C9D0EA0>
Traceback (most recent call last):
  File "monitor.pyc", line 2041, in callback
  File "monitor.pyc", line 2034, in WindowTitle
ctypes.ArgumentError: argument 1: OverflowError: int too long to convert
```

Although I can't personally get this to trigger at all under 64-bit python,
either in PyCharm *or* with the 5.7.1-alpha1 64-bit pre-release.

`game_running()` is only used in a few places, and the key things it
malfunctioning might cause are lack of the synthetic `ShutDown` (already
has an INFO logging) and `StartUp` events.
 2023-01-12 14:50:44 +00:00
Athanasius c350782a67 Merge pull request #1802 from EDCD/enhancement/1801/custom-release-archives 
Create a custom .zip archive for releases
 2023-01-12 14:05:14 +00:00
Athanasius 48a80411b4 windows-build/tar: Make archive at .. and then mv into 'root' 
* Because the archive is a new file in the root it causes:

    `tar: EDMarketConnector: file changed as we read it`

  Verified on Linux/Debian, and also verified that this fix works.
 2023-01-12 13:47:41 +00:00
Athanasius 2678d7d63f windows-build/tar: New job needs to depend on variables 2023-01-12 13:10:43 +00:00
Athanasius bcfcc8c71c windows-build/tar: tar needs to be in job *after* variables 
At least we had `-f EDMarketConnector-release-.tar.gz ` which implies the
`needs.variables.outputs.sem_ver` variable wasn't yet set.
 2023-01-12 13:06:53 +00:00
Athanasius a00c6f789a windows-build/tar: Adjust argument ordering 
`-C ..` applies to anything that happens after it, so needs to be after the
`-f <file>`.
 2023-01-12 13:03:06 +00:00
Athanasius d52f161dc9 windows-build/tar: run, not script. 2023-01-12 12:58:10 +00:00
Athanasius 048be66f54 windows-build/tar: Just run a tar command ourselves directly 
thedoctor0/zip-release has a bug where only the first word in `exclusions`
has `--exclude=` pre-pended to it, the other words being treated as input
filenames/globs/paths.  So, let's do this manually.
 2023-01-12 12:54:19 +00:00
Athanasius 042c8d4ff2 windows-build/tar: Move to running under ubuntu 
* On windows specifying only filenames to exclusions causes things like
  `tar: .editorconfig: Cannot stat: No such file or directory`

  But putting `EDMarketConnector/` prefix on such means they don't work.

* Testing with 'git bash' GNU tar 1.34:

  `tar -c -v -z -f edmc-test.tar.gz --exclude=.editorconfig --exclude=.git\* EDMarketConnector`

  works, with empty output from:

  `tar tfvz edmc-test.tar.gz | grep editorconfig`
 2023-01-12 12:34:44 +00:00
Athanasius 3e05f91949 windows-build/tar: Now we have directory we *do* need exclusion paths 
* Maybe I was wrong about not needing the prefix path on tar exclusions,
  because that was when I'd not copied `directory`.
 2023-01-12 12:18:09 +00:00
Athanasius 15ee894142 windows-build/archives: Re-order to very early, add directory to tar 
* I'd missed copying the `directory` line from zip to tar step.
* There's no reason we can't perform these steps *before* the build, or
  even the python setup, so move them up there.  That has the near side-effect
  of not needing to exclude so much stuff.
 2023-01-12 12:14:00 +00:00
Athanasius 7098479902 windows-build/tar: Different specification of exclusions 2023-01-12 12:03:51 +00:00
Athanasius 43d10ab29a windows-build/archives: Can't multiple setOutput, use env instead 
* As the archive exclusions is static, we can just set it in workflow env.
 2023-01-12 11:53:17 +00:00
Athanasius 4edebf981f windows-build/archives: Create .tar.gz as well 
* Move the definition of archive excludes to a global variable.
* Add another step to create a tar(.gz) archive as well.
* Add .tar.gz to the `Built files` handling.
 2023-01-12 11:39:35 +00:00
Athanasius 7b62fa1125 plugins/inara: Use state[...] values for system/station 
* Also renamed system -> system_name & station -> station_name
 2023-01-11 19:44:47 +00:00
Athanasius c396a253f8 plugins/edsm: Use state[...] values for system/station 
* Also renamed system -> system_name and station -> station_name
 2023-01-11 19:44:46 +00:00
Athanasius ef1642181a monitor/tracking: Move .stationtype to state['StationType'] 
* Nothing outside of monitor.py uses this, but it's of the same nature as
  StationName and MarketID, so do this for consistency.

For now we'll leave monitor.stationservices as-is.
 2023-01-11 19:44:45 +00:00
Athanasius 31e8d0372d monitor/tracking: Move .station_marketid to state['MarketID'] 
1. plugins/eddb.py uses this for MarketID-based station URLs.

* So do the 'rename'.
* Remove EDDB tracking in favour of this.
* Update PLUGINS.md
 2023-01-11 19:44:44 +00:00
Athanasius 2a8dd14e24 tracking/stationname; Minor fixups 
* Missed a some `self.station` in monitor.py
* Fixed EDDB system *and* station link setting.  Brainfart had mixed them
  together in last commit.
 2023-01-11 19:44:43 +00:00
Athanasius dde0cf876c monitor/tracking: Move .station to state['StationName'] 
1. EDDB tracks this.

* So move monitor.station to monitor.state['StationName'].
* PLUGINS.md updated to cite this.
 2023-01-11 19:44:41 +00:00
Athanasius df5eb5b270 monitor/tracking: Switch .systempopulation to state['SystemPopulation'] 
1. EDDB plugin tracked this for keeping the Station link text up to date.

* So moved it to monitor.state['SystemPopulation'].
* PLUGINS.md updated to cite this.
* PLUGINS.md also updated to note state entries that are set to None if
  remote multi-crew is detected.
 2023-01-11 19:44:14 +00:00
Athanasius dbad45cf3b EDDB: Use only state['SystemName'] for this.system_name tracking 2023-01-11 19:44:13 +00:00
Athanasius 86e81adb3d EDDB: Rename this.system to this.system_name 2023-01-11 19:44:12 +00:00
Athanasius fa1c072d9e monitor: Change .system to state['SystemName'] 
1. EDDB plugin needs to track the system name, but we're moving all of that
  into monitor.py.
2. monitor.py was tracking this in monitor.system, but it needs to be in
  monitor.state['SystemName'] in order for plugins to access it.

So, move monitor.system to monitor.state['SystemName'] and update all uses.
 2023-01-11 19:44:08 +00:00
Athanasius dab69367e2 monitor: Cite the Status.json body workaround for Body data caveat 2023-01-11 19:43:26 +00:00
Athanasius d533919790 monitor: Add some documentation about the player location tracking caveats 2023-01-11 19:43:25 +00:00
Athanasius b1308e4f28 PLUGINS.md: Document addition of Bodt(ID|Type) and the caveats about use 2023-01-11 19:43:24 +00:00