From b0256542bc7f75f2bd7b159de2ebabfe52e7ff19 Mon Sep 17 00:00:00 2001 From: Joseph Douce Date: Wed, 28 Feb 2024 13:17:23 +0000 Subject: [PATCH 1/3] Fix exportHtml.py --- gui/utils/exportHtml.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gui/utils/exportHtml.py b/gui/utils/exportHtml.py index 95c27cfc6..d51e4f196 100644 --- a/gui/utils/exportHtml.py +++ b/gui/utils/exportHtml.py @@ -216,7 +216,9 @@ class exportHtmlThread(threading.Thread): eftFit = Port.exportEft(getFit(fit[0]), options={ PortEftOptions.IMPLANTS: True, PortEftOptions.MUTATIONS: True, - PortEftOptions.LOADED_CHARGES: True}) + PortEftOptions.LOADED_CHARGES: True, + PortEftOptions.BOOSTERS: True, + PortEftOptions.CARGO: True}) HTMLfit = ( '
  • Date: Wed, 28 Feb 2024 15:33:18 +0000 Subject: [PATCH 2/3] Searchable exportHtml.py added searchable fits --- gui/utils/exportHtml.py | 68 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 3 deletions(-) diff --git a/gui/utils/exportHtml.py b/gui/utils/exportHtml.py index d51e4f196..a12f97e91 100644 --- a/gui/utils/exportHtml.py +++ b/gui/utils/exportHtml.py @@ -173,13 +173,13 @@ class exportHtmlThread(threading.Thread):
    +
    Last updated: %s ()
    -

    Pyfa fits

    +

    Pyfa fits by Group

    -
    Last updated: %s ()
    - """ % (time.time(), dnaUrl, localDate) + HTML += '
      \n' categoryList = list(sMkt.getShipRoot()) categoryList.sort(key=lambda _ship: _ship.name) @@ -258,6 +258,68 @@ class exportHtmlThread(threading.Thread): HTML += """
    +
    +

    Pyfa fits by Name

    +
    +
    +""" + HTML += '
      \n' + categoryList = list(sMkt.getShipRoot()) + categoryList.sort(key=lambda _ship: _ship.name) + + count = 0 + + for group in categoryList: + # init market group string to give ships something to attach to + HTMLgroup = '' + + ships = list(sMkt.getShipList(group.ID)) + ships.sort(key=lambda _ship: _ship.name) + + # Keep track of how many ships per group + groupFits = 0 + for ship in ships: + fits = sFit.getFitsWithShip(ship.ID) + + if len(fits) > 0: + groupFits += len(fits) + + for fit in fits: + if self.stopRunning: + return + try: + eftFit = Port.exportEft(getFit(fit[0]), options={ + PortEftOptions.IMPLANTS: True, + PortEftOptions.MUTATIONS: True, + PortEftOptions.LOADED_CHARGES: True, + PortEftOptions.BOOSTERS: True, + PortEftOptions.CARGO: True}) + + HTMLfit = ( + '
    • \n' + '

      ' + ship.name + " " + fit[1] + '

      \n' + '
        \n' + ) + + HTMLfit += ' 
      • ' + eftFit + '\n
        • \n' + + HTMLfit += '
      \n
      • \n' + HTML += HTMLfit + except (KeyboardInterrupt, SystemExit): + raise + except: + pyfalog.warning("Failed to export line") + continue + finally: + if self.progress: + self.progress.current = count + count += 1 + + HTML += """ +
    +
    """ From a3142ff62ffcf3e763d0d2f1331f357637e13582 Mon Sep 17 00:00:00 2001 From: Joseph Douce Date: Wed, 28 Feb 2024 15:36:02 +0000 Subject: [PATCH 3/3] Update exportHtml.py --- gui/utils/exportHtml.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/utils/exportHtml.py b/gui/utils/exportHtml.py index a12f97e91..ac6f9eb76 100644 --- a/gui/utils/exportHtml.py +++ b/gui/utils/exportHtml.py @@ -298,7 +298,7 @@ class exportHtmlThread(threading.Thread): HTMLfit = ( '
  • \n' - '

    ' + ship.name + " " + fit[1] + '

    \n' + '

    ' + ship.name + " - " + fit[1] + '

    \n' '