ED/EDMarketConnector
1
0
Fork 0
mirror of https://github.com/EDCD/EDMarketConnector.git synced 2025-04-24 12:40:52 +03:00
Code Issues Projects Releases Wiki Activity
2,554 Commits 16 Branches 276 Tags
Commit Graph

2554 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Athanasius
ac25e75a81 Merge branch 'main' into releases 2021-03-23 18:18:41 +00:00
Athanasius
4ca2fe1b05 Changelog: Korean translation updated. Release/4.2.4 2021-03-23 14:30:26 +00:00
Athanasius
d01404b160 Release 4.2.4: appversion and changelog 2021-03-23 14:29:14 +00:00
Athanasius
6e2b8a7312 Translations: Small Korean update 2021-03-23 14:21:13 +00:00
Athanasius
a627375c1e
Merge pull request #933 from EDCD/enhancement/reduce-log-spam 
Reduce some log spam:
 2021-03-23 14:14:17 +00:00
Athanasius
aab2a58a2d Reduce some log spam: 
* Comment out the traceback in plugins/eddn.py, the return is enough.
* 'Called with no event_queue' can be TRACE.
* Don't care about "Everything was alright, the near-neutral status just
  wasn't stored." from Inara.
 2021-03-23 13:48:44 +00:00
Athanasius
6764cab36f
Merge pull request #932 from EDCD/enhancement/odyssey-version-paranoia 
Extra paranoia about game version for forthcoming Odyssey Alpha
 2021-03-23 13:20:25 +00:00
Athanasius
83f8f4f547 Clean up "not Fleet Carriers" gameversion check 
1. No need for the () on the if.
2. Log when we force is_beta = True from this.
 2021-03-23 12:44:12 +00:00
Athanasius
c722a1cada Extra paranoia: Don't pick up 'JournalAlpha...' for now 
It's possible FDev will use JournalAlpha, but forget to change the
gameversion string.
 2021-03-23 12:40:28 +00:00
Athanasius
f9034076d8 Extra paranoia about game version for forthcoming Odyssey Alpha 
1. Pick up 'JournalAlpha' files if they ever are a thing.
2. Pick up 'alpha' in gameversion to set is_beta = True.
3. For now any gameversion without 'Fleet Carriers Update' is considered
   a beta.
 2021-03-23 12:37:05 +00:00
Athanasius
274b25b5ca
Merge pull request #928 from EDCD/fix/926/replaylog-no-index-0 
Add Paranoia check in sendreplay()
 2021-03-22 11:51:11 +00:00
Athanasius
b4d928246e Adjust logging to include type (and not strictly False). 2021-03-22 11:48:52 +00:00
Athanasius
34c0536a7e Paranoia check in sendreplay(). 
See #926
 2021-03-22 11:43:44 +00:00
Athanasius
03774cd891 Update main copy of edmarketconnector.xml to match releases. 
Principally this updates `master` -> `main` mentions.
 2021-03-21 11:08:13 +00:00
Athanasius
c4d82dadbc appcast: Update stale 'master' link to 'main' 2021-03-21 11:07:34 +00:00
Athanasius
a13946efd9 PLUGINS.md: Update old master branch link to main 
Closes #924
 2021-03-21 11:02:33 +00:00
Athanasius
46703b2349 Release 4.2.3: appcast 2021-03-18 19:02:49 +00:00
Athanasius
aeffb64a82 Merge branch 'release-4.2.3' into releases 2021-03-18 19:01:37 +00:00
Athanasius
22811adf30 Release 4.2.3: appversion and changelog Release/4.2.3 2021-03-18 12:14:10 +00:00
Athanasius
8acbff739b
Merge pull request #920 from EDCD/fix/909/auth-handle-edmc-arg 
Allow 'edmc' argument to .exe to work (and add Korean language)
 2021-03-18 12:05:49 +00:00
Athanasius
2e9f37cef2 Add new .bat file to build/install. 2021-03-18 11:39:45 +00:00
Athanasius
fdee660881 Add .bat file for using --force-localserver-for-auth 2021-03-18 11:26:56 +00:00
Athanasius
07566dbfec Translations: Add Korean to installer 
* Added L10n/ko.strings file.
* Added Korean (ko, decimal 12) to installer languages.
 2021-03-18 10:22:29 +00:00
Athanasius
9bcba49416 docs/Translations.md: Fix typo of .string(s) 2021-03-18 10:17:38 +00:00
Athanasius
2ddea7d4f1 Log when we detect edmc:// arg and attempt ShellExecute() 
This is the code path for when something ignores the ddeexec registry
key and instead invokes EDMarketConnector.exe with the edmc://...
argument directly.

Our response is to try ShellExecute() to invoke the DDE path instead.
If the DDE path isn't set up (registry key
`Computer\HKEY_CLASSES_ROOT\edmc\shell\open\ddeexec` not present and
correct), then this will cause a loop of repeatedly invoking
EDMarketConnector.exe.

That key is inserted by the installer.  The only reasons for it to not
be there would be something blocking the installer from creating it or
something removing it after install.
 2021-03-18 10:13:15 +00:00
Athanasius
d6e7cbce16 Suppress already_running_popup() if we have args.edmc 2021-03-18 09:54:24 +00:00
Athanasius
6ba01c7bc2 Translations: Add Korean 2021-03-18 09:42:54 +00:00
Athanasius
d9734a759d Specify 'edmc' argument to argparse 
Else it complains that the Frontier Auth callback argument is an error.
 2021-03-18 09:39:53 +00:00
Athanasius
a532f38e2e Extend EDCD copyright into 2021. 2021-03-17 17:34:06 +00:00
Athanasius
ec103cea7b Release 4.2.2: appcast 2021-03-17 12:13:28 +00:00
Athanasius
2ff3433245 Merge branch 'release-4.2.2' into releases 2021-03-17 12:11:42 +00:00
Athanasius
aff1cfa6c8 Release 4.2.2: appversion and changelog Release/4.2.2 2021-03-17 12:08:50 +00:00
Athanasius
e4a5b4a4f2
Merge pull request #919 from EDCD/fix/list-has-no-values-attr 
Extend is_horizons() paranoia to type of ships['shipyard_list']
 2021-03-17 12:03:17 +00:00
Athanasius
6bde36ad31 Extend is_horizons() paranoia to type of ships['shipyard_list'] 
The .values() is on this, so it also needs to be a dict.

I also made the logging of "FC or Damaged Station?" consistent
throughout this file.

Yes, we'll keep these as logger.debug() for now.
 2021-03-17 11:26:34 +00:00
Athanasius
9924985f18 appcast 4.2.1 2021-03-15 19:38:16 +00:00
Athanasius
52f9320c44 Merge branch 'release-4.2.1' into releases 2021-03-15 19:38:13 +00:00
Athanasius
301e7e583f ChangeLog: Remembered to update translations Release/4.2.1 2021-03-15 19:27:26 +00:00
Athanasius
1eef5b86f3 Update translations 2021-03-15 19:25:40 +00:00
Athanasius
740d1bd38a Correct order of arguments to isinstance() 2021-03-15 19:21:17 +00:00
Athanasius
d13ebafcba ChangeLog: Point macOS people to the updated docs. 2021-03-15 19:15:46 +00:00
Athanasius
977fec25b0 Release 4.2.1: appversion and changelog 2021-03-15 19:11:27 +00:00
Athanasius
868cb97ffc
Merge pull request #916 from EDCD/fix/907/damaged-station-modules-is-list 
plugins/eddn: Add paranoia about data in is_horizons()
 2021-03-15 17:27:24 +00:00
Athanasius
2da5e0a666
Merge pull request #915 from A-UNDERSCORE-D/fix/908/capidata-not-dict 
Ensured that CAPIData objects are JSON Serialisable
 2021-03-15 17:14:08 +00:00
Athanasius
173cffdcfc Add extra logging to is_horizons() if things not as expected. 
* Log the type(s) if not dict.
* Log if ships['shipyard_list'] isn't present, despite ships being a
  dict.
 2021-03-15 17:06:26 +00:00
Athanasius
98be182922 plugins/eddn: Add paranoia about data in is_horizons() 
A damaged station has `"modules": []`, so trips over modules.values().
 2021-03-15 17:03:39 +00:00
A_D
fbe3e7a6e5
Ensured that CAPIData objects are JSON Serialisable 
While it isnt directly an issue in main (right now), the fix applies
here forward, so we may as well do it here and not deal with a headache
later.
 2021-03-15 18:53:20 +02:00
Athanasius
ec7e19b7c1 Merge branch 'release-4.2.1' 2021-03-15 16:47:55 +00:00
Athanasius
d39d052e13
Merge pull request #914 from EDCD/enhancement/909/extra-frontier-auth-logging 
Add extra logging for Frontier Auth, especially via edmc://
 2021-03-15 16:47:30 +00:00
Athanasius
09e93068ab Merge branch 'release-4.2.1' 2021-03-15 16:17:51 +00:00
Athanasius
7707a811cb Merge branch 'release-4.2.1' 2021-03-15 16:09:21 +00:00