From 3563084f67653c0935fd9c7cd71a1b001c272f4d Mon Sep 17 00:00:00 2001 From: David Sangrey Date: Sat, 22 Jul 2023 20:54:32 -0400 Subject: [PATCH] #2031 Remove more references to EDDB --- L10n/cs.strings | 3 --- L10n/de.strings | 3 --- L10n/en.template | 3 --- L10n/es.strings | 3 --- L10n/fi.strings | 6 ------ L10n/it.strings | 3 --- L10n/ja.strings | 3 --- L10n/ko.strings | 3 --- L10n/pl.strings | 7 ++----- L10n/pt-BR.strings | 3 --- L10n/pt-PT.strings | 3 --- L10n/ru.strings | 3 --- L10n/sr-Latn-BA.strings | 3 --- L10n/sr-Latn.strings | 3 --- L10n/zh-Hans.strings | 3 --- dashboard.py | 3 ++- docs/Killswitches.md | 14 +++++++------- io.edcd.EDMarketConnector.desktop | 2 +- wix/static-EDMarketConnector.wxs | 4 ---- 19 files changed, 12 insertions(+), 63 deletions(-) diff --git a/L10n/cs.strings b/L10n/cs.strings index 90519f65..ffbc24cb 100644 --- a/L10n/cs.strings +++ b/L10n/cs.strings @@ -205,9 +205,6 @@ /* coriolis.py: Settings>Coriolis - invalid override mode found; In files: coriolis.py:156; */ "Invalid Coriolis override mode!" = "Neplatný režim přepisu Coriolis!"; -/* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:179; */ -"EDDB Journal processing disabled. See Log." = "Zpracování EDDB deníku je deaktivováno. Zkontrolujte log."; - /* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:458; eddn.py:2413; eddn.py:2451; eddn.py:2519; */ "Error: Can't connect to EDDN" = "Chyba: Nelze se připojit k EDDN"; diff --git a/L10n/de.strings b/L10n/de.strings index 4ba8793d..898821cb 100644 --- a/L10n/de.strings +++ b/L10n/de.strings @@ -253,9 +253,6 @@ /* coriolis.py: Settings>Coriolis - invalid override mode found; In files: coriolis.py:156; */ "Invalid Coriolis override mode!" = "Ungültiger Coriolis-Überschreibungsmodus!"; -/* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:179; */ -"EDDB Journal processing disabled. See Log." = "EDDB Journal-Verarbeitung deaktiviert. Siehe Log."; - /* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:458; eddn.py:2413; eddn.py:2451; eddn.py:2519; */ "Error: Can't connect to EDDN" = "Fehler: Keine Verbindung zum EDDN"; diff --git a/L10n/en.template b/L10n/en.template index 96944a63..d3b265b7 100644 --- a/L10n/en.template +++ b/L10n/en.template @@ -253,9 +253,6 @@ /* coriolis.py: Settings>Coriolis - invalid override mode found; In files: coriolis.py:156; */ "Invalid Coriolis override mode!" = "Invalid Coriolis override mode!"; -/* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:179; */ -"EDDB Journal processing disabled. See Log." = "EDDB Journal processing disabled. See Log."; - /* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:458; eddn.py:2413; eddn.py:2451; eddn.py:2519; */ "Error: Can't connect to EDDN" = "Error: Can't connect to EDDN"; diff --git a/L10n/es.strings b/L10n/es.strings index abced1a9..6377ebc8 100644 --- a/L10n/es.strings +++ b/L10n/es.strings @@ -211,9 +211,6 @@ /* coriolis.py: Settings>Coriolis - invalid override mode found; In files: coriolis.py:156; */ "Invalid Coriolis override mode!" = "¡Modo sobrescritura de Coriolis Inválido!"; -/* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:179; */ -"EDDB Journal processing disabled. See Log." = "Procesamiento de Journal para EDDB desactivado. Ver Log."; - /* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:458; eddn.py:2413; eddn.py:2451; eddn.py:2519; */ "Error: Can't connect to EDDN" = "Error: No se puede conectar a EDDN"; diff --git a/L10n/fi.strings b/L10n/fi.strings index c2577e42..6a7b54af 100644 --- a/L10n/fi.strings +++ b/L10n/fi.strings @@ -178,9 +178,6 @@ /* l10n.py: The system default language choice in Settings > Appearance; prefs.py: Settings > Configuration - Label on 'reset journal files location to default' button; prefs.py: The system default language choice in Settings > Appearance; prefs.py: Label for 'Default' theme radio button; In files: l10n.py:193; prefs.py:455; prefs.py:709; prefs.py:742; */ "Default" = "Oletus"; -/* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:179; */ -"EDDB Journal processing disabled. See Log." = "EDDB lokikirjan käsittely ei käytössä. Katso lokitiedot."; - /* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:458; eddn.py:2413; eddn.py:2451; eddn.py:2519; */ "Error: Can't connect to EDDN" = "Virhe: ei saatu yhteyttä EDDN:ään"; @@ -193,9 +190,6 @@ /* eddn.py: EDDN delay sending until docked option is on, this message notes that a send was skipped due to this; In files: eddn.py:2063; */ "Delay sending until docked" = "Lähetä tiedot vasta telakoitumisen jälkeen"; -/* eddn.py: Killswitch disabled EDDN; In files: eddn.py:2178; */ -"EDDN journal handler disabled. See Log." = "EDDB lokikirjan käsittelijä ei käytössä. Katso lokitiedot."; - /* eddn.py: Status text shown while attempting to send data; In files: eddn.py:2507; */ "Sending data to EDDN..." = "Lähetetään tietoja EDDN:ään..."; diff --git a/L10n/it.strings b/L10n/it.strings index 515b65b7..09149c99 100644 --- a/L10n/it.strings +++ b/L10n/it.strings @@ -184,9 +184,6 @@ /* coriolis.py: Settings>Coriolis: Label for selection of using Normal, Beta or 'auto' Coriolis URL; In files: coriolis.py:116; */ "Override Beta/Normal Selection" = "Sovrascrivi selezione Beta/Normale"; -/* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:179; */ -"EDDB Journal processing disabled. See Log." = "Elaborazione di EDDB Journal disabilitata. Guarda il Log."; - /* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:458; eddn.py:2413; eddn.py:2451; eddn.py:2519; */ "Error: Can't connect to EDDN" = "Errore: Non riesco a connettermi a EDDN"; diff --git a/L10n/ja.strings b/L10n/ja.strings index 0695827e..6b999088 100644 --- a/L10n/ja.strings +++ b/L10n/ja.strings @@ -253,9 +253,6 @@ /* coriolis.py: Settings>Coriolis - invalid override mode found; In files: coriolis.py:156; */ "Invalid Coriolis override mode!" = "無効なCoriolis上書きモードです！"; -/* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:179; */ -"EDDB Journal processing disabled. See Log." = "EDDBジャーナル処理が無効です。ログを確認してください。"; - /* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:458; eddn.py:2413; eddn.py:2451; eddn.py:2519; */ "Error: Can't connect to EDDN" = "エラー: EDDNに接続できません"; diff --git a/L10n/ko.strings b/L10n/ko.strings index d1a19577..2d69243f 100644 --- a/L10n/ko.strings +++ b/L10n/ko.strings @@ -229,9 +229,6 @@ /* coriolis.py: Settings>Coriolis - invalid override mode found; In files: coriolis.py:156; */ "Invalid Coriolis override mode!" = "잘못된 Coriolis 오버라이딩 모드입니다!"; -/* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:179; */ -"EDDB Journal processing disabled. See Log." = "EDDB 저널 처리 비활성화됨. 로그 참고 바람."; - /* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:458; eddn.py:2413; eddn.py:2451; eddn.py:2519; */ "Error: Can't connect to EDDN" = "오류: EDDN에 연결할 수 없음"; diff --git a/L10n/pl.strings b/L10n/pl.strings index 9c201f7c..e772dfe9 100644 --- a/L10n/pl.strings +++ b/L10n/pl.strings @@ -232,9 +232,6 @@ /* coriolis.py: Settings>Coriolis - invalid override mode found; In files: coriolis.py:156; */ "Invalid Coriolis override mode!" = "Niewłaściwy tryb nadpisania Coriolis!"; -/* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:179; */ -"EDDB Journal processing disabled. See Log." = "Wyłączone przetwarzanie dziennika EDDB. Sprawdź logi."; - /* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:458; eddn.py:2413; eddn.py:2451; eddn.py:2519; */ "Error: Can't connect to EDDN" = "Błąd: Brak połączenia z EDDN"; @@ -257,7 +254,7 @@ "Delay sending until docked" = "Czekaj z wysłaniem na zadokowanie"; /* eddn.py: Killswitch disabled EDDN; In files: eddn.py:2178; */ -"EDDN journal handler disabled. See Log." = "Wyłączona obsługa dziennika EDDB. Sprawdź logi."; +"EDDN journal handler disabled. See Log." = "Wyłączona obsługa dziennika EDDN. Sprawdź logi."; /* eddn.py: Status text shown while attempting to send data; In files: eddn.py:2507; */ "Sending data to EDDN..." = "Wysłanie danych do EDDN..."; @@ -278,7 +275,7 @@ "None" = "Brak"; /* edsm.py: EDSM plugin - Journal handling disabled by killswitch; In files: edsm.py:516; */ -"EDSM Handler disabled. See Log." = "Wyłączona obsługa EDDB. Sprawdź logi."; +"EDSM Handler disabled. See Log." = "Wyłączona obsługa EDSM. Sprawdź logi."; /* edsm.py: EDSM Plugin - Error message from EDSM API; In files: edsm.py:916; edsm.py:1048; */ "Error: EDSM {MSG}" = "Błąd: EDSM {MSG}"; diff --git a/L10n/pt-BR.strings b/L10n/pt-BR.strings index 38998c70..27e9b474 100644 --- a/L10n/pt-BR.strings +++ b/L10n/pt-BR.strings @@ -253,9 +253,6 @@ /* coriolis.py: Settings>Coriolis - invalid override mode found; In files: coriolis.py:156; */ "Invalid Coriolis override mode!" = "Modo de substituição Coriolis inválido!"; -/* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:179; */ -"EDDB Journal processing disabled. See Log." = "Processamento de Jornais no EDDB desativado. Verifique o Log."; - /* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:458; eddn.py:2413; eddn.py:2451; eddn.py:2519; */ "Error: Can't connect to EDDN" = "Erro: Não é possível conectar-se ao EDDN"; diff --git a/L10n/pt-PT.strings b/L10n/pt-PT.strings index 59d160b2..bd936059 100644 --- a/L10n/pt-PT.strings +++ b/L10n/pt-PT.strings @@ -253,9 +253,6 @@ /* coriolis.py: Settings>Coriolis - invalid override mode found; In files: coriolis.py:156; */ "Invalid Coriolis override mode!" = "Modo de sobreposição Coriolis inválido!"; -/* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:179; */ -"EDDB Journal processing disabled. See Log." = "Processamento do diário do EDDB desactivado. Verifique o ficheiro de registos."; - /* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:458; eddn.py:2413; eddn.py:2451; eddn.py:2519; */ "Error: Can't connect to EDDN" = "Erro: Não é possível conectar ao EDDN"; diff --git a/L10n/ru.strings b/L10n/ru.strings index 99c3d70f..38f3d7a4 100644 --- a/L10n/ru.strings +++ b/L10n/ru.strings @@ -253,9 +253,6 @@ /* coriolis.py: Settings>Coriolis - invalid override mode found; In files: coriolis.py:156; */ "Invalid Coriolis override mode!" = "Некорректный режим переопределения URL для coriolis.io"; -/* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:179; */ -"EDDB Journal processing disabled. See Log." = "Обработка журнала EDDB отключена. См. логи."; - /* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:458; eddn.py:2413; eddn.py:2451; eddn.py:2519; */ "Error: Can't connect to EDDN" = "Ошибка: не удается подключиться к EDDN"; diff --git a/L10n/sr-Latn-BA.strings b/L10n/sr-Latn-BA.strings index e80d4f90..62d372e3 100644 --- a/L10n/sr-Latn-BA.strings +++ b/L10n/sr-Latn-BA.strings @@ -232,9 +232,6 @@ /* coriolis.py: Settings>Coriolis - invalid override mode found; In files: coriolis.py:156; */ "Invalid Coriolis override mode!" = "Neispravan Coriolis režim rada!"; -/* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:179; */ -"EDDB Journal processing disabled. See Log." = "EDDB obrada journala je deaktivirana. Pogledajte Log."; - /* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:458; eddn.py:2413; eddn.py:2451; eddn.py:2519; */ "Error: Can't connect to EDDN" = "Greška: Nemoguće povezivanje sa EDDN"; diff --git a/L10n/sr-Latn.strings b/L10n/sr-Latn.strings index d6d937cc..3da6c5b9 100644 --- a/L10n/sr-Latn.strings +++ b/L10n/sr-Latn.strings @@ -253,9 +253,6 @@ /* coriolis.py: Settings>Coriolis - invalid override mode found; In files: coriolis.py:156; */ "Invalid Coriolis override mode!" = "Pogrešan Coriolis preinačeni mod!"; -/* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:179; */ -"EDDB Journal processing disabled. See Log." = "Obrada žurnala za EDDB je deaktivirana. Pogledajte Log."; - /* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:458; eddn.py:2413; eddn.py:2451; eddn.py:2519; */ "Error: Can't connect to EDDN" = "Greška: Nemoguće povezivanje na EDDN"; diff --git a/L10n/zh-Hans.strings b/L10n/zh-Hans.strings index d77b8184..83ad58bd 100644 --- a/L10n/zh-Hans.strings +++ b/L10n/zh-Hans.strings @@ -232,9 +232,6 @@ /* coriolis.py: Settings>Coriolis - invalid override mode found; In files: coriolis.py:156; */ "Invalid Coriolis override mode!" = "无效的 Coriolis 覆盖模式！"; -/* eddb.py: Journal Processing disabled due to an active killswitch; In files: eddb.py:179; */ -"EDDB Journal processing disabled. See Log." = "EDDB Journal Processing 已禁用。请查看诊断日志。"; - /* eddn.py: Error while trying to send data to EDDN; In files: eddn.py:458; eddn.py:2413; eddn.py:2451; eddn.py:2519; */ "Error: Can't connect to EDDN" = "错误：无法连接到 EDDN"; diff --git a/dashboard.py b/dashboard.py index c88f9a21..462af131 100644 --- a/dashboard.py +++ b/dashboard.py @@ -7,7 +7,7 @@ import time import tkinter as tk from calendar import timegm from os.path import getsize, isdir, isfile -from typing import Any, Dict +from typing import Any, Dict, Optional from config import config from EDMCLogging import get_main_logger @@ -34,6 +34,7 @@ class Dashboard(FileSystemEventHandler): def __init__(self) -> None: FileSystemEventHandler.__init__(self) # futureproofing - not need for current version of watchdog + self.session_start: Optional[int] = None self.root: tk.Tk = None # type: ignore self.currentdir: str = None # type: ignore # The actual logdir that we're monitoring self.observer: Observer = None # type: ignore diff --git a/docs/Killswitches.md b/docs/Killswitches.md index bae03c2d..91eccf9f 100644 --- a/docs/Killswitches.md +++ b/docs/Killswitches.md @@ -162,13 +162,13 @@ in older versions will simply become unconditional kills in the new version. The current recognised (to EDMC and its internal plugins) killswitch strings are as follows: -| Kill Switch | Supported Plugins | Description | -| :------------------------------------------- | :---------------------: | :---------------------------------------------------------------------------------------- | -| `plugins.eddn.send` | eddn | Disables all use of the send method on EDDN (effectively disables EDDN updates) | -| `plugins..journal` | eddn, inara, edsm, eddb | Disables all journal processing for the plugin | -| `plugins..worker` | edsm, *inara | Disables the plugins worker thread (effectively disables updates) (does not close thread) | -| `plugins..worker.` | edsm, inara | Disables the plugin worker for the given eventname | -| `plugins..journal.event.` | eddn, inara, edsm | Specific events to disable processing for. | +| Kill Switch | Supported Plugins | Description | +| :------------------------------------------- |:-----------------:| :---------------------------------------------------------------------------------------- | +| `plugins.eddn.send` | eddn | Disables all use of the send method on EDDN (effectively disables EDDN updates) | +| `plugins..journal` | eddn, inara, edsm | Disables all journal processing for the plugin | +| `plugins..worker` | edsm, *inara | Disables the plugins worker thread (effectively disables updates) (does not close thread) | +| `plugins..worker.` | edsm, inara | Disables the plugin worker for the given eventname | +| `plugins..journal.event.` | eddn, inara, edsm | Specific events to disable processing for. | Killswitches marked with `*` do **not** support modification of their values via set/redact/delete. And as such any match will simply stop processing. diff --git a/io.edcd.EDMarketConnector.desktop b/io.edcd.EDMarketConnector.desktop index 472c7add..1fd72ae4 100644 --- a/io.edcd.EDMarketConnector.desktop +++ b/io.edcd.EDMarketConnector.desktop @@ -7,7 +7,7 @@ Name=E:D Market Connector Comment=Utilise Elite Dangerous Journal and CAPI data Icon=io.edcd.EDMarketConnector Categories=Game; -Keywords=Elite;Dangerous;EDDN;EDSM;EDDB;Inara;Spansh; +Keywords=Elite;Dangerous;EDDN;EDSM;Inara;Spansh; Exec=edmarketconnector Terminal=false SingleMainWindow=true diff --git a/wix/static-EDMarketConnector.wxs b/wix/static-EDMarketConnector.wxs index d19dfa67..a0178579 100644 --- a/wix/static-EDMarketConnector.wxs +++ b/wix/static-EDMarketConnector.wxs @@ -543,9 +543,6 @@ - - - @@ -709,7 +706,6 @@ -