offspot-config 2.2.3__tar.gz → 2.2.5__tar.gz

{offspot_config-2.2.3 → offspot_config-2.2.5}/CHANGELOG.md

@@ -5,7 +5,23 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.23] - 2024-04-26
+## [2.2.5] - 2024-05-21
+
+### Added
+
+- [utils.dashboard] New `Reader.to_dashboard_dict()` returning dashboard-transformed download URL
+
+### Fixed
+
+- [builder] Reader download link using local URL
+
+## [2.2.4] - 2024-05-01
+
+### Changed
+
+- [builder] Using captive-portal 1.4.3 fixing 2.2.1 regression
+
+## [2.2.3] - 2024-04-26
 
 ### Fixed
 

{offspot_config-2.2.3 → offspot_config-2.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: offspot-config
-Version: 2.2.3
+Version: 2.2.5
 Summary: Offspot Config helpers
 Project-URL: Homepage, https://github.com/offspot/offspot-config
 Project-URL: Donate, https://www.kiwix.org/en/support-us/

{offspot_config-2.2.3 → offspot_config-2.2.5}/src/offspot_config/builder.py

@@ -49,9 +49,9 @@ KIWIX_ZIM_LOAD_BALANCER_URL = "https://download.kiwix.org/zim/"
 # data source for “internal images” (out of catalog)
 INTERNAL_IMAGES = {
     "captive-portal": {
-        "source": "ghcr.io/offspot/captive-portal:1.4.2",
-        "filesize": 189900800,
-        "fullsize": 189833272,
+        "source": "ghcr.io/offspot/captive-portal:1.4.3",
+        "filesize": 189890560,
+        "fullsize": 189818424,
     },
     "dashboard": {
         "source": "ghcr.io/offspot/dashboard:1.3.1",
@@ -294,7 +294,7 @@ class ConfigBuilder:
 
         if self.dashboard_readers:
             payload["readers"] = [
-                reader.to_dict()
+                reader.to_dashboard_dict(download_fqdn=f"{ZIMDL_PREFIX}.{self.fqdn}")
                 for reader in sorted(self.dashboard_readers, key=Reader.sort)
             ]
 

{offspot_config-2.2.3 → offspot_config-2.2.5}/src/offspot_config/utils/dashboard.py

@@ -30,6 +30,11 @@ class Reader(NamedTuple):
 
         return {field: value_or_dict(getattr(self, field)) for field in self._fields}
 
+    def to_dashboard_dict(self, download_fqdn: str) -> dict[str, str | int]:
+        data = self.to_dict()
+        data["download_url"] = f"//{download_fqdn}/{data['filename']!s}"
+        return data
+
     @property
     def order(self) -> int:
         """sort-usable order based on reader's platform popularity"""

offspot_config-2.2.5/src/offspot_runtime/__about__.py

@@ -0,0 +1 @@
+__version__ = "2.2.5"

{offspot_config-2.2.3 → offspot_config-2.2.5}/tests/test_reader.py

@@ -27,8 +27,8 @@ REALISTIC_VALUES = [
     ),
     (
         "macos",
-        "https://download.kiwix.org/release/kiwix-desktop-macos/kiwix-desktop-macos_3.1.0.dmg",
-        "kiwix-desktop-macos_3.1.0.dmg",
+        "https://download.kiwix.org/release/kiwix-macos/kiwix-macos_3.1.0.dmg",
+        "kiwix-macos_3.1.0.dmg",
         16051402,
         "747fd0841b56d2d5158e0e65646b1be1",
     ),
@@ -47,8 +47,8 @@ REALISTIC_VALUES = [
             "kiwix-3.9.1.apk",
         ),
         (
-            "https://download.kiwix.org/release/kiwix-desktop-macos/kiwix-desktop-macos_3.1.0.dmg",
-            "kiwix-desktop-macos_3.1.0.dmg",
+            "https://download.kiwix.org/release/kiwix-macos/kiwix-macos_3.1.0.dmg",
+            "kiwix-macos_3.1.0.dmg",
         ),
         (
             "https://download.kiwix.org/release/kiwix-desktop/kiwix-desktop_x86_64_2.3.1-4.appimage",
@@ -201,14 +201,14 @@ def test_sort_order():
         ),
         (
             "macos",
-            "https://download.kiwix.org/release/kiwix-desktop-macos/kiwix-desktop-macos_3.1.0.dmg",
+            "https://download.kiwix.org/release/kiwix-macos/kiwix-macos_3.1.0.dmg",
             None,
             None,
             None,
             {
                 "platform": "macos",
-                "download_url": "https://download.kiwix.org/release/kiwix-desktop-macos/kiwix-desktop-macos_3.1.0.dmg",
-                "filename": "kiwix-desktop-macos_3.1.0.dmg",
+                "download_url": "https://download.kiwix.org/release/kiwix-macos/kiwix-macos_3.1.0.dmg",
+                "filename": "kiwix-macos_3.1.0.dmg",
                 "size": 16051402,
                 "checksum": None,
             },

offspot_config-2.2.3/src/offspot_runtime/__about__.py

@@ -1 +0,0 @@
-__version__ = "2.2.3"