aa-intel-tool 0.0.1a14__py3-none-any.whl → 1.0.0__py3-none-any.whl

aa_intel_tool/tests/test_parser_helper_db.py

@@ -0,0 +1,60 @@
+"""
+Tests for the parsers' DB helper => aa_intel_tool/parser/helper/db.py
+"""
+
+# Django
+from django.test import TestCase
+
+# AA Intel Tool
+from aa_intel_tool.models import Scan, ScanData
+from aa_intel_tool.parser.helper.db import safe_scan_to_db
+
+
+class TestParserHelperDb(TestCase):
+    """
+    The tests
+    """
+
+    def test_safe_scan_to_db_without_associated_data(self):
+        """
+        Test that the scan is successfully saved to the DB
+
+        :return:
+        :rtype:
+        """
+
+        new_scan = safe_scan_to_db(scan_type=Scan.Type.DSCAN, parsed_data={})
+
+        from_db = Scan.objects.get(pk=new_scan.hash, scan_type__exact=Scan.Type.DSCAN)
+
+        self.assertEqual(first=new_scan.hash, second=from_db.hash)
+
+    def test_safe_scan_to_db_with_associated_data(self):
+        """
+        Test that the scan is successfully saved to the DB
+
+        :return:
+        :rtype:
+        """
+
+        parsed_data = {
+            "foobar": {
+                "section": ScanData.Section.PILOTLIST,
+                "data": {"name": "William Riker"},
+            }
+        }
+
+        new_scan = safe_scan_to_db(scan_type=Scan.Type.DSCAN, parsed_data=parsed_data)
+
+        scan_from_db = Scan.objects.get(
+            pk=new_scan.hash, scan_type__exact=Scan.Type.DSCAN
+        )
+        scan_data_from_db = ScanData.objects.get(
+            scan_id__exact=scan_from_db.hash,
+            section__exact=ScanData.Section.PILOTLIST,
+        )
+
+        self.assertEqual(first=new_scan.hash, second=scan_from_db.hash)
+        self.assertEqual(
+            first=scan_data_from_db.processed_data, second=parsed_data["foobar"]["data"]
+        )

aa_intel_tool/tests/utils.py

@@ -3,98 +3,11 @@ Helper for our tests
 """
 
 # Standard Library
-import re
 from pathlib import Path
-from typing import List
-
-# Third Party
-from faker import Faker
 
 # Django
-from django.contrib.auth.models import User
 from django.template import Context, Template
 
-# Alliance Auth
-from allianceauth.tests.auth_utils import AuthUtils
-
-fake = Faker()
-
-
-def create_fake_user(  # pylint: disable=too-many-arguments
-    character_id: int,
-    character_name: str,
-    corporation_id: int = None,
-    corporation_name: str = None,
-    corporation_ticker: str = None,
-    permissions: List[str] = None,
-    **kwargs,
-) -> User:
-    """
-    Create a fake user including its main character and (optional) permissions.
-    :param character_id:
-    :param character_name:
-    :param corporation_id:
-    :param corporation_name:
-    :param corporation_ticker:
-    :param permissions:
-    :param kwargs:
-    :return:
-    """
-
-    username = re.sub(pattern=r"[^\w\d@.+-]", repl="_", string=character_name)
-    user = AuthUtils.create_user(username=username)
-
-    if not corporation_id:
-        corporation_id = 2001
-        corporation_name = "Wayne Technologies Inc."
-        corporation_ticker = "WTE"
-
-    alliance_id = kwargs.get("alliance_id", 3001)
-    alliance_name = (
-        kwargs.get("alliance_name", "Wayne Enterprises")
-        if alliance_id is not None
-        else ""
-    )
-
-    AuthUtils.add_main_character_2(
-        user=user,
-        name=character_name,
-        character_id=character_id,
-        corp_id=corporation_id,
-        corp_name=corporation_name,
-        corp_ticker=corporation_ticker,
-        alliance_id=alliance_id,
-        alliance_name=alliance_name,
-    )
-
-    if permissions:
-        perm_objs = [
-            AuthUtils.get_permission_by_name(perm=perm) for perm in permissions
-        ]
-        user = AuthUtils.add_permissions_to_user(perms=perm_objs, user=user)
-
-    return user
-
-
-def get_or_create_fake_user(*args, **kwargs) -> User:
-    """
-    Same as create_fake_user but will not fail when user already exists.
-    """
-
-    if len(args) > 1:
-        character_name = args[1]
-    elif "character_name" in kwargs:
-        character_name = kwargs["character_name"]
-    else:
-        ValueError("character_name is not defined")
-
-    username = character_name.replace("'", "").replace(" ", "_")
-
-    try:
-        return User.objects.get(username=username)
-    except User.DoesNotExist:  # pylint: disable=no-member
-        return create_fake_user(*args, **kwargs)
-
 
 def render_template(string, context=None):
     """

aa_intel_tool/views/general.py

@@ -54,12 +54,12 @@ def index(request: WSGIRequest) -> HttpResponse:
                 messages.error(request=request, message=errormessage)
 
             # Catching every other exception we can't think of (hopefully)
-            # except Exception as exc:  # pylint: disable=broad-exception-caught
-            #     exception_caught = True
-            #     errormessage = (
-            #         _("(System Error) Something unexpected happened.") + f" ({exc})"
-            #     )
-            #     messages.error(request=request, message=errormessage)
+            except Exception as exc:  # pylint: disable=broad-exception-caught
+                exception_caught = True
+                errormessage = (
+                    _("(System Error) Something unexpected happened.") + f" ({exc})"
+                )
+                messages.error(request=request, message=errormessage)
 
             if exception_caught:
                 return redirect(to="aa_intel_tool:intel_tool_index")
@@ -114,6 +114,7 @@ def scan(request: WSGIRequest, scan_hash: str):
         "scan": scan_data,
         "scan_data_section": ScanData.Section,
         "parser_title": SUPPORTED_INTEL_TYPES[intel_scan.scan_type]["name"],
+        "app_settings": AppSettings,
     }
 
     if intel_scan.scan_type in SUPPORTED_INTEL_TYPES:

{aa_intel_tool-0.0.1a14.dist-info → aa_intel_tool-1.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aa-intel-tool
-Version: 0.0.1a14
+Version: 1.0.0
 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
@@ -692,7 +692,7 @@ Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
@@ -733,6 +733,7 @@ ______________________________________________________________________
     - [Screenshots](#screenshots)
       - [Chat Scan](#chat-scan)
       - [D-Scan](#d-scan)
+      - [Fleet Composition](#fleet-composition)
   - [Installation](#installation)
     - [Step 1: Install the Package](#step-1-install-the-package)
     - [Step 2: Configure Alliance Auth](#step-2-configure-alliance-auth)
@@ -746,26 +747,21 @@ ______________________________________________________________________
       - [Nginx](#nginx)
   - [Settings](#settings)
   - [Changelog](#changelog)
+  - [Translation Status](#translation-status)
   - [Contributing](#contributing)
 
 <!-- mdformat-toc end -->
 
 ______________________________________________________________________
 
-> **Warning**
->
-> This app is still in active development and only available as an early alpha
-> version. Do not install this app in your live environment. If you want to test
-> this app, do so in a dedicated test environment. Don't come crying if you wreck
-> your live environment.
->
-> During the alpha phase, it is highly likely that the DB migrations will be reset a
-> couple of times.
+> **Note**
 >
-> Bugs and errors are expected during this time as well, so feel free to report them
-> as early as possible, if you dare to test this app.
+> 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.
 >
-> Thank you!
+> **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>
 
@@ -787,6 +783,10 @@ See [Settings](#settings) section for details.
 
 ![Image: D-Scan Module]
 
+#### Fleet Composition<a name="fleet-composition"></a>
+
+![Image: Fleet Composition Module]
+
 ## Installation<a name="installation"></a>
 
 **Important**: Please make sure you meet all preconditions before you proceed:
@@ -895,8 +895,8 @@ Open your vhost configuration and add the following 2 lines right after the
 `ProxyPreserveHost On` directive:
 
 ```apache
-Timeout      600
 ProxyTimeout 600
+Timeout      600
 ```
 
 Restart your Apache2 service.
@@ -908,8 +908,8 @@ directive:
 
 ```nginx
 proxy_connect_timeout 600;
-proxy_send_timeout    600;
 proxy_read_timeout    600;
+proxy_send_timeout    600;
 send_timeout          600;
 ```
 
@@ -947,6 +947,13 @@ your `local.py`.
 
 See [CHANGELOG.md]
 
+## Translation Status<a name="translation-status"></a>
+
+[![Translation status](https://weblate.ppfeufer.de/widgets/alliance-auth-apps/-/aa-intel-tool/multi-auto.svg)](https://weblate.ppfeufer.de/engage/alliance-auth-apps/)
+
+Do you want to help translate this app into your language or improve the existing
+translation? - [Join our team of translators][weblate engage]!
+
 ## Contributing<a name="contributing"></a>
 
 Do you want to contribute to this project? That's cool!
@@ -959,7 +966,7 @@ Please make sure to read the [Contribution Guidelines]
 [aa intel tool license]: https://github.com/ppfeufer/aa-intel-tool/blob/master/LICENSE
 [aa intel tool on codecov]: https://codecov.io/gh/ppfeufer/aa-intel-tool
 [aa intel tool on pypi]: https://pypi.org/project/aa-intel-tool/
-[alliance auth]: https://gitlab.com/allianceauth/allianceauth
+[alliance auth]: https://gitlab.com/allianceauth/allianceauth "Alliance Auth on GitLab"
 [alliance auth installation guide]: https://allianceauth.readthedocs.io/en/latest/installation/allianceauth.html
 [automated tests on github]: https://github.com/ppfeufer/aa-intel-tool/actions/workflows/automated-checks.yml
 [badge: automated tests]: https://github.com/ppfeufer/aa-intel-tool/actions/workflows/automated-checks.yml/badge.svg "Automated Tests"
@@ -977,10 +984,11 @@ Please make sure to read the [Contribution Guidelines]
 [black code formatter documentation]: http://black.readthedocs.io/en/latest/
 [changelog.md]: https://github.com/ppfeufer/aa-intel-tool/blob/master/CHANGELOG.md
 [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]: 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"
 [ppfeufer on ko-fi]: https://ko-fi.com/ppfeufer "Buy Me a Coffee!"
-[support discord]: https://discord.gg/zmh52wnfvM
-[weblate engage]: https://weblate.ppfeufer.de/engage/alliance-auth-apps/
+[support discord]: https://discord.gg/zmh52wnfvM "Alliance Auth Community Apps Support Discord"
+[weblate engage]: https://weblate.ppfeufer.de/engage/alliance-auth-apps/ "Weblate Translations"

{aa_intel_tool-0.0.1a14.dist-info → aa_intel_tool-1.0.0.dist-info}/RECORD

@@ -6,76 +6,77 @@ aa_intel_tool/auth_hooks.py,sha256=hqLLe3I0nvvth1K1MNfItzp4OUiftwL7RyACDOgaTDI,1
 aa_intel_tool/constants.py,sha256=GkfaU7g4TYBDlMZXIfDKTMOedmiPehWUtX8SrhsMJUw,2862
 aa_intel_tool/exceptions.py,sha256=1uEreioXqnWR8trgU5RSvj7CZ6GdkaWG-wI5G1pfvqs,693
 aa_intel_tool/form.py,sha256=JBYfypS5PjheSCC6Im9DWtDI9tLpEZbW4CrINhrYA3s,503
-aa_intel_tool/models.py,sha256=EqElgzna1gs1XJbTfrWB0dw-mPLIhhIHbpdGry5fFxE,4057
+aa_intel_tool/models.py,sha256=aVIiS1H7bcaEzZA__cZPYCOxETlU4-y-uh_TFNLtlMM,4057
 aa_intel_tool/providers.py,sha256=jIo3ErUfshRhwqALHV5I7toZ9p0PWn3ZRQFof_DXnh4,198
 aa_intel_tool/tasks.py,sha256=lkW1kDJzU8iOINp_tKEL5rG9DM5icvEkyYQUhGrW_hU,1088
 aa_intel_tool/urls.py,sha256=cncBfnPbJErN9w0qM83ZmtlnMJEolDHLQllU8bvxUa0,720
 aa_intel_tool/helper/data_structure.py,sha256=ajH_hDWR5TV22gF0AMIZsu1PcY73OzPdOHx1d_D0GsM,302
 aa_intel_tool/helper/eve_character.py,sha256=EekvX6yw_uzDkLp-3w3hnjmkralxZ0YCiajW-K2-Fcg,5134
-aa_intel_tool/locale/django.pot,sha256=SbLELGVbh8WkBjNfJh-vSb-9kEzqSHFS8McXKgMMPT0,13378
-aa_intel_tool/locale/de/LC_MESSAGES/django.mo,sha256=mfr7FZRODFqwjM4dYGlYkejQvLMmKAgEOxUp6tDk4Ik,8861
-aa_intel_tool/locale/de/LC_MESSAGES/django.po,sha256=h05k5bJnhi8phyB6vgJyxlOwD6v9asDbatQBgrwg8F4,16532
-aa_intel_tool/locale/es/LC_MESSAGES/django.mo,sha256=fn5-xWQW_WcFVctxohD1B41ce4XAo9OqlFFCCLOcZv0,1325
-aa_intel_tool/locale/es/LC_MESSAGES/django.po,sha256=Fpz7eLoT0pBtADpawZ8sHqxKD8T7ODkXsseCckO74VY,14179
-aa_intel_tool/locale/fr_FR/LC_MESSAGES/django.po,sha256=SbLELGVbh8WkBjNfJh-vSb-9kEzqSHFS8McXKgMMPT0,13378
-aa_intel_tool/locale/it_IT/LC_MESSAGES/django.po,sha256=SbLELGVbh8WkBjNfJh-vSb-9kEzqSHFS8McXKgMMPT0,13378
-aa_intel_tool/locale/ja/LC_MESSAGES/django.po,sha256=5hZepIDKhsUMxfilLQSoClDKltwSeJefapTMP9bXutc,13363
-aa_intel_tool/locale/ko_KR/LC_MESSAGES/django.mo,sha256=Au4halkfz7Ats8QTB1-D5x6ncMg_g6JAuIYRH2fUiPo,905
-aa_intel_tool/locale/ko_KR/LC_MESSAGES/django.po,sha256=7wGNr4p-b_BUemfCIXV-WvoW7FzkszmX2B0pfIH0Bq4,13606
-aa_intel_tool/locale/ru/LC_MESSAGES/django.mo,sha256=UmkOjJd4QXfGOqswXFFldVqvzvPTcfTEK3yhrikZiSA,10743
-aa_intel_tool/locale/ru/LC_MESSAGES/django.po,sha256=NAyLwHCRdNBAejI6BqgNNdaWGsRBEJnqAxePCkWlXuc,19399
+aa_intel_tool/locale/django.pot,sha256=YAVPGUKq_I9SxZMhDo1Hcb2nN1BsOBcdTO0j3wpG8ew,13429
+aa_intel_tool/locale/de/LC_MESSAGES/django.mo,sha256=3RquV6wtech_EScmN1xQAEDRAoKgEXLn0aiBc2VMzaM,8875
+aa_intel_tool/locale/de/LC_MESSAGES/django.po,sha256=uQmpGhOXnsIMzmnMaXZWoNmLFf0oY03wMtao1662XuQ,16605
+aa_intel_tool/locale/es/LC_MESSAGES/django.mo,sha256=oKQD1f0efTwms7YcRuTYTyjViRxk7eTxQdyBPVplIdE,1788
+aa_intel_tool/locale/es/LC_MESSAGES/django.po,sha256=6ElYHXcvLYkbw3yewH-4UBX6Jtk91BI-fcgY2G-xhrc,14388
+aa_intel_tool/locale/fr_FR/LC_MESSAGES/django.po,sha256=YAVPGUKq_I9SxZMhDo1Hcb2nN1BsOBcdTO0j3wpG8ew,13429
+aa_intel_tool/locale/it_IT/LC_MESSAGES/django.po,sha256=YAVPGUKq_I9SxZMhDo1Hcb2nN1BsOBcdTO0j3wpG8ew,13429
+aa_intel_tool/locale/ja/LC_MESSAGES/django.po,sha256=p_GhPgv9-JOzjXt83ZkrsSoW2T7UzOiJESCYD2zWX7Q,13414
+aa_intel_tool/locale/ko_KR/LC_MESSAGES/django.mo,sha256=fvjjiLjvwNVLiZkrSZ_wccsrkgMVTwNw9VFvjN30HnE,1058
+aa_intel_tool/locale/ko_KR/LC_MESSAGES/django.po,sha256=LMeA9FF32Od_21P-rU48ejY2W9dQQR8ElEgaieqDhiw,13698
+aa_intel_tool/locale/ru/LC_MESSAGES/django.mo,sha256=0gUd1RVEHaz063iXt2Y5dgQLUo96spcdKj4H8E583lg,11628
+aa_intel_tool/locale/ru/LC_MESSAGES/django.po,sha256=0Yf09wq_Dc5MQWljly6503IqKT9ncCTZQ2_trkxr0Bc,19553
 aa_intel_tool/locale/uk/LC_MESSAGES/django.mo,sha256=EC0IWOvk4lHTg3NHFG0gJqJhcniQlsxfNrAdJPO7NjI,665
-aa_intel_tool/locale/uk/LC_MESSAGES/django.po,sha256=A98c05UT3NnsF6U0pi9CAzAr2lzhoOaFEGn20C9l0i4,13594
-aa_intel_tool/locale/zh_Hans/LC_MESSAGES/django.po,sha256=5hZepIDKhsUMxfilLQSoClDKltwSeJefapTMP9bXutc,13363
+aa_intel_tool/locale/uk/LC_MESSAGES/django.po,sha256=rTvd-trhP8xhA99BPFmlW8w75745Od-KN5XjAhynOXc,13645
+aa_intel_tool/locale/zh_Hans/LC_MESSAGES/django.po,sha256=p_GhPgv9-JOzjXt83ZkrsSoW2T7UzOiJESCYD2zWX7Q,13414
 aa_intel_tool/management/commands/aa_intel_tool_load_eve_types.py,sha256=4o9a32tDfaqyBC_tpiEakIbMbnglDWOV3bOAks0uYC8,1793
-aa_intel_tool/migrations/0001_initial.py,sha256=XPiUlXjkRHqgb-_g91_XAzbKIdGW2FhyeaavXkHMZcg,2019
-aa_intel_tool/migrations/0002_remove_scan_processed_data_scandata.py,sha256=3L5eXOlGcRkXvQuPnEVTW9tOIx2ySjJ8SRNG6oVH_kA,2208
-aa_intel_tool/migrations/0003_alter_scandata_scan.py,sha256=AX_9prazV-ewLB9l6Eekjjc4N2o5hfcM7yQ8QV2yGwQ,718
-aa_intel_tool/migrations/0004_alter_scandata_section.py,sha256=tmOTfA3_gX0mn4C78yGg-Y9nyVYTuQFuoNudBBrdK9w,1150
-aa_intel_tool/migrations/0005_alter_scan_options_alter_scandata_options_and_more.py,sha256=sCHsJPxPjHGkkGK_5oE6_DKkrqzup_PtH52poBKTa0o,3106
-aa_intel_tool/migrations/0006_alter_scandata_unique_together.py,sha256=Gamg7fEG0qsKYpoa8EtlURkQa8x-L47Gr6cWd91Qouw,403
-aa_intel_tool/migrations/0007_alter_scandata_section.py,sha256=Qpa7ka63ZJYrwy4WWAK-c_rOxGpJ3CjvC6RuG5PQ9HU,1369
-aa_intel_tool/migrations/0008_alter_scandata_section.py,sha256=BRo8tYnlWjL97hFIhNGdtW-R2wrTnorqQKqu91TbzhU,1424
-aa_intel_tool/migrations/0009_alter_scan_scan_type.py,sha256=VWC3mw_mZkcfkAExWt2uJo5g8w2VHzw13xS7Wke-erY,756
+aa_intel_tool/migrations/0001_initial.py,sha256=nwtThaFJ7wrOZld0MzQ-MLpHB9xG-SJOZPl8FbM8dFE,4339
 aa_intel_tool/migrations/__init__.py,sha256=DlW5327gBRgSG2GG_T0E1NcpiTFtYs0Vty1fzj4eiPY,34
 aa_intel_tool/parser/__init__.py,sha256=BAFdCEaeC0cmv74ZuZGZJCgJOiliMVBpgdQI63ABJ2U,30
 aa_intel_tool/parser/general.py,sha256=9iqbq7TP5yr9gwkXMj9h3ontdBL0nm0t9qll914RzkI,1952
 aa_intel_tool/parser/helper/db.py,sha256=6tAxvsPo08yEZ29dRIeEbx29zTzOkS3X9FwLRPaH_1k,719
 aa_intel_tool/parser/module/chatlist.py,sha256=zYNA5Xyp0ZaJiJXHvy7u4EaYQMUfU2L5RmGcxw_W6_A,10302
 aa_intel_tool/parser/module/dscan.py,sha256=RWkLSU7HW4yTgYeqyBIVPJUDlbjbx07uC2S07jRXqIs,11726
-aa_intel_tool/parser/module/fleetcomp.py,sha256=DMmBWoQT_gL7dF14gAV6dpZLTsGjgBdlTgstVg1AfP8,5989
+aa_intel_tool/parser/module/fleetcomp.py,sha256=d-aokTxaGJ3AT1khoR0ZpjTGHF59n3wTC594CvOQwas,6160
+aa_intel_tool/scripts/drop_tables.sql,sha256=fJa_scRF95SxCmaMqFGzL4HhUwk5GN5cLexEbS_qwgw,192
 aa_intel_tool/static/aa_intel_tool/css/aa-bootstrap-fix.css,sha256=ksp4pL4qNOpEhcUPN88RLzhdKU-QBZQJnyyPbIv-JQI,324
 aa_intel_tool/static/aa_intel_tool/css/aa-bootstrap-fix.min.css,sha256=STWHOcuZIz2sFU3myexJ_5A-Rb8oyEyopeZhvu-JWCM,177
 aa_intel_tool/static/aa_intel_tool/css/aa-bootstrap-fix.min.css.map,sha256=Q0r5HxDrpkW2JCeM6qnOTRZ6hxRVKpL49UOMuL_yBCc,505
 aa_intel_tool/static/aa_intel_tool/css/aa-intel-tool.css,sha256=agQwIL7Jyph-xSumEwth9l0YsW9os99ssFopE2LfGiA,7431
 aa_intel_tool/static/aa_intel_tool/css/aa-intel-tool.min.css,sha256=ta6cvW6ilB00kXYthry6277b6_nZE1SrHLvmmdUQGhM,5013
 aa_intel_tool/static/aa_intel_tool/css/aa-intel-tool.min.css.map,sha256=ERE_lLDDXEFgNg1vnNDYAdm5n6ItcfGWH3c_dPrkMrA,8996
-aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-chatscan-highlight.js,sha256=pZD9z9RJH62yBm5hh0J8gyUBaoR4wvlnM_m7Ro7aHcw,10571
-aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-chatscan-highlight.min.js,sha256=wyXA0unn5EMlYcJTBSq6nfKkJXXRlWy9AAPIwrf5ekg,6792
-aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-chatscan.js,sha256=Vqk0K0avsQ0GFGvdaBotpwY41qJ12bKlpXrtpl7EWwk,12007
-aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-chatscan.min.js,sha256=go8HtSWyRWArdb1NkKF3Guqy7N9Ni7kKh93cvPK1SkU,5022
-aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-dscan-highlight.js,sha256=RH2Qox2fTZnGwDHdYO0i6dv5vNw-y2g8LnHytbxNAgE,4775
-aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-dscan-highlight.min.js,sha256=Zq3ifYca125vGHfzOwErEdoW1b9fVUWHmRyMQsDlCa8,2606
+aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-chatscan-highlight.js,sha256=d06l_yj279XWm0CL5kMINXjnTD9-gYllpgNxF2U3TGI,10617
+aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-chatscan-highlight.min.js,sha256=nK_kMvIErM_dkHsfNAgnafNW7WG3ts_x-N9tMq2n_Ng,6838
+aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-chatscan-highlight.min.js.map,sha256=ACLqo5gy7w8GcA8CfbjwGWA5gmixog_U1hzXHbrDAnI,4579
+aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-chatscan.js,sha256=F3q2wSnLlm_7xMzdMyHFwr40VamCs5WluDGDhYOpBdU,12010
+aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-chatscan.min.js,sha256=k5Q-oFB7zf6ezhGpyUEdtVqlV_QIJmKNkvy4tIb10r8,5077
+aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-chatscan.min.js.map,sha256=VkLMuubUAalKS8j0DkdgZEkSMc2dlV1QLQAWjg4Cgpc,4924
+aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-dscan-highlight.js,sha256=FwXEx96mpUGwuEeD4miffiMMn4o1FMDltbZlkZxuZbE,4831
+aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-dscan-highlight.min.js,sha256=s3AnvMqonG1Qoi5CsWJ3O0UZ2CURgnq6ZUHcgmRT9J0,2646
+aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-dscan-highlight.min.js.map,sha256=AehPymvbp4r--qDqbGvF9F5iZygDRUzMiK2tdl3nT8E,1960
 aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-dscan.js,sha256=WjVuiheUY1kxAhW_nieUF5zEEvRR0fttpRAXXQKFmn4,20846
-aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-dscan.min.js,sha256=tF_7q_c83OLWZWn_hXJJzJkZbaJ7uGb3E9boOGv1-Kk,9025
-aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-fleetcomposition-highlight.js,sha256=lq9O0px4dGD_pdGxvdmb-EZTagpfAxPhf1HSFXKBPYs,5248
-aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-fleetcomposition-highlight.min.js,sha256=uR7npqpKy9S0eIEinG-bF4MTi4Ld173ejQEdxInvnwo,3028
-aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-fleetcomposition.js,sha256=e20vgVIsNTwx9851b00euG2CRzR4Jv7ZNn_xqfmsgJw,8513
-aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-fleetcomposition.min.js,sha256=5B9zHeJ3VNXMS0ow9-LV0MA1NCkWvqarXE3a6rp0xgI,3151
+aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-dscan.min.js,sha256=waNPa-ShSFemR5bYh1fDx9AWkFtZsLoZn2Fz_Ox0KLY,9077
+aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-dscan.min.js.map,sha256=SHNSZjIc4dpeIyqIw6RpcKPOqt2OlGMWwR7PM7H_yzg,8671
+aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-fleetcomposition-highlight.js,sha256=y0wpHktJDLpXbf5c928duvGsRqL2YxwKyrlYD3RQpfI,5304
+aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-fleetcomposition-highlight.min.js,sha256=JLdPfgOFPOULLKNj0eWgLX3akMMBPvHWEnFUY4QCPlk,3079
+aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-fleetcomposition-highlight.min.js.map,sha256=glXptUuI07kYTDmlSsZ-IWH5d393RIzz_neyAkBxryE,2221
+aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-fleetcomposition.js,sha256=6WVXVhH-sAt6aM_OsJHgkhn9tHqSVlU90PIfSw_Yuo0,8833
+aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-fleetcomposition.min.js,sha256=RS36zcJHlObArouXxIXm4v-CfGyIKwltZYYvimg8BY8,3397
+aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-fleetcomposition.min.js.map,sha256=9Yvbi_dApuNfPEIcURYtWSLtgRqzwRWzW1-Q-oJB0ps,3495
 aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-scan-result-common.js,sha256=p6fsh6DTUw5A5N-QCkMyEQzThcxGYWrKZs9zRn_M9Jw,11087
-aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-scan-result-common.min.js,sha256=FR-1J2ZmUDQ-v3iEEYFVgnrtFp7wuT2hCpx2j66E7-E,6813
+aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-scan-result-common.min.js,sha256=o1runWn070Hs7GPAMIRQAE0brfhSNQItT1I8PqfNsWw,6878
+aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool-scan-result-common.min.js.map,sha256=7XR3bhlKe9LtKTFIMz_NHzEtT73d8srETIYWdlIOGiA,3954
 aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool.js,sha256=Vh7jzhGaMPBosEOtS2Lb15_ULo4dKmXrYkxgdO7xYQo,533
-aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool.min.js,sha256=ACIKnfS8kKekQGw2UfRkvB-gHP9rcSttXm_woPRqnXI,230
+aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool.min.js,sha256=aicPt6exOImVYR-SxIZ7k7pWEWMsiAjAv5Ea3HTJO2o,276
+aa_intel_tool/static/aa_intel_tool/javascript/aa-intel-tool.min.js.map,sha256=i1DO-s4pzmAbcUzkJZOLPQw8Nnj_2w-BQKdHX4jsy88,416
 aa_intel_tool/templates/aa_intel_tool/base.html,sha256=-y8UMLDLafZsQBRsJ4CMLu6zjB5tDoj__z_NdBN0sfc,597
 aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-chatscan-js.html,sha256=ZDHabY5APpH4PCrpZXJXUcjfDH-4WQjxBYrfHUd20Cw,383
 aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-css.html,sha256=m38U-_h4IGFp3K-P6i5tonFUXLB1KznYgooLnuwqHEQ,242
 aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-dscan-js.html,sha256=2kx0ahukBHefYttxf1zSkxQ7yRbBq0Omk9w6pMWK2S4,377
-aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-fleetcomp-js.html,sha256=lXX3TN0Iva5-JoptriCTKyfhQLkQi01SVRAl8j22nrs,625
-aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html,sha256=b-vabaUfsfCOzboExZWlmiAWQSKFjfJ39Py70w_lO3g,2184
+aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-fleetcomp-js.html,sha256=ZOM4y_6B5RkIMnDUkUEVOx8B6TDADEBJUAlz_Lrq4eQ,701
+aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js-l10n.html,sha256=h4TjGWlPoWr39nXnk_Zosvp84N5S1W3CaWa0SBn7S8s,2184
 aa_intel_tool/templates/aa_intel_tool/bundles/aa-intel-tool-js.html,sha256=-L74j26jxDFpvwowpHcPK4vLbhCEHf8EaRQ83sAlH_Y,138
 aa_intel_tool/templates/aa_intel_tool/partials/body/scan-retention-note.html,sha256=tucB11JHa3PbxEax90fGEVgnQRNznl7wWrsc-ZGxd6Q,382
 aa_intel_tool/templates/aa_intel_tool/partials/footer/app-translation-footer.html,sha256=Vaj9QK500wXZbw8X1Lc3NWL9WsO3Nz9YM8eujP-UR40,408
-aa_intel_tool/templates/aa_intel_tool/partials/index/form.html,sha256=qsETPpPH76ONlVgm0psC1WEoQgPhtZ221M8knujdDeU,2903
+aa_intel_tool/templates/aa_intel_tool/partials/index/form.html,sha256=fj_e59C_hkGpWUqAvLK39rJ6s8Apu7IydgywEZBP6_A,3103
 aa_intel_tool/templates/aa_intel_tool/partials/scan/buttons.html,sha256=bXoEDFCzdGsHsnlWP6n39RESBqxl2DqH0UsR5gYXbG8,740
 aa_intel_tool/templates/aa_intel_tool/partials/scan/evetime.html,sha256=V5Aeq9lCKkuNxVIldecNBxbgdhiXvCQAbrK3y_MqaS4,165
 aa_intel_tool/templates/aa_intel_tool/partials/scan/chatlist/alliances.html,sha256=mq5uNDDs2XfH4alnAOSILGQzk8C2Sis5wbJAGEVLxcc,1522
@@ -93,18 +94,20 @@ aa_intel_tool/templates/aa_intel_tool/partials/scan/fleetcomp/fleet-details/pilo
 aa_intel_tool/templates/aa_intel_tool/views/index.html,sha256=Ehvg0JikXH19U53N6atNjiyr2GNt2zE6BhsWB-4r2ZQ,847
 aa_intel_tool/templates/aa_intel_tool/views/scan/chatlist.html,sha256=JnS24Xv0JMw2R_oImpgLq7jFNjz7Sgo_uaryZXJe780,1689
 aa_intel_tool/templates/aa_intel_tool/views/scan/dscan.html,sha256=0_jzzSQum3Gl0OwbW8NC58Oyr0TL77UFnrbUk7XpbGM,2166
-aa_intel_tool/templates/aa_intel_tool/views/scan/fleetcomp.html,sha256=F_ssndSD6I7--jivHSoMV661yaaZ7Q4DYbOhI7LD2fQ,1919
+aa_intel_tool/templates/aa_intel_tool/views/scan/fleetcomp.html,sha256=mZbVNAps2UR8SCrlh_F11sggmzKBXazRM6MP5Vti0hw,1999
 aa_intel_tool/templatetags/__init__.py,sha256=sP2D1ovt2gGAPLcGQkByRgXYhvUJ6C52mZMlLIALQ8s,37
 aa_intel_tool/templatetags/inteltool_versioned_static.py,sha256=Jed97jkX8PBQI8KXUjOKLEqR9v29ApwC65ndOFRiZ4w,520
 aa_intel_tool/tests/__init__.py,sha256=NLuMBNDHYOXDmPgpyG-g_kDaATVQWv1iC-dJ8BA1kZc,29
-aa_intel_tool/tests/test_access.py,sha256=POds0aRXXB4xO6MPMWFV14tna9Zojhqo8F4zPT8tZ44,2217
+aa_intel_tool/tests/test_access.py,sha256=35OrWM21paWdCd43b3jBtmeIjM-sQLDGd2116n0SwFU,2225
+aa_intel_tool/tests/test_admin.py,sha256=yw97GjqqzNNFfJiSJ1MkBeuQfTGvF0JAmvhvRycqMKg,2072
 aa_intel_tool/tests/test_app_settings.py,sha256=xcmNfyjJco3ED-csBkYSgrzeEr3Y5KzZo8ZY3BvtvXw,2567
-aa_intel_tool/tests/test_auth_hooks.py,sha256=SoT3V6KXkSOnkjl8bZhHTDIXe2A7dc5eaTf_pBrOGXs,2132
-aa_intel_tool/tests/test_helper_data_structures.py,sha256=oz4Xcx_avKvFx5ZYjqijjFg5fF4u5qxTaiWPGkLeXmA,723
+aa_intel_tool/tests/test_auth_hooks.py,sha256=Ej4C82aNcGr_9Tbsh6XnlidqCGrqBQFbydPFFdxVEV0,2140
+aa_intel_tool/tests/test_helper_data_structures.py,sha256=1zRuh54-6YtDt7M1w7JpBRHlvS2rgBdnzvWLXV9Kl3s,765
 aa_intel_tool/tests/test_models.py,sha256=rtwWDO251OoU6mHo-6u0LS0X7qb7uHtDIPoY3iEvhS0,817
-aa_intel_tool/tests/test_parser.py,sha256=01Ngo-Ff5KBtZz_fYTvGuVDzzG1GbxfISHneEBEACSc,3937
+aa_intel_tool/tests/test_parser.py,sha256=nz0TNJrO_22xgd8EO7ElY7GX6dB2kZVhHY8L7OSTCX4,3896
+aa_intel_tool/tests/test_parser_helper_db.py,sha256=f8qqPKUxG39X77iEICh_P1UmXDbHPnJc_tXe3FuxGYs,1642
 aa_intel_tool/tests/test_templatetags.py,sha256=y3ZXs5yi0mLVdqvrCjEtxsAhYMh4M3kwu1BwyKzIOVQ,905
-aa_intel_tool/tests/utils.py,sha256=tGkKJAbUVS2T9_xBN_0W6JHqKDs6iifjUZdUP-expIU,3474
+aa_intel_tool/tests/utils.py,sha256=ueoey-p4S-flykSzbq5ZlCPewHBq2op2mNbAZz-Frtk,1128
 aa_intel_tool/tests/test-data/chatscan-faulty.txt,sha256=E1kv5BaZGagLP9VTaac8sVt0PMUMNpyMMqkx3dCZ8cg,40
 aa_intel_tool/tests/test-data/chatscan.txt,sha256=QkZER0l6-iw7uwTiDIpp2PUQ4NecaHWX83rZSrLp_LI,40
 aa_intel_tool/tests/test-data/dscan-german-client.txt,sha256=GKMfjZUYWW7ZSwhcAeElBv6Au53cHY_PlPJAvCpN1Aw,9082
@@ -113,8 +116,8 @@ aa_intel_tool/tests/test-data/dscan.txt,sha256=fYf1MIY_nh2npAt2BzUjGz9XYP7LQnrxr
 aa_intel_tool/tests/test-data/fleetcomp.txt,sha256=BYqCJznI3e6jlHTQwmr08wZr2D_anUdR-9yfu2-RJcI,234
 aa_intel_tool/views/__init__.py,sha256=zf5e30BdJ772oDJkQnBfFIi5a7-HEJByUIkv0iz3Kr8,29
 aa_intel_tool/views/ajax.py,sha256=7xBsd0Eg6enDl7JeI9vNJXaF66lWjhStLfYdJGAobvM,911
-aa_intel_tool/views/general.py,sha256=FSQ0KVqK4WeW20tXH2mPobwOE9b1hm4lXk-LCSzty5M,3998
-aa_intel_tool-0.0.1a14.dist-info/METADATA,sha256=1IXfzB-iVhToLJEdi4NHgSVmInJCTuIjmcuCbDDSRFc,54362
-aa_intel_tool-0.0.1a14.dist-info/WHEEL,sha256=9QBuHhg6FNW7lppboF2vKVbCGTVzsFykgRQjjlajrhA,87
-aa_intel_tool-0.0.1a14.dist-info/licenses/LICENSE,sha256=UTib95uJWe2NQIG3TzU8-Hm-eaEZFqv9fqsjNT_xKWU,35151
-aa_intel_tool-0.0.1a14.dist-info/RECORD,,
+aa_intel_tool/views/general.py,sha256=7VbM9r-UOiMCOAURJ4JXw1tL3sIHT6FhSYXZAYFjjQE,4023
+aa_intel_tool-1.0.0.dist-info/METADATA,sha256=EzEcJIJUWIWfipUwp4SA9BVPkm9-ackctDut80XGUmE,54986
+aa_intel_tool-1.0.0.dist-info/WHEEL,sha256=9QBuHhg6FNW7lppboF2vKVbCGTVzsFykgRQjjlajrhA,87
+aa_intel_tool-1.0.0.dist-info/licenses/LICENSE,sha256=UTib95uJWe2NQIG3TzU8-Hm-eaEZFqv9fqsjNT_xKWU,35151
+aa_intel_tool-1.0.0.dist-info/RECORD,,

aa_intel_tool/migrations/0002_remove_scan_processed_data_scandata.py

@@ -1,69 +0,0 @@
-# Generated by Django 4.0.10 on 2023-08-06 09:03
-
-# Django
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("aa_intel_tool", "0001_initial"),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name="scan",
-            name="processed_data",
-        ),
-        migrations.CreateModel(
-            name="ScanData",
-            fields=[
-                (
-                    "id",
-                    models.AutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                (
-                    "section",
-                    models.CharField(
-                        choices=[
-                            ("invalid", "Invalid scan data"),
-                            ("pilotlist", "Pilot list"),
-                            ("corporationlist", "Corporation list"),
-                            ("alliancelist", "Alliance list"),
-                        ],
-                        default="invalid",
-                        max_length=15,
-                        verbose_name="The scan section",
-                    ),
-                ),
-                (
-                    "processed_data",
-                    models.JSONField(
-                        default=dict, verbose_name="The processed scan section data"
-                    ),
-                ),
-                (
-                    "scan",
-                    models.ForeignKey(
-                        blank=True,
-                        default=None,
-                        null=True,
-                        on_delete=django.db.models.deletion.SET_NULL,
-                        related_name="scan_data",
-                        to="aa_intel_tool.scan",
-                        verbose_name="Scan",
-                    ),
-                ),
-            ],
-            options={
-                "verbose_name": "scan data",
-                "verbose_name_plural": "scan data",
-                "default_permissions": (),
-            },
-        ),
-    ]

aa_intel_tool/migrations/0003_alter_scandata_scan.py

@@ -1,27 +0,0 @@
-# Generated by Django 4.0.10 on 2023-08-06 09:21
-
-# Django
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("aa_intel_tool", "0002_remove_scan_processed_data_scandata"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="scandata",
-            name="scan",
-            field=models.ForeignKey(
-                blank=True,
-                default=None,
-                null=True,
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="scan_data",
-                to="aa_intel_tool.scan",
-                verbose_name="Scan",
-            ),
-        ),
-    ]

aa_intel_tool/migrations/0004_alter_scandata_section.py

@@ -1,34 +0,0 @@
-# Generated by Django 4.0.10 on 2023-08-09 07:37
-
-# Django
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-    dependencies = [
-        ("aa_intel_tool", "0003_alter_scandata_scan"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="scandata",
-            name="section",
-            field=models.CharField(
-                choices=[
-                    ("invalid", "Invalid scan data"),
-                    ("pilotlist", "Pilot list"),
-                    ("corporationlist", "Corporation list"),
-                    ("alliancelist", "Alliance list"),
-                    ("shiptypes", "Ship types"),
-                    ("shiplist", "Ship list"),
-                    ("shiplist_on_grid", "Ship list (on grid)"),
-                    ("shiplist_off_grid", "Ship list (off grid)"),
-                    ("structures_on_grid", "Structures (on grid)"),
-                    ("deployables_on_grid", "Deployables (on grid)"),
-                ],
-                default="invalid",
-                max_length=19,
-                verbose_name="The scan section",
-            ),
-        ),
-    ]