aa-intel-tool 2.1.0__py3-none-any.whl → 2.2.0__py3-none-any.whl

aa_intel_tool/locale/pl_PL/LC_MESSAGES/django.po

@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-20 22:33+0200\n"
-"PO-Revision-Date: 2024-03-29 15:11+0000\n"
+"POT-Creation-Date: 2024-06-23 11:20+0200\n"
+"PO-Revision-Date: 2024-05-10 14:07+0000\n"
 "Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
 "Language-Team: Polish <https://weblate.ppfeufer.de/projects/alliance-auth-"
 "apps/aa-intel-tool/pl/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 5.4.2\n"
+"X-Generator: Weblate 5.5.3\n"
 
 #: aa_intel_tool/__init__.py:9
 #: aa_intel_tool/templates/aa_intel_tool/base.html:6
@@ -166,19 +166,19 @@ msgstr ""
 msgid "No data to parse …"
 msgstr ""
 
-#: aa_intel_tool/parser/module/chatlist.py:68
+#: aa_intel_tool/parser/module/chatlist.py:65
 msgid "Something went wrong while fetching the character information from ESI."
 msgstr ""
 
-#: aa_intel_tool/parser/module/chatlist.py:79
+#: aa_intel_tool/parser/module/chatlist.py:76
 msgid "Character unknown to ESI."
 msgstr ""
 
-#: aa_intel_tool/parser/module/chatlist.py:281
+#: aa_intel_tool/parser/module/chatlist.py:278
 msgid "The chat list module is currently disabled."
 msgstr ""
 
-#: aa_intel_tool/parser/module/chatlist.py:302
+#: aa_intel_tool/parser/module/chatlist.py:299
 #, python-brace-format
 msgid ""
 "Chat scans are currently limited to a maximum of {max_allowed_pilots} pilot "
@@ -188,12 +188,13 @@ msgid_plural ""
 "per scan. Your list of pilots exceeds this limit."
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] ""
 
 #: aa_intel_tool/parser/module/dscan.py:350
 msgid "The D-Scan module is currently disabled."
 msgstr ""
 
-#: aa_intel_tool/parser/module/fleetcomp.py:111
+#: aa_intel_tool/parser/module/fleetcomp.py:187
 msgid "The fleet composition module is currently disabled."
 msgstr ""
 
@@ -297,6 +298,7 @@ msgid "Scans will be deleted after %(scan_retention_time)s day."
 msgid_plural "Scans will be deleted after %(scan_retention_time)s days."
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] ""
 
 #: aa_intel_tool/templates/aa_intel_tool/partials/footer/app-translation-footer.html:5
 msgid ""
@@ -324,6 +326,7 @@ msgid "Limited to a maximum of %(max_pilots)s pilot per scan."
 msgid_plural "Limited to a maximum of %(max_pilots)s pilots per scan."
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] ""
 
 #: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:40
 msgid ""

aa_intel_tool/locale/ru/LC_MESSAGES/django.po

@@ -1,16 +1,17 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Nikolay <nick.postnikov@gmail.com>, 2023.
-# Peter Pfeufer <info@ppfeufer.de>, 2023.
-# Max <mark25@inbox.ru>, 2023.
+# Nikolay <nick.postnikov@gmail.com>, 2023, 2024.
+# Peter Pfeufer <info@ppfeufer.de>, 2023, 2024.
+# Max <mark25@inbox.ru>, 2023, 2024.
+# Roycce_ <malyasov.roma@mail.ru>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-20 22:33+0200\n"
-"PO-Revision-Date: 2023-10-04 15:47+0000\n"
-"Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
+"POT-Creation-Date: 2024-06-23 11:20+0200\n"
+"PO-Revision-Date: 2024-06-06 14:27+0000\n"
+"Last-Translator: Roycce_ <malyasov.roma@mail.ru>\n"
 "Language-Team: Russian <https://weblate.ppfeufer.de/projects/alliance-auth-"
 "apps/aa-intel-tool/ru/>\n"
 "Language: ru\n"
@@ -19,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 3 : (n%10==1 && n%100!=11 ? 0 : "
 "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Weblate 5.0.2\n"
+"X-Generator: Weblate 5.5.5\n"
 
 #: aa_intel_tool/__init__.py:9
 #: aa_intel_tool/templates/aa_intel_tool/base.html:6
@@ -170,19 +171,19 @@ msgstr ""
 msgid "No data to parse …"
 msgstr "Нет данных для анализа …"
 
-#: aa_intel_tool/parser/module/chatlist.py:68
+#: aa_intel_tool/parser/module/chatlist.py:65
 msgid "Something went wrong while fetching the character information from ESI."
 msgstr "Что-то пошло не так при загрузке информации о персонаже через ESI."
 
-#: aa_intel_tool/parser/module/chatlist.py:79
+#: aa_intel_tool/parser/module/chatlist.py:76
 msgid "Character unknown to ESI."
 msgstr "Персонаж не известен для ESI."
 
-#: aa_intel_tool/parser/module/chatlist.py:281
+#: aa_intel_tool/parser/module/chatlist.py:278
 msgid "The chat list module is currently disabled."
 msgstr "Анализатор списка чата отключен."
 
-#: aa_intel_tool/parser/module/chatlist.py:302
+#: aa_intel_tool/parser/module/chatlist.py:299
 #, python-brace-format
 msgid ""
 "Chat scans are currently limited to a maximum of {max_allowed_pilots} pilot "
@@ -207,7 +208,7 @@ msgstr[3] ""
 msgid "The D-Scan module is currently disabled."
 msgstr "Анализатор подскана отключен."
 
-#: aa_intel_tool/parser/module/fleetcomp.py:111
+#: aa_intel_tool/parser/module/fleetcomp.py:187
 msgid "The fleet composition module is currently disabled."
 msgstr "Анализатор состава флота отключен."
 
@@ -483,7 +484,7 @@ msgstr "Класс корабля"
 
 #: aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/ships-breakdown/ship-classes.html:30
 msgid "Total mass (in kg):"
-msgstr ""
+msgstr "Общая масса (в кг):"
 
 #: aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/ships-breakdown/ship-types.html:18
 msgid "Ship type"

aa_intel_tool/locale/sk/LC_MESSAGES/django.po

@@ -3,21 +3,22 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-20 22:33+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"POT-Creation-Date: 2024-06-23 11:20+0200\n"
+"PO-Revision-Date: 2024-05-10 14:07+0000\n"
+"Last-Translator: Anonymous <noreply@weblate.org>\n"
+"Language-Team: Slovak <https://weblate.ppfeufer.de/projects/alliance-auth-"
+"apps/aa-intel-tool/sk/>\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n "
 ">= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
+"X-Generator: Weblate 5.5.3\n"
 
 #: aa_intel_tool/__init__.py:9
 #: aa_intel_tool/templates/aa_intel_tool/base.html:6
@@ -166,19 +167,19 @@ msgstr ""
 msgid "No data to parse …"
 msgstr ""
 
-#: aa_intel_tool/parser/module/chatlist.py:68
+#: aa_intel_tool/parser/module/chatlist.py:65
 msgid "Something went wrong while fetching the character information from ESI."
 msgstr ""
 
-#: aa_intel_tool/parser/module/chatlist.py:79
+#: aa_intel_tool/parser/module/chatlist.py:76
 msgid "Character unknown to ESI."
 msgstr ""
 
-#: aa_intel_tool/parser/module/chatlist.py:281
+#: aa_intel_tool/parser/module/chatlist.py:278
 msgid "The chat list module is currently disabled."
 msgstr ""
 
-#: aa_intel_tool/parser/module/chatlist.py:302
+#: aa_intel_tool/parser/module/chatlist.py:299
 #, python-brace-format
 msgid ""
 "Chat scans are currently limited to a maximum of {max_allowed_pilots} pilot "
@@ -188,12 +189,14 @@ msgid_plural ""
 "per scan. Your list of pilots exceeds this limit."
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
 #: aa_intel_tool/parser/module/dscan.py:350
 msgid "The D-Scan module is currently disabled."
 msgstr ""
 
-#: aa_intel_tool/parser/module/fleetcomp.py:111
+#: aa_intel_tool/parser/module/fleetcomp.py:187
 msgid "The fleet composition module is currently disabled."
 msgstr ""
 
@@ -297,6 +300,8 @@ msgid "Scans will be deleted after %(scan_retention_time)s day."
 msgid_plural "Scans will be deleted after %(scan_retention_time)s days."
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
 #: aa_intel_tool/templates/aa_intel_tool/partials/footer/app-translation-footer.html:5
 msgid ""
@@ -322,6 +327,8 @@ msgid "Limited to a maximum of %(max_pilots)s pilot per scan."
 msgid_plural "Limited to a maximum of %(max_pilots)s pilots per scan."
 msgstr[0] ""
 msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
 #: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:40
 msgid ""

aa_intel_tool/locale/uk/LC_MESSAGES/django.po

@@ -1,13 +1,13 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# Peter Pfeufer <info@ppfeufer.de>, 2023.
+# Peter Pfeufer <info@ppfeufer.de>, 2023, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-20 22:33+0200\n"
-"PO-Revision-Date: 2023-10-04 15:47+0000\n"
+"POT-Creation-Date: 2024-06-23 11:20+0200\n"
+"PO-Revision-Date: 2024-05-10 14:07+0000\n"
 "Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
 "Language-Team: Ukrainian <https://weblate.ppfeufer.de/projects/alliance-auth-"
 "apps/aa-intel-tool/uk/>\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=n==1 ? 3 : (n%10==1 && n%100!=11 ? 0 : "
 "n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Weblate 5.0.2\n"
+"X-Generator: Weblate 5.5.3\n"
 
 #: aa_intel_tool/__init__.py:9
 #: aa_intel_tool/templates/aa_intel_tool/base.html:6
@@ -166,19 +166,19 @@ msgstr ""
 msgid "No data to parse …"
 msgstr ""
 
-#: aa_intel_tool/parser/module/chatlist.py:68
+#: aa_intel_tool/parser/module/chatlist.py:65
 msgid "Something went wrong while fetching the character information from ESI."
 msgstr ""
 
-#: aa_intel_tool/parser/module/chatlist.py:79
+#: aa_intel_tool/parser/module/chatlist.py:76
 msgid "Character unknown to ESI."
 msgstr ""
 
-#: aa_intel_tool/parser/module/chatlist.py:281
+#: aa_intel_tool/parser/module/chatlist.py:278
 msgid "The chat list module is currently disabled."
 msgstr ""
 
-#: aa_intel_tool/parser/module/chatlist.py:302
+#: aa_intel_tool/parser/module/chatlist.py:299
 #, python-brace-format
 msgid ""
 "Chat scans are currently limited to a maximum of {max_allowed_pilots} pilot "
@@ -195,7 +195,7 @@ msgstr[3] ""
 msgid "The D-Scan module is currently disabled."
 msgstr ""
 
-#: aa_intel_tool/parser/module/fleetcomp.py:111
+#: aa_intel_tool/parser/module/fleetcomp.py:187
 msgid "The fleet composition module is currently disabled."
 msgstr ""
 

aa_intel_tool/locale/zh_Hans/LC_MESSAGES/django.po

@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Dehao Wu <wudehao2000@163.com>, 2024.
 # Faer Yili <yilifaer@gmail.com>, 2024.
+# SAM_FPS <sam_fps@163.com>, 2024.
+# Peter Pfeufer <info@ppfeufer.de>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-20 22:33+0200\n"
-"PO-Revision-Date: 2024-01-11 21:04+0000\n"
-"Last-Translator: Dehao Wu <wudehao2000@163.com>\n"
+"POT-Creation-Date: 2024-06-23 11:20+0200\n"
+"PO-Revision-Date: 2024-06-06 14:27+0000\n"
+"Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
 "Language-Team: Chinese (Simplified) <https://weblate.ppfeufer.de/projects/"
 "alliance-auth-apps/aa-intel-tool/zh_Hans/>\n"
 "Language: zh_Hans\n"
@@ -17,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 5.3.1\n"
+"X-Generator: Weblate 5.5.5\n"
 
 #: aa_intel_tool/__init__.py:9
 #: aa_intel_tool/templates/aa_intel_tool/base.html:6
@@ -60,7 +62,7 @@ msgstr ""
 #: aa_intel_tool/models.py:123
 #: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:33
 msgid "Fleet composition"
-msgstr ""
+msgstr "舰队组成"
 
 #: aa_intel_tool/exceptions.py:34
 #, python-brace-format
@@ -166,19 +168,19 @@ msgstr ""
 msgid "No data to parse …"
 msgstr ""
 
-#: aa_intel_tool/parser/module/chatlist.py:68
+#: aa_intel_tool/parser/module/chatlist.py:65
 msgid "Something went wrong while fetching the character information from ESI."
 msgstr ""
 
-#: aa_intel_tool/parser/module/chatlist.py:79
+#: aa_intel_tool/parser/module/chatlist.py:76
 msgid "Character unknown to ESI."
 msgstr ""
 
-#: aa_intel_tool/parser/module/chatlist.py:281
+#: aa_intel_tool/parser/module/chatlist.py:278
 msgid "The chat list module is currently disabled."
 msgstr ""
 
-#: aa_intel_tool/parser/module/chatlist.py:302
+#: aa_intel_tool/parser/module/chatlist.py:299
 #, python-brace-format
 msgid ""
 "Chat scans are currently limited to a maximum of {max_allowed_pilots} pilot "
@@ -192,7 +194,7 @@ msgstr[0] ""
 msgid "The D-Scan module is currently disabled."
 msgstr ""
 
-#: aa_intel_tool/parser/module/fleetcomp.py:111
+#: aa_intel_tool/parser/module/fleetcomp.py:187
 msgid "The fleet composition module is currently disabled."
 msgstr ""
 
@@ -328,7 +330,7 @@ msgstr ""
 
 #: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:51
 msgid "Submit"
-msgstr ""
+msgstr "提交"
 
 #: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:56
 msgid "Working on it, please be patient …"
@@ -370,7 +372,7 @@ msgstr ""
 #: aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/ships-breakdown/ship-classes.html:24
 #: aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/ships-breakdown/ship-types.html:21
 msgid "Count"
-msgstr ""
+msgstr "计数"
 
 #: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/alliances.html:29
 #: aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/corporations.html:29
@@ -452,7 +454,7 @@ msgstr ""
 #: aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/ships-breakdown/ship-classes.html:21
 #: aa_intel_tool/templates/aa_intel_tool/partials/scan/fleetcomp/fleet-details/pilots.html:19
 msgid "Ship class"
-msgstr ""
+msgstr "舰船等级"
 
 #: aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/ships-breakdown/ship-classes.html:30
 msgid "Total mass (in kg):"
@@ -472,7 +474,7 @@ msgstr ""
 
 #: aa_intel_tool/templates/aa_intel_tool/partials/scan/fleetcomp/fleet-details.html:8
 msgid "Fleet details"
-msgstr ""
+msgstr "舰队细节"
 
 #: aa_intel_tool/templates/aa_intel_tool/partials/scan/fleetcomp/fleet-details.html:12
 msgid "Pilots in fleet"
@@ -488,7 +490,7 @@ msgstr ""
 
 #: aa_intel_tool/templates/aa_intel_tool/partials/scan/fleetcomp/fleet-details/pilots.html:22
 msgid "System"
-msgstr ""
+msgstr "星系"
 
 #: aa_intel_tool/templates/aa_intel_tool/partials/scan/fleetcomp/participation.html:8
 msgid "Participation details"

aa_intel_tool/parser/module/chatlist.py

@@ -2,9 +2,6 @@
 Chat list parser
 """
 
-# Standard Library
-from typing import Union
-
 # Django
 from django.db.models import QuerySet
 from django.utils.translation import gettext_lazy as _
@@ -264,7 +261,7 @@ def _parse_chatscan_data(eve_characters: QuerySet[EveCharacter]) -> dict:
 
 def parse(
     scan_data: list, safe_to_db: bool = True, ignore_limit: bool = False
-) -> Union[Scan, dict]:
+) -> Scan | dict:
     """
     Parse chat list
 

aa_intel_tool/parser/module/fleetcomp.py

@@ -29,7 +29,7 @@ from aa_intel_tool.parser.module.chatlist import parse as parse_pilots
 logger = LoggerAddTag(my_logger=get_extension_logger(name=__name__), prefix=__title__)
 
 
-def _get_fleet_composition(pilots: dict, ships: dict) -> dict:
+def get_fleet_composition(pilots: dict, ships: dict) -> dict:
     """
     Getting the fleet composition
 
@@ -98,9 +98,85 @@ def _get_fleet_composition(pilots: dict, ships: dict) -> dict:
     }
 
 
+def parse_line(line) -> list:
+    """
+    Parse a line from the fleet composition scan
+
+    :param line:
+    :type line:
+    :return:
+    :rtype:
+    """
+
+    # Let's split this list up
+    #
+    # line[0] => Pilot Name
+    # line[1] => System
+    # line[2] => Ship Class
+    # line[3] => Ship Type
+    # line[4] => Position in Fleet
+    # line[5] => Skills (FC - WC - SC)
+    # line[6] => Wing Name / Squad Name
+    line = re.split(pattern=r"\t+", string=line.rstrip("\t"))
+
+    if len(line) == 6:
+        line.append("")
+
+    return line
+
+
+def update_ships(ships, line) -> dict:
+    """
+    Update the ships dict
+
+    :param ships:
+    :type ships:
+    :param line:
+    :type line:
+    :return:
+    :rtype:
+    """
+
+    if line[2] not in ships["class"]:
+        ships["class"][line[2]] = {"count": 0}
+
+    if line[3] not in ships["type"]:
+        ships["type"][line[3]] = {"count": 0}
+
+    ships["class"][line[2]]["count"] += 1
+    ships["type"][line[3]]["count"] += 1
+
+    return ships
+
+
+def handle_fleet_composition_and_participation(pilots, ships) -> tuple:
+    """
+    Handle the fleet composition and participation
+
+    :param pilots:
+    :type pilots:
+    :param ships:
+    :type ships:
+    :return:
+    :rtype:
+    """
+
+    fleet_composition = get_fleet_composition(pilots=pilots, ships=ships)
+    participation = None
+
+    if AppSettings.INTELTOOL_ENABLE_MODULE_CHATSCAN is True:
+        participation = parse_pilots(
+            scan_data=list(set(pilots)),
+            safe_to_db=False,
+            ignore_limit=True,
+        )
+
+    return fleet_composition, participation
+
+
 def parse(scan_data: list) -> Scan:
     """
-    Parse fleet composition
+    Parse the fleet composition scan
 
     :param scan_data:
     :type scan_data:
@@ -110,27 +186,15 @@ def parse(scan_data: list) -> Scan:
 
     message = _("The fleet composition module is currently disabled.")
 
-    # Only parse fleet composition when the module is enabled
     if AppSettings.INTELTOOL_ENABLE_MODULE_FLEETCOMP is True:
         parsed_data = {}
         pilots = {}
         ships = {"type": {}, "class": {}}
         lines = []
 
-        # Let's split this list up
-        #
-        # line[0] => Pilot Name
-        # line[1] => System
-        # line[2] => Ship Class
-        # line[3] => Ship Type
-        # line[4] => Position in Fleet
-        # line[5] => Skills (FC - WC - SC)
-        # line[6] => Wing Name / Squad Name
+        # Loop through the scan data
         for entry in scan_data:
-            line = re.split(pattern=r"\t+", string=entry.rstrip("\t"))
-
-            if len(line) == 6:
-                line.append("")
+            line = parse_line(entry)
 
             pilots[line[0]] = {
                 "name": line[0],
@@ -138,31 +202,13 @@ def parse(scan_data: list) -> Scan:
                 "ship": line[2],
                 "ship_type": line[3],
             }
-
-            if line[2] not in ships["class"]:
-                ships["class"][line[2]] = {"count": 0}
-
-            if line[3] not in ships["type"]:
-                ships["type"][line[3]] = {"count": 0}
-
-            ships["class"][line[2]]["count"] += 1
-            ships["type"][line[3]]["count"] += 1
+            ships = update_ships(ships=ships, line=line)
 
             lines.append(line)
 
-        logger.debug(msg=pilots)
-
-        fleet_composition = _get_fleet_composition(pilots=pilots, ships=ships)
-
-        participation = None
-
-        # Check if chat scan module is enabled
-        if AppSettings.INTELTOOL_ENABLE_MODULE_CHATSCAN is True:
-            participation = parse_pilots(
-                scan_data=list(set(pilots)),
-                safe_to_db=False,
-                ignore_limit=True,
-            )
+        fleet_composition, participation = handle_fleet_composition_and_participation(
+            pilots=pilots, ships=ships
+        )
 
         logger.debug(msg=fleet_composition)
 
@@ -187,7 +233,7 @@ def parse(scan_data: list) -> Scan:
                 "data": fleet_composition["pilots"],
             }
 
-        # Add fleet participation data
+        # Add fleet participation data to the parsed data
         if participation:
             parsed_data.update(participation)
 

aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-dscan.js

@@ -1,4 +1,4 @@
-/* global aaIntelToolJsL10n, aaIntelToolJsOptions, addDscanHightlight, removeDscanHightlight, changeDscanStickyHighlight, fetchAjaxData, shipInfoPanel, Intl */
+/* global aaIntelToolJsL10n, aaIntelToolJsOptions, addDscanHightlight, removeDscanHightlight, changeDscanStickyHighlight, fetchAjaxData, shipInfoPanel */
 
 $(() => {
     'use strict';
@@ -398,11 +398,11 @@ $(() => {
     fetchAjaxData(aaIntelToolJsOptions.ajax.getStructuresOnGrid).then(tableData => {
         if (tableData) {
             $('div.aa-intel-loading-table-info-upwell-structures').addClass('d-none');
-            $('div#aa-intel-dscan-row-interesting-on-grid').removeClass('d-none');
 
             if (Object.keys(tableData).length === 0) {
                 $('div.aa-intel-empty-table-info-upwell-structures').removeClass('d-none');
             } else {
+                $('div#aa-intel-dscan-row-interesting-on-grid').removeClass('d-none');
                 $('div.col-aa-intel-upwell-structures').removeClass('d-none');
 
                 elementUpwellStructuresTable.DataTable({
@@ -464,11 +464,11 @@ $(() => {
     fetchAjaxData(aaIntelToolJsOptions.ajax.getDeployablesOnGrid).then(tableData => {
         if (tableData) {
             $('div.aa-intel-loading-table-info-deployables').addClass('d-none');
-            $('div#aa-intel-dscan-row-interesting-on-grid').removeClass('d-none');
 
             if (Object.keys(tableData).length === 0) {
                 $('div.aa-intel-empty-table-info-deployables').removeClass('d-none');
             } else {
+                $('div#aa-intel-dscan-row-interesting-on-grid').removeClass('d-none');
                 $('div.col-aa-intel-deployables').removeClass('d-none');
 
                 elementDeployablesTable.DataTable({
@@ -530,11 +530,11 @@ $(() => {
     fetchAjaxData(aaIntelToolJsOptions.ajax.getStarbasesOnGrid).then(tableData => {
         if (tableData) {
             $('div.aa-intel-loading-table-info-starbases').addClass('d-none');
-            $('div#aa-intel-dscan-row-interesting-on-grid').removeClass('d-none');
 
             if (Object.keys(tableData).length === 0) {
                 $('div.aa-intel-empty-table-info-starbases').removeClass('d-none');
             } else {
+                $('div#aa-intel-dscan-row-interesting-on-grid').removeClass('d-none');
                 $('div.col-aa-intel-starbases').removeClass('d-none');
 
                 elementStarbasesTable.DataTable({