Initial work to support magazines

.github/workflows/django.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       max-parallel: 2
       matrix:
-        python-version: ['3.13', '3.14']
+        python-version: ['3.12', '3.13']
 
     steps:
     - uses: actions/checkout@v3

monitoring/README.md

@@ -1,129 +0,0 @@
-# Asset telemetry monitoring
-
-> [!CAUTION]
-> This is a PoC, not suitable for real world due to lack of any authentication and security
-
-## Pre-requisites
-
-- Python 3.12
-- Podman (or Docker)
-
-## Architecture
-
-The `dispatcher.py` script collects data (`cab` commands) from a CommandStation and sends it a MQTT broker. 
-
-The command being monitored is `<l cab reg speedByte functMap>` which is returned by the `<t cab speed dir>` throttle command. See the [DCC-EX command reference](https://dcc-ex.com/reference/software/command-summary-consolidated.html#t-cab-speed-dir-set-cab-loco-speed).
-
-`mosquitto` is the MQTT broker.
-
-The `handler.py` script subscribes to the MQTT broker and saves relevant data to the Timescale database.
-
-Data is finally save into a Timescale hypertable.
-
-## How to run
-
-### Deploy Timescale
-
-```bash
-$ podman run -d -p 5432:5432 -v $(pwd)/data:/var/lib/postgresql/data -e "POSTGRES_USER=dccmonitor" -e "POSTGRES_PASSWORD=dccmonitor" --name timescale timescale/timescaledb:latest-pg17
-```
-> [!IMPORTANT]
-> A volume should be created for persistent data
-
-Tables and hypertables are automatically created by the `handler.py` script
-
-### Deploy Mosquitto
-
-```bash
-$ podman run --userns=keep-id -d -p 1883:1883 -v $(pwd)/config/mosquitto.conf:/mosquitto/config/mosquitto.conf --name mosquitto eclipse-mosquitto:2.0
-```
-
-### Run the dispatcher and the handler
-
-```bash
-$ python dispatcher.py
-```
-
-```bash
-$ python handler.py
-```
-
-## Debug data in Timescale
-
-### Create a 10 secs aggregated data table
-
-```sql
-CREATE MATERIALIZED VIEW telemetry_10secs
-WITH (timescaledb.continuous) AS
-SELECT 
-    time_bucket('10 seconds', timestamp) AS bucket,
-    cab,
-    ROUND(CAST(AVG(speed) AS NUMERIC), 1) AS avg_speed,
-    MIN(speed) AS min_speed,
-    MAX(speed) AS max_speed
-FROM telemetry
-GROUP BY bucket, cab;
-```
-
-and set the update policy:
-
-```sql
-SELECT add_continuous_aggregate_policy(
-    'telemetry_10secs',
-    start_offset => INTERVAL '1 hour',  -- Go back 1 hour for updates
-    end_offset   => INTERVAL '1 minute', -- Keep the latest 5 min fresh
-    schedule_interval => INTERVAL '1 minute' -- Run every minute
-);
-
-```
-
-### Running statistics from 10 seconds table
-
-```sql
-WITH speed_durations AS (
-    SELECT 
-        cab,
-        avg_speed,
-        max_speed,
-        bucket AS start_time,
-        LEAD(bucket) OVER (
-            PARTITION BY cab ORDER BY bucket
-        ) AS end_time,
-        LEAD(bucket) OVER (PARTITION BY cab ORDER BY bucket) - bucket AS duration
-    FROM telemetry_10secs
-)
-SELECT * FROM speed_durations WHERE end_time IS NOT NULL;
-```
-
-and filtered by `cab` number, via a function
-
-```sql
-CREATE FUNCTION get_speed_durations(cab_id INT) 
-RETURNS TABLE (
-    cab INT, 
-    speed DOUBLE PRECISION, 
-    dir TEXT, 
-    start_time TIMESTAMPTZ, 
-    end_time TIMESTAMPTZ, 
-    duration INTERVAL
-) 
-AS $$
-WITH speed_durations AS (
-    SELECT 
-        cab,
-        avg_speed,
-        max_speed,
-        bucket AS start_time,
-        LEAD(bucket) OVER (
-            PARTITION BY cab ORDER BY bucket
-        ) AS end_time,
-        LEAD(bucket) OVER (PARTITION BY cab ORDER BY bucket) - bucket AS duration
-    FROM telemetry_10secs
-)
-SELECT * FROM speed_durations WHERE end_time IS NOT NULL AND cab = cab_id;
-$$ LANGUAGE sql;
-
--- Refresh data
-CALL refresh_continuous_aggregate('telemetry_10secs', NULL, NULL);
-SELECT * FROM get_speed_durations(1);
-```

monitoring/compose.yml

@@ -1,36 +0,0 @@
-# -*- coding: utf-8 -*-
-# vim: tabstop=2 shiftwidth=2 softtabstop=2
-networks:
-  net:
-
-volumes:
-  pgdata:
-  staticdata:
-
-x-op-service-default: &service_default
-  restart: always  # unless-stopped
-  init: true
-
-services:
-  timescale:
-    <<: *service_default
-    image: timescale/timescaledb:latest-pg17
-    ports:
-        - "${CUSTOM_DOCKER_IP:-0.0.0.0}:5432:5432"
-    environment:
-      POSTGRES_USER: "dccmonitor"
-      POSTGRES_PASSWORD: "dccmonitor"
-    volumes:
-      - "pgdata:/var/lib/postgresql/data"
-    networks:
-      - net
-
-  broker:
-    <<: *service_default
-    image: eclipse-mosquitto:2.0
-    ports:
-        - "${CUSTOM_DOCKER_IP:-0.0.0.0}:1883:1883"
-    volumes:
-      - "./config/mosquitto.conf:/mosquitto/config/mosquitto.conf:ro"
-    networks:
-      - net

monitoring/config/mosquitto.conf

@@ -1,2 +0,0 @@
-allow_anonymous true
-listener 1883

monitoring/dispatcher.py

@@ -1,107 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import time
-import json
-import socket
-import logging
-import paho.mqtt.client as mqtt
-
-# FIXME: create a configuration
-# TCP Socket Configuration
-TCP_HOST = "192.168.10.110"  # Replace with your TCP server IP
-TCP_PORT = 2560              # Replace with your TCP server port
-
-# FIXME: create a configuration
-# MQTT Broker Configuration
-MQTT_BROKER = "localhost"
-MQTT_PORT = 1883
-MQTT_TOPIC = "telemetry/commandstation"
-
-# Connect to MQTT Broker
-mqtt_client = mqtt.Client(mqtt.CallbackAPIVersion.VERSION2)
-
-
-# Connect function with automatic reconnection
-def connect_mqtt():
-    while True:
-        try:
-            mqtt_client.connect(MQTT_BROKER, MQTT_PORT, keepalive=60)
-            mqtt_client.loop_start()  # Start background loop
-            logging.info("Connected to MQTT broker!")
-            return
-        except Exception as e:
-            logging.info(f"Connection failed: {e}. Retrying in 5 seconds...")
-            time.sleep(5)  # Wait before Retrying
-
-
-# Ensure connection before publishing
-def safe_publish(topic, message):
-    if not mqtt_client.is_connected():
-        print("MQTT Disconnected! Reconnecting...")
-        connect_mqtt()  # Reconnect if disconnected
-
-    result = mqtt_client.publish(topic, message, qos=1)
-    result.wait_for_publish()  # Ensure message is published
-    logging.debug(f"Published: {message}")
-
-
-def process_message(message):
-    """Parses the '<l cab speed dir>' format and converts it to JSON."""
-    if not message.startswith("<l"):
-        return None
-
-    parts = message.strip().split()  # Split by spaces
-    if len(parts) != 5:
-        logging.debug(f"Invalid speed command: {message}")
-        return None
-
-    _, _cab, _, _speed, _ = parts  # Ignore the first `<t`
-    cab = int(_cab)
-    speed = int(_speed)
-    if speed > 1 and speed < 128:
-        direction = "r"
-        speed = speed - 1
-    elif speed > 129 and speed < 256:
-        direction = "f"
-        speed = speed - 129
-    else:
-        speed = 0
-        direction = "n"
-
-    try:
-        json_data = {
-            "cab": cab,
-            "speed": speed,
-            "dir": direction
-        }
-        return json_data
-    except ValueError as e:
-        logging.error(f"Error parsing message: {e}")
-        return None
-
-
-def start_tcp_listener():
-    """Listens for incoming TCP messages and publishes them to MQTT."""
-    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as sock:
-        sock.connect((TCP_HOST, TCP_PORT))
-        logging.info(
-            f"Connected to TCP server at {TCP_HOST}:{TCP_PORT}"
-        )
-
-        while True:
-            data = sock.recv(1024).decode("utf-8")  # Read a chunk of data
-            if not data:
-                break
-
-            lines = data.strip().split("\n")  # Handle multiple lines
-            for line in lines:
-                json_data = process_message(line)
-                if json_data:
-                    safe_publish(MQTT_TOPIC, json.dumps(json_data))
-
-
-# Start the listener
-if __name__ == "__main__":
-    logging.basicConfig(level=os.getenv("DCC_LOGLEVEL", "INFO").upper())
-    start_tcp_listener()

monitoring/handler.py

@@ -1,87 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import json
-import logging
-import datetime
-import psycopg2
-import paho.mqtt.client as mqtt
-
-# MQTT Broker Configuration
-MQTT_BROKER = "localhost"
-MQTT_PORT = 1883
-MQTT_TOPIC = "telemetry/commandstation"
-
-# TimescaleDB Configuration
-DB_HOST = "localhost"
-DB_NAME = "dccmonitor"
-DB_USER = "dccmonitor"
-DB_PASSWORD = "dccmonitor"
-
-
-# The callback for when the client receives a CONNACK response from the server.
-def on_connect(client, userdata, flags, reason_code, properties):
-    logging.info(f"Connected with result code {reason_code}")
-    # Subscribing in on_connect() means that if we lose the connection and
-    # reconnect then subscriptions will be renewed.
-    client.subscribe(MQTT_TOPIC)
-
-
-# MQTT Callback: When a new message arrives
-def on_message(client, userdata, msg):
-    try:
-        payload = json.loads(msg.payload.decode("utf-8"))
-        cab = payload["cab"]
-        speed = payload["speed"]
-        direction = payload["dir"]
-        timestamp = datetime.datetime.now(datetime.UTC)
-
-        # Insert into TimescaleDB
-        cur.execute(
-            "INSERT INTO telemetry (timestamp, cab, speed, dir) VALUES (%s, %s, %s, %s)",  # noqa: E501
-            (timestamp, cab, speed, direction),
-        )
-        conn.commit()
-        logging.debug(
-            f"Inserted: {timestamp} | Cab: {cab} | Speed: {speed} | Dir: {direction}"  # noqa: E501
-        )
-
-    except Exception as e:
-        logging.error(f"Error processing message: {e}")
-
-
-if __name__ == "__main__":
-    logging.basicConfig(level=os.getenv("DCC_LOGLEVEL", "INFO").upper())
-
-    # Connect to TimescaleDB
-    conn = psycopg2.connect(
-        dbname=DB_NAME, user=DB_USER, password=DB_PASSWORD, host=DB_HOST
-    )
-    cur = conn.cursor()
-
-    # Ensure hypertable exists
-    cur.execute("""
-        CREATE TABLE IF NOT EXISTS telemetry (
-            timestamp TIMESTAMPTZ NOT NULL DEFAULT now(),
-            cab INT NOT NULL,
-            speed DOUBLE PRECISION NOT NULL,
-            dir TEXT NOT NULL
-        );
-    """)
-    conn.commit()
-
-    # Convert table to hypertable if not already
-    cur.execute("SELECT EXISTS (SELECT 1 FROM timescaledb_information.hypertables WHERE hypertable_name = 'telemetry');")  # noqa: E501
-    if not cur.fetchone()[0]:
-        cur.execute("SELECT create_hypertable('telemetry', 'timestamp');")
-        conn.commit()
-
-    # Setup MQTT Client
-    client = mqtt.Client(mqtt.CallbackAPIVersion.VERSION2)
-    client.on_connect = on_connect
-    client.on_message = on_message
-    client.connect(MQTT_BROKER, MQTT_PORT)
-
-    # Start listening for messages
-    logging.info(f"Listening for MQTT messages on {MQTT_TOPIC}...")
-    client.loop_forever()

monitoring/requirements.txt

@@ -1,2 +0,0 @@
-paho-mqtt
-psycopg2-binary

ram/bookshelf/admin.py

@@ -2,13 +2,17 @@ import html
 
 from django.conf import settings
 from django.contrib import admin
-from django.utils.html import format_html, format_html_join, strip_tags
+from django.utils.html import format_html, strip_tags
 from adminsortable2.admin import SortableAdminBase, SortableInlineAdminMixin
 
 from ram.admin import publish, unpublish
 from ram.utils import generate_csv
 from portal.utils import get_site_conf
-from repository.models import BookDocument, CatalogDocument
+from repository.models import (
+    BookDocument,
+    CatalogDocument,
+    MagazineIssueDocument
+)
 from bookshelf.models import (
     BaseBookProperty,
     BaseBookImage,
@@ -16,6 +20,8 @@ from bookshelf.models import (
     Author,
     Publisher,
     Catalog,
+    Magazine,
+    MagazineIssue,
 )
 
 
@@ -48,6 +54,10 @@ class CatalogDocInline(BookDocInline):
     model = CatalogDocument
 
 
+class MagazineIssueDocInline(BookDocInline):
+    model = MagazineIssueDocument
+
+
 @admin.register(Book)
 class BookAdmin(SortableAdminBase, admin.ModelAdmin):
     inlines = (
@@ -123,14 +133,13 @@ class BookAdmin(SortableAdminBase, admin.ModelAdmin):
     @admin.display(description="Invoices")
     def invoices(self, obj):
         if obj.invoice.exists():
-            html = format_html_join(
+            html = "<br>".join(
-                "<br>",
+                "<a href=\"{}\" target=\"_blank\">{}</a>".format(
-                "<a href=\"{}\" target=\"_blank\">{}</a>",
+                    i.file.url, i
-                ((i.file.url, i) for i in obj.invoice.all())
+                ) for i in obj.invoice.all())
-            )
         else:
             html = "-"
-        return html
+        return format_html(html)
 
     @admin.display(description="Publisher")
     def get_publisher(self, obj):
@@ -208,7 +217,7 @@ class PublisherAdmin(admin.ModelAdmin):
     @admin.display(description="Country")
     def country_flag(self, obj):
         return format_html(
-            '<img src="{}" /> {}', obj.country.flag, obj.country.name
+            '<img src="{}" /> {}'.format(obj.country.flag, obj.country.name)
         )
 
 
@@ -286,14 +295,13 @@ class CatalogAdmin(SortableAdminBase, admin.ModelAdmin):
     @admin.display(description="Invoices")
     def invoices(self, obj):
         if obj.invoice.exists():
-            html = format_html_join(
+            html = "<br>".join(
-                "<br>",
+                "<a href=\"{}\" target=\"_blank\">{}</a>".format(
-                "<a href=\"{}\" target=\"_blank\">{}</a>",
+                    i.file.url, i
-                ((i.file.url, i) for i in obj.invoice.all())
+                ) for i in obj.invoice.all())
-            )
         else:
             html = "-"
-        return html
+        return format_html(html)
 
     def download_csv(modeladmin, request, queryset):
         header = [
@@ -346,3 +354,47 @@ class CatalogAdmin(SortableAdminBase, admin.ModelAdmin):
 
     download_csv.short_description = "Download selected items as CSV"
     actions = [publish, unpublish, download_csv]
+
+
+@admin.register(Issue)
+class MagazineIssueAdmin(admin.ModelAdmin):
+    inlines = (
+        BookPropertyInline,
+        BookImageInline,
+        MagazineIssueDocInline,
+    )
+    list_display = (
+        "__str__",
+        "issue_number",
+        "published",
+    )
+    # autocomplete_fields = ("publisher",)
+    # readonly_fields = ("creation_time", "updated_time")
+    # search_fields = ("title", "publisher__name")
+    # list_filter = ("publisher__name", "language")
+
+    def get_model_perms(self, request):
+        """
+        Return empty perms dict thus hiding the model from admin index.
+        """
+        return {}
+
+    actions = [publish, unpublish]
+
+
+@admin.register(Magazine)
+class MagazineAdmin(admin.ModelAdmin):
+    inlines = (
+        MagazineIssueInline,
+    )
+    list_display = (
+        "__str__",
+        "publisher",
+        "published",
+    )
+    autocomplete_fields = ("publisher",)
+    readonly_fields = ("creation_time", "updated_time")
+    search_fields = ("name", "publisher__name")
+    list_filter = ("publisher__name", "language")
+
+    actions = [publish, unpublish]

ram/bookshelf/migrations/0016_basebook_book_catalogue.py

@@ -1,8 +1,7 @@
 # Generated by Django 5.1.2 on 2024-11-27 16:35
 
 import django.db.models.deletion
-from django.db import migrations, models, connection
+from django.db import migrations, models
-from django.db.utils import ProgrammingError, OperationalError
 
 
 def basebook_to_book(apps, schema_editor):
@@ -17,19 +16,6 @@ def basebook_to_book(apps, schema_editor):
         b.authors.set(row.old_authors.all())
 
 
-def drop_temporary_tables(apps, schema_editor):
-    try:
-        with connection.cursor() as cursor:
-            cursor.execute(
-                'DROP TABLE IF EXISTS bookshelf_basebook_old_authors'
-            )
-            cursor.execute(
-                'DROP TABLE IF EXISTS bookshelf_basebook_authors'
-            )
-    except (ProgrammingError, OperationalError):
-        pass
-
-
 class Migration(migrations.Migration):
 
     dependencies = [
@@ -115,6 +101,10 @@ class Migration(migrations.Migration):
             model_name="basebook",
             name="old_title",
         ),
+        migrations.RemoveField(
+            model_name="basebook",
+            name="old_authors",
+        ),
         migrations.RemoveField(
             model_name="basebook",
             name="old_publisher",
@@ -148,16 +138,4 @@ class Migration(migrations.Migration):
             },
             bases=("bookshelf.basebook",),
         ),
-        # Required by Dajngo 6.0 on SQLite
-        migrations.SeparateDatabaseAndState(
-            state_operations=[
-                migrations.RemoveField(
-                    model_name="basebook",
-                    name="old_authors",
-                ),
-            ],
-            database_operations=[
-                migrations.RunPython(drop_temporary_tables)
-            ]
-        ),
     ]

ram/bookshelf/migrations/0024_alter_basebook_language.py

@@ -1,123 +0,0 @@
-# Generated by Django 6.0 on 2025-12-03 22:07
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookshelf", "0023_delete_basebookdocument"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="basebook",
-            name="language",
-            field=models.CharField(
-                choices=[
-                    ("af", "Afrikaans"),
-                    ("ar", "Arabic"),
-                    ("ar-dz", "Algerian Arabic"),
-                    ("ast", "Asturian"),
-                    ("az", "Azerbaijani"),
-                    ("bg", "Bulgarian"),
-                    ("be", "Belarusian"),
-                    ("bn", "Bengali"),
-                    ("br", "Breton"),
-                    ("bs", "Bosnian"),
-                    ("ca", "Catalan"),
-                    ("ckb", "Central Kurdish (Sorani)"),
-                    ("cs", "Czech"),
-                    ("cy", "Welsh"),
-                    ("da", "Danish"),
-                    ("de", "German"),
-                    ("dsb", "Lower Sorbian"),
-                    ("el", "Greek"),
-                    ("en", "English"),
-                    ("en-au", "Australian English"),
-                    ("en-gb", "British English"),
-                    ("eo", "Esperanto"),
-                    ("es", "Spanish"),
-                    ("es-ar", "Argentinian Spanish"),
-                    ("es-co", "Colombian Spanish"),
-                    ("es-mx", "Mexican Spanish"),
-                    ("es-ni", "Nicaraguan Spanish"),
-                    ("es-ve", "Venezuelan Spanish"),
-                    ("et", "Estonian"),
-                    ("eu", "Basque"),
-                    ("fa", "Persian"),
-                    ("fi", "Finnish"),
-                    ("fr", "French"),
-                    ("fy", "Frisian"),
-                    ("ga", "Irish"),
-                    ("gd", "Scottish Gaelic"),
-                    ("gl", "Galician"),
-                    ("he", "Hebrew"),
-                    ("hi", "Hindi"),
-                    ("hr", "Croatian"),
-                    ("hsb", "Upper Sorbian"),
-                    ("ht", "Haitian Creole"),
-                    ("hu", "Hungarian"),
-                    ("hy", "Armenian"),
-                    ("ia", "Interlingua"),
-                    ("id", "Indonesian"),
-                    ("ig", "Igbo"),
-                    ("io", "Ido"),
-                    ("is", "Icelandic"),
-                    ("it", "Italian"),
-                    ("ja", "Japanese"),
-                    ("ka", "Georgian"),
-                    ("kab", "Kabyle"),
-                    ("kk", "Kazakh"),
-                    ("km", "Khmer"),
-                    ("kn", "Kannada"),
-                    ("ko", "Korean"),
-                    ("ky", "Kyrgyz"),
-                    ("lb", "Luxembourgish"),
-                    ("lt", "Lithuanian"),
-                    ("lv", "Latvian"),
-                    ("mk", "Macedonian"),
-                    ("ml", "Malayalam"),
-                    ("mn", "Mongolian"),
-                    ("mr", "Marathi"),
-                    ("ms", "Malay"),
-                    ("my", "Burmese"),
-                    ("nb", "Norwegian Bokmål"),
-                    ("ne", "Nepali"),
-                    ("nl", "Dutch"),
-                    ("nn", "Norwegian Nynorsk"),
-                    ("os", "Ossetic"),
-                    ("pa", "Punjabi"),
-                    ("pl", "Polish"),
-                    ("pt", "Portuguese"),
-                    ("pt-br", "Brazilian Portuguese"),
-                    ("ro", "Romanian"),
-                    ("ru", "Russian"),
-                    ("sk", "Slovak"),
-                    ("sl", "Slovenian"),
-                    ("sq", "Albanian"),
-                    ("sr", "Serbian"),
-                    ("sr-latn", "Serbian Latin"),
-                    ("sv", "Swedish"),
-                    ("sw", "Swahili"),
-                    ("ta", "Tamil"),
-                    ("te", "Telugu"),
-                    ("tg", "Tajik"),
-                    ("th", "Thai"),
-                    ("tk", "Turkmen"),
-                    ("tr", "Turkish"),
-                    ("tt", "Tatar"),
-                    ("udm", "Udmurt"),
-                    ("ug", "Uyghur"),
-                    ("uk", "Ukrainian"),
-                    ("ur", "Urdu"),
-                    ("uz", "Uzbek"),
-                    ("vi", "Vietnamese"),
-                    ("zh-hans", "Simplified Chinese"),
-                    ("zh-hant", "Traditional Chinese"),
-                ],
-                default="en",
-                max_length=7,
-            ),
-        ),
-    ]

ram/bookshelf/migrations/0024_issue_magazine_magazineissue.py

@@ -0,0 +1,226 @@
+# Generated by Django 5.2.8 on 2025-11-13 23:01
+
+import bookshelf.models
+import django.db.models.deletion
+import ram.utils
+import tinymce.models
+import uuid
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookshelf", "0023_delete_basebookdocument"),
+        ("metadata", "0025_alter_company_options_alter_manufacturer_options_and_more"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Issue",
+            fields=[
+                (
+                    "basebook_ptr",
+                    models.OneToOneField(
+                        auto_created=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        parent_link=True,
+                        primary_key=True,
+                        serialize=False,
+                        to="bookshelf.basebook",
+                    ),
+                ),
+                ("issue_number", models.CharField(max_length=100)),
+            ],
+            options={
+                "abstract": False,
+            },
+            bases=("bookshelf.basebook",),
+        ),
+        migrations.CreateModel(
+            name="Magazine",
+            fields=[
+                (
+                    "uuid",
+                    models.UUIDField(
+                        default=uuid.uuid4,
+                        editable=False,
+                        primary_key=True,
+                        serialize=False,
+                    ),
+                ),
+                ("description", tinymce.models.HTMLField(blank=True)),
+                ("notes", tinymce.models.HTMLField(blank=True)),
+                ("creation_time", models.DateTimeField(auto_now_add=True)),
+                ("updated_time", models.DateTimeField(auto_now=True)),
+                ("published", models.BooleanField(default=True)),
+                ("name", models.CharField(max_length=200)),
+                (
+                    "image",
+                    models.ImageField(
+                        blank=True,
+                        storage=ram.utils.DeduplicatedStorage,
+                        upload_to=bookshelf.models.magazine_image_upload,
+                    ),
+                ),
+                (
+                    "language",
+                    models.CharField(
+                        choices=[
+                            ("af", "Afrikaans"),
+                            ("ar", "Arabic"),
+                            ("ar-dz", "Algerian Arabic"),
+                            ("ast", "Asturian"),
+                            ("az", "Azerbaijani"),
+                            ("bg", "Bulgarian"),
+                            ("be", "Belarusian"),
+                            ("bn", "Bengali"),
+                            ("br", "Breton"),
+                            ("bs", "Bosnian"),
+                            ("ca", "Catalan"),
+                            ("ckb", "Central Kurdish (Sorani)"),
+                            ("cs", "Czech"),
+                            ("cy", "Welsh"),
+                            ("da", "Danish"),
+                            ("de", "German"),
+                            ("dsb", "Lower Sorbian"),
+                            ("el", "Greek"),
+                            ("en", "English"),
+                            ("en-au", "Australian English"),
+                            ("en-gb", "British English"),
+                            ("eo", "Esperanto"),
+                            ("es", "Spanish"),
+                            ("es-ar", "Argentinian Spanish"),
+                            ("es-co", "Colombian Spanish"),
+                            ("es-mx", "Mexican Spanish"),
+                            ("es-ni", "Nicaraguan Spanish"),
+                            ("es-ve", "Venezuelan Spanish"),
+                            ("et", "Estonian"),
+                            ("eu", "Basque"),
+                            ("fa", "Persian"),
+                            ("fi", "Finnish"),
+                            ("fr", "French"),
+                            ("fy", "Frisian"),
+                            ("ga", "Irish"),
+                            ("gd", "Scottish Gaelic"),
+                            ("gl", "Galician"),
+                            ("he", "Hebrew"),
+                            ("hi", "Hindi"),
+                            ("hr", "Croatian"),
+                            ("hsb", "Upper Sorbian"),
+                            ("hu", "Hungarian"),
+                            ("hy", "Armenian"),
+                            ("ia", "Interlingua"),
+                            ("id", "Indonesian"),
+                            ("ig", "Igbo"),
+                            ("io", "Ido"),
+                            ("is", "Icelandic"),
+                            ("it", "Italian"),
+                            ("ja", "Japanese"),
+                            ("ka", "Georgian"),
+                            ("kab", "Kabyle"),
+                            ("kk", "Kazakh"),
+                            ("km", "Khmer"),
+                            ("kn", "Kannada"),
+                            ("ko", "Korean"),
+                            ("ky", "Kyrgyz"),
+                            ("lb", "Luxembourgish"),
+                            ("lt", "Lithuanian"),
+                            ("lv", "Latvian"),
+                            ("mk", "Macedonian"),
+                            ("ml", "Malayalam"),
+                            ("mn", "Mongolian"),
+                            ("mr", "Marathi"),
+                            ("ms", "Malay"),
+                            ("my", "Burmese"),
+                            ("nb", "Norwegian Bokmål"),
+                            ("ne", "Nepali"),
+                            ("nl", "Dutch"),
+                            ("nn", "Norwegian Nynorsk"),
+                            ("os", "Ossetic"),
+                            ("pa", "Punjabi"),
+                            ("pl", "Polish"),
+                            ("pt", "Portuguese"),
+                            ("pt-br", "Brazilian Portuguese"),
+                            ("ro", "Romanian"),
+                            ("ru", "Russian"),
+                            ("sk", "Slovak"),
+                            ("sl", "Slovenian"),
+                            ("sq", "Albanian"),
+                            ("sr", "Serbian"),
+                            ("sr-latn", "Serbian Latin"),
+                            ("sv", "Swedish"),
+                            ("sw", "Swahili"),
+                            ("ta", "Tamil"),
+                            ("te", "Telugu"),
+                            ("tg", "Tajik"),
+                            ("th", "Thai"),
+                            ("tk", "Turkmen"),
+                            ("tr", "Turkish"),
+                            ("tt", "Tatar"),
+                            ("udm", "Udmurt"),
+                            ("ug", "Uyghur"),
+                            ("uk", "Ukrainian"),
+                            ("ur", "Urdu"),
+                            ("uz", "Uzbek"),
+                            ("vi", "Vietnamese"),
+                            ("zh-hans", "Simplified Chinese"),
+                            ("zh-hant", "Traditional Chinese"),
+                        ],
+                        default="en",
+                        max_length=7,
+                    ),
+                ),
+                (
+                    "publisher",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="bookshelf.publisher",
+                    ),
+                ),
+                (
+                    "tags",
+                    models.ManyToManyField(
+                        blank=True, related_name="magazine", to="metadata.tag"
+                    ),
+                ),
+            ],
+            options={
+                "ordering": ["name"],
+            },
+        ),
+        migrations.CreateModel(
+            name="MagazineIssue",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "issue",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="magazine_issue",
+                        to="bookshelf.issue",
+                    ),
+                ),
+                (
+                    "magazine",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="magazine_issue",
+                        to="bookshelf.magazine",
+                    ),
+                ),
+            ],
+            options={
+                "ordering": ["magazine", "issue"],
+                "unique_together": {("magazine", "issue")},
+            },
+        ),
+    ]

ram/bookshelf/models.py

@@ -3,6 +3,7 @@ import shutil
 from django.db import models
 from django.conf import settings
 from django.urls import reverse
+from django.utils.dates import MONTHS
 from django_countries.fields import CountryField
 
 from ram.utils import DeduplicatedStorage
@@ -153,3 +154,62 @@ class Catalog(BaseBook):
     def get_scales(self):
         return "/".join([s.scale for s in self.scales.all()])
     get_scales.short_description = "Scales"
+
+
+class Magazine(BaseModel):
+    name = models.CharField(max_length=200)
+    publisher = models.ForeignKey(Publisher, on_delete=models.CASCADE)
+    ISBN = models.CharField(max_length=17, blank=True)  # 13 + dashes
+    image = models.ImageField(
+        blank=True,
+        upload_to=book_image_upload,
+        storage=DeduplicatedStorage,
+    )
+    language = models.CharField(
+        max_length=7,
+        choices=settings.LANGUAGES,
+        default='en'
+    )
+    tags = models.ManyToManyField(
+        Tag, related_name="magazine", blank=True
+    )
+
+    def delete(self, *args, **kwargs):
+        shutil.rmtree(
+            os.path.join(
+                settings.MEDIA_ROOT, "images", "magazines", str(self.uuid)
+            ),
+            ignore_errors=True
+        )
+        super(Magazine, self).delete(*args, **kwargs)
+
+    class Meta:
+        ordering = ["name"]
+
+    def __str__(self):
+        return self.name
+
+    def get_absolute_url(self):
+        return reverse(
+            "bookshelf_item",
+            kwargs={"selector": "magazine", "uuid": self.uuid}
+        )
+
+
+class MagazineIssue(BaseBook):
+    magazine = models.ForeignKey(
+        Magazine, on_delete=models.CASCADE, related_name="issue"
+    )
+    issue_number = models.CharField(max_length=100)
+    publication_month = models.SmallIntegerField(
+        null=True,
+        blank=True,
+        choices=MONTHS.items()
+    )
+
+    class Meta:
+        unique_together = ("magazine", "issue_number")
+        ordering = ["magazine", "issue_number"]
+
+    def __str__(self):
+        return f"{self.magazine.name} - {self.issue.issue_number}"

ram/consist/admin.py

@@ -54,7 +54,7 @@ class ConsistAdmin(SortableAdminBase, admin.ModelAdmin):
     @admin.display(description="Country")
     def country_flag(self, obj):
         return format_html(
-            '<img src="{}" /> {}', obj.country.flag, obj.country
+            '<img src="{}" /> {}'.format(obj.country.flag, obj.country)
         )
 
     fieldsets = (

ram/metadata/admin.py

@@ -54,7 +54,7 @@ class CompanyAdmin(admin.ModelAdmin):
     @admin.display(description="Country")
     def country_flag(self, obj):
         return format_html(
-            '<img src="{}" /> {}', obj.country.flag, obj.country.name
+            '<img src="{}" /> {}'.format(obj.country.flag, obj.country.name)
         )
 
 
@@ -68,7 +68,7 @@ class ManufacturerAdmin(admin.ModelAdmin):
     @admin.display(description="Country")
     def country_flag(self, obj):
         return format_html(
-            '<img src="{}" /> {}', obj.country.flag, obj.country.name
+            '<img src="{}" /> {}'.format(obj.country.flag, obj.country.name)
         )
 
 

ram/portal/templatetags/dcc.py

@@ -1,38 +1,36 @@
 from django import template
 from django.utils.html import format_html
-from django.utils.safestring import mark_safe
 
 register = template.Library()
 
 
 @register.simple_tag
 def dcc(object):
-    socket = mark_safe(
+    socket = (
         '<i class="bi bi-ban small"></i>'
     )
     decoder = ''
     if object.decoder_interface is not None:
-        socket = mark_safe(
+        socket = (
             f'<abbr title="{object.get_decoder_interface()}">'
             f'<i class="bi bi-dice-6"></i></abbr>'
         )
     if object.decoder:
         if object.decoder.sound:
-            decoder = mark_safe(
+            decoder = (
                 f'<abbr title="{object.decoder}">'
                 '<i class="bi bi-volume-up-fill"></i></abbr>'
             )
         else:
-            decoder = mark_safe(
+            decoder = (
                 f'<abbr title="{object.decoder}'
                 f'({object.get_decoder_interface()})">'
                 '<i class="bi bi-cpu-fill"></i></abbr>'
             )
+
     if decoder:
         return format_html(
-            '{} <i class="bi bi-arrow-bar-left"></i> {}',
+            f'{socket} <i class="bi bi-arrow-bar-left"></i>{decoder}'
-            socket,
-            decoder,
         )
 
-    return socket
+    return format_html(socket)

ram/ram/__init__.py

@@ -1,4 +1,4 @@
 from ram.utils import git_suffix
 
-__version__ = "0.17.15"
+__version__ = "0.17.14"
 __version__ += git_suffix(__file__)

ram/ram/db_router.py

@@ -1,32 +0,0 @@
-class TelemetryRouter:
-    db_table = "telemetry_10secs"
-
-    def db_for_read(self, model, **hints):
-        """Send read operations to the correct database."""
-        if model._meta.db_table == self.db_table:
-            return "telemetry"  # Replace with your database name
-        return None  # Default database
-
-    def db_for_write(self, model, **hints):
-        """Send write operations to the correct database."""
-        if model._meta.db_table == self.db_table:
-            return False  # Prevent Django from writing RO tables
-        return None
-
-    def allow_relation(self, obj1, obj2, **hints):
-        """
-        Allow relations if a model in the auth or contenttypes apps is
-        involved.
-        """
-        if (
-            obj1._meta.db_table == self.db_table
-            or obj2._meta.db_table == self.db_table
-        ):
-            return True
-        return None
-
-    def allow_migrate(self, db, app_label, model_name=None, **hints):
-        """Prevent Django from migrating this model if it's using a specific database."""
-        if db == "telemetry":
-            return False  # Prevent Django from creating/modifying tables
-        return None

ram/ram/settings.py

@@ -95,16 +95,8 @@ DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.sqlite3",
         "NAME": STORAGE_DIR / "db.sqlite3",
-    },
+    }
-    "telemetry": {
-        "ENGINE": "django.db.backends.postgresql",
-        "HOST": "127.0.0.1",
-        "NAME": "dccmonitor",
-        "USER": "dccmonitor",
-        "PASSWORD": "dccmonitor",
-    },
 }
-DATABASE_ROUTERS = ["ram.db_router.TelemetryRouter"]
 
 
 # Password validation

ram/ram/utils.py

@@ -48,9 +48,8 @@ def git_suffix(fname):
 
 def get_image_preview(url, max_size=150):
     return format_html(
-        '<img src="{src}" style="max-width: {size}px; max-height: {size}px; background-color: #eee;" />',  # noqa: E501
+        '<img src="{src}" style="max-width: {size}px; max-height: {size}px;'
-        src=url,
+        'background-color: #eee;" />'.format(src=url, size=max_size)
-        size=max_size,
     )
 
 

ram/repository/models.py

@@ -1,12 +1,11 @@
 from django.db import models
-from django.core.exceptions import ValidationError
 
 from tinymce import models as tinymce
 
 from ram.models import PrivateDocument
 from metadata.models import Decoder, Shop, Tag
 from roster.models import RollingStock
-from bookshelf.models import Book, Catalog
+from bookshelf.models import Book, Catalog, Issue
 
 
 class GenericDocument(PrivateDocument):
@@ -77,6 +76,20 @@ class CatalogDocument(PrivateDocument):
         ]
 
 
+class MagazineIssueDocument(PrivateDocument):
+    issue = models.ForeignKey(
+        Issue, on_delete=models.CASCADE, related_name="document"
+    )
+
+    class Meta:
+        verbose_name_plural = "Magazines documents"
+        constraints = [
+            models.UniqueConstraint(
+                fields=["issue", "file"], name="unique_issue_file"
+            )
+        ]
+
+
 class RollingStockDocument(PrivateDocument):
     rolling_stock = models.ForeignKey(
         RollingStock, on_delete=models.CASCADE, related_name="document"

ram/roster/admin.py

@@ -2,7 +2,7 @@ import html
 
 from django.conf import settings
 from django.contrib import admin
-from django.utils.html import format_html, format_html_join, strip_tags
+from django.utils.html import format_html, strip_tags
 
 from adminsortable2.admin import SortableAdminBase, SortableInlineAdminMixin
 
@@ -17,7 +17,6 @@ from roster.models import (
     RollingStockImage,
     RollingStockProperty,
     RollingStockJournal,
-    RollingStockTelemetry,
 )
 
 
@@ -45,7 +44,7 @@ class RollingClass(admin.ModelAdmin):
     @admin.display(description="Country")
     def country_flag(self, obj):
         return format_html(
-            '<img src="{}" /> {}', obj.country.flag, obj.country.name
+            '<img src="{}" /> {}'.format(obj.country.flag, obj.country)
         )
 
 
@@ -153,7 +152,7 @@ class RollingStockAdmin(SortableAdminBase, admin.ModelAdmin):
     @admin.display(description="Country")
     def country_flag(self, obj):
         return format_html(
-            '<img src="{}" /> {}', obj.country.flag, obj.country.name
+            '<img src="{}" /> {}'.format(obj.country.flag, obj.country)
         )
 
     fieldsets = (
@@ -223,14 +222,13 @@ class RollingStockAdmin(SortableAdminBase, admin.ModelAdmin):
     @admin.display(description="Invoices")
     def invoices(self, obj):
         if obj.invoice.exists():
-            html = format_html_join(
+            html = "<br>".join(
-                "<br>",
+                "<a href=\"{}\" target=\"_blank\">{}</a>".format(
-                "<a href=\"{}\" target=\"_blank\">{}</a>",
+                    i.file.url, i
-                ((i.file.url, i) for i in obj.invoice.all())
+                ) for i in obj.invoice.all())
-            )
         else:
             html = "-"
-        return html
+        return format_html(html)
 
     def download_csv(modeladmin, request, queryset):
         header = [
@@ -298,29 +296,3 @@ class RollingStockAdmin(SortableAdminBase, admin.ModelAdmin):
 
     download_csv.short_description = "Download selected items as CSV"
     actions = [publish, unpublish, download_csv]
-
-
-@admin.register(RollingStockTelemetry)
-class RollingTelemtryAdmin(admin.ModelAdmin):
-    list_filter = ("bucket", "cab")
-    list_display = ("bucket_highres", "cab", "max_speed", "avg_speed")
-
-    def bucket_highres(self, obj):
-        return obj.bucket.strftime("%Y-%m-%d %H:%M:%S")
-
-    bucket_highres.admin_order_field = "bucket"  # Enable sorting
-    bucket_highres.short_description = "Bucket"  # Column name in admin
-
-    def get_changelist_instance(self, request):
-        changelist = super().get_changelist_instance(request)
-        changelist.list_display_links = None  # Disable links
-        return changelist
-
-    def has_add_permission(self, request):
-        return False  # Disable adding new objects
-
-    def has_change_permission(self, request, obj=None):
-        return False  # Disable editing objects
-
-    def has_delete_permission(self, request, obj=None):
-        return False  # Disable deleting objects

ram/roster/migrations/0039_rollingstocktelemetry.py

@@ -1,32 +0,0 @@
-# Generated by Django 6.0 on 2025-12-07 18:12
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("roster", "0038_alter_rollingstock_rolling_class"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="RollingStockTelemetry",
-            fields=[
-                (
-                    "bucket",
-                    models.DateTimeField(
-                        editable=False, primary_key=True, serialize=False
-                    ),
-                ),
-                ("cab", models.PositiveIntegerField(editable=False)),
-                ("avg_speed", models.FloatField(editable=False)),
-                ("max_speed", models.PositiveIntegerField(editable=False)),
-            ],
-            options={
-                "verbose_name_plural": "Telemetries",
-                "db_table": "telemetry_10secs",
-                "ordering": ["cab", "bucket"],
-            },
-        ),
-    ]

ram/roster/models.py

@@ -238,20 +238,6 @@ class RollingStockJournal(models.Model):
     objects = PublicManager()
 
 
-# trick: this is technically an abstract class
-# it is made readonly via db_router and admin to avoid any unwanted change
-class RollingStockTelemetry(models.Model):
-    bucket = models.DateTimeField(primary_key=True, editable=False)
-    cab = models.PositiveIntegerField(editable=False)
-    avg_speed = models.FloatField(editable=False)
-    max_speed = models.PositiveIntegerField(editable=False)
-
-    class Meta:
-        db_table = "telemetry_10secs"
-        ordering = ["cab", "bucket"]
-        verbose_name_plural = "Telemetries"
-
-
 # @receiver(models.signals.post_delete, sender=Cab)
 # def post_save_image(sender, instance, *args, **kwargs):
 #     try:

requirements.txt

@@ -8,7 +8,7 @@ django-countries
 django-health-check
 django-admin-sortable2
 django-tinymce
-psycopg2-binary
+# Optional: # psycopg2-binary
 # Required by django-countries and not always installed
 # by default on modern venvs (like Python 3.12 on Fedora 39)
 setuptools