Fix: Update beta logic and query to handle empty report_url (#141)

SynoCommunity · Jan 23, 2025 · 32314a3 · 32314a3
1 parent 8b4f42d
commit 32314a3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/spkrepo/models.py b/spkrepo/models.py
@@ -462,7 +462,7 @@ def version_string(self):
 
     @hybrid_property
     def beta(self):
-        return self.report_url != None  # noqa: E711
+        return bool(self.report_url)  # Treats None and "" as False
 
     @hybrid_property
     def all_builds_active(self):
@@ -484,6 +484,10 @@ def all_builds_active(cls):
             .label("total_builds")
         )
 
+    @beta.expression
+    def beta(cls):
+        return db.and_(cls.report_url.isnot(None), cls.report_url != "")
+
     @property
     def path(self):
         return os.path.join(self.package.name, str(self.version))

diff --git a/spkrepo/views/nas.py b/spkrepo/views/nas.py
@@ -64,7 +64,9 @@ def get_catalog(arch, build, language, beta):
     ).select_from(Version)
 
     if not beta:
-        latest_version = latest_version.filter(Version.report_url.is_(None))
+        latest_version = latest_version.filter(
+            db.or_(Version.report_url.is_(None), Version.report_url == "")
+        )
 
     latest_version = (
         latest_version.join(Build)