aa-sov-timer 2.3.2__tar.gz → 2.3.4__tar.gz

{aa_sov_timer-2.3.2 → aa_sov_timer-2.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aa-sov-timer
-Version: 2.3.2
+Version: 2.3.4
 Summary: Sov Campaign Timer for Alliance Auth
 Project-URL: Changelog, https://github.com/ppfeufer/aa-sov-timer/blob/master/CHANGELOG.md
 Project-URL: Documentation, https://github.com/ppfeufer/aa-sov-timer/blob/master/README.md
@@ -729,22 +729,21 @@ Sovereignty campaign overview for Alliance Auth.
 
 ______________________________________________________________________
 
-<!-- mdformat-toc start --slug=github --maxlevel=6 --minlevel=1 -->
-
-- [AA Sovereignty Timer](#aa-sovereignty-timer)
-  - [Screenshots](#screenshots)
-    - [AA Sov Timer Dashboard](#aa-sov-timer-dashboard)
-  - [Installation](#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)
-    - [Step 4: Preload Eve Universe Data](#step-4-preload-eve-universe-data)
-    - [Step 5: Setting up Permission](#step-5-setting-up-permission)
-    - [Step 6: Keep Campaigns Updated](#step-6-keep-campaigns-updated)
-  - [Updating](#updating)
-  - [Changelog](#changelog)
-  - [Translation Status](#translation-status)
-  - [Contributing](#contributing)
+<!-- mdformat-toc start --slug=github --maxlevel=6 --minlevel=2 -->
+
+- [Screenshots](#screenshots)
+  - [AA Sov Timer Dashboard](#aa-sov-timer-dashboard)
+- [Installation](#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)
+  - [Step 4: Preload Eve Universe Data](#step-4-preload-eve-universe-data)
+  - [Step 5: Setting up Permission](#step-5-setting-up-permission)
+  - [Step 6: Keep Campaigns Updated](#step-6-keep-campaigns-updated)
+- [Updating](#updating)
+- [Changelog](#changelog)
+- [Translation Status](#translation-status)
+- [Contributing](#contributing)
 
 <!-- mdformat-toc end -->
 
@@ -789,7 +788,7 @@ pip install aa-sov-timer
 
 Configure your AA settings (`local.py`) as follows:
 
-- Add `'eveuniverse',` to `INSTALLED_APPS`
+- Add `'eveuniverse',` to `INSTALLED_APPS` if not already done for another app
 - Add `'sovtimer',` to `INSTALLED_APPS`
 
 Restart your supervisor

{aa_sov_timer-2.3.2 → aa_sov_timer-2.3.4}/README.md

@@ -19,22 +19,21 @@ Sovereignty campaign overview for Alliance Auth.
 
 ______________________________________________________________________
 
-<!-- mdformat-toc start --slug=github --maxlevel=6 --minlevel=1 -->
-
-- [AA Sovereignty Timer](#aa-sovereignty-timer)
-  - [Screenshots](#screenshots)
-    - [AA Sov Timer Dashboard](#aa-sov-timer-dashboard)
-  - [Installation](#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)
-    - [Step 4: Preload Eve Universe Data](#step-4-preload-eve-universe-data)
-    - [Step 5: Setting up Permission](#step-5-setting-up-permission)
-    - [Step 6: Keep Campaigns Updated](#step-6-keep-campaigns-updated)
-  - [Updating](#updating)
-  - [Changelog](#changelog)
-  - [Translation Status](#translation-status)
-  - [Contributing](#contributing)
+<!-- mdformat-toc start --slug=github --maxlevel=6 --minlevel=2 -->
+
+- [Screenshots](#screenshots)
+  - [AA Sov Timer Dashboard](#aa-sov-timer-dashboard)
+- [Installation](#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)
+  - [Step 4: Preload Eve Universe Data](#step-4-preload-eve-universe-data)
+  - [Step 5: Setting up Permission](#step-5-setting-up-permission)
+  - [Step 6: Keep Campaigns Updated](#step-6-keep-campaigns-updated)
+- [Updating](#updating)
+- [Changelog](#changelog)
+- [Translation Status](#translation-status)
+- [Contributing](#contributing)
 
 <!-- mdformat-toc end -->
 
@@ -79,7 +78,7 @@ pip install aa-sov-timer
 
 Configure your AA settings (`local.py`) as follows:
 
-- Add `'eveuniverse',` to `INSTALLED_APPS`
+- Add `'eveuniverse',` to `INSTALLED_APPS` if not already done for another app
 - Add `'sovtimer',` to `INSTALLED_APPS`
 
 Restart your supervisor

{aa_sov_timer-2.3.2 → aa_sov_timer-2.3.4}/sovtimer/__init__.py

@@ -5,5 +5,5 @@ App init
 # Django
 from django.utils.translation import gettext_lazy as _
 
-__version__ = "2.3.2"
+__version__ = "2.3.4"
 __title__ = _("Sovereignty Timers")

aa_sov_timer-2.3.4/sovtimer/app_settings.py

@@ -0,0 +1,20 @@
+"""
+App settings
+"""
+
+# Standard Library
+from re import RegexFlag
+
+# Django
+from django.conf import settings
+
+
+def debug_enabled() -> RegexFlag:
+    """
+    Check if DEBUG is enabled
+
+    :return:
+    :rtype:
+    """
+
+    return settings.DEBUG

{aa_sov_timer-2.3.2 → aa_sov_timer-2.3.4}/sovtimer/constants.py

@@ -12,13 +12,16 @@ from esi import __version__ as esi_version
 from sovtimer import __version__
 
 APP_NAME = "aa-sov-timer"
+APP_NAME_VERBOSE = "AA Sovereignty Timer"
+APP_NAME_VERBOSE_USERAGENT = "AA-Sovereignty-Timer"
+PACKAGE_NAME = "sovtimer"
 GITHUB_URL = f"https://github.com/ppfeufer/{APP_NAME}"
-USER_AGENT = f"{APP_NAME}/{__version__} +{GITHUB_URL} via django-esi/{esi_version}"
+USER_AGENT = f"{APP_NAME_VERBOSE_USERAGENT}/{__version__} (+{GITHUB_URL}) Django-ESI/{esi_version}"
 
 # aa-sov-timer/sovtimer
 APP_BASE_DIR = os.path.join(os.path.dirname(__file__))
 # aa-sov-timer/sovtimer/static/sovtimer
-APP_STATIC_DIR = os.path.join(APP_BASE_DIR, "static", "sovtimer")
+APP_STATIC_DIR = os.path.join(APP_BASE_DIR, "static", PACKAGE_NAME)
 
 # All internal URLs need to start with this prefix
 INTERNAL_URL_PREFIX = "-"

{aa_sov_timer-2.3.2 → aa_sov_timer-2.3.4}/sovtimer/helper/static_files.py

@@ -26,9 +26,10 @@ logger = LoggerAddTag(my_logger=get_extension_logger(__name__), prefix=__title__
 def calculate_integrity_hash(relative_file_path: str) -> str:
     """
     Calculates the integrity hash for a given static file
+
     :param self:
     :type self:
-    :param relative_file_path: The file path relative to the `aa-sov-timer/sovtimer/static/sovtimer` folder
+    :param relative_file_path: The file path relative to the `{APP_NAME}/{PACKAGE_NAME}/static/{PACKAGE_NAME}` folder
     :type relative_file_path: str
     :return: The integrity hash
     :rtype: str

{aa_sov_timer-2.3.2 → aa_sov_timer-2.3.4}/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-02-26 18:42+0100\n"
+"POT-Creation-Date: 2025-04-09 11:48+0200\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"

{aa_sov_timer-2.3.2 → aa_sov_timer-2.3.4}/sovtimer/locale/de/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-02-26 18:42+0100\n"
+"POT-Creation-Date: 2025-04-09 11:48+0200\n"
 "PO-Revision-Date: 2024-12-15 10:37+0000\n"
 "Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
 "Language-Team: German <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-sov-timer/de/>\n"

{aa_sov_timer-2.3.2 → aa_sov_timer-2.3.4}/sovtimer/locale/django.pot

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: AA Sov Timer 2.3.2\n"
+"Project-Id-Version: AA Sov Timer 2.3.4\n"
 "Report-Msgid-Bugs-To: https://github.com/ppfeufer/aa-sov-timer/issues\n"
-"POT-Creation-Date: 2025-02-27 11:22+0100\n"
+"POT-Creation-Date: 2025-04-09 11:48+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"

{aa_sov_timer-2.3.2 → aa_sov_timer-2.3.4}/sovtimer/locale/es/LC_MESSAGES/django.po

@@ -7,7 +7,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-02-26 18:42+0100\n"
+"POT-Creation-Date: 2025-04-09 11:48+0200\n"
 "PO-Revision-Date: 2024-12-15 10:37+0000\n"
 "Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
 "Language-Team: Spanish <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-sov-timer/es/>\n"

{aa_sov_timer-2.3.2 → aa_sov_timer-2.3.4}/sovtimer/locale/fr_FR/LC_MESSAGES/django.po

@@ -10,7 +10,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-02-26 18:42+0100\n"
+"POT-Creation-Date: 2025-04-09 11:48+0200\n"
 "PO-Revision-Date: 2024-12-15 10:37+0000\n"
 "Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
 "Language-Team: French <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-sov-timer/fr/>\n"

{aa_sov_timer-2.3.2 → aa_sov_timer-2.3.4}/sovtimer/locale/it_IT/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-02-26 18:42+0100\n"
+"POT-Creation-Date: 2025-04-09 11:48+0200\n"
 "PO-Revision-Date: 2024-12-22 21:15+0000\n"
 "Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
 "Language-Team: Italian <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-sov-timer/it/>\n"

{aa_sov_timer-2.3.2 → aa_sov_timer-2.3.4}/sovtimer/locale/ja/LC_MESSAGES/django.po

@@ -7,7 +7,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-02-26 18:42+0100\n"
+"POT-Creation-Date: 2025-04-09 11:48+0200\n"
 "PO-Revision-Date: 2024-08-06 03:28+0000\n"
 "Last-Translator: Deleted User <noreply+44@weblate.org>\n"
 "Language-Team: Japanese <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-sov-timer/ja/>\n"

{aa_sov_timer-2.3.2 → aa_sov_timer-2.3.4}/sovtimer/locale/ko_KR/LC_MESSAGES/django.po

@@ -9,7 +9,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-02-26 18:42+0100\n"
+"POT-Creation-Date: 2025-04-09 11:48+0200\n"
 "PO-Revision-Date: 2024-12-15 10:37+0000\n"
 "Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
 "Language-Team: Korean <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-sov-timer/ko/>\n"

{aa_sov_timer-2.3.2 → aa_sov_timer-2.3.4}/sovtimer/locale/nl_NL/LC_MESSAGES/django.po

@@ -7,7 +7,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-02-26 18:42+0100\n"
+"POT-Creation-Date: 2025-04-09 11:48+0200\n"
 "PO-Revision-Date: 2024-05-10 14:12+0000\n"
 "Last-Translator: Anonymous <noreply@weblate.org>\n"
 "Language-Team: Dutch <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-sov-timer/nl/>\n"

{aa_sov_timer-2.3.2 → aa_sov_timer-2.3.4}/sovtimer/locale/pl_PL/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-02-26 18:42+0100\n"
+"POT-Creation-Date: 2025-04-09 11:48+0200\n"
 "PO-Revision-Date: 2024-05-10 14:12+0000\n"
 "Last-Translator: Anonymous <noreply@weblate.org>\n"
 "Language-Team: Polish <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-sov-timer/pl/>\n"

{aa_sov_timer-2.3.2 → aa_sov_timer-2.3.4}/sovtimer/locale/ru/LC_MESSAGES/django.po

@@ -8,7 +8,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-02-26 18:42+0100\n"
+"POT-Creation-Date: 2025-04-09 11:48+0200\n"
 "PO-Revision-Date: 2024-12-15 10:37+0000\n"
 "Last-Translator: Peter Pfeufer <info@ppfeufer.de>\n"
 "Language-Team: Russian <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-sov-timer/ru/>\n"

{aa_sov_timer-2.3.2 → aa_sov_timer-2.3.4}/sovtimer/locale/sk/LC_MESSAGES/django.po

@@ -7,7 +7,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-02-26 18:42+0100\n"
+"POT-Creation-Date: 2025-04-09 11:48+0200\n"
 "PO-Revision-Date: 2024-05-10 14:12+0000\n"
 "Last-Translator: Anonymous <noreply@weblate.org>\n"
 "Language-Team: Slovak <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-sov-timer/sk/>\n"

{aa_sov_timer-2.3.2 → aa_sov_timer-2.3.4}/sovtimer/locale/uk/LC_MESSAGES/django.po

@@ -8,7 +8,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-02-26 18:42+0100\n"
+"POT-Creation-Date: 2025-04-09 11:48+0200\n"
 "PO-Revision-Date: 2025-02-24 15:17+0000\n"
 "Last-Translator: M <skrypets@gmail.com>\n"
 "Language-Team: Ukrainian <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-sov-timer/uk/>\n"

{aa_sov_timer-2.3.2 → aa_sov_timer-2.3.4}/sovtimer/locale/zh_Hans/LC_MESSAGES/django.po

@@ -10,7 +10,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-02-26 18:42+0100\n"
+"POT-Creation-Date: 2025-04-09 11:48+0200\n"
 "PO-Revision-Date: 2024-05-15 09:21+0000\n"
 "Last-Translator: SAM_FPS <sam_fps@163.com>\n"
 "Language-Team: Chinese (Simplified) <https://weblate.ppfeufer.de/projects/alliance-auth-apps/aa-sov-timer/zh_Hans/>\n"

{aa_sov_timer-2.3.2 → aa_sov_timer-2.3.4}/sovtimer/static/sovtimer/js/aa-sov-timer.js

@@ -160,13 +160,12 @@ $(document).ready(() => {
                 data: 'start_time',
                 render: {
                     _: (data) => {
-                        return moment(data)
-                            .locale(sovtimerSettings.language.momentJS)
-                            .utc()
-                            .format(sovtimerSettings.datetimeFormat.datetimeWithSeconds);
+                        return data === null ? '' : moment(data).utc().format(
+                            sovtimerSettings.datetimeFormat.datetimeLong
+                        );
                     },
                     sort: (data) => {
-                        return data;
+                        return data === null ? '' : data;
                     }
                 }
             },

aa_sov_timer-2.3.4/sovtimer/static/sovtimer/js/aa-sov-timer.min.js

@@ -0,0 +1,2 @@
+$(document).ready(()=>{function n(t){return t&&"object"==typeof t&&!Array.isArray(t)&&!(t instanceof Date)}function i(e,...t){return t.length&&t.forEach(t=>{if(n(e)&&n(t))for(var a in t)n(t[a])?"__proto__"!==a&&"constructor"!==a&&"prototype"!==a&&(e[a]&&n(e[a])||(e[a]={}),i(e[a],t[a])):e[a]=t[a]}),e}let m=sovtimerJsSettingsDefaults;"undefined"!=typeof sovtimerJsSettingsOverride&&(m=i(sovtimerJsSettingsDefaults,sovtimerJsSettingsOverride));const l=$(".aa-sovtimer-timers-total"),d=$(".aa-sovtimer-timers-upcoming"),c=$(".aa-sovtimer-timers-active"),r=t=>{let a="",e="aa-sovtimer-remaining";t<0?(e+=" aa-sovtimer-timer-elapsed",a="-",t=Math.abs(t),t++):t--;const n=Math.floor(t/86400);let i=Math.floor(t/3600)%24,r=Math.floor(t/60)%60,s=Math.floor(t)%60;return i<10&&(i="0"+i),r<10&&(r="0"+r),s<10&&(s="0"+s),{countdown:`<span class="${e}">${a}${n}d ${i}h ${r}m ${s}s</span>`,remainingTimeInSeconds:a+t}},s=$(".aa-sovtimer-campaigns").DataTable({language:m.dataTables.language,ajax:{url:m.url.ajaxUpdate,dataSrc:"",cache:!1},columns:[{data:"event_type"},{data:"solar_system_name_html"},{data:"constellation_name_html"},{data:"region_name_html"},{data:"defender_name_html"},{data:"adm"},{data:"start_time",render:{_:t=>null===t?"":moment(t).utc().format(m.datetimeFormat.datetimeLong),sort:t=>null===t?"":t}},{data:"remaining_time"},{data:"campaign_progress"},{data:"remaining_time_in_seconds"},{data:"solar_system_name"},{data:"constellation_name"},{data:"region_name"},{data:"defender_name"},{data:"active_campaign"}],columnDefs:[{visible:!1,targets:[0,9,10,11,12,13,14]},{width:"150px",targets:[8]}],order:[[6,"asc"]],filterDropDown:{columns:[{idx:10,title:m.translation.dtFilter.system},{idx:11,title:m.translation.dtFilter.constellation},{idx:12,title:m.translation.dtFilter.region},{idx:13,title:m.translation.dtFilter.owner},{idx:14,title:m.translation.dtFilter.activeCampaign}],autoSize:!1,bootstrap:!0,bootstrap_version:5},createdRow:(t,a)=>{const e=l.html(),n=parseInt(e)+1;if(l.html(n),a.active_campaign===m.translation.no&&a.remaining_time_in_seconds<=m.upcomingTimerThreshold){$(t).addClass("aa-sovtimer-upcoming-campaign");const i=d.html(),r=parseInt(i)+1;d.html(r)}if(a.active_campaign===m.translation.yes){$(t).addClass("aa-sovtimer-active-campaign");const s=c.html(),o=parseInt(s)+1;c.html(o)}},paging:!1});setInterval(()=>{s.ajax.reload(t=>{l.html("0"),d.html("0"),c.html("0"),$.each(t,(t,a)=>{const e=l.html(),n=parseInt(e)+1;if(l.html(n),a.active_campaign===m.translation.no&&a.remaining_time_in_seconds<=m.upcomingTimerThreshold){const i=d.html(),r=parseInt(i)+1;d.html(r)}if(a.active_campaign===m.translation.yes){const s=c.html(),o=parseInt(s)+1;c.html(o)}})})},3e4),setInterval(()=>{s.rows().every(t=>{const a=s.row(t).data(),e=r(a.remaining_time_in_seconds);a.remaining_time_in_seconds=e.remainingTimeInSeconds,a.remaining_time=e.countdown,s.row(t).data(a)})},1e3)});
+//# sourceMappingURL=aa-sov-timer.min.js.map

aa_sov_timer-2.3.4/sovtimer/static/sovtimer/js/aa-sov-timer.min.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["aa-sov-timer.js"],"names":["$","document","ready","isObject","item","Array","isArray","Date","deepMerge","target","sources","length","forEach","source","key","let","sovtimerSettings","sovtimerJsSettingsDefaults","sovtimerJsSettingsOverride","elementTimerTotal","elementTimerUpcoming","elementTimerActive","secondsToRemainingTime","prefix","spanClasses","secondsRemaining","Math","abs","days","floor","hours","minutes","seconds","countdown","remainingTimeInSeconds","sovCampaignTable","DataTable","language","dataTables","ajax","url","ajaxUpdate","dataSrc","cache","columns","data","render","_","moment","utc","format","datetimeFormat","datetimeLong","sort","columnDefs","visible","targets","width","order","filterDropDown","idx","title","translation","dtFilter","system","constellation","region","owner","activeCampaign","autoSize","bootstrap","bootstrap_version","createdRow","row","currentTotal","html","newTotal","parseInt","active_campaign","no","remaining_time_in_seconds","upcomingTimerThreshold","addClass","currentUpcoming","newUpcoming","yes","currentActive","newActive","paging","setInterval","reload","each","tableData","i","rows","every","element","remaining","remaining_time"],"mappings":"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"}

aa_sov_timer-2.3.4/sovtimer/tasks.py

@@ -0,0 +1,227 @@
+"""
+The tasks
+"""
+
+# Third Party
+from celery import shared_task
+
+# Django
+from django.core.cache import cache
+from django.db import transaction
+
+# Alliance Auth
+from allianceauth.services.hooks import get_extension_logger
+from allianceauth.services.tasks import QueueOnce
+
+# Alliance Auth (External Libs)
+from app_utils.logging import LoggerAddTag
+from eveuniverse.core.esitools import is_esi_online
+from eveuniverse.models import EveEntity, EveSolarSystem
+
+# AA Sovereignty Timer
+from sovtimer import __title__
+from sovtimer.models import Campaign, SovereigntyStructure
+
+logger = LoggerAddTag(my_logger=get_extension_logger(name=__name__), prefix=__title__)
+
+
+ESI_ERROR_LIMIT = 50
+ESI_TIMEOUT_ONCE_ERROR_LIMIT_REACHED = 60
+ESI_SOV_STRUCTURES_CACHE_KEY = "sov_structures_cache"
+ESI_MAX_RETRIES = 5
+
+TASK_TIME_LIMIT = 600  # Stop after 10 minutes
+
+# Params for all tasks
+TASK_PRIORITY = 6
+TASK_ONCE_ARGS = {"graceful": True}
+TASK_ONCE = {"base": QueueOnce, "once": TASK_ONCE_ARGS}
+
+TASK_DEFAULTS = {
+    "time_limit": TASK_TIME_LIMIT,
+    "max_retries": ESI_MAX_RETRIES,
+    "default_retry_delay": 300,
+}
+TASK_DEFAULTS_ONCE = {**TASK_DEFAULTS, **TASK_ONCE}
+
+
+@shared_task(**TASK_DEFAULTS_ONCE)
+def run_sov_campaign_updates() -> None:
+    """
+    Update all sovereignty campaigns and structures
+
+    This task is used to update all sovereignty campaigns and structures from ESI.
+    It should be called by a periodic task, or in your `local.py` settings file via:
+
+    ```python
+    # AA Sovereignty Timer - https://github.com/ppfeufer/aa-sov-timer
+    if "sovtimer" in INSTALLED_APPS:
+        # Run campaign updates every 30 seconds
+        CELERYBEAT_SCHEDULE["sovtimer.tasks.run_sov_campaign_updates"] = {
+            "task": "sovtimer.tasks.run_sov_campaign_updates",
+            "schedule": 30.0,
+        }
+    ```
+    """
+
+    if not is_esi_online():
+        logger.info(
+            msg=(
+                "ESI seems to be offline, currently. "
+                "Can't start ESI related tasks. Aborting …"
+            )
+        )
+
+        return
+
+    logger.info(msg="Updating sovereignty structures and campaigns from ESI …")
+
+    update_sov_structures.apply_async(priority=TASK_PRIORITY, once=TASK_ONCE_ARGS)
+    update_sov_campaigns.apply_async(priority=TASK_PRIORITY, once=TASK_ONCE_ARGS)
+
+
+@shared_task(**TASK_DEFAULTS_ONCE)
+def update_sov_campaigns() -> None:
+    """
+    Update sovereignty campaigns
+
+    This task is used to update the sovereignty campaigns from ESI.
+    """
+
+    campaigns_from_esi = Campaign.get_sov_campaigns_from_esi()
+
+    logger.debug(
+        msg=f"Number of sovereignty campaigns from ESI: {len(campaigns_from_esi or [])}"
+    )
+
+    if not campaigns_from_esi:
+        logger.info(msg="No sovereignty campaigns found, nothing to update.")
+
+        return
+
+    logger.debug(msg="Updating sovereignty campaigns …")
+
+    campaigns = []
+    defender_ids = {campaign.get("defender_id") for campaign in campaigns_from_esi}
+    existing_campaigns = {c.campaign_id: c for c in Campaign.objects.all()}
+
+    EveEntity.objects.bulk_create(
+        [EveEntity(id=defender_id) for defender_id in defender_ids],
+        ignore_conflicts=True,
+    )
+
+    for campaign in campaigns_from_esi:
+        campaign_id = campaign.get("campaign_id")
+        campaign_current__defender_score = campaign.get("defender_score")
+        campaign_current__progress_previous = campaign_current__defender_score
+
+        if campaign_id in existing_campaigns:
+            campaign_previous = existing_campaigns[campaign_id]
+            campaign_previous__progress_previous = campaign_previous.progress_previous
+            campaign_previous__progress = campaign_previous.defender_score
+            campaign_current__progress_previous = campaign_previous__progress
+
+            if campaign_previous__progress == campaign_current__defender_score:
+                campaign_current__progress_previous = (
+                    campaign_previous__progress_previous
+                )
+
+        campaigns.append(
+            Campaign(
+                attackers_score=campaign.get("attackers_score"),
+                campaign_id=campaign_id,
+                defender_score=campaign.get("defender_score"),
+                event_type=campaign.get("event_type"),
+                start_time=campaign.get("start_time"),
+                structure_id=campaign.get("structure_id"),
+                progress_current=campaign_current__defender_score,
+                progress_previous=campaign_current__progress_previous,
+            )
+        )
+
+    Campaign.objects.all().delete()
+    Campaign.objects.bulk_create(
+        objs=campaigns,
+        batch_size=500,
+        # ignore_conflicts=True,
+    )
+    EveEntity.objects.bulk_update_new_esi()
+
+    logger.info(msg=f"{len(campaigns)} sovereignty campaigns updated from ESI.")
+
+
+@shared_task(**TASK_DEFAULTS_ONCE)
+def update_sov_structures() -> None:
+    """
+    Update sovereignty structures
+
+    This task is used to update the sovereignty structures from ESI.
+    """
+
+    if cache.get(ESI_SOV_STRUCTURES_CACHE_KEY) is None:
+        logger.debug(msg="Updating sovereignty structures …")
+
+        structures_from_esi = SovereigntyStructure.get_sov_structures_from_esi()
+
+        if structures_from_esi:
+            with transaction.atomic():
+                esi_structure_ids = set()
+                sov_structures = []
+
+                for structure in structures_from_esi:
+                    structure_id = structure.get("structure_id")
+
+                    if structure_id not in esi_structure_ids:
+                        esi_structure_ids.add(structure_id)
+
+                        sov_holder, _ = EveEntity.objects.get_or_create(
+                            id=structure.get("alliance_id")
+                        )
+
+                        structure_solar_system = EveSolarSystem.objects.get(
+                            id=structure.get("solar_system_id")
+                        )
+
+                        vulnerability_occupancy_level = (
+                            1
+                            if structure.get("vulnerability_occupancy_level") is None
+                            else structure.get("vulnerability_occupancy_level")
+                        )
+
+                        vulnerable_end_time = structure.get("vulnerable_end_time")
+                        vulnerable_start_time = structure.get("vulnerable_start_time")
+
+                        sov_structures.append(
+                            SovereigntyStructure(
+                                alliance=sov_holder,
+                                solar_system=structure_solar_system,
+                                structure_id=structure_id,
+                                structure_type_id=structure.get("structure_type_id"),
+                                vulnerability_occupancy_level=vulnerability_occupancy_level,
+                                vulnerable_end_time=vulnerable_end_time,
+                                vulnerable_start_time=vulnerable_start_time,
+                            )
+                        )
+
+                SovereigntyStructure.objects.bulk_create(
+                    objs=sov_structures,
+                    batch_size=500,
+                    update_conflicts=True,
+                    update_fields=[
+                        "alliance",
+                        "solar_system",
+                        "structure_type_id",
+                        "vulnerability_occupancy_level",
+                        "vulnerable_end_time",
+                        "vulnerable_start_time",
+                    ],
+                )
+
+                EveEntity.objects.bulk_update_new_esi()
+                SovereigntyStructure.objects.exclude(pk__in=esi_structure_ids).delete()
+
+                cache.set(key=ESI_SOV_STRUCTURES_CACHE_KEY, value=True, timeout=120)
+
+                logger.info(
+                    msg=f"{len(sov_structures)} sovereignty structures updated from ESI."
+                )

{aa_sov_timer-2.3.2 → aa_sov_timer-2.3.4}/sovtimer/templates/sovtimer/base.html

@@ -19,7 +19,6 @@
 
         <div class="aa-sovtimer-body">
             {% get_datatables_language_static LANGUAGE_CODE as DT_LANG_PATH %}
-            {% get_momentjs_language_code LANGUAGE_CODE as MOMENTJS_LCODE %}
 
             <script>
                 const sovtimerJsSettingsDefaults = {
@@ -29,10 +28,7 @@
                         timeWithSeconds: 'LTS',
                         datetime: 'L LT',
                         datetimeWithSeconds: 'L LTS',
-                    },
-                    language: {
-                        django: '{{ LANGUAGE_CODE }}',
-                        momentJS: '{{ MOMENTJS_LCODE }}',
+                        datetimeLong: 'LL LTS',
                     },
                     dataTables: {
                         paging: true,