Fix the server docker image build

This commit is contained in:
2026-02-28 20:47:53 +01:00
parent 564ba1d85d
commit 5c01ecb2d1
11 changed files with 87 additions and 35 deletions

View File

@@ -28,12 +28,8 @@ from xml.etree import ElementTree
from xml.dom import minidom
import gzip
# noinspection PyPackageRequirements
import wx
import config
import eos.db
from service.esi import Esi
from eos.saveddata.implant import Implant as es_Implant
from eos.saveddata.character import Character as es_Character, Skill
@@ -42,7 +38,12 @@ from eos.const import FittingSlot as es_Slot
from eos.saveddata.fighter import Fighter as es_Fighter
pyfalog = Logger(__name__)
_t = wx.GetTranslation
def _t(s):
import wx
return wx.GetTranslation(s)
class CharacterImportThread(threading.Thread):
@@ -97,6 +98,7 @@ class CharacterImportThread(threading.Thread):
pyfalog.error(e)
continue
import wx
wx.CallAfter(self.callback)
def stop(self):
@@ -132,6 +134,7 @@ class SkillBackupThread(threading.Thread):
with open(path, mode='w', encoding='utf-8') as backupFile:
backupFile.write(backupData)
import wx
wx.CallAfter(self.callback)
def stop(self):
@@ -386,6 +389,7 @@ class Character:
def apiFetchCallback(self, guiCallback, e=None):
eos.db.commit()
import wx
wx.CallAfter(guiCallback, e)
@staticmethod
@@ -501,6 +505,7 @@ class UpdateAPIThread(threading.Thread):
try:
char = eos.db.getCharacter(self.charID)
from service.esi import Esi
sEsi = Esi.getInstance()
sChar = Character.getInstance()
ssoChar = sChar.getSsoCharacter(char.ID)

View File

@@ -22,7 +22,6 @@ import datetime
from time import time
from weakref import WeakSet
import wx
from logbook import Logger
import eos.db
@@ -235,6 +234,7 @@ class Fit:
@classmethod
def getCommandProcessor(cls, fitID):
if fitID not in cls.processors:
import wx
cls.processors[fitID] = wx.CommandProcessor(maxCommands=100)
return cls.processors[fitID]

View File

@@ -38,7 +38,6 @@ from service.port.eft import (
isValidImplantImport, isValidBoosterImport)
from service.port.esi import exportESI, importESI
from service.port.multibuy import exportMultiBuy
from service.port.shipstats import exportFitStats
from service.port.xml import importXml, exportXml
from service.port.muta import parseMutant, parseDynamicItemString, fetchDynamicItem
@@ -346,4 +345,5 @@ class Port:
@staticmethod
def exportFitStats(fit, callback=None):
return exportFitStats(fit, callback=callback)
from service.port.shipstats import exportFitStats as _exportFitStats
return _exportFitStats(fit, callback=callback)

View File

@@ -24,7 +24,6 @@ import urllib.error
import urllib.parse
import json
from collections import namedtuple
import wx
from logbook import Logger
@@ -582,6 +581,7 @@ class LocaleSettings:
@classmethod
def supported_languages(cls):
"""Requires the application to be initialized, otherwise wx.Translation isn't set."""
import wx
pyfalog.info(f'using "{config.CATALOG}" to fetch languages, relatively base path "{os.getcwd()}"')
return {x: wx.Locale.FindLanguageInfo(x) for x in wx.Translations.Get().GetAvailableTranslations(config.CATALOG)}