aa-intel-tool 1.2.0__py3-none-any.whl → 2.0.0b1__py3-none-any.whl

aa_intel_tool/__init__.py

@@ -2,13 +2,8 @@
 App init
 """
 
-# Standard Library
-from importlib import metadata
-
 # Django
 from django.utils.translation import gettext_lazy as _
 
-__version__ = metadata.version(distribution_name="aa-intel-tool")
+__version__ = "2.0.0-beta.1"
 __title__ = _("Intel Parser")
-
-del metadata

aa_intel_tool/app_settings.py

@@ -2,11 +2,23 @@
 App settings
 """
 
+# Standard Library
+from enum import IntEnum
+
+# Alliance Auth
+from allianceauth.services.hooks import get_extension_logger
+
 # Alliance Auth (External Libs)
 from app_utils.app_settings import clean_setting
+from app_utils.logging import LoggerAddTag
+
+# AA Intel Tool
+from aa_intel_tool import __title__
+
+logger = LoggerAddTag(my_logger=get_extension_logger(name=__name__), prefix=__title__)
 
 
-class AppSettings:  # pylint: disable=too-few-public-methods
+class AppSettings:
     """
     App settings from local.py
     """
@@ -50,3 +62,22 @@ class AppSettings:  # pylint: disable=too-few-public-methods
     INTELTOOL_DSCAN_GRID_SIZE = clean_setting(
         name="INTELTOOL_DSCAN_GRID_SIZE", default_value=10000, required_type=int
     )
+
+
+class AdditionalEveCategoryId(IntEnum):
+    """
+    Eve category IDs which are not covered by Eve Universe
+    Unfortunately Python doesn't allow to extend eveuniverse.constants.EveCategoryId
+    """
+
+    DEPLOYABLE = 22
+    STARBASE = 23
+    SCANNER_PROBE = 479
+
+
+class UpwellStructureId(IntEnum):
+    """
+    Upwell Structure IDs
+    """
+
+    ANSIBLEX_JUMP_GATE = 35841

aa_intel_tool/auth_hooks.py

@@ -20,7 +20,7 @@ class AaIntelToolMenuItem(MenuItemHook):  # pylint: disable=too-few-public-metho
         MenuItemHook.__init__(
             self,
             text=__title__,
-            classes="fas fa-clipboard-list fa-fw",
+            classes="fa-solid fa-clipboard-list",
             url_name="aa_intel_tool:intel_tool_index",
             navactive=["aa_intel_tool:"],
         )

aa_intel_tool/constants.py

@@ -4,7 +4,6 @@ App constants
 
 # Standard Library
 import re
-from enum import IntEnum
 
 # Django
 from django.utils.text import slugify
@@ -35,17 +34,6 @@ distance_units_off_grid: str = """
 distance_units = f"{distance_units_on_grid}|{distance_units_off_grid}"
 
 
-class AdditionalEveCategoryId(IntEnum):
-    """
-    Eve category IDs which are not covered by Eve Universe
-    Unfortunately Python doesn't allow to extend eveuniverse.constants.EveCategoryId
-    """
-
-    DEPLOYABLE = 22
-    STARBASE = 23
-    SCANNER_PROBE = 479
-
-
 # Pre-compiled regex patterns used throughout the app
 REGEX_PATTERN = {
     "chatlist": re.compile(pattern=r"(?im)^[a-zA-Z0-9\u0080-\uFFFF -_]{3,37}$"),
@@ -64,7 +52,6 @@ REGEX_PATTERN = {
     ),
 }
 
-
 # Supported intel types and their parameters
 SUPPORTED_INTEL_TYPES = {
     "chatlist": {

aa_intel_tool/locale/es/LC_MESSAGES/django.po

@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # Zigor Fernandez Moreno <sietehierros@gmail.com>, 2023.
 # Peter Pfeufer <info@ppfeufer.de>, 2023.
+# Geovanny David Morales De la cruz <moralesgeovanny1996@gmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-10-04 17:44+0200\n"
-"PO-Revision-Date: 2023-10-04 15:46+0000\n"
-"Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
+"PO-Revision-Date: 2023-10-25 07:04+0000\n"
+"Last-Translator: Geovanny David Morales De la cruz <moralesgeovanny1996@gmail"
+".com>\n"
 "Language-Team: Spanish <https://weblate.ppfeufer.de/projects/"
 "alliance-auth-apps/aa-intel-tool/es/>\n"
 "Language: es\n"
@@ -17,7 +19,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 5.0.2\n"
+"X-Generator: Weblate 5.1\n"
 
 #: aa_intel_tool/__init__.py:12
 #: aa_intel_tool/templates/aa_intel_tool/base.html:6
@@ -234,7 +236,7 @@ msgstr ""
 #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:19
 msgctxt "Decimal separator"
 msgid "."
-msgstr ""
+msgstr "."
 
 #: aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:20
 msgctxt "Thousands separator"

aa_intel_tool/locale/fr_FR/LC_MESSAGES/django.po

@@ -1,15 +1,15 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# erka Ekanon <M6musicT@hotmail.fr>, 2024.
+# Peter Pfeufer <info@ppfeufer.de>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-10-04 17:44+0200\n"
-"PO-Revision-Date: 2023-10-04 15:46+0000\n"
-"Last-Translator: Anonymous <noreply@weblate.org>\n"
+"PO-Revision-Date: 2024-01-12 19:05+0000\n"
+"Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
 "Language-Team: French <https://weblate.ppfeufer.de/projects/"
 "alliance-auth-apps/aa-intel-tool/fr/>\n"
 "Language: fr_FR\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.0.2\n"
+"X-Generator: Weblate 5.3.1\n"
 
 #: aa_intel_tool/__init__.py:12
 #: aa_intel_tool/templates/aa_intel_tool/base.html:6
@@ -303,10 +303,12 @@ msgid ""
 "Do you want to help translate this app into your language or improve the "
 "existing translation?"
 msgstr ""
+"Voulez-vous aider à traduire cette application dans votre langue ou "
+"améliorer la traduction existante ?"
 
 #: aa_intel_tool/templates/aa_intel_tool/partials/footer/app-translation-footer.html:8
 msgid "Join our team of translators!"
-msgstr ""
+msgstr "Rejoignez notre équipe de traducteurs !"
 
 #: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:10
 msgid "What can I paste?"

aa_intel_tool/locale/zh_Hans/LC_MESSAGES/django.po

@@ -1,15 +1,15 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# Dehao Wu <wudehao2000@163.com>, 2024.
+# Faer Yili <yilifaer@gmail.com>, 2024.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-10-04 17:44+0200\n"
-"PO-Revision-Date: 2023-10-04 15:47+0000\n"
-"Last-Translator: Anonymous <noreply@weblate.org>\n"
+"PO-Revision-Date: 2024-01-11 21:04+0000\n"
+"Last-Translator: Dehao Wu <wudehao2000@163.com>\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 +17,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.0.2\n"
+"X-Generator: Weblate 5.3.1\n"
 
 #: aa_intel_tool/__init__.py:12
 #: aa_intel_tool/templates/aa_intel_tool/base.html:6
@@ -300,11 +300,11 @@ msgstr[0] ""
 msgid ""
 "Do you want to help translate this app into your language or improve the "
 "existing translation?"
-msgstr ""
+msgstr "您想帮助将此应用程序翻译成您的母语或改进现有的翻译吗?"
 
 #: aa_intel_tool/templates/aa_intel_tool/partials/footer/app-translation-footer.html:8
 msgid "Join our team of translators!"
-msgstr ""
+msgstr "加入我们的翻译团队吧！"
 
 #: aa_intel_tool/templates/aa_intel_tool/partials/index/form.html:10
 msgid "What can I paste?"
@@ -450,7 +450,7 @@ msgstr ""
 
 #: aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/ships-breakdown/ship-types.html:18
 msgid "Ship type"
-msgstr ""
+msgstr "舰船类型"
 
 #: aa_intel_tool/templates/aa_intel_tool/partials/scan/dscan/ships-breakdown/ship-types.html:36
 msgid "No data."

aa_intel_tool/management/commands/aa_intel_tool_load_eve_types.py

@@ -15,7 +15,7 @@ from eveuniverse.constants import EveCategoryId
 
 # AA Intel Tool
 from aa_intel_tool import __title__
-from aa_intel_tool.constants import AdditionalEveCategoryId
+from aa_intel_tool.app_settings import AdditionalEveCategoryId
 
 logger = LoggerAddTag(logging.getLogger(__name__), __title__)
 

aa_intel_tool/parser/module/chatlist.py

@@ -41,9 +41,10 @@ def _get_character_info(scan_data: list) -> QuerySet[EveCharacter]:
     :rtype:
     """
 
+    fetch_from_eveuniverse = False
+
     # Check if we have to bother Eve Universe or if we have all characters already
     # Excluding corporation_id=1000001 (Doomheim) to force an update here …
-    fetch_from_eveuniverse = False
     try:
         eve_characters = EveCharacter.objects.filter(
             character_name__in=scan_data
@@ -54,6 +55,7 @@ def _get_character_info(scan_data: list) -> QuerySet[EveCharacter]:
         if len(scan_data) != eve_characters.count():
             fetch_from_eveuniverse = True
 
+    # Fetch the character information from Eve Universe if needed
     if fetch_from_eveuniverse:
         try:
             eve_character_ids = (
@@ -111,6 +113,7 @@ def _parse_alliance_info(
     :rtype:
     """
 
+    # Build alliance info dict
     if eve_character.alliance_id is None:
         alliance_info = _get_unaffiliated_alliance_info()
     else:
@@ -151,6 +154,7 @@ def _parse_corporation_info(
         "logo": eve_character.corporation_logo_url_32,
     }
 
+    # Add eve links if requested
     if with_evelinks:
         corporation_info["dotlan"] = dotlan.corporation_url(
             name=eve_character.corporation_name
@@ -159,6 +163,7 @@ def _parse_corporation_info(
             eve_id=eve_character.corporation_id
         )
 
+    # Add alliance info if requested
     if with_alliance_info:
         corporation_info["alliance"] = _parse_alliance_info(
             eve_character=eve_character, with_evelinks=with_evelinks
@@ -208,17 +213,21 @@ def _parse_chatscan_data(eve_characters: QuerySet[EveCharacter]) -> dict:
     corporation_info = {}
     character_info = {}
 
+    # Loop through the characters
     for eve_character in eve_characters:
         eve_character__alliance_name = "Unaffiliated"
 
+        # If the character is in an alliance, use the alliance name
         if eve_character.alliance_name is not None:
             eve_character__alliance_name = eve_character.alliance_name
 
-        if eve_character__alliance_name not in counter:
-            counter[eve_character__alliance_name] = 0
+        counter[eve_character__alliance_name] = (
+            counter.get(eve_character__alliance_name, 0) + 1
+        )
 
-        if eve_character.corporation_name not in counter:
-            counter[eve_character.corporation_name] = 0
+        counter[eve_character.corporation_name] = (
+            counter.get(eve_character.corporation_name, 0) + 1
+        )
 
         # Alliance Info
         if eve_character__alliance_name not in alliance_info:
@@ -238,12 +247,10 @@ def _parse_chatscan_data(eve_characters: QuerySet[EveCharacter]) -> dict:
         )
 
         # Update the counter
-        counter[eve_character__alliance_name] += 1
         alliance_info[eve_character__alliance_name]["count"] = counter[
             eve_character__alliance_name
         ]
 
-        counter[eve_character.corporation_name] += 1
         corporation_info[eve_character.corporation_name]["count"] = counter[
             eve_character.corporation_name
         ]
@@ -273,12 +280,14 @@ def parse(
 
     message = _("The chat list module is currently disabled.")
 
+    # Only parse the chat scan if the module is enabled
     if AppSettings.INTELTOOL_ENABLE_MODULE_CHATSCAN is True:
         logger.debug(msg=f"{len(scan_data)} name(s) to work through …")
 
         pilots_in_scan = len(scan_data)
         max_allowed_pilots = AppSettings.INTELTOOL_CHATSCAN_MAX_PILOTS
 
+        # Check if the number of pilots in the scan exceeds the maximum allowed number
         if 0 < max_allowed_pilots < pilots_in_scan and ignore_limit is False:
             logger.debug(
                 msg=(
@@ -287,6 +296,7 @@ def parse(
                 )
             )
 
+            # Throw a tantrum
             raise ParserError(
                 message=ngettext(
                     singular=f"Chat scans are currently limited to a maximum of {max_allowed_pilots} pilot per scan. Your list of pilots exceeds this limit.",  # pylint: disable=line-too-long

aa_intel_tool/parser/module/dscan.py

@@ -20,7 +20,11 @@ from eveuniverse.models import EveType
 
 # AA Intel Tool
 from aa_intel_tool import __title__
-from aa_intel_tool.app_settings import AppSettings
+from aa_intel_tool.app_settings import (
+    AdditionalEveCategoryId,
+    AppSettings,
+    UpwellStructureId,
+)
 from aa_intel_tool.exceptions import ParserError
 from aa_intel_tool.helper.data_structure import dict_to_list
 from aa_intel_tool.models import Scan, ScanData
@@ -44,9 +48,11 @@ def _is_on_grid(distance: str) -> bool:
         REGEX_PATTERN,
     )
 
+    # Check if we have a distance
     if re.search(pattern=REGEX_PATTERN["localised_on_grid"], string=distance):
         distance_sanitised = int(re.sub(pattern=r"[^0-9]", repl="", string=distance))
 
+        # Check if the distance is within the grid size
         if distance_sanitised <= AppSettings.INTELTOOL_DSCAN_GRID_SIZE:
             return True
 
@@ -102,6 +108,7 @@ def _get_ships(eve_types: QuerySet, counter: dict) -> dict:
         eve_group__eve_category_id__exact=EveCategoryId.SHIP
     )
 
+    # Loop through all ships types
     for eve_type in eve_types_ships:
         # Info for "All Ships" table
         if eve_type[0] in counter["all"]:
@@ -160,6 +167,7 @@ def _get_upwell_structures_on_grid(
 
     upwell_structures = {}
 
+    # Loop through all Upwell structures
     for eve_type in eve_types_structures:
         if eve_type[0] in counter["ongrid"]:
             if eve_type[1] not in upwell_structures:
@@ -167,7 +175,10 @@ def _get_upwell_structures_on_grid(
                 upwell_structures[eve_type[1]]["count"] = counter["ongrid"][eve_type[0]]
 
                 # If it is an Ansiblex Jump Gate, add the destination system
-                if eve_type[0] == 35841 and ansiblex_destination:
+                if (
+                    eve_type[0] == UpwellStructureId.ANSIBLEX_JUMP_GATE
+                    and ansiblex_destination
+                ):
                     upwell_structures[eve_type[1]][
                         "name"
                     ] += f" » {ansiblex_destination}"
@@ -187,17 +198,13 @@ def _get_deployables_on_grid(eve_types: QuerySet, counter: dict) -> list:
     :rtype:
     """
 
-    # AA Intel Tool
-    from aa_intel_tool.constants import (  # pylint: disable=import-outside-toplevel
-        AdditionalEveCategoryId,
-    )
-
     eve_types_deployables = eve_types.filter(
         eve_group__eve_category_id__exact=AdditionalEveCategoryId.DEPLOYABLE
     )
 
     deployables = {}
 
+    # Loop through all deployables
     for eve_type in eve_types_deployables:
         if eve_type[0] in counter["ongrid"]:
             if eve_type[1] not in deployables:
@@ -219,17 +226,13 @@ def _get_starbases_on_grid(eve_types: QuerySet, counter: dict) -> list:
     :rtype:
     """
 
-    # AA Intel Tool
-    from aa_intel_tool.constants import (  # pylint: disable=import-outside-toplevel
-        AdditionalEveCategoryId,
-    )
-
     eve_types_starbase = eve_types.filter(
         eve_group__eve_category_id__exact=AdditionalEveCategoryId.STARBASE
     )
 
     starbases = {}
 
+    # Loop through all starbases
     for eve_type in eve_types_starbase:
         if eve_type[0] in counter["ongrid"]:
             if eve_type[1] not in starbases:
@@ -241,7 +244,7 @@ def _get_starbases_on_grid(eve_types: QuerySet, counter: dict) -> list:
 
 def _get_ansiblex_jumpgate_destination(ansiblex_name: str) -> str:
     """
-    Get the Ansiblex Jump Gate  destination system
+    Get the Ansiblex Jump Gate destination system
 
     :param ansiblex_name:
     :type ansiblex_name:
@@ -268,7 +271,6 @@ def _get_scan_details(scan_data: list) -> tuple:
     ansiblex_destination = None
     counter = {"all": {}, "ongrid": {}, "offgrid": {}, "type": {}}
     eve_ids = {"all": [], "ongrid": [], "offgrid": []}
-    # dscan_lines = []
 
     # Let's split this list up
     #
@@ -276,35 +278,31 @@ def _get_scan_details(scan_data: list) -> tuple:
     # line[1] => Name
     # line[2] => Ship Class / Structure Type
     # line[3] => Distance
+    #
+    # Loop through all lines
     for entry in scan_data:
         line = re.split(pattern=r"\t+", string=entry.rstrip("\t"))
         entry_id = int(line[0])
 
-        if entry_id not in counter["all"]:
-            counter["all"][entry_id] = 0
+        counter["all"][entry_id] = counter["all"].get(entry_id, 0) + 1
 
+        # Check if the entry is "on grid" or not
         if _is_on_grid(line[3]):
-            if entry_id not in counter["ongrid"]:
-                counter["ongrid"][entry_id] = 0
+            counter["ongrid"][entry_id] = counter["ongrid"].get(entry_id, 0) + 1
 
-            # If there is an Ansiblex Jump Gate, get its destination system
-            if entry_id == 35841:
+            # If it is an Ansiblex Jump Gate, get its destination system
+            if entry_id == UpwellStructureId.ANSIBLEX_JUMP_GATE:
                 ansiblex_destination = _get_ansiblex_jumpgate_destination(
                     ansiblex_name=line[1]
                 )
 
-            counter["ongrid"][entry_id] += 1
             eve_ids["ongrid"].append(entry_id)
         else:
-            if entry_id not in counter["offgrid"]:
-                counter["offgrid"][entry_id] = 0
+            counter["offgrid"][entry_id] = counter["offgrid"].get(entry_id, 0) + 1
 
-            counter["offgrid"][entry_id] += 1
             eve_ids["offgrid"].append(entry_id)
 
-        counter["all"][entry_id] += 1
         eve_ids["all"].append(entry_id)
-        # dscan_lines.append([entry_id, line[1], line[2], line[3]])
 
     return ansiblex_destination, counter, eve_ids
 
@@ -321,9 +319,14 @@ def parse(scan_data: list) -> Scan:
 
     message = _("The D-Scan module is currently disabled.")
 
+    # Only parse the D-Scan when the module is enabled
     if AppSettings.INTELTOOL_ENABLE_MODULE_DSCAN is True:
         parsed_data = {}
-        ansiblex_destination, counter, eve_ids = _get_scan_details(scan_data=scan_data)
+        (
+            ansiblex_destination,  # pylint: disable=unused-variable
+            counter,
+            eve_ids,
+        ) = _get_scan_details(scan_data=scan_data)
 
         eve_types = EveType.objects.bulk_get_or_create_esi(
             ids=set(eve_ids["all"]), include_children=True
@@ -334,19 +337,19 @@ def parse(scan_data: list) -> Scan:
         upwell_structures = _get_upwell_structures_on_grid(
             eve_types=eve_types,
             counter=counter,
-            ansiblex_destination=ansiblex_destination,
+            # ansiblex_destination=ansiblex_destination,
         )
         deployables = _get_deployables_on_grid(eve_types=eve_types, counter=counter)
         starbases = _get_starbases_on_grid(eve_types=eve_types, counter=counter)
 
-        # Add "ships all" to parsed data when available
+        # Add "ships all" to the parsed data when available
         if ships["all"]:
             parsed_data["all"] = {
                 "section": ScanData.Section.SHIPLIST,
                 "data": ships["all"],
             }
 
-        # Add "ships on grid" to parsed data when available
+        # Add "ships on grid" to the parsed data when available
         if ships["ongrid"]:
             parsed_data["ongrid"] = {
                 "section": ScanData.Section.SHIPLIST_ON_GRID,
@@ -360,21 +363,21 @@ def parse(scan_data: list) -> Scan:
                 "data": ships["offgrid"],
             }
 
-        # Add "ship types" to parsed data when available
+        # Add "ship types" to the parsed data when available
         if ships["types"]:
             parsed_data["shiptypes"] = {
                 "section": ScanData.Section.SHIPTYPES,
                 "data": ships["types"],
             }
 
-        # Add "Upwell structures on grid" to parsed data when available
+        # Add "Upwell structures on grid" to the parsed data when available
         if upwell_structures:
             parsed_data["sructures_on_grid"] = {
                 "section": ScanData.Section.STRUCTURES_ON_GRID,
                 "data": upwell_structures,
             }
 
-        # Add "deployables on grid" to parsed data when available
+        # Add "deployables on grid" to the parsed data when available
         if deployables:
             parsed_data["deployables"] = {
                 "section": ScanData.Section.DEPLOYABLES_ON_GRID,

aa_intel_tool/parser/module/fleetcomp.py

@@ -39,19 +39,21 @@ def _get_fleet_composition(pilots: dict, ships: dict) -> dict:
     :rtype:
     """
 
-    # Ships
+    # Get ship class IDs
     ship_class_ids = (
         EveEntity.objects.fetch_by_names_esi(names=ships["class"], update=True)
         .filter(category=EveEntity.CATEGORY_INVENTORY_TYPE)
         .values_list("id", flat=True)
     )
 
+    # Get ship class details
     ship_class_details = EveType.objects.bulk_get_or_create_esi(
         ids=set(ship_class_ids), include_children=True
     ).values_list("id", "name", "eve_group__id", "eve_group__name", named=True)
 
+    # Loop through ship classes
     for ship_class in ship_class_details:
-        # Ship classes
+        # Build ship class dict
         ships["class"][ship_class.name]["id"] = ship_class.id
         ships["class"][ship_class.name]["name"] = ship_class.name
         ships["class"][ship_class.name]["type_id"] = ship_class.eve_group__id
@@ -60,18 +62,21 @@ def _get_fleet_composition(pilots: dict, ships: dict) -> dict:
             type_id=ship_class.id, size=32
         )
 
-        # Ship types
+        # Build ship type dict
         ships["type"][ship_class.eve_group__name]["id"] = ship_class.eve_group__id
         ships["type"][ship_class.eve_group__name]["name"] = ship_class.eve_group__name
 
     # Pilots
     pilot_details = _get_character_info(scan_data=list(set(pilots)))
 
+    # Loop through pilots
     for pilot in pilot_details:
+        # Get ship class details for a pilot
         pilot__ship_class = ship_class_details.filter(
             name=pilots[pilot.character_name]["ship"]
         ).get()
 
+        # Build pilots dict
         pilots[pilot.character_name]["id"] = pilot.character_id
         pilots[pilot.character_name]["portrait"] = pilot.portrait_url_32
         pilots[pilot.character_name]["evewho"] = evewho.character_url(
@@ -102,9 +107,9 @@ 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 = {"list": [], "flying": {}}
         pilots = {}
         ships = {"type": {}, "class": {}}
         lines = []
@@ -124,7 +129,6 @@ def parse(scan_data: list) -> Scan:
             if len(line) == 6:
                 line.append("")
 
-            # pilots["list"].append(line[0])
             pilots[line[0]] = {
                 "name": line[0],
                 "solarsystem": line[1],
@@ -148,6 +152,8 @@ def parse(scan_data: list) -> Scan:
         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)),