Improve admin webui

.flake8

@@ -1,7 +1,7 @@
 [flake8]
 max-line-length = 88
 extend-ignore = E203
-per-file-ignores = __init__.py:F401 spkrepo/app.py:F841
+per-file-ignores = __init__.py:F401
 exclude =
     docs/*
     migrations/*

migrations/alembic.ini

@@ -1,5 +1,5 @@
 [alembic]
-script_location = .
+script_location = ./migrations
 
 [loggers]
 keys = root,sqlalchemy,alembic

migrations/env.py

@@ -5,9 +5,14 @@
 from flask import current_app
 from sqlalchemy import engine_from_config, pool
 
+from spkrepo import create_app
+
 config = context.config
 fileConfig(config.config_file_name)
 
+# Set up the Flask application context
+app = create_app()  # Create the Flask app
+app.app_context().push()  # Push the app context
 
 config.set_main_option(
     "sqlalchemy.url", current_app.config.get("SQLALCHEMY_DATABASE_URI")

migrations/versions/dc7687894ba7_increase_field_sizes.py

@@ -13,7 +13,6 @@
 
 
 def upgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
     op.alter_column(
         "version",
         "conf_dependencies",
@@ -42,11 +41,9 @@ def upgrade():
         type_=sa.UnicodeText(),
         existing_nullable=True,
     )
-    # ### end Alembic commands ###
 
 
 def downgrade():
-    # ### commands auto generated by Alembic - please adjust! ###
     op.alter_column(
         "version",
         "conf_resource",
@@ -75,4 +72,3 @@ def downgrade():
         type_=sa.VARCHAR(length=255),
         existing_nullable=True,
     )
-    # ### end Alembic commands ###

spkrepo/app.py

@@ -2,12 +2,11 @@
 import jinja2
 from flask import Flask
 from flask_admin import Admin
-from flask_babel import Babel
 from wtforms import HiddenField
 
 from . import config as default_config
 from .cli import spkrepo as spkrepo_cli
-from .ext import cache, db, debug_toolbar, mail, migrate, security
+from .ext import babel, cache, db, debug_toolbar, mail, migrate, security
 from .models import user_datastore
 from .views import (
     ArchitectureView,
@@ -16,6 +15,7 @@
     IndexView,
     PackageView,
     ScreenshotView,
+    ServiceView,
     SpkrepoConfirmRegisterForm,
     UserView,
     VersionView,
@@ -53,18 +53,19 @@ def create_app(config=None, register_blueprints=True, init_admin=True):
         admin.add_view(UserView())
         admin.add_view(ArchitectureView())
         admin.add_view(FirmwareView())
+        admin.add_view(ServiceView())
         admin.add_view(ScreenshotView())
         admin.add_view(PackageView())
         admin.add_view(VersionView())
         admin.add_view(BuildView())
         admin.init_app(app)
 
-    # Initialize Flask-Babel
-    babel = Babel(app)
-
     # Commands
     app.cli.add_command(spkrepo_cli)
 
+    # Flask-Babel
+    babel.init_app(app)
+
     # SQLAlchemy
     db.init_app(app)
 

spkrepo/cli.py

@@ -180,8 +180,15 @@ def depopulate_db():
     from spkrepo.models import Package
 
     for package in Package.query.all():
-        shutil.rmtree(os.path.join(current_app.config["DATA_PATH"], package.name))
+        # Delete the package and its associated versions and builds
         db.session.delete(package)
+
+        # Remove the directory associated with the package (if it exists)
+        shutil.rmtree(
+            os.path.join(current_app.config["DATA_PATH"], package.name),
+            ignore_errors=True,
+        )
+
     db.session.commit()
 
 

spkrepo/ext.py

@@ -1,11 +1,15 @@
 # -*- coding: utf-8 -*-
+from flask_babel import Babel
 from flask_caching import Cache
 from flask_debugtoolbar import DebugToolbarExtension
 from flask_mail import Mail
 from flask_migrate import Migrate
 from flask_security import Security
 from flask_sqlalchemy import SQLAlchemy
 
+# Flask-Babel
+babel = Babel()
+
 # Cache
 cache = Cache()
 

spkrepo/models.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import hashlib
 import io
 import os
 import shutil
@@ -328,7 +329,7 @@ class Build(db.Model):
     publisher_user_id = db.Column(db.Integer, db.ForeignKey("user.id"))
     checksum = db.Column(db.Unicode(32))
     extract_size = db.Column(db.Integer)
-    path = db.Column(db.Unicode(100))
+    path = db.Column(db.Unicode(2048))
     md5 = db.Column(db.Unicode(32))
     insert_date = db.Column(db.DateTime, default=db.func.now(), nullable=False)
     active = db.Column(db.Boolean(), default=False, nullable=False)
@@ -343,7 +344,11 @@ class Build(db.Model):
     )
     firmware = db.relationship("Firmware", lazy=False)
     publisher = db.relationship("User", foreign_keys=[publisher_user_id])
-    downloads = db.relationship("Download", back_populates="build")
+    downloads = db.relationship(
+        "Download",
+        back_populates="build",
+        cascade="save-update, merge, delete, delete-orphan",
+    )
 
     @classmethod
     def generate_filename(cls, package, version, firmware, architectures):
@@ -360,6 +365,24 @@ def save(self, stream):
         ) as f:
             f.write(stream.read())
 
+    def calculate_md5(self):
+        if not self.path:
+            raise ValueError("Path cannot be empty.")
+
+        file_path = os.path.join(current_app.config["DATA_PATH"], self.path)
+
+        if not os.path.exists(file_path):
+            raise FileNotFoundError(f"File not found at path: {file_path}")
+
+        if self.md5 is None:
+            with io.open(file_path, "rb") as f:
+                md5_hash = hashlib.md5()
+                for chunk in iter(lambda: f.read(4096), b""):
+                    md5_hash.update(chunk)
+                return md5_hash.hexdigest()
+
+        return self.md5
+
     def _after_insert(self):
         assert os.path.exists(os.path.join(current_app.config["DATA_PATH"], self.path))
 

spkrepo/tests/common.py

@@ -281,8 +281,7 @@ def create_spk(self, create, extracted, **kwargs):
         with create_spk(self) as spk_stream:
             self.save(spk_stream)
             if self.md5 is None:
-                spk_stream.seek(0)
-                self.md5 = hashlib.md5(spk_stream.read()).hexdigest()
+                self.md5 = self.calculate_md5()
         spk_stream.close()
 
     @classmethod

spkrepo/tests/test_nas.py

@@ -227,11 +227,11 @@ def test_stable_build_active_stable(self):
             catalog[0], build, data, dict(arch="88f628x", build="1594")
         )
 
-    def test_stable_build_active_stable_5004(self):
+    def test_stable_noarch_build_active_stable_5004(self):
         build = BuildFactory(
             active=True,
             version__report_url=None,
-            architectures=[Architecture.find("88f6281", syno=True)],
+            architectures=[Architecture.find("noarch", syno=True)],
             firmware=Firmware.find(1594),
         )
         db.session.commit()
@@ -247,6 +247,23 @@ def test_stable_build_active_stable_5004(self):
             catalog["packages"][0], build, data, dict(arch="88f628x", build="5004")
         )
 
+    def test_stable_arch_build_active_stable_5004(self):
+        BuildFactory(
+            active=True,
+            version__report_url=None,
+            architectures=[Architecture.find("88f6281", syno=True)],
+            firmware=Firmware.find(1594),
+        )
+        db.session.commit()
+        data = dict(arch="88f6281", build="5004", language="enu")
+        response = self.client.post(url_for("nas.catalog"), data=data)
+        self.assert200(response)
+        self.assertHeader(response, "Content-Type", "application/json")
+        catalog = json.loads(response.data.decode())
+        self.assertIn("packages", catalog)
+        self.assertIn("keyrings", catalog)
+        self.assertEqual(len(catalog["packages"]), 0)
+
     def test_stable_build_active_stable_download_count(self):
         package = PackageFactory()
         build = BuildFactory(
@@ -543,9 +560,9 @@ def test_generic(self):
         response = self.client.get(
             url_for(
                 "nas.download",
-                architecture_id=architecture.id,
-                firmware_build=4458,
-                build_id=build.id,
+                md5=build.md5,
+                arch=architecture.code,
+                build=4458,
             ),
             environ_base={"REMOTE_ADDR": "127.0.0.1"},
             headers={"User-Agent": "My User Agent"},
@@ -575,9 +592,9 @@ def test_wrong_build(self):
         response = self.client.get(
             url_for(
                 "nas.download",
-                architecture_id=architecture.id,
-                firmware_build=4458,
-                build_id=build.id + 1,
+                md5=build.md5 + "1",
+                arch=architecture.code,
+                build=4458,
             )
         )
         self.assert404(response)
@@ -596,9 +613,9 @@ def test_inactive_build(self):
         response = self.client.get(
             url_for(
                 "nas.download",
-                architecture_id=architecture.id,
-                firmware_build=4458,
-                build_id=build.id,
+                md5=build.md5,
+                arch=architecture.code,
+                build=4458,
             )
         )
         self.assert403(response)
@@ -617,9 +634,9 @@ def test_wrong_architecture(self):
         response = self.client.get(
             url_for(
                 "nas.download",
-                architecture_id=10,
-                firmware_build=4458,
-                build_id=build.id,
+                md5=build.md5,
+                arch=Architecture.find(10).code if Architecture.find(10) else "",
+                build=4458,
             )
         )
         self.assert404(response)
@@ -638,9 +655,9 @@ def test_incorrect_architecture(self):
         response = self.client.get(
             url_for(
                 "nas.download",
-                architecture_id=Architecture.find("cedarview").id,
-                firmware_build=4458,
-                build_id=build.id,
+                md5=build.md5,
+                arch=Architecture.find("cedarview").code,
+                build=4458,
             )
         )
         self.assert400(response)
@@ -659,9 +676,9 @@ def test_incorrect_firmware_build(self):
         response = self.client.get(
             url_for(
                 "nas.download",
-                architecture_id=architecture.id,
-                firmware_build=1593,
-                build_id=build.id,
+                md5=build.md5,
+                arch=architecture.code,
+                build=1593,
             )
         )
         self.assert400(response)

spkrepo/utils.py

@@ -345,6 +345,18 @@ def unsign(self):
         self.stream.truncate()
         self.stream.seek(0)
 
+    def calculate_md5(self):
+        md5_hash = hashlib.md5()
+
+        # Ensure the stream position is at the beginning
+        self.stream.seek(0)
+
+        # Update MD5 hash directly from the stream
+        for chunk in iter(lambda: self.stream.read(4096), b""):
+            md5_hash.update(chunk)
+
+        return md5_hash.hexdigest()
+
     def _generate_signature(self, stream, timestamp_url, gnupghome):  # pragma: no cover
         # generate the signature
         gpg = gnupg.GPG(gnupghome=gnupghome)

spkrepo/views/__init__.py

@@ -6,6 +6,7 @@
     IndexView,
     PackageView,
     ScreenshotView,
+    ServiceView,
     UserView,
     VersionView,
 )