aa-sov-timer 2.6.2__tar.gz → 3.0.0__tar.gz

{aa_sov_timer-2.6.2 → aa_sov_timer-3.0.0}/.gitignore

@@ -18,3 +18,6 @@ alliance_auth.sqlite3
 /sovtimer/locale/en/
 .esi-compatibility-date
 .make/myauth-path
+
+.esi-compatibility-date
+.make/myauth-path

{aa_sov_timer-2.6.2 → aa_sov_timer-3.0.0}/PKG-INFO

@@ -1,13 +1,15 @@
 Metadata-Version: 2.4
 Name: aa-sov-timer
-Version: 2.6.2
+Version: 3.0.0
 Summary: Sov Campaign Timer for Alliance Auth
 Project-URL: Changelog, https://github.com/ppfeufer/aa-sov-timer/blob/master/CHANGELOG.md
+Project-URL: Codecov, https://codecov.io/gh/ppfeufer/aa-sov-timer
+Project-URL: Discord, https://discord.gg/fjnHAmk
 Project-URL: Documentation, https://github.com/ppfeufer/aa-sov-timer/blob/master/README.md
-Project-URL: Donations, https://ko-fi.com/ppfeufer
-Project-URL: Homepage, https://github.com/ppfeufer/aa-sov-timer
-Project-URL: Source, https://github.com/ppfeufer/aa-sov-timer.git
+Project-URL: Donation, https://ko-fi.com/ppfeufer
+Project-URL: GitHub, https://github.com/ppfeufer/aa-sov-timer
 Project-URL: Tracker, https://github.com/ppfeufer/aa-sov-timer/issues
+Project-URL: Translation, https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-sov-timer/
 Author-email: Peter Pfeufer <develop@ppfeufer.de>
 License:                     GNU GENERAL PUBLIC LICENSE
                                Version 3, 29 June 2007
@@ -699,13 +701,15 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Internet :: WWW/HTTP
 Classifier: Topic :: Internet :: WWW/HTTP :: Dynamic Content
-Requires-Python: >=3.10
+Requires-Python: <3.14,>=3.10
 Requires-Dist: allianceauth-app-utils>=1.25
 Requires-Dist: allianceauth<5,>=4.9
+Requires-Dist: django-esi<9,>=8
 Requires-Dist: django-eveuniverse>=1.5.4
 Provides-Extra: tests-allianceauth-latest
 Requires-Dist: coverage; extra == 'tests-allianceauth-latest'
 Requires-Dist: django-webtest; extra == 'tests-allianceauth-latest'
+Requires-Dist: requests-mock; extra == 'tests-allianceauth-latest'
 Description-Content-Type: text/markdown
 
 # AA Sovereignty Timer<a name="aa-sovereignty-timer"></a>
@@ -721,7 +725,7 @@ Description-Content-Type: text/markdown
 [![codecov](https://codecov.io/gh/ppfeufer/aa-sov-timer/branch/master/graph/badge.svg?token=J9PBF0HM8C "codecov")](https://codecov.io/gh/ppfeufer/aa-sov-timer)
 [![Translation status](https://weblate.ppfeufer.de/widget/alliance-auth-apps/aa-sov-timer/svg-badge.svg)](https://weblate.ppfeufer.de/engage/alliance-auth-apps/)
 [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg "Contributor Covenant")](https://github.com/ppfeufer/aa-sov-timer/blob/master/CODE_OF_CONDUCT.md)
-[![Discord](https://img.shields.io/discord/790364535294132234?label=discord "Discord")](https://discord.gg/zmh52wnfvM)
+[![Discord](https://img.shields.io/discord/399006117012832262?label=discord)](https://discord.gg/fjnHAmk)
 
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/N4N8CL1BY)
 
@@ -734,7 +738,7 @@ ______________________________________________________________________
 - [Screenshots](#screenshots)
   - [AA Sov Timer Dashboard](#aa-sov-timer-dashboard)
 - [Installation](#installation)
-  - [Bare Metaal Installation](#bare-metaal-installation)
+  - [Bare Metal Installation](#bare-metal-installation)
     - [Step 1: Installing the App](#step-1-installing-the-app)
     - [Step 2: Update Your AA Settings](#step-2-update-your-aa-settings)
     - [Step 3: Finalizing the Installation](#step-3-finalizing-the-installation)
@@ -747,7 +751,7 @@ ______________________________________________________________________
     - [Step 3: Build Auth and Restart Your Containers](#step-3-build-auth-and-restart-your-containers)
     - [Step 4: Finalizing the Installation](#step-4-finalizing-the-installation)
 - [Updating](#updating)
-  - [Bare Metal Installation](#bare-metal-installation)
+  - [Bare Metal Installation](#bare-metal-installation-1)
   - [Docker Installation](#docker-installation-1)
   - [Common Steps](#common-steps)
 - [Changelog](#changelog)
@@ -776,7 +780,7 @@ ______________________________________________________________________
 - AA Sovereignty Timer needs the app [django-eveuniverse](https://gitlab.com/ErikKalkoken/django-eveuniverse)
   to function. Please make sure it is installed before continuing.
 
-### Bare Metaal Installation<a name="bare-metaal-installation"></a>
+### Bare Metal Installation<a name="bare-metal-installation"></a>
 
 #### Step 1: Installing the App<a name="step-1-installing-the-app"></a>
 
@@ -784,7 +788,7 @@ Make sure you're in the virtual environment (venv) of your Alliance Auth install
 Then install the latest version:
 
 ```shell
-pip install aa-sov-timer==2.6.2
+pip install aa-sov-timer==3.0.0
 ```
 
 #### Step 2: Update Your AA Settings<a name="step-2-update-your-aa-settings"></a>
@@ -845,7 +849,7 @@ Now your system is updating the sovereignty campaigns every 30 seconds.
 Add the app to your `conf/requirements.txt`:
 
 ```text
-aa-sov-timer==2.6.2
+aa-sov-timer==3.0.0
 ```
 
 #### Step 2: Update Your AA Settings<a name="step-2-update-your-aa-settings-1"></a>
@@ -887,7 +891,7 @@ auth sovtimer_load_initial_data
 
 ## Updating<a name="updating"></a>
 
-### Bare Metal Installation<a name="bare-metal-installation"></a>
+### Bare Metal Installation<a name="bare-metal-installation-1"></a>
 
 To update your existing installation of AA Sovereignty Timer, first enable your
 virtual environment.
@@ -896,7 +900,7 @@ Then run the following commands from your AA project directory (the one that
 contains `manage.py`).
 
 ```shell
-pip install aa-sov-timer==2.6.2
+pip install aa-sov-timer==3.0.0
 
 python manage.py collectstatic
 python manage.py migrate
@@ -909,7 +913,7 @@ Finally, restart your AA supervisor service.
 To update your existing installation of AA Sovereignty Timer, all you need to do is to update the respective line in your `conf/requirements.txt` file to the latest version.
 
 ```text
-aa-sov-timer==2.6.2
+aa-sov-timer==3.0.0
 ```
 
 Now rebuild your containers and restart them:

{aa_sov_timer-2.6.2 → aa_sov_timer-3.0.0}/README.md

@@ -11,7 +11,7 @@
 [![codecov](https://codecov.io/gh/ppfeufer/aa-sov-timer/branch/master/graph/badge.svg?token=J9PBF0HM8C "codecov")](https://codecov.io/gh/ppfeufer/aa-sov-timer)
 [![Translation status](https://weblate.ppfeufer.de/widget/alliance-auth-apps/aa-sov-timer/svg-badge.svg)](https://weblate.ppfeufer.de/engage/alliance-auth-apps/)
 [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-2.1-4baaaa.svg "Contributor Covenant")](https://github.com/ppfeufer/aa-sov-timer/blob/master/CODE_OF_CONDUCT.md)
-[![Discord](https://img.shields.io/discord/790364535294132234?label=discord "Discord")](https://discord.gg/zmh52wnfvM)
+[![Discord](https://img.shields.io/discord/399006117012832262?label=discord)](https://discord.gg/fjnHAmk)
 
 [![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/N4N8CL1BY)
 
@@ -24,7 +24,7 @@ ______________________________________________________________________
 - [Screenshots](#screenshots)
   - [AA Sov Timer Dashboard](#aa-sov-timer-dashboard)
 - [Installation](#installation)
-  - [Bare Metaal Installation](#bare-metaal-installation)
+  - [Bare Metal Installation](#bare-metal-installation)
     - [Step 1: Installing the App](#step-1-installing-the-app)
     - [Step 2: Update Your AA Settings](#step-2-update-your-aa-settings)
     - [Step 3: Finalizing the Installation](#step-3-finalizing-the-installation)
@@ -37,7 +37,7 @@ ______________________________________________________________________
     - [Step 3: Build Auth and Restart Your Containers](#step-3-build-auth-and-restart-your-containers)
     - [Step 4: Finalizing the Installation](#step-4-finalizing-the-installation)
 - [Updating](#updating)
-  - [Bare Metal Installation](#bare-metal-installation)
+  - [Bare Metal Installation](#bare-metal-installation-1)
   - [Docker Installation](#docker-installation-1)
   - [Common Steps](#common-steps)
 - [Changelog](#changelog)
@@ -66,7 +66,7 @@ ______________________________________________________________________
 - AA Sovereignty Timer needs the app [django-eveuniverse](https://gitlab.com/ErikKalkoken/django-eveuniverse)
   to function. Please make sure it is installed before continuing.
 
-### Bare Metaal Installation<a name="bare-metaal-installation"></a>
+### Bare Metal Installation<a name="bare-metal-installation"></a>
 
 #### Step 1: Installing the App<a name="step-1-installing-the-app"></a>
 
@@ -74,7 +74,7 @@ Make sure you're in the virtual environment (venv) of your Alliance Auth install
 Then install the latest version:
 
 ```shell
-pip install aa-sov-timer==2.6.2
+pip install aa-sov-timer==3.0.0
 ```
 
 #### Step 2: Update Your AA Settings<a name="step-2-update-your-aa-settings"></a>
@@ -135,7 +135,7 @@ Now your system is updating the sovereignty campaigns every 30 seconds.
 Add the app to your `conf/requirements.txt`:
 
 ```text
-aa-sov-timer==2.6.2
+aa-sov-timer==3.0.0
 ```
 
 #### Step 2: Update Your AA Settings<a name="step-2-update-your-aa-settings-1"></a>
@@ -177,7 +177,7 @@ auth sovtimer_load_initial_data
 
 ## Updating<a name="updating"></a>
 
-### Bare Metal Installation<a name="bare-metal-installation"></a>
+### Bare Metal Installation<a name="bare-metal-installation-1"></a>
 
 To update your existing installation of AA Sovereignty Timer, first enable your
 virtual environment.
@@ -186,7 +186,7 @@ Then run the following commands from your AA project directory (the one that
 contains `manage.py`).
 
 ```shell
-pip install aa-sov-timer==2.6.2
+pip install aa-sov-timer==3.0.0
 
 python manage.py collectstatic
 python manage.py migrate
@@ -199,7 +199,7 @@ Finally, restart your AA supervisor service.
 To update your existing installation of AA Sovereignty Timer, all you need to do is to update the respective line in your `conf/requirements.txt` file to the latest version.
 
 ```text
-aa-sov-timer==2.6.2
+aa-sov-timer==3.0.0
 ```
 
 Now rebuild your containers and restart them:

{aa_sov_timer-2.6.2 → aa_sov_timer-3.0.0}/pyproject.toml

@@ -18,7 +18,7 @@ license = { file = "LICENSE" }
 authors = [
     { name = "Peter Pfeufer", email = "develop@ppfeufer.de" },
 ]
-requires-python = ">=3.10"
+requires-python = ">=3.10,<3.14"
 classifiers = [
     "Environment :: Web Environment",
     "Framework :: Django",
@@ -41,18 +41,22 @@ dynamic = [
 dependencies = [
     "allianceauth>=4.9,<5",
     "allianceauth-app-utils>=1.25",
+    "django-esi>=8,<9",
     "django-eveuniverse>=1.5.4",
 ]
 optional-dependencies.tests-allianceauth-latest = [
     "coverage",
     "django-webtest",
+    "requests-mock",
 ]
 urls.Changelog = "https://github.com/ppfeufer/aa-sov-timer/blob/master/CHANGELOG.md"
+urls.Codecov = "https://codecov.io/gh/ppfeufer/aa-sov-timer"
+urls.Discord = "https://discord.gg/fjnHAmk"
 urls.Documentation = "https://github.com/ppfeufer/aa-sov-timer/blob/master/README.md"
-urls.Donations = "https://ko-fi.com/ppfeufer"
-urls.Homepage = "https://github.com/ppfeufer/aa-sov-timer"
-urls.Source = "https://github.com/ppfeufer/aa-sov-timer.git"
+urls.Donation = "https://ko-fi.com/ppfeufer"
+urls.GitHub = "https://github.com/ppfeufer/aa-sov-timer"
 urls.Tracker = "https://github.com/ppfeufer/aa-sov-timer/issues"
+urls.Translation = "https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-sov-timer/"
 
 [tool.hatch.build]
 include = [
@@ -61,3 +65,6 @@ include = [
 
 [tool.hatch.version]
 path = "sovtimer/__init__.py"
+
+[tool.hatch.metadata]
+allow-direct-references = true

{aa_sov_timer-2.6.2 → aa_sov_timer-3.0.0}/sovtimer/__init__.py

@@ -5,12 +5,14 @@ App init
 # Django
 from django.utils.translation import gettext_lazy as _
 
-__version__ = "2.6.2"
-__title__ = _("Sovereignty Timers")
+__version__ = "3.0.0"
+__title__ = "Sovereignty Timer"
+__title_translated__ = _("Sovereignty Timer")
+
+__esi_compatibility_date__ = "2025-11-06"
 
 __package_name__ = "aa-sov-timer"
 __app_name__ = "sovtimer"
 __app_name_verbose__ = "AA Sovereignty Timer"
-__app_name_useragent__ = "AA-Sovereignty-Timer"
 
 __github_url__ = f"https://github.com/ppfeufer/{__package_name__}"

aa_sov_timer-3.0.0/sovtimer/apps.py

@@ -0,0 +1,22 @@
+"""
+App config
+"""
+
+# Django
+from django.apps import AppConfig
+from django.utils.text import format_lazy
+
+# AA Sovereignty Timer
+from sovtimer import __title_translated__, __version__
+
+
+class AaSovtimerConfig(AppConfig):
+    """
+    Application config
+    """
+
+    name = "sovtimer"
+    label = "sovtimer"
+    verbose_name = format_lazy(
+        "{app_title} v{version}", app_title=__title_translated__, version=__version__
+    )

{aa_sov_timer-2.6.2 → aa_sov_timer-3.0.0}/sovtimer/auth_hooks.py

@@ -7,7 +7,7 @@ from allianceauth import hooks
 from allianceauth.services.hooks import MenuItemHook, UrlHook
 
 # AA Sovereignty Timer
-from sovtimer import __title__, urls
+from sovtimer import __title_translated__, urls
 
 
 class AaSovtimerMenuItem(MenuItemHook):  # pylint: disable=too-few-public-methods
@@ -19,7 +19,7 @@ class AaSovtimerMenuItem(MenuItemHook):  # pylint: disable=too-few-public-method
         # Setup menu entry for sidebar
         MenuItemHook.__init__(
             self,
-            text=__title__,
+            text=__title_translated__,
             classes="fa-regular fa-clock",
             url_name="sovtimer:dashboard",
             navactive=["sovtimer:"],
@@ -33,10 +33,11 @@ class AaSovtimerMenuItem(MenuItemHook):  # pylint: disable=too-few-public-method
         :return:
         """
 
-        if request.user.has_perm(perm="sovtimer.basic_access"):
-            return MenuItemHook.render(self, request=request)
-
-        return ""
+        return (
+            MenuItemHook.render(self, request=request)
+            if request.user.has_perm("sovtimer.basic_access")
+            else ""
+        )
 
 
 @hooks.register("menu_item_hook")

aa_sov_timer-3.0.0/sovtimer/constants.py

@@ -0,0 +1,7 @@
+"""
+Constants we use throughout the app
+"""
+
+# Prefix used for all internal URLs within the application.
+# This ensures that internal URLs are easily distinguishable.
+INTERNAL_URL_PREFIX = "-"

{aa_sov_timer-2.6.2 → aa_sov_timer-3.0.0}/sovtimer/locale/cs_CZ/LC_MESSAGES/django.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: AA Sov Timer 2.2.1\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-sov-timer/issues\n"
-"POT-Creation-Date: 2025-10-07 11:47+0200\n"
+"POT-Creation-Date: 2025-11-12 03:15+0100\n"
 "PO-Revision-Date: 2024-07-10 14:26+0000\n"
 "Last-Translator: Dadas Aideron <dadas.aideron@gmail.com>\n"
 "Language-Team: Czech <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-sov-timer/cs/>\n"
@@ -17,118 +17,105 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
 "X-Generator: Weblate 5.6.2\n"
 
-#: sovtimer/__init__.py:9
-msgid "Sovereignty Timers"
-msgstr ""
-
-#: sovtimer/apps.py:20
-#, python-brace-format
-msgid "Sovereignty Timer v{__version__}"
-msgstr ""
-
-#: sovtimer/models.py:33 sovtimer/templates/sovtimer/base.html:7
+#: sovtimer/__init__.py:10 sovtimer/models.py:37
+#: sovtimer/templates/sovtimer/base.html:7
 #: sovtimer/templates/sovtimer/base.html:11
 msgid "Sovereignty Timer"
 msgstr ""
 
-#: sovtimer/models.py:36
+#: sovtimer/models.py:40
 msgid "Can access the Sovereignty Timer module"
 msgstr ""
 
-#: sovtimer/models.py:73
+#: sovtimer/models.py:77
 msgid "Sovereignty structure"
 msgstr ""
 
-#: sovtimer/models.py:74
+#: sovtimer/models.py:78
 msgid "Sovereignty structures"
 msgstr ""
 
-#: sovtimer/models.py:111
+#: sovtimer/models.py:135
 msgid "Sov Hub defense"
 msgstr ""
 
-#: sovtimer/models.py:112
+#: sovtimer/models.py:136
 msgid "TCU defense"
 msgstr ""
 
-#: sovtimer/models.py:138
+#: sovtimer/models.py:162
 msgid "Sovereignty campaign"
 msgstr ""
 
-#: sovtimer/models.py:139
+#: sovtimer/models.py:163
 msgid "Sovereignty campaigns"
 msgstr ""
 
-#: sovtimer/templates/sovtimer/dashboard.html:15
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:25
-msgid "Type"
+#: sovtimer/templates/sovtimer/dashboard.html:15 sovtimer/views.py:163
+msgid "Yes"
 msgstr ""
 
-#: sovtimer/templates/sovtimer/dashboard.html:16
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:26
-msgid "System"
+#: sovtimer/templates/sovtimer/dashboard.html:16 sovtimer/views.py:161
+msgid "No"
 msgstr ""
 
-#: sovtimer/templates/sovtimer/dashboard.html:17
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:27
-msgid "Constellation"
+#: sovtimer/templates/sovtimer/partials/common/spinner.html:8
+msgid "Loading …"
 msgstr ""
 
-#: sovtimer/templates/sovtimer/dashboard.html:18
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:28
-msgid "Region"
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:6
+msgid "Sovereignty campaign list"
 msgstr ""
 
-#: sovtimer/templates/sovtimer/dashboard.html:19
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:29
-msgid "Owner / Defender"
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:16
+msgid "Total"
 msgstr ""
 
-#: sovtimer/templates/sovtimer/dashboard.html:20
-msgid "Active campaign"
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:30
+msgid "Upcoming"
 msgstr ""
 
-#: sovtimer/templates/sovtimer/dashboard.html:21 sovtimer/views.py:163
-msgid "Yes"
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:31
+msgid "< 4hrs"
 msgstr ""
 
-#: sovtimer/templates/sovtimer/dashboard.html:22 sovtimer/views.py:161
-msgid "No"
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:45
+msgid "Active"
 msgstr ""
 
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:6
-msgid "Sovereignty campaign list"
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:57
+msgid "The campaign list is automatically updated every 30 seconds. Progress for any active campaigns will be shown as <i>Previous - Trend - Current</i>."
 msgstr ""
 
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:12
-msgid "Total campaigns:"
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:64
+msgid "System"
 msgstr ""
 
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:13
-msgid "Upcoming campaigns (< 4hrs):"
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:65
+msgid "Constellation"
 msgstr ""
 
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:14
-msgid "Active campaigns:"
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:66
+msgid "Region"
 msgstr ""
 
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:18
-msgid "The campaign list is automatically updated every 30 seconds. Progress for any active campaigns will be shown as <i>Previous - Trend - Current</i>."
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:67
+msgid "Owner / Defender"
 msgstr ""
 
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:30
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:68
 msgid "ADM"
 msgstr ""
 
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:31
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:69
 msgid "Start"
 msgstr ""
 
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:32
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:70
 msgid "Remaining"
 msgstr ""
 
-#: sovtimer/templates/sovtimer/partials/dashboard/table.html:33
+#: sovtimer/templates/sovtimer/partials/dashboard/table.html:71
 msgid "Progress"
 msgstr ""