aa-intel-tool 0.0.1a8__tar.gz → 0.0.1a10__tar.gz

{aa_intel_tool-0.0.1a8 → aa_intel_tool-0.0.1a10}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: aa-intel-tool
-Version: 0.0.1a8
+Version: 0.0.1a10
 Summary: A simple parser for D-Scans and more for Alliance Auth
-Project-URL: Homepage, https://github.com/ppfeufer/aa-intel-tool
+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
+Project-URL: Homepage, https://github.com/ppfeufer/aa-intel-tool
 Project-URL: Source, https://github.com/ppfeufer/aa-intel-tool.git
-Project-URL: Changelog, https://github.com/ppfeufer/aa-intel-tool/blob/master/CHANGELOG.md
 Project-URL: Tracker, https://github.com/ppfeufer/aa-intel-tool/issues
 Author-email: Peter Pfeufer <develop@ppfeufer.de>
 License-Expression: GPL-3.0
@@ -28,7 +28,7 @@ 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: django-eveuniverse>=1.3.0
+Requires-Dist: django-eveuniverse>=1.3
 Description-Content-Type: text/markdown
 
 # AA Intel Tool
@@ -254,13 +254,15 @@ Restart your Nginx service.
 To customize the app, the following settings are available and can be made in
 your `local.py`.
 
-| 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     | Sets 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     | Sets the limit of pilots for chat scans, since these can take quite a long time to process. Set to 0 to disable. | 500     |
+| 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   |
+
 
 > **Note**
 >

{aa_intel_tool-0.0.1a8 → aa_intel_tool-0.0.1a10}/README.md

@@ -221,13 +221,15 @@ Restart your Nginx service.
 To customize the app, the following settings are available and can be made in
 your `local.py`.
 
-| 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     | Sets 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     | Sets the limit of pilots for chat scans, since these can take quite a long time to process. Set to 0 to disable. | 500     |
+| 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   |
+
 
 > **Note**
 >

{aa_intel_tool-0.0.1a8 → aa_intel_tool-0.0.1a10}/aa_intel_tool/app_settings.py

@@ -50,3 +50,10 @@ class AppSettings:  # pylint: disable=too-few-public-methods
     INTELTOOL_CHATSCAN_MAX_PILOTS = clean_setting(
         name="INTELTOOL_CHATSCAN_MAX_PILOTS", default_value=500, required_type=int
     )
+
+    # Set the grid size for D-Scans.
+    # This defines the size of teh grid in which ships and
+    # structure are considered to be "on grid"
+    INTELTOOL_DSCAN_GRID_SIZE = clean_setting(
+        name="INTELTOOL_DSCAN_GRID_SIZE", default_value=10000, required_type=int
+    )

aa_intel_tool-0.0.1a10/aa_intel_tool/constants.py

@@ -0,0 +1,79 @@
+"""
+App constants
+"""
+
+# Standard Library
+import re
+
+# Django
+from django.utils.text import slugify
+from django.utils.translation import gettext_lazy as _
+
+# AA Intel Tool
+# import aa_intel_tool.parser.module.chatlist
+import aa_intel_tool.parser.module.dscan
+import aa_intel_tool.parser.module.fleetcomp
+from aa_intel_tool import __version__
+
+# All internal URLs need to start with this prefix
+INTERNAL_URL_PREFIX = "-"
+
+
+# Localised units
+distance_units_on_grid: str = """
+    km|m    # Latin (English, German and so on)
+    |км|м   # Russian
+"""
+distance_units_off_grid: str = """
+    AU|     # English
+    AE|     # German
+    а.е.    # Russian
+"""
+
+distance_units = f"{distance_units_on_grid}|{distance_units_off_grid}"
+
+
+# Pre-compiled regex patterns used throughout the app
+REGEX_PATTERN = {
+    # "chatlist": re.compile(pattern=r"(?im)^[a-zA-Z0-9\u0080-\uFFFF -_]{3,37}$"),
+    "dscan": re.compile(
+        pattern=rf"(?im)^(\d+)[\t](.*)[\t](.*)[\t](-|(.*) ({distance_units}))$",
+        flags=re.VERBOSE,
+    ),
+    "fleetcomp": re.compile(
+        pattern=r"(?im)^([a-zA-Z0-9 -_]{3,37})[\t](.*)[\t](.*)[\t](.*)[\t](.*)[\t]([0-5] - [0-5] - [0-5])([\t](.*))?$"  # pylint: disable=line-too-long
+    ),
+    "localised_on_grid": re.compile(
+        pattern=rf"{distance_units_on_grid}", flags=re.VERBOSE
+    ),
+    "localised_off_grid": re.compile(
+        pattern=rf"{distance_units_off_grid}", flags=re.VERBOSE
+    ),
+}
+
+
+# Supported intel types and their parameters
+SUPPORTED_INTEL_TYPES = {
+    # "chatlist": {
+    #     "name": _("Chat List"),
+    #     "parser": aa_intel_tool.parser.module.chatlist.parse,
+    #     "pattern": REGEX_PATTERN["chatlist"],
+    # },
+    "dscan": {
+        "name": _("D-Scan"),
+        "parser": aa_intel_tool.parser.module.dscan.parse,
+        "pattern": REGEX_PATTERN["dscan"],
+    },
+    "fleetcomp": {
+        "name": _("Fleet Composition"),
+        "parser": aa_intel_tool.parser.module.fleetcomp.parse,
+        "pattern": REGEX_PATTERN["fleetcomp"],
+    },
+}
+
+
+# Building our user agent for ESI calls
+VERBOSE_NAME = "AA Intel Tool"
+verbose_name_slugified: str = slugify(VERBOSE_NAME, allow_unicode=True)
+github_url: str = "https://github.com/ppfeufer/aa-intel-tool"
+USER_AGENT = f"{verbose_name_slugified} v{__version__} {github_url}"

aa_intel_tool-0.0.1a10/aa_intel_tool/helper/data_structure.py

@@ -0,0 +1,22 @@
+"""
+Helper for different data structures
+"""
+
+
+def dict_to_list(input_dict: dict) -> list:
+    """
+    Cleaning up and sorting a dict and transform it into a list
+
+    :param input_dict:
+    :type input_dict:
+    :return:
+    :rtype:
+    """
+
+    return [
+        data
+        for (
+            not_used,  # pylint: disable=unused-variable
+            data,
+        ) in sorted(input_dict.items())
+    ]

{aa_intel_tool-0.0.1a8 → aa_intel_tool-0.0.1a10}/aa_intel_tool/locale/es/LC_MESSAGES/django.po

@@ -1,49 +1,49 @@
 # 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.
-#
-#, fuzzy
+# Zigor Fernandez Moreno <sietehierros@gmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-08-10 20:47+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"
+"PO-Revision-Date: 2023-08-15 13:30+0000\n"
+"Last-Translator: Zigor Fernandez Moreno <sietehierros@gmail.com>\n"
+"Language-Team: Spanish <https://weblate.ppfeufer.de/projects/"
+"alliance-auth-apps/aa-intel-tool/es/>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Weblate 4.18.2\n"
 
 #. Translators: This is the app name and version, which will appear in the Django Backend
 #: apps.py:21
 #, python-brace-format
 msgid "Intel Tool v{__version__}"
-msgstr ""
+msgstr "Herramienta de Intel v{__version__}"
 
 #: form.py:20
 msgid "Paste here …"
-msgstr ""
+msgstr "Pegar aquí…"
 
 #: models.py:21 models.py:110
 msgid "Invalid scan data"
-msgstr ""
+msgstr "Datos de escaneo no válidos"
 
 #: models.py:22 templates/aa_intel_tool/partials/index/form.html:15
 #: templates/aa_intel_tool/views/scan/dscan.html:12
 msgid "D-Scan"
-msgstr ""
+msgstr "D-Scan"
 
 #: models.py:23 templates/aa_intel_tool/partials/index/form.html:31
 msgid "Fleet Composition"
-msgstr ""
+msgstr "Composición de la Flota"
 
 #: models.py:24
 msgid "Chat List"
-msgstr ""
+msgstr "Lista de Chat"
 
 #: models.py:31
 msgid "The hash of the scan."
@@ -277,10 +277,12 @@ msgid ""
 "Do you want to help translate this app into your language or improve the "
 "existing translation?"
 msgstr ""
+"¿Quieres ayudar a traducir esta aplicación a tu idioma o mejorar la "
+"traducción existente?"
 
 #: templates/aa_intel_tool/partials/footer/app-translation-footer.html:8
 msgid "Join our team of translators!"
-msgstr ""
+msgstr "¡Únete a nuestro equipo de traductores!"
 
 #: templates/aa_intel_tool/partials/index/form.html:10
 msgid "What can I paste?"
@@ -299,7 +301,7 @@ msgstr[1] ""
 
 #: templates/aa_intel_tool/partials/index/form.html:46
 msgid "Submit"
-msgstr ""
+msgstr "Enviar"
 
 #: templates/aa_intel_tool/partials/index/form.html:52
 msgid "Working on it, please be patient …"
@@ -355,7 +357,7 @@ msgstr ""
 
 #: templates/aa_intel_tool/partials/scan/chatlist/pilots.html:18
 msgid "Name"
-msgstr ""
+msgstr "Nombre"
 
 #: templates/aa_intel_tool/partials/scan/chatlist/pilots.html:19
 msgid "Alliance"

{aa_intel_tool-0.0.1a8 → aa_intel_tool-0.0.1a10}/aa_intel_tool/locale/ru/LC_MESSAGES/django.po

@@ -1,24 +1,24 @@
 # 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.
-#
-#, fuzzy
+# Nikolay <nick.postnikov@gmail.com>, 2023.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2023-08-10 20:47+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"
+"PO-Revision-Date: 2023-08-13 20:40+0000\n"
+"Last-Translator: Nikolay <nick.postnikov@gmail.com>\n"
+"Language-Team: Russian <https://weblate.ppfeufer.de/projects/"
+"alliance-auth-apps/aa-intel-tool/ru/>\n"
+"Language: ru\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%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || "
-"(n%100>=11 && n%100<=14)? 2 : 3);\n"
+"n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || ("
+"n%100>=11 && n%100<=14)? 2 : 3);\n"
+"X-Generator: Weblate 4.18.2\n"
 
 #. Translators: This is the app name and version, which will appear in the Django Backend
 #: apps.py:21
@@ -41,7 +41,7 @@ msgstr ""
 
 #: models.py:23 templates/aa_intel_tool/partials/index/form.html:31
 msgid "Fleet Composition"
-msgstr ""
+msgstr "Состав флота"
 
 #: models.py:24
 msgid "Chat List"
@@ -241,23 +241,23 @@ msgstr ""
 
 #: templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:31
 msgid "Search …"
-msgstr ""
+msgstr "Поиск…"
 
 #: templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:33
 msgid "First"
-msgstr ""
+msgstr "Первый"
 
 #: templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:34
 msgid "Last"
-msgstr ""
+msgstr "Последний"
 
 #: templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:35
 msgid "Next"
-msgstr ""
+msgstr "Следующий"
 
 #: templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:36
 msgid "Previous"
-msgstr ""
+msgstr "Предыдущий"
 
 #: templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html:39
 msgid ": activate to sort column ascending"
@@ -279,10 +279,12 @@ msgid ""
 "Do you want to help translate this app into your language or improve the "
 "existing translation?"
 msgstr ""
+"Вы хотите помочь перевести это приложение на ваш язык или улучшить текущий "
+"перевод?"
 
 #: templates/aa_intel_tool/partials/footer/app-translation-footer.html:8
 msgid "Join our team of translators!"
-msgstr ""
+msgstr "Присоединяйтесь к нашей команде переводчиков!"
 
 #: templates/aa_intel_tool/partials/index/form.html:10
 msgid "What can I paste?"
@@ -301,7 +303,7 @@ msgstr[1] ""
 
 #: templates/aa_intel_tool/partials/index/form.html:46
 msgid "Submit"
-msgstr ""
+msgstr "Отправить"
 
 #: templates/aa_intel_tool/partials/index/form.html:52
 msgid "Working on it, please be patient …"
@@ -357,7 +359,7 @@ msgstr ""
 
 #: templates/aa_intel_tool/partials/scan/chatlist/pilots.html:18
 msgid "Name"
-msgstr ""
+msgstr "Название"
 
 #: templates/aa_intel_tool/partials/scan/chatlist/pilots.html:19
 msgid "Alliance"
@@ -365,7 +367,7 @@ msgstr ""
 
 #: templates/aa_intel_tool/partials/scan/chatlist/pilots.html:20
 msgid "Corporation"
-msgstr ""
+msgstr "Корпорация"
 
 #: templates/aa_intel_tool/partials/scan/dscan/ship-classes.html:16
 msgid "Ship Class"
@@ -377,7 +379,7 @@ msgstr ""
 
 #: templates/aa_intel_tool/partials/scan/dscan/ship-types.html:16
 msgid "Ship Type"
-msgstr ""
+msgstr "Тип корабля"
 
 #: templates/aa_intel_tool/partials/scan/evetime.html:5
 msgid "Scan taken at (Eve Time)"

aa_intel_tool-0.0.1a10/aa_intel_tool/migrations/0006_alter_scandata_unique_together.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.0.10 on 2023-08-22 18:41
+
+# Django
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("aa_intel_tool", "0005_alter_scan_options_alter_scandata_options_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name="scandata",
+            unique_together={("scan", "section")},
+        ),
+    ]

{aa_intel_tool-0.0.1a8 → aa_intel_tool-0.0.1a10}/aa_intel_tool/models.py

@@ -147,3 +147,5 @@ class ScanData(models.Model):
         default_permissions = ()
         verbose_name = _("Scan data")
         verbose_name_plural = _("Scan data")
+
+        unique_together = ("scan", "section")

{aa_intel_tool-0.0.1a8 → aa_intel_tool-0.0.1a10}/aa_intel_tool/parser/module/chatlist.py

@@ -23,6 +23,7 @@ from eveuniverse.models import EveEntity
 from aa_intel_tool import __title__
 from aa_intel_tool.app_settings import AppSettings
 from aa_intel_tool.exceptions import ParserError
+from aa_intel_tool.helper.data_structure import dict_to_list
 from aa_intel_tool.helper.eve_character import get_or_create_character
 from aa_intel_tool.models import Scan, ScanData
 from aa_intel_tool.parser.helper.db import safe_scan_to_db
@@ -139,25 +140,6 @@ def _parse_character_info(eve_character: EveCharacter) -> dict:
     }
 
 
-def _cleanup_entity_data(entity_info: dict) -> list:
-    """
-    Cleaning up and sorting the parsed entity data
-
-    :param entity_info:
-    :type entity_info:
-    :return:
-    :rtype:
-    """
-
-    return [
-        data
-        for (
-            not_used,  # pylint: disable=unused-variable
-            data,
-        ) in sorted(entity_info.items())
-    ]
-
-
 def _parse_chatscan_data(eve_characters: QuerySet[EveCharacter]) -> dict:
     """
     Parse the chat scan data and return character information,
@@ -215,9 +197,9 @@ def _parse_chatscan_data(eve_characters: QuerySet[EveCharacter]) -> dict:
         ]
 
     return {
-        "pilots": _cleanup_entity_data(entity_info=character_info),
-        "corporations": _cleanup_entity_data(entity_info=corporation_info),
-        "alliances": _cleanup_entity_data(entity_info=alliance_info),
+        "pilots": dict_to_list(input_dict=character_info),
+        "corporations": dict_to_list(input_dict=corporation_info),
+        "alliances": dict_to_list(input_dict=alliance_info),
     }