aa-intel-tool 1.2.0__tar.gz → 2.0.0b1__tar.gz

{aa_intel_tool-1.2.0 → aa_intel_tool-2.0.0b1}/.gitignore

@@ -4,7 +4,7 @@
 .idea/
 .tox/
 htmlcov/
-pastebin/
+node_modules/
 
 *.log
 *.tmp
@@ -13,3 +13,4 @@ pastebin/
 __pycache__
 .coverage
 /coverage.xml
+alliance_auth.sqlite3

{aa_intel_tool-1.2.0 → aa_intel_tool-2.0.0b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aa-intel-tool
-Version: 1.2.0
+Version: 2.0.0b1
 Summary: A simple parser for D-Scans and more for Alliance Auth
 Project-URL: Changelog, https://github.com/ppfeufer/aa-intel-tool/blob/master/CHANGELOG.md
 Project-URL: Documentation, https://github.com/ppfeufer/aa-intel-tool/blob/master/README.md
@@ -687,7 +687,7 @@ License-File: LICENSE
 Keywords: allianceauth,eveonline
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Django
-Classifier: Framework :: Django :: 4.0
+Classifier: Framework :: Django :: 4.2
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: OS Independent
@@ -697,15 +697,16 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
 Requires-Python: >=3.8
 Requires-Dist: allianceauth-app-utils>=1.19.1
-Requires-Dist: allianceauth>=3.6.1
+Requires-Dist: allianceauth>=4.0.0b1
 Requires-Dist: django-eveuniverse>=1.3
-Provides-Extra: tests-allianceauth-stable
-Requires-Dist: coverage; extra == 'tests-allianceauth-stable'
-Requires-Dist: django-webtest; extra == 'tests-allianceauth-stable'
+Provides-Extra: tests-allianceauth-latest
+Requires-Dist: coverage; extra == 'tests-allianceauth-latest'
+Requires-Dist: django-webtest; extra == 'tests-allianceauth-latest'
 Description-Content-Type: text/markdown
 
 # AA Intel Tool<a name="aa-intel-tool"></a>
@@ -758,15 +759,6 @@ ______________________________________________________________________
 
 ______________________________________________________________________
 
-> **Note**
->
-> This app makes use of a feature introduced with Alliance Auth v3.6.1, meaning,
-> installing this app will pull in Alliance Auth v3.6.1 unsupervised if you haven't
-> updated yet.
->
-> **Please make sure to update Allianceauth to version 3.6.1 or higher before you
-> install this app to avoid any complications.**
-
 ## Overview<a name="overview"></a>
 
 ### Features<a name="features"></a>
@@ -793,18 +785,21 @@ See [Settings](#settings) section for details.
 
 ## Installation<a name="installation"></a>
 
-> **Note**
+> \[!NOTE\]
 >
-> Please make sure you meet all preconditions before you proceed:
+> **AA Intel Tool needs at least Alliance Auth v4.0.0!**
 >
-> - AA Intel Tool is a plugin for [Alliance Auth]. If you don't have Alliance Auth running
->   already, please install it first before proceeding. (see the official
->   [Alliance Auth installation guide] for details)
-> - AA Intel Tool needs at least **Alliance Auth v3.6.1**. Please make sure to meet this
->   condition _before_ installing this app, otherwise an update to Alliance Auth will
->   be pulled in unsupervised.
-> - AA Intel Tool needs [Eve Universe] to function. Please make sure it is installed,
->   before continuing.
+> Please make sure to update your Alliance Auth instance _before_ you install this
+> module or update to the latest version, otherwise an update to Alliance Auth will
+> be pulled in unsupervised.
+
+**Important**: Please make sure you meet all preconditions before you proceed:
+
+- AA Intel Tool is a plugin for [Alliance Auth]. If you don't have Alliance Auth running
+  already, please install it first before proceeding. (see the official
+  [Alliance Auth installation guide] for details)
+- AA Intel Tool needs [Eve Universe] to function. Please make sure it is installed,
+  before continuing.
 
 ### Step 1: Install the Package<a name="step-1-install-the-package"></a>
 
@@ -929,14 +924,14 @@ your `local.py`.
 > Enable the chat scan module at your own risk. This module has the potential to
 > generate a huge number of ESI calls, which CCP might not be too happy about.
 
-| Name                              | Description                                                                                                                              | Default |
-| :-------------------------------- | :--------------------------------------------------------------------------------------------------------------------------------------- | :------ |
-| INTELTOOL_ENABLE_MODULE_CHATSCAN  | Enable or disable the chat scan module.                                                                                                  | False   |
-| INTELTOOL_ENABLE_MODULE_DSCAN     | Enable or disable the d-scan module.                                                                                                     | True    |
-| INTELTOOL_ENABLE_MODULE_FLEETCOMP | Enable or disable the fleet composition module.                                                                                          | True    |
-| INTELTOOL_SCAN_RETENTION_TIME     | Set the time in days for how long the scans will be kept in the database. Set to 0 to keep scans indefinitely.                           | 30      |
-| INTELTOOL_CHATSCAN_MAX_PILOTS     | Set the limit of pilots for chat scans, since these can take quite a long time to process. Set to 0 to disable.                          | 500     |
-| INTELTOOL_DSCAN_GRID_SIZE         | Set the grid size for D-Scans. This defines <br/>the size of the grid in km in which ships and structures are considered to be "on grid" | 10000   |
+| Name                              | Description                                                                                                                             | Default |
+| :-------------------------------- | :-------------------------------------------------------------------------------------------------------------------------------------- | :------ |
+| INTELTOOL_ENABLE_MODULE_CHATSCAN  | Enable or disable the chat scan module.                                                                                                 | False   |
+| INTELTOOL_ENABLE_MODULE_DSCAN     | Enable or disable the d-scan module.                                                                                                    | True    |
+| INTELTOOL_ENABLE_MODULE_FLEETCOMP | Enable or disable the fleet composition module.                                                                                         | True    |
+| INTELTOOL_SCAN_RETENTION_TIME     | Set the time in days for how long the scans will be kept in the database. Set to 0 to keep scans indefinitely.                          | 30      |
+| INTELTOOL_CHATSCAN_MAX_PILOTS     | Set the limit of pilots for chat scans, since these can take quite a long time to process. Set to 0 to disable.                         | 500     |
+| INTELTOOL_DSCAN_GRID_SIZE         | Set the grid size for D-Scans.<br/>This defines the size of the grid in km in which ships and structures are considered to be "on grid" | 10000   |
 
 > **Note**
 >
@@ -991,9 +986,9 @@ Please make sure to read the [Contribution Guidelines].\
 [code of conduct]: https://github.com/ppfeufer/aa-intel-tool/blob/master/CODE_OF_CONDUCT.md
 [contribution guidelines]: https://github.com/ppfeufer/aa-intel-tool/blob/master/CONTRIBUTING.md "Contribution Guidelines"
 [eve universe]: https://gitlab.com/ErikKalkoken/django-eveuniverse "Eve Universe"
-[image: chat scan module]: https://raw.githubusercontent.com/ppfeufer/aa-intel-tool/master/docs/images/chat-scan.jpg "Chat Scan Module"
-[image: d-scan module]: https://raw.githubusercontent.com/ppfeufer/aa-intel-tool/master/docs/images/d-scan.jpg "D-Scan Module"
-[image: fleet composition module]: https://raw.githubusercontent.com/ppfeufer/aa-intel-tool/master/docs/images/fleet-composition.jpg "Fleet Composition Module"
+[image: chat scan module]: https://raw.githubusercontent.com/ppfeufer/aa-intel-tool/master/docs/images/representation/chat-scan.jpg "Chat Scan Module"
+[image: d-scan module]: https://raw.githubusercontent.com/ppfeufer/aa-intel-tool/master/docs/images/representation/d-scan.jpg "D-Scan Module"
+[image: fleet composition module]: https://raw.githubusercontent.com/ppfeufer/aa-intel-tool/master/docs/images/representation/fleet-composition.jpg "Fleet Composition Module"
 [ppfeufer on ko-fi]: https://ko-fi.com/ppfeufer "Buy Me a Coffee!"
 [pre-commit.ci status]: https://results.pre-commit.ci/latest/github/ppfeufer/aa-intel-tool/master "pre-commit.ci"
 [support discord]: https://discord.gg/zmh52wnfvM "Alliance Auth Community Apps Support Discord"

{aa_intel_tool-1.2.0 → aa_intel_tool-2.0.0b1}/README.md

@@ -48,15 +48,6 @@ ______________________________________________________________________
 
 ______________________________________________________________________
 
-> **Note**
->
-> This app makes use of a feature introduced with Alliance Auth v3.6.1, meaning,
-> installing this app will pull in Alliance Auth v3.6.1 unsupervised if you haven't
-> updated yet.
->
-> **Please make sure to update Allianceauth to version 3.6.1 or higher before you
-> install this app to avoid any complications.**
-
 ## Overview<a name="overview"></a>
 
 ### Features<a name="features"></a>
@@ -83,18 +74,21 @@ See [Settings](#settings) section for details.
 
 ## Installation<a name="installation"></a>
 
-> **Note**
+> \[!NOTE\]
 >
-> Please make sure you meet all preconditions before you proceed:
+> **AA Intel Tool needs at least Alliance Auth v4.0.0!**
 >
-> - AA Intel Tool is a plugin for [Alliance Auth]. If you don't have Alliance Auth running
->   already, please install it first before proceeding. (see the official
->   [Alliance Auth installation guide] for details)
-> - AA Intel Tool needs at least **Alliance Auth v3.6.1**. Please make sure to meet this
->   condition _before_ installing this app, otherwise an update to Alliance Auth will
->   be pulled in unsupervised.
-> - AA Intel Tool needs [Eve Universe] to function. Please make sure it is installed,
->   before continuing.
+> Please make sure to update your Alliance Auth instance _before_ you install this
+> module or update to the latest version, otherwise an update to Alliance Auth will
+> be pulled in unsupervised.
+
+**Important**: Please make sure you meet all preconditions before you proceed:
+
+- AA Intel Tool is a plugin for [Alliance Auth]. If you don't have Alliance Auth running
+  already, please install it first before proceeding. (see the official
+  [Alliance Auth installation guide] for details)
+- AA Intel Tool needs [Eve Universe] to function. Please make sure it is installed,
+  before continuing.
 
 ### Step 1: Install the Package<a name="step-1-install-the-package"></a>
 
@@ -219,14 +213,14 @@ your `local.py`.
 > Enable the chat scan module at your own risk. This module has the potential to
 > generate a huge number of ESI calls, which CCP might not be too happy about.
 
-| Name                              | Description                                                                                                                              | Default |
-| :-------------------------------- | :--------------------------------------------------------------------------------------------------------------------------------------- | :------ |
-| INTELTOOL_ENABLE_MODULE_CHATSCAN  | Enable or disable the chat scan module.                                                                                                  | False   |
-| INTELTOOL_ENABLE_MODULE_DSCAN     | Enable or disable the d-scan module.                                                                                                     | True    |
-| INTELTOOL_ENABLE_MODULE_FLEETCOMP | Enable or disable the fleet composition module.                                                                                          | True    |
-| INTELTOOL_SCAN_RETENTION_TIME     | Set the time in days for how long the scans will be kept in the database. Set to 0 to keep scans indefinitely.                           | 30      |
-| INTELTOOL_CHATSCAN_MAX_PILOTS     | Set the limit of pilots for chat scans, since these can take quite a long time to process. Set to 0 to disable.                          | 500     |
-| INTELTOOL_DSCAN_GRID_SIZE         | Set the grid size for D-Scans. This defines <br/>the size of the grid in km in which ships and structures are considered to be "on grid" | 10000   |
+| Name                              | Description                                                                                                                             | Default |
+| :-------------------------------- | :-------------------------------------------------------------------------------------------------------------------------------------- | :------ |
+| INTELTOOL_ENABLE_MODULE_CHATSCAN  | Enable or disable the chat scan module.                                                                                                 | False   |
+| INTELTOOL_ENABLE_MODULE_DSCAN     | Enable or disable the d-scan module.                                                                                                    | True    |
+| INTELTOOL_ENABLE_MODULE_FLEETCOMP | Enable or disable the fleet composition module.                                                                                         | True    |
+| INTELTOOL_SCAN_RETENTION_TIME     | Set the time in days for how long the scans will be kept in the database. Set to 0 to keep scans indefinitely.                          | 30      |
+| INTELTOOL_CHATSCAN_MAX_PILOTS     | Set the limit of pilots for chat scans, since these can take quite a long time to process. Set to 0 to disable.                         | 500     |
+| INTELTOOL_DSCAN_GRID_SIZE         | Set the grid size for D-Scans.<br/>This defines the size of the grid in km in which ships and structures are considered to be "on grid" | 10000   |
 
 > **Note**
 >
@@ -281,9 +275,9 @@ Please make sure to read the [Contribution Guidelines].\
 [code of conduct]: https://github.com/ppfeufer/aa-intel-tool/blob/master/CODE_OF_CONDUCT.md
 [contribution guidelines]: https://github.com/ppfeufer/aa-intel-tool/blob/master/CONTRIBUTING.md "Contribution Guidelines"
 [eve universe]: https://gitlab.com/ErikKalkoken/django-eveuniverse "Eve Universe"
-[image: chat scan module]: https://raw.githubusercontent.com/ppfeufer/aa-intel-tool/master/docs/images/chat-scan.jpg "Chat Scan Module"
-[image: d-scan module]: https://raw.githubusercontent.com/ppfeufer/aa-intel-tool/master/docs/images/d-scan.jpg "D-Scan Module"
-[image: fleet composition module]: https://raw.githubusercontent.com/ppfeufer/aa-intel-tool/master/docs/images/fleet-composition.jpg "Fleet Composition Module"
+[image: chat scan module]: https://raw.githubusercontent.com/ppfeufer/aa-intel-tool/master/docs/images/representation/chat-scan.jpg "Chat Scan Module"
+[image: d-scan module]: https://raw.githubusercontent.com/ppfeufer/aa-intel-tool/master/docs/images/representation/d-scan.jpg "D-Scan Module"
+[image: fleet composition module]: https://raw.githubusercontent.com/ppfeufer/aa-intel-tool/master/docs/images/representation/fleet-composition.jpg "Fleet Composition Module"
 [ppfeufer on ko-fi]: https://ko-fi.com/ppfeufer "Buy Me a Coffee!"
 [pre-commit.ci status]: https://results.pre-commit.ci/latest/github/ppfeufer/aa-intel-tool/master "pre-commit.ci"
 [support discord]: https://discord.gg/zmh52wnfvM "Alliance Auth Community Apps Support Discord"

aa_intel_tool-2.0.0b1/aa_intel_tool/__init__.py

@@ -0,0 +1,9 @@
+"""
+App init
+"""
+
+# Django
+from django.utils.translation import gettext_lazy as _
+
+__version__ = "2.0.0-beta.1"
+__title__ = _("Intel Parser")

{aa_intel_tool-1.2.0 → aa_intel_tool-2.0.0b1}/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-1.2.0 → aa_intel_tool-2.0.0b1}/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-1.2.0 → aa_intel_tool-2.0.0b1}/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-1.2.0 → aa_intel_tool-2.0.0b1}/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-1.2.0 → aa_intel_tool-2.0.0b1}/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-1.2.0 → aa_intel_tool-2.0.0b1}/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-1.2.0 → aa_intel_tool-2.0.0b1}/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-1.2.0 → aa_intel_tool-2.0.0b1}/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