fix localized import problem

Fitting description limit extended to 500 characters

localized fitting file sample

Author: jeffy-g

config.py

@@ -66,6 +66,14 @@
 
 CATALOG = 'lang'
 
+EVE_FIT_NOTE_MAX = 500
+'''
+eve fit (xml) "description" limit
+
+Description can contain html tags like <font size="14" color="#ff000000">
+
+If it contains html tags, they will be converted to html entities
+'''
 
 slotColourMapDark = {
     FittingSlot.LOW: wx.Colour(44, 36, 19),  # yellow = low slots 24/13

dist_assets/win/dist.py

@@ -14,7 +14,7 @@
 os.environ["PYFA_DIST_DIR"] = os.path.join(os.getcwd(), 'dist')
 
 os.environ["PYFA_VERSION"] = version
-iscc = r"C:\Program Files (x86)\Inno Setup 6\ISCC.exe"
+iscc = "C:\Program Files (x86)\Inno Setup 6\ISCC.exe"
 
 source = os.path.join(os.environ["PYFA_DIST_DIR"], "pyfa")
 

eos/db/saveddata/queries.py

@@ -205,6 +205,7 @@ def getCharactersForUser(lookfor, eager=None):
 
 @cachedQuery(Fit, 1, "lookfor")
 def getFit(lookfor, eager=None):
+    # type: (int, bool) -> Fit
     if isinstance(lookfor, int):
         if eager is None:
             with sd_lock:
@@ -319,6 +320,7 @@ def countFitsWithShip(lookfor, ownerID=None, where=None, eager=None):
 
 
 def getFitList(eager=None):
+    # type: (list[str]) -> list[Fit]
     eager = processEager(eager)
     with sd_lock:
         fits = removeInvalid(saveddata_session.query(Fit).options(*eager).all())

eos/db/util.py

@@ -35,6 +35,7 @@
 
 
 def processEager(eager):
+    # type: (list[str]) -> str
     if eager is None:
         return tuple()
     else:
@@ -49,6 +50,7 @@ def processEager(eager):
 
 
 def _replacements(eagerString):
+    # type: (str) -> str
     splitEager = eagerString.split(".")
     for i in range(len(splitEager)):
         part = splitEager[i]

gui/builtinAdditionPanes/notesView.py

@@ -6,36 +6,65 @@
 from gui.utils.helpers_wxPython import HandleCtrlBackspace
 from gui.utils.numberFormatter import formatAmount
 from service.fit import Fit
+from config import EVE_FIT_NOTE_MAX
+
+
+LATER = 1000
+'''timer interval, delay the save'''
+
+# 3
+EXPAND_LF_LEN = len("<br>") - 1
+'''
+If you save `Fit.notes` to "description" in eve fit(xml export),
+newline characters must be converted to "<br>"
+'''
+
+def computeEVEFitDescSize(note):
+    # type: (str) -> int
+    return len(note) + (note.count("\n") * EXPAND_LF_LEN)
+
+def ifExceedsTheUpperLimit(nv, note=None):
+    # type: (wx.TextCtrl, str) -> None
+    '''When the note size exceeds the upper limit, the text will turn red.'''
+    if note is None: note = nv.GetValue()
+    color = '#FF0000' if computeEVEFitDescSize(note) > EVE_FIT_NOTE_MAX else '#000000'
+    nv.SetForegroundColour(color)
+    nv.Refresh(False)
 
 
 class NotesView(wx.Panel):
 
     def __init__(self, parent):
         wx.Panel.__init__(self, parent)
         self.lastFitId = None
+        self.changeTimer = wx.Timer(self)
         self.mainFrame = gui.mainFrame.MainFrame.getInstance()
-        mainSizer = wx.BoxSizer(wx.VERTICAL)
         self.editNotes = wx.TextCtrl(self, style=wx.TE_MULTILINE | wx.BORDER_NONE)
-        mainSizer.Add(self.editNotes, 1, wx.EXPAND | wx.ALL, 10)
-        self.SetSizer(mainSizer)
-        self.mainFrame.Bind(GE.FIT_CHANGED, self.fitChanged)
         self.Bind(wx.EVT_TEXT, self.onText)
-        self.editNotes.Bind(wx.EVT_KEY_DOWN, self.OnKeyDown)
-        self.changeTimer = wx.Timer(self)
         self.Bind(wx.EVT_TIMER, self.delayedSave, self.changeTimer)
+        self.mainFrame.Bind(GE.FIT_CHANGED, self.fitChanged)
+        self.editNotes.Bind(wx.EVT_KEY_DOWN, self.OnKeyDown)
+        mainSizer = wx.BoxSizer(wx.VERTICAL)
+        mainSizer.Add(self.editNotes, 1, wx.EXPAND | wx.ALL, 10)
+        self.SetSizer(mainSizer)
 
     def OnKeyDown(self, event):
+        # type: (wx.KeyEvent) -> None
+        nv = self.editNotes
         if event.RawControlDown() and event.GetKeyCode() == wx.WXK_BACK:
             try:
-                HandleCtrlBackspace(self.editNotes)
+                HandleCtrlBackspace(nv)
             except (KeyboardInterrupt, SystemExit):
                 raise
             except:
                 pass
         else:
             event.Skip()
 
+        ifExceedsTheUpperLimit(nv)
+
     def fitChanged(self, event):
+        # type: (wx.Event) -> None
         event.Skip()
         activeFitID = self.mainFrame.getActiveFit()
         if activeFitID is not None and activeFitID not in event.fitIDs:
@@ -57,21 +86,29 @@ def fitChanged(self, event):
             return
         elif activeFitID != self.lastFitId:
             self.lastFitId = activeFitID
-            self.editNotes.ChangeValue(fit.notes or "")
+            note = fit.notes or ""
+            nv = self.editNotes
+            nv.ChangeValue(note)
+            ifExceedsTheUpperLimit(nv, note)
             wx.PostEvent(self.mainFrame, GE.FitNotesChanged())
 
     def onText(self, event):
+        # type: (wx.Event) -> None
         # delay the save so we're not writing to sqlite on every keystroke
         self.changeTimer.Stop()  # cancel the existing timer
-        self.changeTimer.Start(1000, True)
+        self.changeTimer.Start(LATER, True)
+        # When the note size exceeds the upper limit, the text will turn red.
+        ifExceedsTheUpperLimit(self.editNotes)
 
     def delayedSave(self, event):
+        # type: (wx.Event) -> None
         event.Skip()
         sFit = Fit.getInstance()
         sFit.editNotes(self.lastFitId, self.editNotes.GetValue())
         wx.PostEvent(self.mainFrame, GE.FitNotesChanged())
 
     def getTabExtraText(self):
+        # type: () -> str|None
         fitID = self.mainFrame.getActiveFit()
         if fitID is None:
             return None
@@ -82,7 +119,7 @@ def getTabExtraText(self):
         opt = sFit.serviceFittingOptions["additionsLabels"]
         # Amount of active implants
         if opt in (1, 2):
-            amount = len(self.editNotes.GetValue())
+            amount = computeEVEFitDescSize(self.editNotes.GetValue())
             return ' ({})'.format(formatAmount(amount, 2, 0, 3)) if amount else None
         else:
             return None

gui/builtinItemStatsViews/itemDescription.py

@@ -22,9 +22,9 @@ def __init__(self, parent, stuff, item):
 
         desc = item.description.replace("\n", "<br>")
         # Strip font tags
-        desc = re.sub("<( *)font( *)color( *)=(.*?)>(?P<inside>.*?)<( *)/( *)font( *)>", r"\g<inside>", desc)
+        desc = re.sub(r"<( *)font( *)color( *)=(.*?)>(?P<inside>.*?)<( *)/( *)font( *)>", r"\g<inside>", desc)
         # Strip URLs
-        desc = re.sub("<( *)a(.*?)>(?P<inside>.*?)<( *)/( *)a( *)>", r"\g<inside>", desc)
+        desc = re.sub(r"<( *)a(.*?)>(?P<inside>.*?)<( *)/( *)a( *)>", r"\g<inside>", desc)
         desc = "<body bgcolor='{}' text='{}'>{}</body>".format(
                 bgcolor.GetAsString(wx.C2S_HTML_SYNTAX),
                 fgcolor.GetAsString(wx.C2S_HTML_SYNTAX),

gui/globalEvents.py

@@ -1,22 +1,22 @@
 # noinspection PyPackageRequirements
-import wx.lib.newevent
+from wx.lib.newevent import NewEvent
 
-FitRenamed, FIT_RENAMED = wx.lib.newevent.NewEvent()
-FitChanged, FIT_CHANGED = wx.lib.newevent.NewEvent()
-FitRemoved, FIT_REMOVED = wx.lib.newevent.NewEvent()
-FitNotesChanged, FIT_NOTES_CHANGED = wx.lib.newevent.NewEvent()
-CharListUpdated, CHAR_LIST_UPDATED = wx.lib.newevent.NewEvent()
-CharChanged, CHAR_CHANGED = wx.lib.newevent.NewEvent()
-GraphOptionChanged, GRAPH_OPTION_CHANGED = wx.lib.newevent.NewEvent()
-TargetProfileRenamed, TARGET_PROFILE_RENAMED = wx.lib.newevent.NewEvent()
-TargetProfileChanged, TARGET_PROFILE_CHANGED = wx.lib.newevent.NewEvent()
-TargetProfileRemoved, TARGET_PROFILE_REMOVED = wx.lib.newevent.NewEvent()
+FitRenamed, FIT_RENAMED = NewEvent()
+FitChanged, FIT_CHANGED = NewEvent()
+FitRemoved, FIT_REMOVED = NewEvent()
+FitNotesChanged, FIT_NOTES_CHANGED = NewEvent()
+CharListUpdated, CHAR_LIST_UPDATED = NewEvent()
+CharChanged, CHAR_CHANGED = NewEvent()
+GraphOptionChanged, GRAPH_OPTION_CHANGED = NewEvent()
+TargetProfileRenamed, TARGET_PROFILE_RENAMED = NewEvent()
+TargetProfileChanged, TARGET_PROFILE_CHANGED = NewEvent()
+TargetProfileRemoved, TARGET_PROFILE_REMOVED = NewEvent()
 # For events when item is actually replaced under the hood,
 # but from user's perspective it's supposed to change/mutate
-ItemChangedInplace, ITEM_CHANGED_INPLACE = wx.lib.newevent.NewEvent()
+ItemChangedInplace, ITEM_CHANGED_INPLACE = NewEvent()
 
-EffectiveHpToggled, EFFECTIVE_HP_TOGGLED = wx.lib.newevent.NewEvent()
+EffectiveHpToggled, EFFECTIVE_HP_TOGGLED = NewEvent()
 
-SsoLoggingIn, EVT_SSO_LOGGING_IN = wx.lib.newevent.NewEvent()
-SsoLogin, EVT_SSO_LOGIN = wx.lib.newevent.NewEvent()
-SsoLogout, EVT_SSO_LOGOUT = wx.lib.newevent.NewEvent()
+SsoLoggingIn, EVT_SSO_LOGGING_IN = NewEvent()
+SsoLogin, EVT_SSO_LOGIN = NewEvent()
+SsoLogout, EVT_SSO_LOGOUT = NewEvent()

gui/mainFrame.py

@@ -363,6 +363,7 @@ def UnregisterStatsWindow(self, wnd):
         self.statsWnds.remove(wnd)
 
     def getActiveFit(self):
+        # type: () -> int
         p = self.fitMultiSwitch.GetSelectedPage()
         m = getattr(p, "getActiveFit", None)
         return m() if m is not None else None
@@ -845,7 +846,7 @@ def fileImportDialog(self, event):
                 style=wx.FD_OPEN | wx.FD_FILE_MUST_EXIST | wx.FD_MULTIPLE
         ) as dlg:
             if dlg.ShowModal() == wx.ID_OK:
-                    # set some arbitrary spacing to create width in window
+                # set some arbitrary spacing to create width in window
                 progress = ProgressHelper(message=" " * 100, callback=self._openAfterImport)
                 call = (Port.importFitsThreaded, [dlg.GetPaths(), progress], {})
                 self.handleProgress(

pyfa.spec

@@ -1,5 +1,7 @@
 # -*- mode: python -*-
 
+# If you get a cp65001 error during build, set the environment variable PYTHONIOENCODING="utf8"
+
 import os
 from itertools import chain
 import subprocess

service/fit.py

@@ -321,6 +321,7 @@ def switchFit(self, fitID):
             self.fill(fit)
 
     def getFit(self, fitID, projected=False, basic=False):
+        # type: (int, bool, bool) -> Fit
         """
         Gets fit from database