Replace ckeditor with tinymce due to deprecation

.github/workflows/django.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       max-parallel: 2
       matrix:
-        python-version: ['3.13', '3.14']
+        python-version: ['3.9', '3.10', '3.11', '3.12']
 
     steps:
     - uses: actions/checkout@v3
@@ -25,11 +25,7 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install -r requirements.txt
-    - name: Run Migrations
-      run: |
-        cd ram
-        python manage.py migrate
     - name: Run Tests
       run: |
         cd ram
-        python manage.py test --verbosity=2
+        python manage.py migrate

.gitignore

@@ -10,6 +10,7 @@ __pycache__/
 .Python
 build/
 develop-eggs/
+dist/
 downloads/
 eggs/
 .eggs/
@@ -127,13 +128,7 @@ dmypy.json
 # Pyre type checker
 .pyre/
 
-# node.js / npm stuff
-node_modules
-package-lock.json
-
-# our own stuff
 *.swp
 ram/storage/
 !ram/storage/.gitignore
 arduino/CommandStation-EX/build/
-utils

AGENTS.md

@@ -1,341 +0,0 @@
-# Django Railroad Assets Manager - Agent Guidelines
-
-This document provides coding guidelines and command references for AI coding agents working on the Django-RAM project.
-
-## Project Overview
-
-Django Railroad Assets Manager (django-ram) is a Django 6.0+ application for managing model railroad collections with DCC++ EX integration. The project manages rolling stock, consists, metadata, books/magazines, and provides an optional REST API for DCC control.
-
-## Environment Setup
-
-### Python Requirements
-- Python 3.11+ (tested on 3.13, 3.14)
-- Django >= 6.0
-- Working directory: `ram/` (Django project root)
-- Virtual environment recommended: `python3 -m venv venv && source venv/bin/activate`
-
-### Installation
-```bash
-pip install -r requirements.txt           # Core dependencies
-pip install -r requirements-dev.txt       # Development tools
-cd ram && python manage.py migrate        # Initialize database
-python manage.py createsuperuser          # Create admin user
-```
-
-### Frontend Assets
-```bash
-npm install                               # Install clean-css-cli, terser
-```
-
-## Project Structure
-
-```
-ram/                      # Django project root
-├── ram/                 # Core settings, URLs, base models
-├── portal/              # Public-facing frontend (Bootstrap 5)
-├── roster/              # Rolling stock management (main app)
-├── metadata/            # Manufacturers, companies, scales, decoders
-├── bookshelf/           # Books and magazines
-├── consist/             # Train consists (multiple locomotives)
-├── repository/          # Document repository
-├── driver/              # DCC++ EX API gateway (optional, disabled by default)
-└── storage/             # Runtime data (SQLite DB, media, cache)
-```
-
-## Build/Lint/Test Commands
-
-### Running the Development Server
-```bash
-cd ram
-python manage.py runserver                # Runs on http://localhost:8000
-```
-
-### Database Management
-```bash
-python manage.py makemigrations           # Create new migrations
-python manage.py migrate                  # Apply migrations
-python manage.py showmigrations           # Show migration status
-```
-
-### Testing
-```bash
-# Run all tests (comprehensive test suite with 75+ tests)
-python manage.py test
-
-# Run tests for a specific app
-python manage.py test roster                  # Rolling stock tests
-python manage.py test metadata                # Metadata tests  
-python manage.py test bookshelf               # Books/magazines tests
-python manage.py test consist                 # Consist tests
-
-# Run a specific test case class
-python manage.py test roster.tests.RollingStockTestCase
-python manage.py test metadata.tests.ScaleTestCase
-
-# Run a single test method
-python manage.py test roster.tests.RollingStockTestCase.test_road_number_int_extraction
-python manage.py test bookshelf.tests.TocEntryTestCase.test_toc_entry_page_validation_exceeds_book
-
-# Run with verbosity for detailed output
-python manage.py test --verbosity=2
-
-# Keep test database for inspection
-python manage.py test --keepdb
-
-# Run tests matching a pattern
-python manage.py test --pattern="test_*.py"
-```
-
-### Linting and Formatting
-```bash
-# Run flake8 (configured in requirements-dev.txt)
-flake8 .                                  # Lint entire project
-flake8 roster/                            # Lint specific app
-flake8 roster/models.py                   # Lint specific file
-
-# Note: No .flake8 config exists; uses PEP 8 defaults
-# Long lines use # noqa: E501 comments in settings.py
-
-# Run black formatter with 79 character line length
-black -l 79 .                             # Format entire project
-black -l 79 roster/                       # Format specific app
-black -l 79 roster/models.py              # Format specific file
-black -l 79 --check .                     # Check formatting without changes
-black -l 79 --diff .                      # Show formatting changes
-```
-
-### Admin Commands
-```bash
-python manage.py createsuperuser          # Create admin user
-python manage.py purge_cache              # Custom: purge cache
-python manage.py loaddata <fixture>       # Load sample data
-```
-
-### Debugging & Profiling
-```bash
-# Use pdbpp for debugging (installed via requirements-dev.txt)
-import pdb; pdb.set_trace()               # Set breakpoint in code
-
-# Use pyinstrument for profiling
-python manage.py runserver --noreload     # With pyinstrument middleware
-```
-
-## Code Style Guidelines
-
-### General Python Style
-- **PEP 8 compliant** - Follow standard Python style guide
-- **Line length**: 79 characters preferred; 119 acceptable for complex lines
-- **Long lines**: Use `# noqa: E501` comment when necessary (see settings.py)
-- **Indentation**: 4 spaces (no tabs)
-- **Encoding**: UTF-8
-- **Blank lines**: Must not contain any whitespace (spaces or tabs)
-
-### Import Organization
-Follow Django's import style (as seen in models.py, views.py, admin.py):
-
-```python
-# 1. Standard library imports
-import os
-import re
-from itertools import chain
-from functools import reduce
-
-# 2. Related third-party imports
-from django.db import models
-from django.conf import settings
-from django.contrib import admin
-from tinymce import models as tinymce
-
-# 3. Local application imports
-from ram.models import BaseModel, Image
-from ram.utils import DeduplicatedStorage, slugify
-from metadata.models import Scale, Manufacturer
-```
-
-**Key points:**
-- Group imports by category with blank lines between
-- Use `from module import specific` for commonly used items
-- Avoid `import *`
-- Use `as` for aliasing when needed (e.g., `tinymce.models as tinymce`)
-
-### Naming Conventions
-- **Classes**: `PascalCase` (e.g., `RollingStock`, `BaseModel`)
-- **Functions/methods**: `snake_case` (e.g., `get_items_per_page()`, `image_thumbnail()`)
-- **Variables**: `snake_case` (e.g., `road_number`, `item_number_slug`)
-- **Constants**: `UPPER_SNAKE_CASE` (e.g., `BASE_DIR`, `ALLOWED_HOSTS`)
-- **Private methods**: Prefix with `_` (e.g., `_internal_method()`)
-- **Model Meta options**: Use `verbose_name`, `verbose_name_plural`, `ordering`
-
-### Django Model Patterns
-
-```python
-class MyModel(BaseModel):  # Inherit from BaseModel for common fields
-    # Field order: relationships first, then data fields, then metadata
-    foreign_key = models.ForeignKey(OtherModel, on_delete=models.CASCADE)
-    name = models.CharField(max_length=128)
-    slug = models.SlugField(max_length=128, unique=True)
-    created = models.DateTimeField(auto_now_add=True)
-    
-    class Meta:
-        ordering = ["name"]
-        verbose_name = "My Model"
-        verbose_name_plural = "My Models"
-    
-    def __str__(self):
-        return self.name
-    
-    @property
-    def computed_field(self):
-        """Document properties with docstrings."""
-        return self.calculate_something()
-```
-
-**Model field conventions:**
-- Use `null=True, blank=True` for optional fields
-- Use `help_text` for user-facing field descriptions
-- Use `limit_choices_to` for filtered ForeignKey choices
-- Use `related_name` for reverse relations
-- Set `on_delete=models.CASCADE` explicitly
-- Use `default=None` with `null=True` for nullable fields
-
-### Admin Customization
-
-```python
-@admin.register(MyModel)
-class MyModelAdmin(admin.ModelAdmin):
-    list_display = ("name", "created", "custom_method")
-    list_filter = ("category", "created")
-    search_fields = ("name", "slug")
-    autocomplete_fields = ("foreign_key",)
-    readonly_fields = ("created", "updated")
-    save_as = True  # Enable "Save as new" button
-    
-    @admin.display(description="Custom Display")
-    def custom_method(self, obj):
-        return format_html('<strong>{}</strong>', obj.name)
-```
-
-### Error Handling
-```python
-# Use Django's exception classes
-from django.core.exceptions import ValidationError, ObjectDoesNotExist
-from django.http import Http404
-from django.db.utils import OperationalError, ProgrammingError
-
-# Handle database errors gracefully
-try:
-    config = get_site_conf()
-except (OperationalError, ProgrammingError):
-    config = default_config  # Provide fallback
-```
-
-### Type Hints
-- **Not currently used** in this project
-- Follow existing patterns without type hints unless explicitly adding them
-
-## Django-Specific Patterns
-
-### Using BaseModel
-All major models inherit from `ram.models.BaseModel`:
-```python
-from ram.models import BaseModel
-
-class MyModel(BaseModel):
-    # Automatically includes: uuid, description, notes, creation_time, 
-    # updated_time, published, obj_type, obj_label properties
-    pass
-```
-
-### Using PublicManager
-Models use `PublicManager` for filtering published items:
-```python
-from ram.managers import PublicManager
-
-objects = PublicManager()  # Only returns items where published=True
-```
-
-### Image and Document Patterns
-```python
-from ram.models import Image, Document, PrivateDocument
-
-class MyImage(Image):
-    my_model = models.ForeignKey(MyModel, on_delete=models.CASCADE)
-    # Inherits: order, image, image_thumbnail()
-
-class MyDocument(PrivateDocument):
-    my_model = models.ForeignKey(MyModel, on_delete=models.CASCADE)
-    # Inherits: description, file, private, creation_time, updated_time
-```
-
-### Using DeduplicatedStorage
-For media files that should be deduplicated:
-```python
-from ram.utils import DeduplicatedStorage
-
-image = models.ImageField(upload_to="images/", storage=DeduplicatedStorage)
-```
-
-## Testing Practices
-
-### Test Coverage
-The project has comprehensive test coverage:
-- **roster/tests.py**: RollingStock, RollingClass models (~340 lines, 19+ tests)
-- **metadata/tests.py**: Scale, Manufacturer, Company, etc. (~378 lines, 29+ tests)
-- **bookshelf/tests.py**: Book, Magazine, Catalog, TocEntry (~436 lines, 25+ tests)
-- **consist/tests.py**: Consist, ConsistItem (~315 lines, 15+ tests)
-- **ram/tests.py**: BaseModel, utility functions (~140 lines, 11+ tests)
-
-### Writing Tests
-```python
-from django.test import TestCase
-from django.core.exceptions import ValidationError
-from roster.models import RollingStock
-
-class RollingStockTestCase(TestCase):
-    def setUp(self):
-        """Set up test data."""
-        # Create necessary related objects
-        self.company = Company.objects.create(name="RGS", country="US")
-        self.scale = Scale.objects.create(scale="HO", ratio="1:87", tracks=16.5)
-        # ...
-    
-    def test_road_number_int_extraction(self):
-        """Test automatic extraction of integer from road number."""
-        stock = RollingStock.objects.create(
-            rolling_class=self.rolling_class,
-            road_number="RGS-42",
-            scale=self.scale,
-        )
-        self.assertEqual(stock.road_number_int, 42)
-    
-    def test_validation_error(self):
-        """Test that validation errors are raised correctly."""
-        with self.assertRaises(ValidationError):
-            # Test validation logic
-            pass
-```
-
-**Testing best practices:**
-- Use descriptive test method names with `test_` prefix
-- Include docstrings explaining what each test verifies
-- Create necessary test data in `setUp()` method
-- Test both success and failure cases
-- Use `assertRaises()` for exception testing
-- Test model properties, methods, and validation logic
-
-## Git & Version Control
-
-- Branch: `master` (main development branch)
-- CI runs on push and PR to master
-- Follow conventional commit messages
-- No pre-commit hooks configured (consider adding)
-
-## Additional Notes
-
-- **Settings override**: Use `ram/local_settings.py` for local configuration
-- **Debug mode**: `DEBUG = True` in settings.py (change for production)
-- **Database**: SQLite by default (in `storage/db.sqlite3`)
-- **Static files**: Bootstrap 5.3.8, Bootstrap Icons 1.13.1
-- **Rich text**: TinyMCE for HTMLField content
-- **REST API**: Disabled by default (`REST_ENABLED = False`)
-- **Security**: CSP middleware enabled, secure cookies in production

Makefile

@@ -1,141 +0,0 @@
-# Makefile for Django RAM project
-# Handles frontend asset minification and common development tasks
-
-.PHONY: help minify minify-js minify-css clean install test
-
-# Directories
-JS_SRC_DIR = ram/portal/static/js/src
-JS_OUT_DIR = ram/portal/static/js
-CSS_SRC_DIR = ram/portal/static/css/src
-CSS_OUT_DIR = ram/portal/static/css
-
-# Source files
-JS_SOURCES = $(JS_SRC_DIR)/theme_selector.js $(JS_SRC_DIR)/tabs_selector.js $(JS_SRC_DIR)/validators.js
-
-CSS_SOURCES = $(CSS_SRC_DIR)/main.css
-
-# Output files
-JS_OUTPUT = $(JS_OUT_DIR)/main.min.js
-CSS_OUTPUT = $(CSS_OUT_DIR)/main.min.css
-
-# Default target
-help:
-	@echo "Django RAM - Available Make targets:"
-	@echo ""
-	@echo "  make install     - Install npm dependencies (terser, clean-css-cli)"
-	@echo "  make minify      - Minify both JS and CSS files"
-	@echo "  make minify-js   - Minify JavaScript files only"
-	@echo "  make minify-css  - Minify CSS files only"
-	@echo "  make clean       - Remove minified files"
-	@echo "  make watch       - Watch for changes and auto-minify (requires inotify-tools)"
-	@echo "  make run         - Run Django development server"
-	@echo "  make test        - Run Django test suite"
-	@echo "  make lint        - Run flake8 linter"
-	@echo "  make format      - Run black formatter (line length 79)"
-	@echo "  make ruff-check  - Run ruff linter"
-	@echo "  make ruff-format - Run ruff formatter"
-	@echo "  make dump-data   - Dump database to gzipped JSON (usage: make dump-data FILE=backup.json.gz)"
-	@echo "  make load-data   - Load data from fixture file (usage: make load-data FILE=backup.json.gz)"
-	@echo "  make help        - Show this help message"
-	@echo ""
-
-# Install npm dependencies
-install:
-	@echo "Installing npm dependencies..."
-	npm install
-	@echo "Done! terser and clean-css-cli installed."
-
-# Minify both JS and CSS
-minify: minify-js minify-css
-
-# Minify JavaScript
-minify-js: $(JS_OUTPUT)
-
-$(JS_OUTPUT): $(JS_SOURCES)
-	@echo "Minifying JavaScript..."
-	npx terser $(JS_SOURCES) \
-		--compress \
-		--mangle \
-		--source-map "url=main.min.js.map" \
-		--output $(JS_OUTPUT)
-	@echo "Created: $(JS_OUTPUT)"
-
-# Minify CSS
-minify-css: $(CSS_OUTPUT)
-
-$(CSS_OUTPUT): $(CSS_SOURCES)
-	@echo "Minifying CSS..."
-	npx cleancss -o $(CSS_OUTPUT) $(CSS_SOURCES)
-	@echo "Created: $(CSS_OUTPUT)"
-
-# Clean minified files
-clean:
-	@echo "Removing minified files..."
-	rm -f $(JS_OUTPUT) $(CSS_OUTPUT)
-	@echo "Clean complete."
-
-# Watch for changes (requires inotify-tools on Linux)
-watch:
-	@echo "Watching for file changes..."
-	@echo "Press Ctrl+C to stop"
-	@while true; do \
-		inotifywait -e modify,create $(JS_SRC_DIR)/*.js $(CSS_SRC_DIR)/*.css 2>/dev/null && \
-		make minify; \
-	done || echo "Note: install inotify-tools for file watching support"
-
-# Run Django development server
-run:
-	@cd ram && python manage.py runserver
-
-# Run Django tests
-test:
-	@echo "Running Django tests..."
-	@cd ram && python manage.py test
-
-# Run flake8 linter
-lint:
-	@echo "Running flake8..."
-	@flake8 ram/
-
-# Run black formatter
-format:
-	@echo "Running black formatter..."
-	@black -l 79 --extend-exclude="/migrations/" ram/
-
-# Run ruff linter
-ruff-check:
-	@echo "Running ruff check..."
-	@ruff check ram/
-
-# Run ruff formatter
-ruff-format:
-	@echo "Running ruff format..."
-	@ruff format ram/
-
-# Dump database to gzipped JSON file
-# Usage: make dump-data FILE=backup.json.gz
-dump-data:
-ifndef FILE
-	$(error FILE is not set. Usage: make dump-data FILE=backup.json.gz)
-endif
-	$(eval FILE_ABS := $(shell realpath -m $(FILE)))
-	@echo "Dumping database to $(FILE_ABS)..."
-	@cd ram && python manage.py dumpdata \
-		--indent=2 \
-		-e admin \
-		-e contenttypes \
-		-e sessions \
-		--natural-foreign \
-		--natural-primary | gzip > $(FILE_ABS)
-	@echo "✓ Database dumped successfully to $(FILE_ABS)"
-
-# Load data from fixture file
-# Usage: make load-data FILE=backup.json.gz
-load-data:
-ifndef FILE
-	$(error FILE is not set. Usage: make load-data FILE=backup.json.gz)
-endif
-	$(eval FILE_ABS := $(shell realpath $(FILE)))
-	@echo "Loading data from $(FILE_ABS)..."
-	@cd ram && python manage.py loaddata $(FILE_ABS)
-	@echo "✓ Data loaded successfully from $(FILE_ABS)"

README.md

@@ -23,8 +23,7 @@ security assesment, pentest, ISO certification, etc.
 
 This project probably doesn't match your needs nor expectations. Be aware.
 
-> [!CAUTION]
+Your model train may also catch fire while using this software.
-> Your model train may catch fire while using this software.
 
 Check out [my own instance](https://daniele.mynarrowgauge.org).
 
@@ -41,49 +40,23 @@ Project is based on the following technologies and components:
 
 It has been developed with:
 
-- [neovim](https://neovim.io/): because `vim` rocks, `neovim` rocks more
+- [vim](https://www.vim.org/): because it rocks
 - [arduino-cli](https://github.com/arduino/arduino-cli/): a mouse? What the heck?
 - [vim-arduino](https://github.com/stevearc/vim-arduino): another IDE? No thanks
 - [podman](https://podman.io/): because containers are fancy
-- [QEMU (avr)](https://qemu-project.gitlab.io/qemu/system/target-avr.html): QEMU can even make toasts!
+- [QEMU (avr)](https://qemu-project.gitlab.io/qemu/system/target-avr.html): QEMU can even make toast!
 
-## Future developments
-
-A bunch of random, probably useless, ideas:
-
-### A bookshelf
-
-✅DONE
-
-Because books matter more than model trains themselves.
-
-### Live assets KPI collection
-
-Realtime data usage is collected via a daemon connected over TCP to the EX-CommandStation and recorded for every asset with a DCC address.
-
-### Asset lifecycle
-
-Data is collected to compute the asset usage and then the wear level of its components (eg. the engine).
-
-### Required mainentance forecast
-
-Eventually data is used to "forecast" any required maintenance, like for example the replacement of carbon brushes, gear and motor oiling.
-
-### Asset export to JMRI
-
-Export assets (locomotives) into the JMRI format to be loaded in the JMRI
-roster.
 
 ## Requirements
 
-- Python 3.11+
+- Python 3.9+
 - A USB port when running Arduino hardware (and adaptors if you have a Mac)
 
 ## Web portal installation
 
 ### Using containers
 
-Do it yourself, otherwise, raise a request :)
+coming soon
 
 ### Manual installation
 
@@ -110,8 +83,6 @@ $ python manage.py migrate
 $ python manage.py createsuperuser
 ```
 
-To load some sample metadata, see the [sample_data folder instructions](./sample_data/README.md).
-
 Run Django
 
 ```bash
@@ -128,52 +99,43 @@ connected via serial port, to the network, allowing commands to be sent via a
 TCP socket. A response generated by the DCC++ EX board is sent to all connected clients,
 providing synchronization between multiple clients (eg. multiple JMRI instances).
 
-Its use is not needed when running DCC++ EX from a [WiFi](https://dcc-ex.com/get-started/wifi-setup.html) capable board, like when
+Its use is not needed when running DCC++ EX from a [WiFi](https://dcc-ex.com/get-started/wifi-setup.html) capable board (like when
-using an ESP8266 module, a [Mega+WiFi board](https://dcc-ex.com/reference/hardware/microcontrollers/wifi-mega.html), or an
+using an ESP8266 module or a [Mega+WiFi board](https://dcc-ex.com/advanced-setup/supported-microcontrollers/wifi-mega.html)).
-[ESP32](https://dcc-ex.com/reference/hardware/microcontrollers/esp32.html) (recommended).
 
-### Manual setup
+### Customize the settings
 
-You'll need [namp-ncat](https://nmap.org/ncat/) , and `stty` to setup the serial port.
+The daemon comes with default settings in `config.ini`.
-
+Settings may need to be customized based on your setup.
-> [!IMPORTANT]
-> Other variants of `nc` or `ncat` may not work as expected.
-
-Then you can run the following commands:
-
-```bash
-$ stty -F /dev/ttyACM0 -echo 115200
-$ ncat -n -k -l 2560 </dev/ttyACM0 >/dev/ttyACM0
-```
-
-> [!IMPORTANT]
-> You'll might need to change the serial port (`/dev/ttyACM0`) to match your board.
-
-> [!NOTE]
-> Your user will also need access to the device file, so you might need to add it to the `dialout` group.
 
 
 ### Using containers
 
 ```bash
-$ cd connector
+$ cd daemons
-$ podman build -t dcc/connector .
+$ podman build -t dcc/net-to-serial .
-$ podman run -d --group-add keep-groups --device /dev/ttyACM0:/dev/arduino -p 2560:2560 dcc/connector
+$ podman run --group-add keep-groups --device /dev/ttyACM0 -p 2560:2560 dcc/net-to-serial
+```
+
+### Manual setup
+
+```bash
+$ cd daemons
+$ pip install -r requirements.txt
+$ python ./net-to-serial.py
 ```
 
 ### Test with a simulator
 
-A [QEMU AVR based simulator](daemons/simulator/README.md) running DCC++ EX is bundled togheter with the connector
+A [QEMU AVR based simulator](daemons/simulator/README.md) running DCC++ EX is bundled togheter with the `net-to-serial.py`
-into a container. To run it:
+daemon into a container. To run it:
 
 ```bash
-$ cd connector/simulator
+$ cd daemons/simulator
-$ podman build -t dcc/connector:sim .
+$ podman build -t dcc/net-to-serial:sim .
-$ podman run --init --cpus 0.1 -d -p 2560:2560 dcc/connector:sim
+$ podman run --init --cpus 0.1 -d -p 2560:2560 dcc/net-to-serial:sim
 ```
 
-> [!WARNING]
+To be continued ...
-> The simulator is intended for light development and testing purposes only and far from being a complete replacement for a real hardware.
 
 ## Screenshots
 
@@ -184,12 +146,15 @@ $ podman run --init --cpus 0.1 -d -p 2560:2560 dcc/connector:sim
 ![Screenshot 2023-09-18 at 21-59-30 RGS 1930s short train - Railroad Assets Manager](https://github.com/daniviga/django-ram/assets/1818657/77f9b7c9-27b3-4a65-bad0-26e9cf77e623)
 
 
+
 #### Dark mode
 
 ![Screenshot 2023-09-18 at 21-58-22 Company RGS - Railroad Assets Manager](https://github.com/daniviga/django-ram/assets/1818657/c95697c9-0897-46f4-941c-6092271e4743)
 
 ---
 
+
+
 ### Backoffice
 
 ![image](https://user-images.githubusercontent.com/1818657/175789937-3e4970a2-b37d-44c3-8605-62dabe209c65.png)
@@ -201,3 +166,8 @@ $ podman run --init --cpus 0.1 -d -p 2560:2560 dcc/connector:sim
 ### Rest API
 
 ![image](https://user-images.githubusercontent.com/1818657/180622471-ade06c84-c73b-41d5-a2a7-02a95b2ffc02.png)
+
+
+
+
+

connector/99-dcc-usb-connector.rules

@@ -1,22 +0,0 @@
-# Udev rule to auto-start/stop dcc-usb-connector.service when USB device is connected/removed
-#
-# This rule detects when a CH340 USB-to-serial adapter (ID 1a86:7523)
-# is connected/removed on /dev/ttyUSB0, then automatically starts/stops
-# the dcc-usb-connector.service (user systemd service).
-#
-# Installation:
-#   sudo cp 99-dcc-usb-connector.rules /etc/udev/rules.d/
-#   sudo udevadm control --reload-rules
-#   sudo udevadm trigger --subsystem-match=tty
-#
-# Testing:
-#   udevadm test /sys/class/tty/ttyUSB0
-#   udevadm monitor --property --subsystem-match=tty
-#
-# The service will be started when the device is plugged in and stopped
-# when the device is unplugged.
-
-# Match USB device 1a86:7523 on ttyUSB0
-# TAG+="systemd" tells systemd to track this device
-# ENV{SYSTEMD_USER_WANTS} starts the service on "add" and stops it on "remove"
-SUBSYSTEM=="tty", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="7523", KERNEL=="ttyUSB0", TAG+="systemd", ENV{SYSTEMD_USER_WANTS}="dcc-usb-connector.service"

connector/Dockerfile

@@ -1,9 +0,0 @@
-FROM alpine:edge
-
-RUN apk add --no-cache coreutils nmap-ncat
-
-EXPOSE 2560/tcp
-
-SHELL ["/bin/ash", "-c"]
-CMD stty -F /dev/arduino -echo 115200 && \
-    ncat -n -k -l 2560 </dev/arduino >/dev/arduino

connector/INSTALL.md

@@ -1,345 +0,0 @@
-# DCC USB-to-Network Bridge Auto-Start Installation
-
-This directory contains configuration files to automatically start the `dcc-usb-connector.service` when a specific USB device (CH340 USB-to-serial adapter, ID `1a86:7523`) is connected to `/dev/ttyUSB0`.
-
-## Overview
-
-The setup uses:
-- **Udev rule** (`99-dcc-usb-connector.rules`) - Detects USB device connection/disconnection
-- **Systemd user service** (`dcc-usb-connector.service`) - Bridges serial port to network port 2560
-- **Installation script** (`install-udev-rule.sh`) - Automated installation helper
-
-When the USB device is plugged in, the service automatically starts. When unplugged, it stops.
-
-## Prerequisites
-
-1. **Operating System**: Linux with systemd and udev
-2. **Required packages**:
-   ```bash
-   sudo dnf install nmap-ncat systemd udev
-   ```
-3. **User permissions**: Your user should be in the `dialout` group:
-   ```bash
-   sudo usermod -a -G dialout $USER
-   # Log out and log back in for changes to take effect
-   ```
-
-## Quick Installation
-
-Run the installation script:
-
-```bash
-./install-udev-rule.sh
-```
-
-This script will:
-- Install the udev rule (requires sudo)
-- Install the systemd user service to `~/.config/systemd/user/`
-- Enable systemd lingering for your user
-- Check for required tools and permissions
-- Provide testing instructions
-
-## Manual Installation
-
-If you prefer to install manually:
-
-### 1. Install the udev rule
-
-```bash
-sudo cp 99-dcc-usb-connector.rules /etc/udev/rules.d/
-sudo udevadm control --reload-rules
-sudo udevadm trigger --subsystem-match=tty
-```
-
-### 2. Install the systemd service
-
-```bash
-mkdir -p ~/.config/systemd/user/
-cp dcc-usb-connector.service ~/.config/systemd/user/
-systemctl --user daemon-reload
-```
-
-### 3. Enable lingering (optional but recommended)
-
-This allows your user services to run even when you're not logged in:
-
-```bash
-sudo loginctl enable-linger $USER
-```
-
-## Verification
-
-### Test the udev rule
-
-```bash
-# Monitor udev events (plug/unplug device while this runs)
-udevadm monitor --property --subsystem-match=tty
-
-# Test udev rule (when device is connected)
-udevadm test /sys/class/tty/ttyUSB0
-```
-
-### Check service status
-
-```bash
-# Check if service is running
-systemctl --user status dcc-usb-connector.service
-
-# View service logs
-journalctl --user -u dcc-usb-connector.service -f
-```
-
-### Test the network bridge
-
-```bash
-# Connect to the bridge
-telnet localhost 2560
-
-# Or using netcat
-nc localhost 2560
-```
-
-## Usage
-
-### Automatic Operation
-
-Once installed, the service will:
-- **Start automatically** when USB device `1a86:7523` is connected to `/dev/ttyUSB0`
-- **Stop automatically** when the device is disconnected
-- Bridge serial communication to network port `2560`
-
-### Manual Control
-
-You can still manually control the service:
-
-```bash
-# Start the service
-systemctl --user start dcc-usb-connector.service
-
-# Stop the service
-systemctl --user stop dcc-usb-connector.service
-
-# Check status
-systemctl --user status dcc-usb-connector.service
-
-# View logs
-journalctl --user -u dcc-usb-connector.service
-```
-
-## How It Works
-
-### Component Interaction
-
-```
-USB Device Connected (1a86:7523 on /dev/ttyUSB0)
-         ↓
-    Udev Rule Triggered
-         ↓
-    Systemd User Service Started
-         ↓
-    stty configures serial port (115200 baud)
-         ↓
-    ncat bridges /dev/ttyUSB0 ↔ TCP port 2560
-         ↓
-    Client apps connect to localhost:2560
-```
-
-### Udev Rule Details
-
-The udev rule (`99-dcc-usb-connector.rules`) matches:
-- **Subsystem**: `tty` (TTY/serial devices)
-- **Vendor ID**: `1a86` (CH340 manufacturer)
-- **Product ID**: `7523` (CH340 serial adapter)
-- **Kernel device**: `ttyUSB0` (specific port)
-
-When matched, it sets `ENV{SYSTEMD_USER_WANTS}="dcc-usb-connector.service"`, telling systemd to start the service.
-
-### Service Configuration
-
-The service (`dcc-usb-connector.service`):
-1. Runs `stty -F /dev/ttyUSB0 -echo 115200` to configure the serial port
-2. Executes `ncat -n -k -l 2560 </dev/ttyUSB0 >/dev/ttyUSB0` to bridge serial ↔ network
-3. Uses `KillMode=mixed` for proper process cleanup
-4. Terminates within 5 seconds when stopped
-5. **Uses `StopWhenUnneeded=yes`** - This ensures the service stops when the device is removed
-
-### Auto-Stop Mechanism
-
-When the USB device is unplugged:
-1. **Udev detects** the removal event
-2. **Systemd removes** the device dependency from the service
-3. **StopWhenUnneeded=yes** tells systemd to automatically stop the service when no longer needed
-4. **Service terminates** gracefully within 5 seconds
-
-This combination ensures clean automatic stop without requiring manual intervention or custom scripts.
-
-## Troubleshooting
-
-### Service doesn't start automatically
-
-1. **Check udev rule is loaded**:
-   ```bash
-   udevadm test /sys/class/tty/ttyUSB0 | grep SYSTEMD_USER_WANTS
-   ```
-   Should show: `ENV{SYSTEMD_USER_WANTS}='dcc-usb-connector.service'`
-
-2. **Check device is recognized**:
-   ```bash
-   lsusb | grep 1a86:7523
-   ls -l /dev/ttyUSB0
-   ```
-
-3. **Verify systemd user instance is running**:
-   ```bash
-   systemctl --user status
-   loginctl show-user $USER | grep Linger
-   ```
-
-### Permission denied on /dev/ttyUSB0
-
-Add your user to the `dialout` group:
-```bash
-sudo usermod -a -G dialout $USER
-# Log out and log back in
-groups  # Verify 'dialout' appears
-```
-
-### Device appears as /dev/ttyUSB1 instead of /dev/ttyUSB0
-
-The udev rule specifically matches `ttyUSB0`. To make it flexible:
-
-Edit `99-dcc-usb-connector.rules` and change:
-```
-KERNEL=="ttyUSB0"
-```
-to:
-```
-KERNEL=="ttyUSB[0-9]*"
-```
-
-Then reload:
-```bash
-sudo udevadm control --reload-rules
-sudo udevadm trigger --subsystem-match=tty
-```
-
-### Service starts but ncat fails
-
-1. **Check ncat is installed**:
-   ```bash
-   which ncat
-   ncat --version
-   ```
-
-2. **Verify serial port works**:
-   ```bash
-   stty -F /dev/ttyUSB0
-   cat /dev/ttyUSB0  # Should not error
-   ```
-
-3. **Check port 2560 is available**:
-   ```bash
-   netstat -tuln | grep 2560
-   # Should be empty if nothing is listening
-   ```
-
-### View detailed logs
-
-```bash
-# Follow service logs in real-time
-journalctl --user -u dcc-usb-connector.service -f
-
-# View all logs for the service
-journalctl --user -u dcc-usb-connector.service
-
-# View with timestamps
-journalctl --user -u dcc-usb-connector.service -o short-iso
-```
-
-## Uninstallation
-
-To remove the auto-start feature:
-
-```bash
-# Remove udev rule
-sudo rm /etc/udev/rules.d/99-dcc-usb-connector.rules
-sudo udevadm control --reload-rules
-sudo udevadm trigger --subsystem-match=tty
-
-# Remove systemd service
-systemctl --user stop dcc-usb-connector.service
-rm ~/.config/systemd/user/dcc-usb-connector.service
-systemctl --user daemon-reload
-
-# (Optional) Disable lingering
-sudo loginctl disable-linger $USER
-```
-
-## Advanced Configuration
-
-### Customize for different USB device
-
-Edit `99-dcc-usb-connector.rules` and change:
-- `ATTRS{idVendor}=="1a86"` - USB vendor ID
-- `ATTRS{idProduct}=="7523"` - USB product ID
-
-Find your device IDs with:
-```bash
-lsusb
-# Output: Bus 001 Device 003: ID 1a86:7523 QinHeng Electronics ...
-#                                   ^^^^:^^^^
-#                                   VID   PID
-```
-
-### Change network port
-
-Edit `dcc-usb-connector.service` and change:
-```
-ExecStart=/usr/bin/bash -c "/usr/bin/ncat -n -k -l 2560 ...
-```
-Replace `2560` with your desired port number.
-
-### Enable auto-restart on failure
-
-Edit `dcc-usb-connector.service` and add under `[Service]`:
-```
-Restart=on-failure
-RestartSec=5
-```
-
-Then reload:
-```bash
-systemctl --user daemon-reload
-```
-
-## Testing Without Physical Device
-
-For development/testing without the actual USB device:
-
-```bash
-# Create a virtual serial port pair
-socat -d -d pty,raw,echo=0 pty,raw,echo=0
-
-# This creates two linked devices, e.g., /dev/pts/3 and /dev/pts/4
-# Update the service to use one of these instead of /dev/ttyUSB0
-```
-
-## References
-
-- [systemd user services](https://www.freedesktop.org/software/systemd/man/systemd.service.html)
-- [udev rules writing](https://www.reactivated.net/writing_udev_rules.html)
-- [ncat documentation](https://nmap.org/ncat/)
-- [DCC++ EX](https://dcc-ex.com/) - The DCC command station software
-
-## License
-
-See the main project LICENSE file.
-
-## Support
-
-For issues specific to the auto-start feature:
-1. Check the troubleshooting section above
-2. Review logs: `journalctl --user -u dcc-usb-connector.service`
-3. Test udev rules: `udevadm test /sys/class/tty/ttyUSB0`
-
-For DCC++ EX or django-ram issues, see the main project documentation.

connector/README.md

@@ -1,55 +0,0 @@
-# DCC Serial-to-Network Bridge
-
-This directory provides two ways to bridge a serial port to a network port using `ncat` from [nmap](https://nmap.org/ncat/):
-
-1. **Auto-Start with systemd + udev** (Recommended) - Automatically starts/stops when USB device is plugged/unplugged
-2. **Container-based** - Manual control using Podman/Docker
-
-> [!IMPORTANT]
-> Other variants of `nc` or `ncat` may not work as expected.
-
-## Option 1: Auto-Start with systemd + udev (Recommended)
-
-Automatically start the bridge when USB device `1a86:7523` is connected to `/dev/ttyUSB0` and stop it when removed.
-
-### Quick Install
-
-```bash
-./install-udev-rule.sh
-```
-
-### Features
-- ✅ Auto-start when device connected
-- ✅ Auto-stop when device removed
-- ✅ User-level service (no root needed)
-- ✅ Runs on boot (with lingering enabled)
-
-See [INSTALL.md](INSTALL.md) for detailed documentation.
-
-### Test
-
-```bash
-# Run the test script
-./test-udev-autostart.sh
-
-# Or manually check
-systemctl --user status dcc-usb-connector.service
-telnet localhost 2560
-```
-
-## Option 2: Container-based (Manual)
-
-### Build and run the container
-
-```bash
-$ podman build -t dcc/bridge .
-$ podman run -d --group-add keep-groups --device=/dev/ttyACM0:/dev/arduino -p 2560:2560 --name dcc-bridge dcc/bridge
-```
-
-### Test
-
-It can be tested with `telnet`:
-
-```bash
-$ telnet localhost 2560
-```

connector/dcc-usb-connector.service

@@ -1,17 +0,0 @@
-[Unit]
-Description=DCC USB-to-Network Bridge Daemon
-After=network.target
-# Device will be available via udev rule, but add condition as safety check
-ConditionPathIsReadWrite=/dev/ttyUSB0
-# Stop this service when the device is no longer needed (removed)
-StopWhenUnneeded=yes
-
-[Service]
-ExecStartPre=/usr/bin/stty -F /dev/ttyUSB0 -echo 115200
-ExecStart=/usr/bin/bash -c "/usr/bin/ncat -n -k -l 2560 </dev/ttyUSB0 >/dev/ttyUSB0"
-KillMode=mixed
-TimeoutStopSec=5
-PrivateTmp=true
-
-[Install]
-WantedBy=default.target

connector/install-udev-rule.sh

@@ -1,127 +0,0 @@
-#!/usr/bin/env bash
-#
-# Installation script for DCC USB-to-Network Bridge auto-start
-#
-# This script installs the udev rule and systemd service to automatically
-# start the dcc-usb-connector.service when USB device 1a86:7523 is connected.
-#
-# Usage:
-#   ./install-udev-rule.sh
-#
-
-set -e
-
-# Colors for output
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-NC='\033[0m' # No Color
-
-# Get the directory where this script is located
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-
-echo -e "${GREEN}DCC USB-to-Network Bridge Auto-Start Installation${NC}"
-echo "=========================================================="
-echo
-
-# Check if running as root (not recommended for systemd user service)
-if [ "$EUID" -eq 0 ]; then
-    echo -e "${YELLOW}Warning: You are running as root.${NC}"
-    echo "This script will install a user systemd service."
-    echo "Please run as a regular user (not with sudo)."
-    echo
-    read -p "Continue anyway? (y/N) " -n 1 -r
-    echo
-    if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-        exit 1
-    fi
-fi
-
-# Check for required files
-echo "Checking required files..."
-if [ ! -f "$SCRIPT_DIR/99-dcc-usb-connector.rules" ]; then
-    echo -e "${RED}Error: 99-dcc-usb-connector.rules not found${NC}"
-    exit 1
-fi
-if [ ! -f "$SCRIPT_DIR/dcc-usb-connector.service" ]; then
-    echo -e "${RED}Error: dcc-usb-connector.service not found${NC}"
-    exit 1
-fi
-echo -e "${GREEN}✓ All required files found${NC}"
-echo
-
-# Install udev rule (requires sudo)
-echo "Installing udev rule..."
-echo "This requires sudo privileges."
-sudo cp "$SCRIPT_DIR/99-dcc-usb-connector.rules" /etc/udev/rules.d/
-sudo udevadm control --reload-rules
-sudo udevadm trigger --subsystem-match=tty
-echo -e "${GREEN}✓ Udev rule installed${NC}"
-echo
-
-# Install systemd user service
-echo "Installing systemd user service..."
-mkdir -p ~/.config/systemd/user/
-cp "$SCRIPT_DIR/dcc-usb-connector.service" ~/.config/systemd/user/
-systemctl --user daemon-reload
-echo -e "${GREEN}✓ Systemd service installed${NC}"
-echo
-
-# Enable lingering (allows user services to run without being logged in)
-echo "Enabling systemd lingering for user..."
-if loginctl show-user "$USER" | grep -q "Linger=yes"; then
-    echo -e "${GREEN}✓ Lingering already enabled${NC}"
-else
-    sudo loginctl enable-linger "$USER"
-    echo -e "${GREEN}✓ Lingering enabled${NC}"
-fi
-echo
-
-# Check user groups
-echo "Checking user permissions..."
-if groups "$USER" | grep -q '\bdialout\b'; then
-    echo -e "${GREEN}✓ User is in 'dialout' group${NC}"
-else
-    echo -e "${YELLOW}Warning: User is not in 'dialout' group${NC}"
-    echo "You may need to add yourself to the dialout group:"
-    echo "  sudo usermod -a -G dialout $USER"
-    echo "Then log out and log back in for changes to take effect."
-fi
-echo
-
-# Check for ncat
-echo "Checking for required tools..."
-if command -v ncat &> /dev/null; then
-    echo -e "${GREEN}✓ ncat is installed${NC}"
-else
-    echo -e "${YELLOW}Warning: ncat is not installed${NC}"
-    echo "Install it with: sudo dnf install nmap-ncat"
-fi
-echo
-
-# Summary
-echo "=========================================================="
-echo -e "${GREEN}Installation complete!${NC}"
-echo
-echo "The service will automatically start when USB device 1a86:7523"
-echo "is connected to /dev/ttyUSB0"
-echo
-echo "To test:"
-echo "  1. Plug in the USB device"
-echo "  2. Check service status: systemctl --user status dcc-usb-connector.service"
-echo "  3. Test connection: telnet localhost 2560"
-echo
-echo "To manually control:"
-echo "  Start:  systemctl --user start dcc-usb-connector.service"
-echo "  Stop:   systemctl --user stop dcc-usb-connector.service"
-echo "  Status: systemctl --user status dcc-usb-connector.service"
-echo
-echo "To view logs:"
-echo "  journalctl --user -u dcc-usb-connector.service -f"
-echo
-echo "To uninstall:"
-echo "  sudo rm /etc/udev/rules.d/99-dcc-usb-connector.rules"
-echo "  rm ~/.config/systemd/user/dcc-usb-connector.service"
-echo "  systemctl --user daemon-reload"
-echo "  sudo udevadm control --reload-rules"
-echo

connector/simulator/Dockerfile

@@ -1,8 +0,0 @@
-FROM dcc/bridge
-
-RUN apk update && apk add --no-cache qemu-system-avr \
-    && mkdir /io
-ADD start.sh /usr/local/bin
-ADD CommandStation-EX*.elf /io
-
-ENTRYPOINT ["/usr/local/bin/start.sh"]

connector/simulator/README.md

@@ -1,13 +0,0 @@
-# Connector and AVR simulator
-
-> [!WARNING]
-> The simulator is intended for light development and testing purposes only and far from being a complete replacement for a real hardware.
-
-`qemu-system-avr` tries to use all the CPU cycles (leaving a CPU core stuck at 100%; limit CPU core usage to 10% via `--cpus 0.1`. It can be adjusted on slower machines.
-
-```bash
-$ podman build -t dcc/connector:sim .
-$ podman run --init --cpus 0.1 -d -p 2560:2560 dcc/connector:sim
-```
-
-All traffic will be collected on the container's `stderr` for debugging purposes.

connector/test-udev-autostart.sh

@@ -1,147 +0,0 @@
-#!/usr/bin/env bash
-#
-# Test script for DCC USB-to-Network Bridge auto-start/stop functionality
-#
-# This script helps verify that the service starts when the USB device
-# is connected and stops when it's removed.
-#
-# Usage:
-#   ./test-udev-autostart.sh
-#
-
-set -e
-
-# Colors for output
-RED='\033[0;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-BLUE='\033[0;34m'
-NC='\033[0m' # No Color
-
-echo -e "${BLUE}=== DCC USB-to-Network Bridge Auto-Start/Stop Test ===${NC}"
-echo
-
-# Check if udev rule is installed
-echo -e "${BLUE}1. Checking udev rule installation...${NC}"
-if [ -f /etc/udev/rules.d/99-dcc-usb-connector.rules ]; then
-    echo -e "${GREEN}✓ Udev rule is installed${NC}"
-    echo "   Location: /etc/udev/rules.d/99-dcc-usb-connector.rules"
-else
-    echo -e "${RED}✗ Udev rule is NOT installed${NC}"
-    echo "   Run: sudo cp 99-dcc-usb-connector.rules /etc/udev/rules.d/"
-    exit 1
-fi
-echo
-
-# Check if service is installed
-echo -e "${BLUE}2. Checking systemd service installation...${NC}"
-if [ -f ~/.config/systemd/user/dcc-usb-connector.service ]; then
-    echo -e "${GREEN}✓ Systemd service is installed${NC}"
-    echo "   Location: ~/.config/systemd/user/dcc-usb-connector.service"
-else
-    echo -e "${RED}✗ Systemd service is NOT installed${NC}"
-    echo "   Run: cp dcc-usb-connector.service ~/.config/systemd/user/"
-    exit 1
-fi
-echo
-
-# Check lingering
-echo -e "${BLUE}3. Checking systemd lingering...${NC}"
-if loginctl show-user "$USER" | grep -q "Linger=yes"; then
-    echo -e "${GREEN}✓ Lingering is enabled${NC}"
-else
-    echo -e "${YELLOW}⚠ Lingering is NOT enabled${NC}"
-    echo "   Services may not start automatically when you're not logged in"
-    echo "   Run: sudo loginctl enable-linger $USER"
-fi
-echo
-
-# Check if device is connected
-echo -e "${BLUE}4. Checking USB device...${NC}"
-if lsusb | grep -q "1a86:7523"; then
-    echo -e "${GREEN}✓ USB device 1a86:7523 is connected${NC}"
-    lsusb | grep "1a86:7523"
-    
-    if [ -e /dev/ttyUSB0 ]; then
-        echo -e "${GREEN}✓ /dev/ttyUSB0 exists${NC}"
-        ls -l /dev/ttyUSB0
-    else
-        echo -e "${YELLOW}⚠ /dev/ttyUSB0 does NOT exist${NC}"
-        echo "   The device may be on a different port"
-        echo "   Available ttyUSB devices:"
-        ls -l /dev/ttyUSB* 2>/dev/null || echo "   (none found)"
-    fi
-else
-    echo -e "${YELLOW}⚠ USB device 1a86:7523 is NOT connected${NC}"
-    echo "   Please plug in the device to test"
-fi
-echo
-
-# Check service status
-echo -e "${BLUE}5. Checking service status...${NC}"
-if systemctl --user is-active --quiet dcc-usb-connector.service; then
-    echo -e "${GREEN}✓ Service is RUNNING${NC}"
-    systemctl --user status dcc-usb-connector.service --no-pager -l
-else
-    echo -e "${YELLOW}⚠ Service is NOT running${NC}"
-    echo "   Status:"
-    systemctl --user status dcc-usb-connector.service --no-pager -l || true
-fi
-echo
-
-# Test udev rule
-echo -e "${BLUE}6. Testing udev rule (if device is connected)...${NC}"
-if [ -e /dev/ttyUSB0 ]; then
-    echo "   Running: udevadm test /sys/class/tty/ttyUSB0"
-    echo "   Looking for SYSTEMD_USER_WANTS..."
-    if udevadm test /sys/class/tty/ttyUSB0 2>&1 | grep -q "SYSTEMD_USER_WANTS"; then
-        echo -e "${GREEN}✓ Udev rule is triggering systemd${NC}"
-        udevadm test /sys/class/tty/ttyUSB0 2>&1 | grep "SYSTEMD_USER_WANTS"
-    else
-        echo -e "${RED}✗ Udev rule is NOT triggering systemd${NC}"
-        echo "   The rule may not be matching correctly"
-    fi
-else
-    echo -e "${YELLOW}⚠ Cannot test udev rule - device not connected${NC}"
-fi
-echo
-
-# Check network port
-echo -e "${BLUE}7. Checking network port 2560...${NC}"
-if netstat -tuln 2>/dev/null | grep -q ":2560" || ss -tuln 2>/dev/null | grep -q ":2560"; then
-    echo -e "${GREEN}✓ Port 2560 is listening${NC}"
-    netstat -tuln 2>/dev/null | grep ":2560" || ss -tuln 2>/dev/null | grep ":2560"
-else
-    echo -e "${YELLOW}⚠ Port 2560 is NOT listening${NC}"
-    echo "   Service may not be running or ncat failed to start"
-fi
-echo
-
-# Summary and instructions
-echo -e "${BLUE}=== Test Summary ===${NC}"
-echo
-echo "To test auto-start/stop behavior:"
-echo
-echo "1. ${YELLOW}Monitor the service in one terminal:${NC}"
-echo "   watch -n 1 'systemctl --user status dcc-usb-connector.service'"
-echo
-echo "2. ${YELLOW}Monitor udev events in another terminal:${NC}"
-echo "   udevadm monitor --property --subsystem-match=tty"
-echo
-echo "3. ${YELLOW}Plug in the USB device${NC} and watch:"
-echo "   - Udev should detect the device"
-echo "   - Service should automatically start"
-echo "   - Port 2560 should become available"
-echo
-echo "4. ${YELLOW}Unplug the USB device${NC} and watch:"
-echo "   - Udev should detect device removal"
-echo "   - Service should automatically stop (thanks to StopWhenUnneeded=yes)"
-echo "   - Port 2560 should close"
-echo
-echo "5. ${YELLOW}Check logs:${NC}"
-echo "   journalctl --user -u dcc-usb-connector.service -f"
-echo
-echo "Expected behavior:"
-echo "  • Device connected  → Service starts → Port 2560 opens"
-echo "  • Device removed    → Service stops  → Port 2560 closes"
-echo

daemons/Dockerfile

@@ -0,0 +1,9 @@
+FROM python:3.11-alpine
+
+RUN mkdir /opt/dcc && pip -q install pyserial
+ADD net-to-serial.py config.ini /opt/dcc
+RUN python3 -q -m compileall /opt/dcc/net-to-serial.py
+
+EXPOSE 2560/tcp
+
+CMD ["python3", "/opt/dcc/net-to-serial.py"]

daemons/README.md

@@ -0,0 +1,3 @@
+## DCC++ EX connector
+
+See [README.md](../README.md)

daemons/config.ini

@@ -0,0 +1,14 @@
+[Daemon]
+LogLevel = debug
+ListeningIP = 0.0.0.0
+ListeningPort = 2560
+MaxClients = 10
+
+[Serial]
+# UNO
+Port = /dev/ttyACM0
+# Mega WiFi
+# Port = /dev/ttyUSB0
+Baudrate = 115200
+# Timeout in milliseconds
+Timeout = 50

daemons/net-to-serial.py

@@ -0,0 +1,120 @@
+#!/usr/bin/env python3
+import re
+import logging
+import serial
+import asyncio
+import configparser
+
+from pathlib import Path
+
+
+class SerialDaemon:
+    connected_clients = set()
+
+    def __init__(self, config):
+        self.ser = serial.Serial(
+            config["Serial"]["Port"],
+            timeout=int(config["Serial"]["Timeout"]) / 1000,
+        )
+        self.ser.baudrate = config["Serial"]["Baudrate"]
+        self.max_clients = int(config["Daemon"]["MaxClients"])
+
+    def __del__(self):
+        try:
+            self.ser.close()
+        except AttributeError:
+            pass
+
+    def __read_serial(self):
+        """Serial reader wrapper"""
+        response = b""
+        while True:
+            line = self.ser.read_until()
+            if not line.strip():  # empty line
+                break
+            if line.decode().startswith("<*"):
+                logging.debug("Serial debug: {}".format(line))
+            else:
+                response += line
+        logging.debug("Serial read: {}".format(response))
+
+        return response
+
+    def __write_serial(self, data):
+        """Serial writer wrapper"""
+        self.ser.write(data)
+
+    async def handle_echo(self, reader, writer):
+        """Process a request from socket and return the response"""
+        logging.info(
+            "Clients already connected: {} (max: {})".format(
+                len(self.connected_clients),
+                self.max_clients,
+            )
+        )
+
+        addr = writer.get_extra_info("peername")[0]
+        if len(self.connected_clients) < self.max_clients:
+            self.connected_clients.add(writer)
+            while True:  # keep connection to client open
+                data = await reader.read(100)
+                if not data:  # client has disconnected
+                    break
+                logging.info("Received {} from {}".format(data, addr))
+                self.__write_serial(data)
+                response = self.__read_serial()
+                for client in self.connected_clients:
+                    client.write(response)
+                    await client.drain()
+                logging.info("Sent: {}".format(response))
+            self.connected_clients.remove(writer)
+        else:
+            logging.warning(
+                "TooManyClients: client {} disconnected".format(addr)
+            )
+
+        writer.close()
+        await writer.wait_closed()
+
+    async def return_board(self):
+        """Return the board signature"""
+        line = ""
+        # drain the serial until we are ready to go
+        self.__write_serial(b"<s>")
+        while "DCC-EX" not in line:
+            line = self.__read_serial().decode()
+        board = re.findall(r"<iDCC-EX.*>", line)[0]
+        return board
+
+
+async def main():
+    config = configparser.ConfigParser()
+    config.read(
+        Path(__file__).resolve().parent / "config.ini"
+    )  # mimick os.path.join
+    logging.basicConfig(level=config["Daemon"]["LogLevel"].upper())
+
+    sd = SerialDaemon(config)
+    server = await asyncio.start_server(
+        sd.handle_echo,
+        config["Daemon"]["ListeningIP"],
+        config["Daemon"]["ListeningPort"],
+    )
+    addr = server.sockets[0].getsockname()
+    logging.info("Serving on {} port {}".format(addr[0], addr[1]))
+    logging.info(
+        "Proxying to {} (Baudrate: {}, Timeout: {})".format(
+            config["Serial"]["Port"],
+            config["Serial"]["Baudrate"],
+            config["Serial"]["Timeout"],
+        )
+    )
+    logging.info("Initializing board")
+    logging.info("Board {} ready".format(await sd.return_board()))
+
+    async with server:
+        await server.serve_forever()
+
+
+if __name__ == "__main__":
+    asyncio.run(main())

daemons/requirements.txt

@@ -0,0 +1 @@
+PySerial

daemons/simulator/Dockerfile

@@ -0,0 +1,7 @@
+FROM dcc/net-to-serial
+
+RUN apk update && apk add qemu-system-avr && mkdir /io
+ADD start.sh /opt/dcc
+ADD CommandStation-EX*.elf /io
+
+ENTRYPOINT ["/opt/dcc/start.sh"]

daemons/simulator/README.md

@@ -0,0 +1,8 @@
+# AVR Simulator
+
+`qemu-system-avr` tries to use all the CPU cicles (leaving a CPU core stuck at 100%; limit CPU core usage to 10% via `--cpus 0.1`. It can be adjusted on slower machines.
+
+```bash
+$ podman build -t dcc/net-to-serial:sim . 
+$ podman run --init --cpus 0.1 -d -p 2560:2560 dcc/net-to-serial:sim
+```

daemons/simulator/start.sh

@@ -7,5 +7,7 @@ if [ -c /dev/pts/0 ]; then
     PTY=1
 fi
 
+sed -i "s/ttyACM0/pts\/${PTY}/" /opt/dcc/config.ini
+
 qemu-system-avr -machine uno -bios /io/CommandStation-EX*.elf -serial pty -daemonize
-ncat -n -k -l 2560 -o /dev/stderr </dev/pts/${PTY} >/dev/pts/${PTY}
+/opt/dcc/net-to-serial.py

docs/nginx/nginx.conf

@@ -1,43 +0,0 @@
-server {
-    listen       [::]:443 ssl;
-    listen       443 ssl;
-    server_name  myhost;
-
-    # ssl_certificate ...;
-
-    add_header X-Xss-Protection "1; mode=block";
-    add_header Strict-Transport-Security "max-age=15768000";
-    add_header Permissions-Policy "geolocation=(),midi=(),sync-xhr=(),microphone=(),camera=(),magnetometer=(),gyroscope=(),fullscreen=(self),payment=()";
-    add_header Content-Security-Policy "child-src 'none'; object-src 'none'";
-
-    client_max_body_size 250M;
-    error_page  403 404 https://$server_name/404;
-
-    location / {
-        proxy_pass               http://127.0.0.1:8000;
-        proxy_set_header         Host              $host;
-        proxy_set_header         X-Real-IP         $remote_addr;
-        proxy_set_header         X-Forwarded-For   $proxy_add_x_forwarded_for;
-        proxy_set_header         X-Forwarded-Proto $scheme;
-        proxy_redirect           http:// https://;
-        proxy_connect_timeout    1800;
-        proxy_read_timeout       1800;
-        proxy_max_temp_file_size 8192m;
-    }
-
-    # static files
-    location /static {
-        root /myroot/ram/storage;
-    }
-
-    # media files
-    location ~ ^/media/(images|uploads) {
-        root /myroot/ram/storage;
-    }
-
-    # protected filed to be served via X-Accel-Redirect
-    location /private {
-    	internal;
-        alias /myroot/ram/storage/media;
-    }
-}

docs/query_optimization.md

@@ -1,837 +0,0 @@
-# Query Optimization Summary
-
-## ✅ **Completed Tasks**
-
-### 1. **Portal Views Optimization** (`ram/portal/views.py`)
-Added `select_related()` and `prefetch_related()` to **17+ views**:
-- `GetData.get_data()` - Base rolling stock queries
-- `GetHome.get_data()` - Featured items
-- `SearchObjects.run_search()` - Search across all models
-- `GetManufacturerItem.get()` - Manufacturer filtering
-- `GetObjectsFiltered.run_filter()` - Type/company/scale filtering
-- `GetRollingStock.get()` - Detail view (critical N+1 fix)
-- `GetConsist.get()` - Consist detail (critical N+1 fix)
-- `Consists.get_data()` - Consist listings
-- `Books.get_data()` - Book listings
-- `Catalogs.get_data()` - Catalog listings
-- `Magazines.get_data()` - Magazine listings
-- `GetMagazine.get()` - Magazine detail
-- `GetMagazineIssue.get()` - Magazine issue details
-- `GetBookCatalog.get_object()` - Book/catalog details
-
-### 2. **Admin Query Optimization**
-Added `get_queryset()` overrides in admin classes:
-- **`roster/admin.py`**: `RollingStockAdmin` - optimizes list views with related objects
-- **`bookshelf/admin.py`**: `BookAdmin`, `CatalogAdmin`, and `MagazineAdmin` - prefetches authors, tags, images
-- **`consist/admin.py`**: `ConsistAdmin` - prefetches consist items
-
-### 3. **Enhanced Model Managers** (`ram/ram/managers.py`)
-Created specialized managers with reusable optimization methods:
-
-**`RollingStockManager`:**
-- `with_related()` - For list views (8 select_related, 2 prefetch_related)
-- `with_details()` - For detail views (adds properties, documents, journal)
-- `get_published_with_related()` - Convenience method combining filtering + optimization
-
-**`ConsistManager`:**
-- `with_related()` - Basic consist data (company, scale, tags, consist_item)
-- `with_rolling_stock()` - Deep prefetch of all consist composition
-
-**`BookManager`:**
-- `with_related()` - Authors, publisher, tags, TOC, images
-- `with_details()` - Adds properties and documents
-
-**`CatalogManager`:**
-- `with_related()` - Manufacturer, scales, tags, images
-- `with_details()` - Adds properties and documents
-
-**`MagazineIssueManager`:**
-- `with_related()` - Magazine, tags, TOC, images
-- `with_details()` - Adds properties and documents
-
-### 4. **Updated Models to Use Optimized Managers**
-- `roster/models.py`: `RollingStock.objects = RollingStockManager()`
-- `consist/models.py`: `Consist.objects = ConsistManager()`
-- `bookshelf/models.py`: 
-  - `Book.objects = BookManager()`
-  - `Catalog.objects = CatalogManager()`
-  - `MagazineIssue.objects = MagazineIssueManager()`
-
-## 📊 **Performance Impact**
-
-**Before:**
-- N+1 query problems throughout the application
-- Unoptimized queries hitting database hundreds of times per page
-- Admin list views loading each related object individually
-
-**After:**
-- **List views**: Reduced from ~100+ queries to ~5-10 queries
-- **Detail views**: Reduced from ~50+ queries to ~3-5 queries  
-- **Admin interfaces**: Reduced from ~200+ queries to ~10-20 queries
-- **Search functionality**: Optimized across all model types
-
-## 🎯 **Key Improvements**
-
-1. **`GetRollingStock` view**: Critical fix - was doing individual queries for each property, document, and journal entry
-2. **`GetConsist` view**: Critical fix - was doing N queries for N rolling stock items in consist, now prefetches all nested rolling stock data
-3. **Search views**: Now prefetch related objects for books, catalogs, magazine issues, and consists
-4. **Admin list pages**: No longer query database for each row's foreign keys
-5. **Image prefetch fix**: Corrected invalid `prefetch_related('image')` calls for Consist and Magazine models
-
-## ✅ **Validation**
-- All modified files pass Python syntax validation
-- Code follows existing project patterns
-- Uses Django's recommended query optimization techniques
-- Maintains backward compatibility
-
-## 📝 **Testing Instructions**
-Once Django 6.0+ is available in the environment:
-```bash
-cd ram
-python manage.py test --verbosity=2
-python manage.py check
-```
-
-## 🔍 **How to Use the Optimized Managers**
-
-### In Views
-```python
-# Instead of:
-rolling_stock = RollingStock.objects.get_published(request.user)
-
-# Use optimized version:
-rolling_stock = RollingStock.objects.get_published(request.user).with_related()
-
-# For detail views with all related data:
-rolling_stock = RollingStock.objects.with_details().get(uuid=uuid)
-```
-
-### In Admin
-The optimizations are automatic - just inherit from the admin classes as usual.
-
-### Custom QuerySets
-```python
-# Consist with full rolling stock composition:
-consist = Consist.objects.with_rolling_stock().get(uuid=uuid)
-
-# Books with all related data:
-books = Book.objects.with_details().filter(publisher=publisher)
-
-# Catalogs optimized for list display:
-catalogs = Catalog.objects.with_related().all()
-```
-
-## 📈 **Expected Performance Gains**
-
-### Homepage (Featured Items)
-- **Before**: ~80 queries
-- **After**: ~8 queries
-- **Improvement**: 90% reduction
-
-### Rolling Stock Detail Page
-- **Before**: ~60 queries
-- **After**: ~5 queries
-- **Improvement**: 92% reduction
-
-### Consist Detail Page
-- **Before**: ~150 queries (for 10 items)
-- **After**: ~8 queries
-- **Improvement**: 95% reduction
-
-### Admin Rolling Stock List (50 items)
-- **Before**: ~250 queries
-- **After**: ~12 queries
-- **Improvement**: 95% reduction
-
-### Search Results
-- **Before**: ~120 queries
-- **After**: ~15 queries
-- **Improvement**: 87% reduction
-
-## ⚠️ **Important: Image Field Prefetching**
-
-### Models with Direct ImageField (CANNOT prefetch 'image')
-Some models have `image` as a direct `ImageField`, not a ForeignKey relation. These **cannot** use `prefetch_related('image')` or `select_related('image')`:
-
-- ✅ **Consist**: `image = models.ImageField(...)` - Direct field
-- ✅ **Magazine**: `image = models.ImageField(...)` - Direct field
-
-### Models with Related Image Models (CAN prefetch 'image')
-These models have separate Image model classes with `related_name="image"`:
-
-- ✅ **RollingStock**: Uses `RollingStockImage` model → `prefetch_related('image')` ✓
-- ✅ **Book**: Uses `BaseBookImage` model → `prefetch_related('image')` ✓
-- ✅ **Catalog**: Uses `BaseBookImage` model → `prefetch_related('image')` ✓
-- ✅ **MagazineIssue**: Inherits from `BaseBook` → `prefetch_related('image')` ✓
-
-### Fixed Locations
-**Consist (7 locations fixed):**
-- `ram/managers.py`: Removed `select_related('image')`, added `select_related('scale')`
-- `portal/views.py`: Fixed 5 queries (search, filter, detail views)
-- `consist/admin.py`: Removed `select_related('image')`
-
-**Magazine (3 locations fixed):**
-- `portal/views.py`: Fixed 2 queries (list and detail views)
-- `bookshelf/admin.py`: Added optimized `get_queryset()` method
-
-## 🚀 **Future Optimization Opportunities**
-
-1. **Database Indexing**: Add indexes to frequently queried fields (see suggestions in codebase analysis)
-2. **Caching**: Implement caching for `get_site_conf()` which is called multiple times per request
-3. **Pagination**: Pass QuerySets directly to Paginator instead of converting to lists
-4. **Aggregation**: Use database aggregation for counting instead of Python loops
-5. **Connection Pooling**: Add `CONN_MAX_AGE` in production settings
-6. **Query Count Tests**: Add `assertNumQueries()` tests to verify optimization effectiveness
-
-## 📚 **References**
-
-- [Django QuerySet API reference](https://docs.djangoproject.com/en/stable/ref/models/querysets/)
-- [Django Database access optimization](https://docs.djangoproject.com/en/stable/topics/db/optimization/)
-- [select_related() documentation](https://docs.djangoproject.com/en/stable/ref/models/querysets/#select-related)
-- [prefetch_related() documentation](https://docs.djangoproject.com/en/stable/ref/models/querysets/#prefetch-related)
-
----
-
-## 🔄 **Manager Helper Refactoring** (2026-01-18)
-
-Successfully replaced all explicit `prefetch_related()` and `select_related()` calls with centralized manager helper methods. **Updated to use custom QuerySet classes to enable method chaining after `get_published()`.**
-
-### Implementation Details
-
-The optimization uses a **QuerySet-based approach** where helper methods are defined on custom QuerySet classes that extend `PublicQuerySet`. This allows method chaining like:
-
-```python
-RollingStock.objects.get_published(user).with_related().filter(...)
-```
-
-**Architecture:**
-- **`PublicQuerySet`**: Base QuerySet with `get_published()` and `get_public()` methods
-- **Model-specific QuerySets**: `RollingStockQuerySet`, `ConsistQuerySet`, `BookQuerySet`, etc.
-- **Managers**: Delegate to QuerySets via `get_queryset()` override
-
-This pattern ensures that helper methods (`with_related()`, `with_details()`, `with_rolling_stock()`) are available both on the manager and on QuerySets returned by filtering methods.
-
-### Changes Summary
-
-**Admin Files (4 files updated):**
-- **roster/admin.py** (RollingStockAdmin:161-164): Replaced explicit prefetch with `.with_related()`
-- **consist/admin.py** (ConsistAdmin:62-67): Replaced explicit prefetch with `.with_related()`
-- **bookshelf/admin.py** (BookAdmin:101-106): Replaced explicit prefetch with `.with_related()`
-- **bookshelf/admin.py** (CatalogAdmin:276-281): Replaced explicit prefetch with `.with_related()`
-
-**Portal Views (portal/views.py - 14 replacements):**
-- **GetData.get_data()** (lines 96-110): RollingStock list view → `.with_related()`
-- **GetHome.get_data()** (lines 141-159): Featured items → `.with_related()`
-- **SearchObjects.run_search()** (lines 203-217): RollingStock search → `.with_related()`
-- **SearchObjects.run_search()** (lines 219-271): Consist, Book, Catalog, MagazineIssue search → `.with_related()`
-- **GetObjectsFiltered.run_filter()** (lines 364-387): Manufacturer filter → `.with_related()`
-- **GetObjectsFiltered.run_filter()** (lines 423-469): Multiple filters → `.with_related()`
-- **GetRollingStock.get()** (lines 513-525): RollingStock detail → `.with_details()`
-- **GetRollingStock.get()** (lines 543-567): Related consists and trainsets → `.with_related()`
-- **Consists.get_data()** (lines 589-595): Consist list → `.with_related()`
-- **GetConsist.get()** (lines 573-589): Consist detail → `.with_rolling_stock()`
-- **Books.get_data()** (lines 787-792): Book list → `.with_related()`
-- **Catalogs.get_data()** (lines 798-804): Catalog list → `.with_related()`
-- **GetMagazine.get()** (lines 840-844): Magazine issues → `.with_related()`
-- **GetMagazineIssue.get()** (lines 867-872): Magazine issue detail → `.with_details()`
-- **GetBookCatalog.get_object()** (lines 892-905): Book/Catalog detail → `.with_details()`
-
-### Benefits
-
-1. **Consistency**: All queries now use standardized manager methods
-2. **Maintainability**: Prefetch logic is centralized in `ram/managers.py`
-3. **Readability**: Code is cleaner and more concise
-4. **DRY Principle**: Eliminates repeated prefetch patterns throughout codebase
-
-### Statistics
-
-- **Total Replacements**: ~36 explicit prefetch calls replaced
-- **Files Modified**: 5 files
-- **Locations Updated**: 18 locations
-- **Test Results**: All 95 core tests pass
-- **System Check**: No issues
-
-### Example Transformations
-
-**Before:**
-```python
-# Admin (repeated in multiple files)
-def get_queryset(self, request):
-    qs = super().get_queryset(request)
-    return qs.select_related(
-        'rolling_class',
-        'rolling_class__company',
-        'rolling_class__type',
-        'manufacturer',
-        'scale',
-        'decoder',
-        'shop',
-    ).prefetch_related('tags', 'image')
-```
-
-**After:**
-```python
-# Admin (clean and maintainable)
-def get_queryset(self, request):
-    qs = super().get_queryset(request)
-    return qs.with_related()
-```
-
-**Before:**
-```python
-# Views (verbose and error-prone)
-roster = (
-    RollingStock.objects.get_published(request.user)
-    .select_related(
-        'rolling_class',
-        'rolling_class__company',
-        'rolling_class__type',
-        'manufacturer',
-        'scale',
-    )
-    .prefetch_related('tags', 'image')
-    .filter(query)
-)
-```
-
-**After:**
-```python
-# Views (concise and clear)
-roster = (
-    RollingStock.objects.get_published(request.user)
-    .with_related()
-    .filter(query)
-)
-```
-
----
-
-*Generated: 2026-01-17*
-*Updated: 2026-01-18*
-*Project: Django Railroad Assets Manager (django-ram)*
-
----
-
-## 🗄️ **Database Indexing** (2026-01-18)
-
-Added 32 strategic database indexes across all major models to improve query performance, especially for filtering, joining, and ordering operations.
-
-### Implementation Summary
-
-**RollingStock model** (`roster/models.py`):
-- Single field indexes: `published`, `featured`, `item_number_slug`, `road_number_int`, `scale`
-- Composite indexes: `published+featured`, `manufacturer+item_number_slug`
-- **10 indexes total**
-
-**RollingClass model** (`roster/models.py`):
-- Single field indexes: `company`, `type`
-- Composite index: `company+identifier` (matches ordering)
-- **3 indexes total**
-
-**Consist model** (`consist/models.py`):
-- Single field indexes: `published`, `scale`, `company`
-- Composite index: `published+scale`
-- **4 indexes total**
-
-**ConsistItem model** (`consist/models.py`):
-- Single field indexes: `load`, `order`
-- Composite index: `consist+load`
-- **3 indexes total**
-
-**Book model** (`bookshelf/models.py`):
-- Single field index: `title`
-- Note: Inherited fields (`published`, `publication_year`) cannot be indexed due to multi-table inheritance
-- **1 index total**
-
-**Catalog model** (`bookshelf/models.py`):
-- Single field index: `manufacturer`
-- **1 index total**
-
-**Magazine model** (`bookshelf/models.py`):
-- Single field indexes: `published`, `name`
-- **2 indexes total**
-
-**MagazineIssue model** (`bookshelf/models.py`):
-- Single field indexes: `magazine`, `publication_month`
-- **2 indexes total**
-
-**Manufacturer model** (`metadata/models.py`):
-- Single field indexes: `category`, `slug`
-- Composite index: `category+slug`
-- **3 indexes total**
-
-**Company model** (`metadata/models.py`):
-- Single field indexes: `slug`, `country`, `freelance`
-- **3 indexes total**
-
-**Scale model** (`metadata/models.py`):
-- Single field indexes: `slug`, `ratio_int`
-- Composite index: `-ratio_int+-tracks` (for descending order)
-- **3 indexes total**
-
-### Migrations Applied
-
-- `metadata/migrations/0027_*` - 9 indexes
-- `roster/migrations/0041_*` - 10 indexes  
-- `bookshelf/migrations/0032_*` - 6 indexes
-- `consist/migrations/0020_*` - 7 indexes
-
-### Index Naming Convention
-
-- Single field: `{app}_{field}_idx` (e.g., `roster_published_idx`)
-- Composite: `{app}_{desc}_idx` (e.g., `roster_pub_feat_idx`)
-- Keep under 30 characters for PostgreSQL compatibility
-
-### Technical Notes
-
-**Multi-table Inheritance Issue:**
-- Django models using multi-table inheritance (Book, Catalog, MagazineIssue inherit from BaseBook/BaseModel)
-- Cannot add indexes on inherited fields in child model's Meta class
-- Error: `models.E016: 'indexes' refers to field 'X' which is not local to model 'Y'`
-- Solution: Only index local fields in child models; consider indexing parent model fields separately
-
-**Performance Impact:**
-- Filters on `published=True` are now ~10x faster (most common query)
-- Foreign key lookups benefit from automatic + explicit indexes
-- Composite indexes eliminate filesorts for common filter+order combinations
-- Scale lookups by slug or ratio are now instant
-
-### Test Results
-- **All 146 tests passing** ✅
-- No regressions introduced
-- Migrations applied successfully
-
----
-
-## 📊 **Database Aggregation Optimization** (2026-01-18)
-
-Replaced Python-level counting and loops with database aggregation for significant performance improvements.
-
-### 1. GetConsist View Optimization (`portal/views.py:571-629`)
-
-**Problem:** N+1 query issue when checking if rolling stock items are published.
-
-**Before:**
-```python
-data = list(
-    item.rolling_stock
-    for item in consist_items.filter(load=False)
-    if RollingStock.objects.get_published(request.user)
-    .filter(uuid=item.rolling_stock_id)
-    .exists()  # Separate query for EACH item!
-)
-```
-
-**After:**
-```python
-# Fetch all published IDs once
-published_ids = set(
-    RollingStock.objects.get_published(request.user)
-    .values_list('uuid', flat=True)
-)
-
-# Use Python set membership (O(1) lookup)
-data = [
-    item.rolling_stock
-    for item in consist_items.filter(load=False)
-    if item.rolling_stock.uuid in published_ids
-]
-```
-
-**Performance:**
-- **Before**: 22 queries for 10-item consist (1 base + 10 items + 10 exists checks + 1 loads query)
-- **After**: 2 queries (1 for published IDs + 1 for consist items)
-- **Improvement**: 91% reduction in queries
-
-### 2. Consist Model - Loads Count (`consist/models.py:51-54`)
-
-**Added Property:**
-```python
-@property
-def loads_count(self):
-    """Count of loads in this consist using database aggregation."""
-    return self.consist_item.filter(load=True).count()
-```
-
-**Template Optimization (`portal/templates/consist.html:145`):**
-- **Before**: `{{ loads|length }}` (evaluates entire QuerySet)
-- **After**: `{{ loads_count }}` (uses pre-calculated count)
-
-### 3. Admin CSV Export Optimizations
-
-Optimized 4 admin CSV export functions to use `select_related()` and `prefetch_related()`, and moved repeated calculations outside loops.
-
-#### Consist Admin (`consist/admin.py:106-164`)
-
-**Before:**
-```python
-for obj in queryset:
-    for item in obj.consist_item.all():  # Query per consist
-        types = " + ".join(
-            "{}x {}".format(t["count"], t["type"])
-            for t in obj.get_type_count()  # Calculated per item!
-        )
-        tags = settings.CSV_SEPARATOR_ALT.join(
-            t.name for t in obj.tags.all()  # Query per item!
-        )
-```
-
-**After:**
-```python
-queryset = queryset.select_related(
-    'company', 'scale'
-).prefetch_related(
-    'tags',
-    'consist_item__rolling_stock__rolling_class__type'
-)
-
-for obj in queryset:
-    # Calculate once per consist
-    types = " + ".join(...)
-    tags_str = settings.CSV_SEPARATOR_ALT.join(...)
-
-    for item in obj.consist_item.all():
-        # Reuse cached values
-```
-
-**Performance:**
-- **Before**: ~400+ queries for 100 consists with 10 items each
-- **After**: 1 query
-- **Improvement**: 99.75% reduction
-
-#### RollingStock Admin (`roster/admin.py:249-326`)
-
-**Added prefetching:**
-```python
-queryset = queryset.select_related(
-    'rolling_class',
-    'rolling_class__type',
-    'rolling_class__company',
-    'manufacturer',
-    'scale',
-    'decoder',
-    'shop'
-).prefetch_related('tags', 'property__property')
-```
-
-**Performance:**
-- **Before**: ~500+ queries for 100 items
-- **After**: 1 query
-- **Improvement**: 99.8% reduction
-
-#### Book Admin (`bookshelf/admin.py:178-231`)
-
-**Added prefetching:**
-```python
-queryset = queryset.select_related(
-    'publisher', 'shop'
-).prefetch_related('authors', 'tags', 'property__property')
-```
-
-**Performance:**
-- **Before**: ~400+ queries for 100 books
-- **After**: 1 query
-- **Improvement**: 99.75% reduction
-
-#### Catalog Admin (`bookshelf/admin.py:349-404`)
-
-**Added prefetching:**
-```python
-queryset = queryset.select_related(
-    'manufacturer', 'shop'
-).prefetch_related('scales', 'tags', 'property__property')
-```
-
-**Performance:**
-- **Before**: ~400+ queries for 100 catalogs
-- **After**: 1 query
-- **Improvement**: 99.75% reduction
-
-### Performance Summary Table
-
-| Operation | Before | After | Improvement |
-|-----------|--------|-------|-------------|
-| GetConsist view (10 items) | ~22 queries | 2 queries | **91% reduction** |
-| Consist CSV export (100 consists) | ~400+ queries | 1 query | **99.75% reduction** |
-| RollingStock CSV export (100 items) | ~500+ queries | 1 query | **99.8% reduction** |
-| Book CSV export (100 books) | ~400+ queries | 1 query | **99.75% reduction** |
-| Catalog CSV export (100 catalogs) | ~400+ queries | 1 query | **99.75% reduction** |
-
-### Best Practices Applied
-
-1. ✅ **Use database aggregation** (`.count()`, `.annotate()`) instead of Python `len()`
-2. ✅ **Bulk fetch before loops** - Use `values_list()` to get all IDs at once
-3. ✅ **Cache computed values** - Calculate once outside loops, reuse inside
-4. ✅ **Use set membership** - `in set` is O(1) vs repeated `.exists()` queries
-5. ✅ **Prefetch in admin** - Add `select_related()` and `prefetch_related()` to querysets
-6. ✅ **Pass context data** - Pre-calculate counts in views, pass to templates
-
-### Files Modified
-
-1. `ram/portal/views.py` - GetConsist view optimization
-2. `ram/portal/templates/consist.html` - Use pre-calculated loads_count
-3. `ram/consist/models.py` - Added loads_count property
-4. `ram/consist/admin.py` - CSV export optimization
-5. `ram/roster/admin.py` - CSV export optimization
-6. `ram/bookshelf/admin.py` - CSV export optimizations (Book and Catalog)
-
-### Test Results
-
-- **All 146 tests passing** ✅
-- No regressions introduced
-- All optimizations backward-compatible
-
-### Related Documentation
-
-- Existing optimizations: Manager helper methods (see "Manager Helper Refactoring" section above)
-- Database indexes (see "Database Indexing" section above)
-
----
-
-## 🧪 **Test Coverage Enhancement** (2026-01-17)
-
-Significantly expanded test coverage for portal views to ensure query optimizations don't break functionality.
-
-### Portal Tests (`ram/portal/tests.py`)
-
-Added **51 comprehensive tests** (~642 lines) covering:
-
-**View Tests:**
-- `GetHome` - Homepage with featured items
-- `GetData` - Rolling stock listing
-- `GetRollingStock` - Rolling stock detail pages
-- `GetManufacturerItem` - Manufacturer filtering
-- `GetObjectsFiltered` - Type/company/scale filtering
-- `Consists` - Consist listings
-- `GetConsist` - Consist detail pages
-- `Books` - Book listings
-- `GetBookCatalog` - Book detail pages
-- `Catalogs` - Catalog listings
-- `Magazines` - Magazine listings
-- `GetMagazine` - Magazine detail pages
-- `GetMagazineIssue` - Magazine issue detail pages
-- `SearchObjects` - Search functionality
-
-**Test Coverage:**
-- HTTP 200 responses for valid requests
-- HTTP 404 responses for invalid UUIDs
-- Pagination functionality
-- Query optimization validation
-- Context data verification
-- Template rendering
-- Published/unpublished filtering
-- Featured items display
-- Search across multiple model types
-- Related object prefetching
-
-**Test Results:**
-- **146 total tests** across entire project (51 in portal)
-- All tests passing ✅
-- Test execution time: ~38 seconds
-- No regressions from optimizations
-
-### Example Test Pattern
-
-```python
-class GetHomeTestCase(BaseTestCase):
-    def test_get_home_success(self):
-        """Test homepage loads successfully with featured items."""
-        response = self.client.get(reverse('portal:home'))
-        self.assertEqual(response.status_code, 200)
-        self.assertIn('featured', response.context)
-        
-    def test_get_home_with_query_optimization(self):
-        """Verify homepage uses optimized queries."""
-        with self.assertNumQueries(8):  # Expected query count
-            response = self.client.get(reverse('portal:home'))
-            self.assertEqual(response.status_code, 200)
-```
-
-### Files Modified
-- `ram/portal/tests.py` - Added 642 lines of test code
-
----
-
-## 🛠️ **Frontend Build System** (2026-01-18)
-
-Added Makefile for automated frontend asset minification to streamline development workflow.
-
-### Makefile Features
-
-**Available Targets:**
-- `make install` - Install npm dependencies (terser, clean-css-cli)
-- `make minify` - Minify both JS and CSS files
-- `make minify-js` - Minify JavaScript files only
-- `make minify-css` - Minify CSS files only
-- `make clean` - Remove minified files
-- `make watch` - Watch for file changes and auto-minify (requires inotify-tools)
-- `make help` - Display available targets
-
-**JavaScript Minification:**
-- Source: `ram/portal/static/js/src/`
-  - `theme_selector.js` - Dark/light theme switching
-  - `tabs_selector.js` - Deep linking for tabs
-  - `validators.js` - Form validation helpers
-- Output: `ram/portal/static/js/main.min.js`
-- Tool: terser (compression + mangling)
-
-**CSS Minification:**
-- Source: `ram/portal/static/css/src/main.css`
-- Output: `ram/portal/static/css/main.min.css`
-- Tool: clean-css-cli
-
-### Usage
-
-```bash
-# First time setup
-make install
-
-# Minify assets
-make minify
-
-# Development workflow
-make watch  # Auto-minify on file changes
-```
-
-### Implementation Details
-
-- **Dependencies**: Defined in `package.json`
-  - `terser` - JavaScript minifier
-  - `clean-css-cli` - CSS minifier
-- **Configuration**: Makefile uses npx to run tools
-- **File structure**: Follows convention (src/ → output/)
-- **Integration**: Works alongside Django's static file handling
-
-### Benefits
-
-1. **Consistency**: Standardized build process for all developers
-2. **Automation**: Single command to minify all assets
-3. **Development**: Watch mode for instant feedback
-4. **Documentation**: Self-documenting via `make help`
-5. **Portability**: Works on any system with npm installed
-
-### Files Modified
-
-1. `Makefile` - New 72-line Makefile with comprehensive targets
-2. `ram/portal/static/js/main.min.js` - Updated minified output
-3. `ram/portal/static/js/src/README.md` - Updated instructions
-
----
-
-## 📝 **Documentation Enhancement** (2026-01-18)
-
-### AGENTS.md Updates
-
-Added comprehensive coding style guidelines:
-
-**Code Style Section:**
-- PEP 8 compliance requirements
-- Line length standards (79 chars preferred, 119 acceptable)
-- Blank line whitespace rule (must not contain spaces/tabs)
-- Import organization patterns (stdlib → third-party → local)
-- Naming conventions (PascalCase, snake_case, UPPER_SNAKE_CASE)
-
-**Django-Specific Patterns:**
-- Model field ordering and conventions
-- Admin customization examples
-- BaseModel usage patterns
-- PublicManager integration
-- Image/Document patterns
-- DeduplicatedStorage usage
-
-**Testing Best Practices:**
-- Test method naming conventions
-- Docstring requirements
-- setUp() method usage
-- Exception testing patterns
-- Coverage examples from existing tests
-
-**Black Formatter:**
-- Added black to development requirements
-- Command examples with 79-character line length
-- Check and diff mode usage
-- Integration with flake8
-
-### Query Optimization Documentation
-
-Created comprehensive `docs/query_optimization.md` documenting:
-- All optimization work from prefetch branch
-- Performance metrics with before/after comparisons
-- Implementation patterns and examples
-- Test results validation
-- Future optimization opportunities
-
----
-
-## 📊 **Prefetch Branch Summary**
-
-### Overall Statistics
-
-**Commits**: 9 major commits from 2026-01-17 to 2026-01-18
-- Test coverage expansion
-- Query optimization implementation
-- Manager refactoring
-- Database indexing
-- Aggregation optimization
-- Build system addition
-- Documentation enhancements
-
-**Files Changed**: 19 files
-- Added: 2,046 lines
-- Removed: 58 lines
-- Net change: +1,988 lines
-
-**Test Coverage**:
-- Before: 95 tests
-- After: 146 tests ✅
-- Added: 51 new portal tests
-- Execution time: ~38 seconds
-- Pass rate: 100%
-
-**Database Migrations**: 4 new migrations
-- `metadata/0027_*` - 9 indexes
-- `roster/0041_*` - 13 indexes (10 + 3 RollingClass)
-- `bookshelf/0032_*` - 6 indexes
-- `consist/0020_*` - 7 indexes
-- **Total**: 32 new database indexes
-
-**Query Performance Improvements**:
-- Homepage: 90% reduction (80 → 8 queries)
-- Rolling Stock detail: 92% reduction (60 → 5 queries)
-- Consist detail: 95% reduction (150 → 8 queries)
-- Admin lists: 95% reduction (250 → 12 queries)
-- CSV exports: 99.75% reduction (400+ → 1 query)
-
-### Key Achievements
-
-1. ✅ **Query Optimization**: Comprehensive select_related/prefetch_related implementation
-2. ✅ **Manager Refactoring**: Centralized optimization methods in custom QuerySets
-3. ✅ **Database Indexing**: 32 strategic indexes for filtering, joining, ordering
-4. ✅ **Aggregation**: Replaced Python loops with database counting
-5. ✅ **Test Coverage**: 51 new tests ensuring optimization correctness
-6. ✅ **Build System**: Makefile for frontend asset minification
-7. ✅ **Documentation**: Comprehensive guides for developers and AI agents
-
-### Merge Readiness
-
-The prefetch branch is production-ready:
-- ✅ All 146 tests passing
-- ✅ No system check issues
-- ✅ Backward compatible changes
-- ✅ Comprehensive documentation
-- ✅ Database migrations ready
-- ✅ Performance validated
-- ✅ Code style compliant (flake8, black)
-
-### Recommended Next Steps
-
-1. **Merge to master**: All work is complete and tested
-2. **Deploy to production**: Run migrations, clear cache
-3. **Monitor performance**: Verify query count reductions in production
-4. **Add query count tests**: Use `assertNumQueries()` for regression prevention
-5. **Consider caching**: Implement caching for `get_site_conf()` and frequently accessed data
-
----
-
-*Updated: 2026-01-25 - Added Test Coverage, Frontend Build System, Documentation, and Prefetch Branch Summary*
-*Project: Django Railroad Assets Manager (django-ram)*

package.json

@@ -1,6 +0,0 @@
-{
-  "dependencies": {
-    "clean-css-cli": "^5.6.3",
-    "terser": "^5.44.1"
-  }
-}

pyproject.toml

@@ -1,39 +0,0 @@
-[tool.ruff]
-# Exclude patterns matching flake8 config
-exclude = [
-    "*settings.py*",
-    "*/migrations/*",
-    ".git",
-    ".venv",
-    "venv",
-    "__pycache__",
-    "*.pyc",
-]
-
-# Target Python 3.13+ as per project requirements
-target-version = "py313"
-
-# Line length set to 79 (PEP 8 standard)
-line-length = 79
-
-[tool.ruff.lint]
-# Enable Pyflakes (F) and pycodestyle (E, W) rules to match flake8
-select = ["E", "F", "W"]
-
-# Ignore E501 (line-too-long) to match flake8 config
-ignore = ["E501"]
-
-[tool.ruff.lint.per-file-ignores]
-# Additional per-file ignores if needed
-"*settings.py*" = ["F403", "F405"]  # Allow star imports in settings
-"*/migrations/*" = ["E", "F", "W"]  # Ignore all rules in migrations
-
-[tool.ruff.format]
-# Use double quotes for strings (project preference)
-quote-style = "double"
-
-# Use 4 spaces for indentation
-indent-style = "space"
-
-# Auto-detect line ending style
-line-ending = "auto"

ram/bookshelf/admin.py

@@ -1,171 +1,35 @@
-import html
-
-from django.conf import settings
 from django.contrib import admin
-from django.utils.html import (
-    format_html,
-    format_html_join,
-    strip_tags,
-    mark_safe,
-)
 from adminsortable2.admin import SortableAdminBase, SortableInlineAdminMixin
 
-from ram.admin import publish, unpublish
+from bookshelf.models import BookProperty, BookImage, Book, Author, Publisher
-from ram.utils import generate_csv
-from portal.utils import get_site_conf
-from repository.models import (
-    BookDocument,
-    CatalogDocument,
-    MagazineIssueDocument,
-)
-from bookshelf.models import (
-    BaseBookProperty,
-    BaseBookImage,
-    Book,
-    Author,
-    Publisher,
-    Catalog,
-    Magazine,
-    MagazineIssue,
-    TocEntry,
-)
 
 
 class BookImageInline(SortableInlineAdminMixin, admin.TabularInline):
-    model = BaseBookImage
+    model = BookImage
     min_num = 0
-    extra = 1
+    extra = 0
     readonly_fields = ("image_thumbnail",)
     classes = ["collapse"]
-    verbose_name = "Image"
 
 
 class BookPropertyInline(admin.TabularInline):
-    model = BaseBookProperty
+    model = BookProperty
     min_num = 0
     extra = 0
-    autocomplete_fields = ("property",)
-    verbose_name = "Property"
-    verbose_name_plural = "Properties"
-
-
-class BookDocInline(admin.TabularInline):
-    model = BookDocument
-    min_num = 0
-    extra = 1
-    classes = ["collapse"]
-
-
-class CatalogDocInline(BookDocInline):
-    model = CatalogDocument
-
-
-class MagazineIssueDocInline(BookDocInline):
-    model = MagazineIssueDocument
-
-
-class BookTocInline(admin.TabularInline):
-    model = TocEntry
-    min_num = 0
-    extra = 0
-    fields = (
-        "title",
-        "subtitle",
-        "authors",
-        "page",
-        "featured",
-    )
 
 
 @admin.register(Book)
 class BookAdmin(SortableAdminBase, admin.ModelAdmin):
-    inlines = (
+    inlines = (BookImageInline, BookPropertyInline,)
-        BookTocInline,
-        BookPropertyInline,
-        BookImageInline,
-        BookDocInline,
-    )
     list_display = (
         "title",
         "get_authors",
         "get_publisher",
         "publication_year",
-        "number_of_pages",
+        "number_of_pages"
-        "published",
     )
-    autocomplete_fields = ("authors", "publisher", "shop")
-    readonly_fields = ("invoices", "creation_time", "updated_time")
     search_fields = ("title", "publisher__name", "authors__last_name")
-    list_filter = ("publisher__name", "authors", "published")
+    list_filter = ("publisher__name", "authors")
-
-    def get_queryset(self, request):
-        """Optimize queryset with select_related and prefetch_related."""
-        qs = super().get_queryset(request)
-        return qs.with_related()
-
-    fieldsets = (
-        (
-            None,
-            {
-                "fields": (
-                    "published",
-                    "title",
-                    "authors",
-                    "publisher",
-                    "ISBN",
-                    "language",
-                    "number_of_pages",
-                    "publication_year",
-                    "description",
-                    "tags",
-                )
-            },
-        ),
-        (
-            "Purchase data",
-            {
-                "fields": (
-                    "shop",
-                    "purchase_date",
-                    "price",
-                    "invoices",
-                )
-            },
-        ),
-        (
-            "Notes",
-            {"classes": ("collapse",), "fields": ("notes",)},
-        ),
-        (
-            "Audit",
-            {
-                "classes": ("collapse",),
-                "fields": (
-                    "creation_time",
-                    "updated_time",
-                ),
-            },
-        ),
-    )
-
-    def get_form(self, request, obj=None, **kwargs):
-        form = super().get_form(request, obj, **kwargs)
-        form.base_fields["price"].label = "Price ({})".format(
-            get_site_conf().currency
-        )
-        return form
-
-    @admin.display(description="Invoices")
-    def invoices(self, obj):
-        if obj.invoice.exists():
-            html = format_html_join(
-                mark_safe("<br>"),
-                '<a href="{}" target="_blank">{}</a>',
-                ((i.file.url, i) for i in obj.invoice.all()),
-            )
-        else:
-            html = "-"
-        return html
 
     @admin.display(description="Publisher")
     def get_publisher(self, obj):
@@ -173,380 +37,16 @@ class BookAdmin(SortableAdminBase, admin.ModelAdmin):
 
     @admin.display(description="Authors")
     def get_authors(self, obj):
-        return obj.authors_list
+        return ", ".join(a.short_name() for a in obj.authors.all())
-
-    def download_csv(modeladmin, request, queryset):
-        header = [
-            "Title",
-            "Authors",
-            "Publisher",
-            "ISBN",
-            "Language",
-            "Number of Pages",
-            "Publication Year",
-            "Description",
-            "Tags",
-            "Shop",
-            "Purchase Date",
-            "Price ({})".format(get_site_conf().currency),
-            "Notes",
-            "Properties",
-        ]
-
-        data = []
-
-        # Prefetch related data to avoid N+1 queries
-        queryset = queryset.select_related(
-            'publisher', 'shop'
-        ).prefetch_related('authors', 'tags', 'property__property')
-
-        for obj in queryset:
-            properties = settings.CSV_SEPARATOR_ALT.join(
-                "{}:{}".format(property.property.name, property.value)
-                for property in obj.property.all()
-            )
-            data.append(
-                [
-                    obj.title,
-                    obj.authors_list.replace(",", settings.CSV_SEPARATOR_ALT),
-                    obj.publisher.name,
-                    obj.ISBN,
-                    dict(settings.LANGUAGES)[obj.language],
-                    obj.number_of_pages,
-                    obj.publication_year,
-                    html.unescape(strip_tags(obj.description)),
-                    settings.CSV_SEPARATOR_ALT.join(
-                        t.name for t in obj.tags.all()
-                    ),
-                    obj.shop,
-                    obj.purchase_date,
-                    obj.price,
-                    html.unescape(strip_tags(obj.notes)),
-                    properties,
-                ]
-            )
-
-        return generate_csv(header, data, "bookshelf_books.csv")
-
-    download_csv.short_description = "Download selected items as CSV"
-    actions = [publish, unpublish, download_csv]
 
 
 @admin.register(Author)
 class AuthorAdmin(admin.ModelAdmin):
-    search_fields = (
+    search_fields = ("first_name", "last_name",)
-        "first_name",
-        "last_name",
-    )
     list_filter = ("last_name",)
 
 
 @admin.register(Publisher)
 class PublisherAdmin(admin.ModelAdmin):
-    list_display = ("name", "country_flag_name")
+    list_display = ("name", "country")
     search_fields = ("name",)
-
-    @admin.display(description="Country")
-    def country_flag_name(self, obj):
-        return format_html(
-            '<img src="{}" /> {}', obj.country.flag, obj.country.name
-        )
-
-
-@admin.register(Catalog)
-class CatalogAdmin(SortableAdminBase, admin.ModelAdmin):
-    inlines = (
-        BookPropertyInline,
-        BookImageInline,
-        CatalogDocInline,
-    )
-    list_display = (
-        "__str__",
-        "manufacturer",
-        "years",
-        "get_scales",
-        "published",
-    )
-    autocomplete_fields = ("manufacturer",)
-    readonly_fields = ("invoices", "creation_time", "updated_time")
-    search_fields = ("manufacturer__name", "years", "scales__scale")
-    list_filter = (
-        "published",
-        "manufacturer__name",
-        "publication_year",
-        "scales__scale",
-    )
-
-    def get_queryset(self, request):
-        """Optimize queryset with select_related and prefetch_related."""
-        qs = super().get_queryset(request)
-        return qs.with_related()
-
-    fieldsets = (
-        (
-            None,
-            {
-                "fields": (
-                    "published",
-                    "manufacturer",
-                    "years",
-                    "scales",
-                    "ISBN",
-                    "language",
-                    "number_of_pages",
-                    "publication_year",
-                    "description",
-                    "tags",
-                )
-            },
-        ),
-        (
-            "Purchase data",
-            {
-                "fields": (
-                    "shop",
-                    "purchase_date",
-                    "price",
-                    "invoices",
-                )
-            },
-        ),
-        (
-            "Notes",
-            {"classes": ("collapse",), "fields": ("notes",)},
-        ),
-        (
-            "Audit",
-            {
-                "classes": ("collapse",),
-                "fields": (
-                    "creation_time",
-                    "updated_time",
-                ),
-            },
-        ),
-    )
-
-    def get_form(self, request, obj=None, **kwargs):
-        form = super().get_form(request, obj, **kwargs)
-        form.base_fields["price"].label = "Price ({})".format(
-            get_site_conf().currency
-        )
-        return form
-
-    @admin.display(description="Invoices")
-    def invoices(self, obj):
-        if obj.invoice.exists():
-            html = format_html_join(
-                mark_safe("<br>"),
-                '<a href="{}" target="_blank">{}</a>',
-                ((i.file.url, i) for i in obj.invoice.all()),
-            )
-        else:
-            html = "-"
-        return html
-
-    def download_csv(modeladmin, request, queryset):
-        header = [
-            "Catalog",
-            "Manufacturer",
-            "Years",
-            "Scales",
-            "ISBN",
-            "Language",
-            "Number of Pages",
-            "Publication Year",
-            "Description",
-            "Tags",
-            "Shop",
-            "Purchase Date",
-            "Price ({})".format(get_site_conf().currency),
-            "Notes",
-            "Properties",
-        ]
-
-        data = []
-
-        # Prefetch related data to avoid N+1 queries
-        queryset = queryset.select_related(
-            'manufacturer', 'shop'
-        ).prefetch_related('scales', 'tags', 'property__property')
-
-        for obj in queryset:
-            properties = settings.CSV_SEPARATOR_ALT.join(
-                "{}:{}".format(property.property.name, property.value)
-                for property in obj.property.all()
-            )
-            data.append(
-                [
-                    obj.__str__(),
-                    obj.manufacturer.name,
-                    obj.years,
-                    obj.get_scales(),
-                    obj.ISBN,
-                    dict(settings.LANGUAGES)[obj.language],
-                    obj.number_of_pages,
-                    obj.publication_year,
-                    html.unescape(strip_tags(obj.description)),
-                    settings.CSV_SEPARATOR_ALT.join(
-                        t.name for t in obj.tags.all()
-                    ),
-                    obj.shop,
-                    obj.purchase_date,
-                    obj.price,
-                    html.unescape(strip_tags(obj.notes)),
-                    properties,
-                ]
-            )
-
-        return generate_csv(header, data, "bookshelf_catalogs.csv")
-
-    download_csv.short_description = "Download selected items as CSV"
-    actions = [publish, unpublish, download_csv]
-
-
-@admin.register(MagazineIssue)
-class MagazineIssueAdmin(SortableAdminBase, admin.ModelAdmin):
-    inlines = (
-        BookTocInline,
-        BookPropertyInline,
-        BookImageInline,
-        MagazineIssueDocInline,
-    )
-    list_display = (
-        "__str__",
-        "issue_number",
-        "published",
-    )
-    autocomplete_fields = ("shop",)
-    readonly_fields = ("magazine", "creation_time", "updated_time")
-
-    def get_model_perms(self, request):
-        """
-        Return empty perms dict thus hiding the model from admin index.
-        """
-        return {}
-
-    fieldsets = (
-        (
-            None,
-            {
-                "fields": (
-                    "published",
-                    "magazine",
-                    "issue_number",
-                    "publication_year",
-                    "publication_month",
-                    "ISBN",
-                    "language",
-                    "number_of_pages",
-                    "description",
-                    "tags",
-                )
-            },
-        ),
-        (
-            "Purchase data",
-            {
-                "classes": ("collapse",),
-                "fields": (
-                    "shop",
-                    "purchase_date",
-                    "price",
-                ),
-            },
-        ),
-        (
-            "Notes",
-            {"classes": ("collapse",), "fields": ("notes",)},
-        ),
-        (
-            "Audit",
-            {
-                "classes": ("collapse",),
-                "fields": (
-                    "creation_time",
-                    "updated_time",
-                ),
-            },
-        ),
-    )
-    actions = [publish, unpublish]
-
-
-class MagazineIssueInline(admin.TabularInline):
-    model = MagazineIssue
-    min_num = 0
-    extra = 0
-    autocomplete_fields = ("shop",)
-    show_change_link = True
-    fields = (
-        "preview",
-        "published",
-        "issue_number",
-        "publication_year",
-        "publication_month",
-        "number_of_pages",
-        "language",
-    )
-    readonly_fields = ("preview",)
-
-    class Media:
-        js = ("admin/js/magazine_issue_defaults.js",)
-
-
-@admin.register(Magazine)
-class MagazineAdmin(SortableAdminBase, 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 = (
-        "published",
-        "publisher__name",
-    )
-
-    def get_queryset(self, request):
-        """Optimize queryset with select_related and prefetch_related."""
-        qs = super().get_queryset(request)
-        return qs.select_related('publisher').prefetch_related('tags')
-
-    fieldsets = (
-        (
-            None,
-            {
-                "fields": (
-                    "published",
-                    "name",
-                    "website",
-                    "publisher",
-                    "ISBN",
-                    "language",
-                    "description",
-                    "image",
-                    "tags",
-                )
-            },
-        ),
-        (
-            "Notes",
-            {"classes": ("collapse",), "fields": ("notes",)},
-        ),
-        (
-            "Audit",
-            {
-                "classes": ("collapse",),
-                "fields": (
-                    "creation_time",
-                    "updated_time",
-                ),
-            },
-        ),
-    )
-    actions = [publish, unpublish]

ram/bookshelf/migrations/0001_initial.py

@@ -1,7 +1,6 @@
 # Generated by Django 4.2.5 on 2023-10-01 20:16
 
-# ckeditor removal
+import ckeditor_uploader.fields
-# import ckeditor_uploader.fields
 from django.db import migrations, models
 import django.db.models.deletion
 import uuid
@@ -48,8 +47,7 @@ class Migration(migrations.Migration):
                 ("ISBN", models.CharField(max_length=13, unique=True)),
                 ("publication_year", models.SmallIntegerField(blank=True, null=True)),
                 ("purchase_date", models.DateField(blank=True, null=True)),
-                # ("notes", ckeditor_uploader.fields.RichTextUploadingField(blank=True)),
+                ("notes", ckeditor_uploader.fields.RichTextUploadingField(blank=True)),
-                ("notes", models.TextField(blank=True)),
                 ("creation_time", models.DateTimeField(auto_now_add=True)),
                 ("updated_time", models.DateTimeField(auto_now=True)),
                 ("authors", models.ManyToManyField(to="bookshelf.author")),

ram/bookshelf/migrations/0009_alter_bookimage_image.py

@@ -12,7 +12,7 @@ from django.conf import settings
 
 def move_images(apps, schema_editor):
     sys.stdout.write("\n  Processing files. Please await...")
-    for r in bookshelf.models.BaseBookImage.objects.all():
+    for r in bookshelf.models.BookImage.objects.all():
         fname = os.path.basename(r.image.path)
         new_image = bookshelf.models.book_image_upload(r, fname)
         new_path = os.path.join(settings.MEDIA_ROOT, new_image)
@@ -31,21 +31,19 @@ class Migration(migrations.Migration):
         ("bookshelf", "0008_alter_author_options_alter_publisher_options"),
     ]
 
-    # Migration is stale and shouldn't be used since model hes been heavily
-    # modified since then. Leaving it here for reference.
     operations = [
-        #     migrations.AlterField(
+        migrations.AlterField(
-        #         model_name="bookimage",
+            model_name="bookimage",
-        #         name="image",
+            name="image",
-        #         field=models.ImageField(
+            field=models.ImageField(
-        #             blank=True,
+                blank=True,
-        #             null=True,
+                null=True,
-        #             storage=ram.utils.DeduplicatedStorage,
+                storage=ram.utils.DeduplicatedStorage,
-        #             upload_to=bookshelf.models.book_image_upload,
+                upload_to=bookshelf.models.book_image_upload,
-        #         ),
+            ),
-        #     ),
+        ),
-        #     migrations.RunPython(
+        migrations.RunPython(
-        #         move_images,
+            move_images,
-        #         reverse_code=migrations.RunPython.noop
+            reverse_code=migrations.RunPython.noop
-        #     ),
+        ),
     ]

ram/bookshelf/migrations/0013_book_description.py

@@ -1,19 +0,0 @@
-# Generated by Django 5.0.2 on 2024-03-02 14:31
-
-import tinymce.models
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookshelf", "0012_alter_book_notes"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="book",
-            name="description",
-            field=tinymce.models.HTMLField(blank=True),
-        ),
-    ]

ram/bookshelf/migrations/0014_book_published.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.1.2 on 2024-11-04 13:27
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookshelf", "0013_book_description"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="book",
-            name="published",
-            field=models.BooleanField(default=True),
-        ),
-    ]

ram/bookshelf/migrations/0015_alter_book_authors.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.1.2 on 2024-11-26 22:21
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookshelf", "0014_book_published"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="book",
-            name="authors",
-            field=models.ManyToManyField(blank=True, to="bookshelf.author"),
-        ),
-    ]

ram/bookshelf/migrations/0016_basebook_book_catalogue.py

@@ -1,163 +0,0 @@
-# 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.utils import ProgrammingError, OperationalError
-
-
-def basebook_to_book(apps, schema_editor):
-    basebook = apps.get_model("bookshelf", "BaseBook")
-    book = apps.get_model("bookshelf", "Book")
-    for row in basebook.objects.all():
-        b = book.objects.create(
-            basebook_ptr=row,
-            title=row.old_title,
-            publisher=row.old_publisher,
-        )
-        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 = [
-        ("bookshelf", "0015_alter_book_authors"),
-        ("metadata", "0019_alter_scale_gauge"),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name="Book",
-            options={"ordering": ["creation_time"]},
-        ),
-        migrations.RenameModel(
-            old_name="BookImage",
-            new_name="BaseBookImage",
-        ),
-        migrations.RenameModel(
-            old_name="BookProperty",
-            new_name="BaseBookProperty",
-        ),
-        migrations.RenameModel(
-            old_name="Book",
-            new_name="BaseBook",
-        ),
-        migrations.RenameField(
-            model_name="basebook",
-            old_name="title",
-            new_name="old_title",
-        ),
-        migrations.RenameField(
-            model_name="basebook",
-            old_name="authors",
-            new_name="old_authors",
-        ),
-        migrations.RenameField(
-            model_name="basebook",
-            old_name="publisher",
-            new_name="old_publisher",
-        ),
-        migrations.AlterModelOptions(
-            name="basebookimage",
-            options={"ordering": ["order"], "verbose_name_plural": "Images"},
-        ),
-        migrations.CreateModel(
-            name="Book",
-            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",
-                    ),
-                ),
-                ("title", models.CharField(max_length=200)),
-                (
-                    "authors",
-                    models.ManyToManyField(
-                        blank=True,
-                        to="bookshelf.author"
-                    ),
-                ),
-                (
-                    "publisher",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        to="bookshelf.publisher"
-                    ),
-                 ),
-            ],
-            options={
-                "ordering": ["title"],
-            },
-        ),
-        migrations.RunPython(
-            basebook_to_book,
-            reverse_code=migrations.RunPython.noop
-        ),
-        migrations.RemoveField(
-            model_name="basebook",
-            name="old_title",
-        ),
-        migrations.RemoveField(
-            model_name="basebook",
-            name="old_publisher",
-        ),
-        migrations.CreateModel(
-            name="Catalog",
-            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",
-                    ),
-                ),
-                ("years", models.CharField(max_length=12)),
-                (
-                    "manufacturer",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        to="metadata.manufacturer",
-                    ),
-                ),
-                ("scales", models.ManyToManyField(to="metadata.scale")),
-            ],
-            options={
-                "ordering": ["manufacturer", "publication_year"],
-            },
-            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/0017_alter_basebook_options_basebookdocument.py

@@ -1,52 +0,0 @@
-# Generated by Django 5.1.2 on 2024-12-22 20:38
-
-import django.db.models.deletion
-import ram.utils
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookshelf", "0016_basebook_book_catalogue"),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name="basebook",
-            options={},
-        ),
-        migrations.CreateModel(
-            name="BaseBookDocument",
-            fields=[
-                (
-                    "id",
-                    models.BigAutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                ("description", models.CharField(blank=True, max_length=128)),
-                (
-                    "file",
-                    models.FileField(
-                        storage=ram.utils.DeduplicatedStorage(), upload_to="files/"
-                    ),
-                ),
-                ("private", models.BooleanField(default=False)),
-                (
-                    "book",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="document",
-                        to="bookshelf.basebook",
-                    ),
-                ),
-            ],
-            options={
-                "unique_together": {("book", "file")},
-            },
-        ),
-    ]

ram/bookshelf/migrations/0018_alter_basebookdocument_options.py

@@ -1,17 +0,0 @@
-# Generated by Django 5.1.4 on 2024-12-22 20:44
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookshelf", "0017_alter_basebook_options_basebookdocument"),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name="basebookdocument",
-            options={"verbose_name_plural": "Documents"},
-        ),
-    ]

ram/bookshelf/migrations/0019_basebook_price.py

@@ -1,36 +0,0 @@
-# Generated by Django 5.1.4 on 2024-12-29 17:06
-
-from django.db import migrations, models
-
-
-def price_to_property(apps, schema_editor):
-    basebook = apps.get_model("bookshelf", "BaseBook")
-    for row in basebook.objects.all():
-        prop = row.property.filter(property__name__icontains="price")
-        for p in prop:
-            try:
-                row.price = float(p.value)
-            except ValueError:
-                pass
-        row.save()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookshelf", "0018_alter_basebookdocument_options"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="basebook",
-            name="price",
-            field=models.DecimalField(
-                blank=True, decimal_places=2, max_digits=10, null=True
-            ),
-        ),
-        migrations.RunPython(
-            price_to_property,
-            reverse_code=migrations.RunPython.noop
-        ),
-    ]

ram/bookshelf/migrations/0020_alter_basebookdocument_unique_together_and_more.py

@@ -1,23 +0,0 @@
-# Generated by Django 5.1.4 on 2025-01-08 22:25
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookshelf", "0019_basebook_price"),
-    ]
-
-    operations = [
-        migrations.AlterUniqueTogether(
-            name="basebookdocument",
-            unique_together=set(),
-        ),
-        migrations.AddConstraint(
-            model_name="basebookdocument",
-            constraint=models.UniqueConstraint(
-                fields=("book", "file"), name="unique_book_file"
-            ),
-        ),
-    ]

ram/bookshelf/migrations/0021_basebookdocument_creation_time_and_more.py

@@ -1,34 +0,0 @@
-# Generated by Django 5.1.4 on 2025-01-18 11:20
-
-import django.utils.timezone
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookshelf", "0020_alter_basebookdocument_unique_together_and_more"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="basebookdocument",
-            name="creation_time",
-            field=models.DateTimeField(
-                auto_now_add=True, default=django.utils.timezone.now
-            ),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name="basebookdocument",
-            name="updated_time",
-            field=models.DateTimeField(auto_now=True),
-        ),
-        migrations.AlterField(
-            model_name="basebookdocument",
-            name="private",
-            field=models.BooleanField(
-                default=False, help_text="Document will be visible only to logged users"
-            ),
-        ),
-    ]

ram/bookshelf/migrations/0022_basebook_shop.py

@@ -1,50 +0,0 @@
-# Generated by Django 5.1.4 on 2025-01-26 14:32
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-def shop_from_property(apps, schema_editor):
-    basebook = apps.get_model("bookshelf", "BaseBook")
-    shop_model = apps.get_model("metadata", "Shop")
-    for row in basebook.objects.all():
-        property = row.property.filter(
-            property__name__icontains="shop"
-        ).first()
-        if property:
-            shop, created = shop_model.objects.get_or_create(
-                name=property.value,
-                defaults={"on_line": False}
-            )
-
-            row.shop = shop
-            row.save()
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookshelf", "0021_basebookdocument_creation_time_and_more"),
-        ("metadata", "0023_shop"),
-    ]
-
-    operations = [
-        migrations.RemoveConstraint(
-            model_name="basebookdocument",
-            name="unique_book_file",
-        ),
-        migrations.AddField(
-            model_name="basebook",
-            name="shop",
-            field=models.ForeignKey(
-                blank=True,
-                null=True,
-                on_delete=django.db.models.deletion.CASCADE,
-                to="metadata.shop",
-            ),
-        ),
-        migrations.RunPython(
-            shop_from_property,
-            reverse_code=migrations.RunPython.noop
-        ),
-    ]

ram/bookshelf/migrations/0023_delete_basebookdocument.py

@@ -1,17 +0,0 @@
-# Generated by Django 5.1.4 on 2025-02-09 13:47
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookshelf", "0022_basebook_shop"),
-        ("repository", "0001_initial"),
-    ]
-
-    operations = [
-        migrations.DeleteModel(
-            name="BaseBookDocument",
-        ),
-    ]

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/0025_magazine_magazineissue.py

@@ -1,224 +0,0 @@
-# Generated by Django 6.0 on 2025-12-08 17:47
-
-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", "0024_alter_basebook_language"),
-        ("metadata", "0025_alter_company_options_alter_manufacturer_options_and_more"),
-    ]
-
-    operations = [
-        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)),
-                ("ISBN", models.CharField(blank=True, max_length=17)),
-                (
-                    "image",
-                    models.ImageField(
-                        blank=True,
-                        storage=ram.utils.DeduplicatedStorage,
-                        upload_to=bookshelf.models.book_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"),
-                            ("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,
-                    ),
-                ),
-                (
-                    "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=[
-                (
-                    "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)),
-                (
-                    "publication_month",
-                    models.SmallIntegerField(
-                        blank=True,
-                        choices=[
-                            (1, "January"),
-                            (2, "February"),
-                            (3, "March"),
-                            (4, "April"),
-                            (5, "May"),
-                            (6, "June"),
-                            (7, "July"),
-                            (8, "August"),
-                            (9, "September"),
-                            (10, "October"),
-                            (11, "November"),
-                            (12, "December"),
-                        ],
-                        null=True,
-                    ),
-                ),
-                (
-                    "magazine",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="issue",
-                        to="bookshelf.magazine",
-                    ),
-                ),
-            ],
-            options={
-                "ordering": ["magazine", "issue_number"],
-                "unique_together": {("magazine", "issue_number")},
-            },
-            bases=("bookshelf.basebook",),
-        ),
-    ]

ram/bookshelf/migrations/0026_alter_basebook_language_alter_magazine_image_and_more.py

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

ram/bookshelf/migrations/0027_magazine_website.py

@@ -1,18 +0,0 @@
-# Generated by Django 6.0 on 2025-12-12 14:02
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookshelf", "0026_alter_basebook_language_alter_magazine_image_and_more"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="magazine",
-            name="website",
-            field=models.URLField(blank=True),
-        ),
-    ]

ram/bookshelf/migrations/0028_alter_magazine_options_alter_magazineissue_options.py

@@ -1,29 +0,0 @@
-# Generated by Django 6.0 on 2025-12-21 21:56
-
-import django.db.models.functions.text
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookshelf", "0027_magazine_website"),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name="magazine",
-            options={"ordering": [django.db.models.functions.text.Lower("name")]},
-        ),
-        migrations.AlterModelOptions(
-            name="magazineissue",
-            options={
-                "ordering": [
-                    "magazine",
-                    "publication_year",
-                    "publication_month",
-                    "issue_number",
-                ]
-            },
-        ),
-    ]

ram/bookshelf/migrations/0029_alter_catalog_manufacturer_alter_catalog_scales.py

@@ -1,29 +0,0 @@
-# Generated by Django 6.0 on 2025-12-23 11:18
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookshelf", "0028_alter_magazine_options_alter_magazineissue_options"),
-        ("metadata", "0025_alter_company_options_alter_manufacturer_options_and_more"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="catalog",
-            name="manufacturer",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE,
-                related_name="catalogs",
-                to="metadata.manufacturer",
-            ),
-        ),
-        migrations.AlterField(
-            model_name="catalog",
-            name="scales",
-            field=models.ManyToManyField(related_name="catalogs", to="metadata.scale"),
-        ),
-    ]

ram/bookshelf/migrations/0030_tocentry.py

@@ -1,53 +0,0 @@
-# Generated by Django 6.0 on 2025-12-29 11:02
-
-import django.db.models.deletion
-import tinymce.models
-import uuid
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookshelf", "0029_alter_catalog_manufacturer_alter_catalog_scales"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="TocEntry",
-            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)),
-                ("title", models.CharField(max_length=200)),
-                ("subtitle", models.CharField(blank=True, max_length=200)),
-                ("authors", models.CharField(blank=True, max_length=256)),
-                ("page", models.SmallIntegerField()),
-                ("featured", models.BooleanField(default=False)),
-                (
-                    "book",
-                    models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
-                        related_name="toc",
-                        to="bookshelf.basebook",
-                    ),
-                ),
-            ],
-            options={
-                "verbose_name": "Table of Contents Entry",
-                "verbose_name_plural": "Table of Contents Entries",
-                "ordering": ["page"],
-            },
-        ),
-    ]

ram/bookshelf/migrations/0031_alter_tocentry_authors_alter_tocentry_subtitle_and_more.py

@@ -1,28 +0,0 @@
-# Generated by Django 6.0 on 2025-12-31 13:47
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookshelf", "0030_tocentry"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="tocentry",
-            name="authors",
-            field=models.CharField(blank=True),
-        ),
-        migrations.AlterField(
-            model_name="tocentry",
-            name="subtitle",
-            field=models.CharField(blank=True),
-        ),
-        migrations.AlterField(
-            model_name="tocentry",
-            name="title",
-            field=models.CharField(),
-        ),
-    ]

ram/bookshelf/migrations/0032_book_book_title_idx_catalog_catalog_mfr_idx_and_more.py

@@ -1,43 +0,0 @@
-# Generated by Django 6.0.1 on 2026-01-18 13:42
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("bookshelf", "0031_alter_tocentry_authors_alter_tocentry_subtitle_and_more"),
-        (
-            "metadata",
-            "0027_company_company_slug_idx_company_company_country_idx_and_more",
-        ),
-    ]
-
-    operations = [
-        migrations.AddIndex(
-            model_name="book",
-            index=models.Index(fields=["title"], name="book_title_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="catalog",
-            index=models.Index(fields=["manufacturer"], name="catalog_mfr_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="magazine",
-            index=models.Index(fields=["published"], name="magazine_published_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="magazine",
-            index=models.Index(fields=["name"], name="magazine_name_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="magazineissue",
-            index=models.Index(fields=["magazine"], name="mag_issue_mag_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="magazineissue",
-            index=models.Index(
-                fields=["publication_month"], name="mag_issue_pub_month_idx"
-            ),
-        ),
-    ]

ram/bookshelf/models.py

@@ -1,18 +1,16 @@
 import os
 import shutil
-from urllib.parse import urlparse
+from uuid import uuid4
 from django.db import models
 from django.conf import settings
 from django.urls import reverse
-from django.utils.dates import MONTHS
-from django.db.models.functions import Lower
-from django.core.exceptions import ValidationError
 from django_countries.fields import CountryField
 
+from tinymce import models as tinymce
+
+from metadata.models import Tag
 from ram.utils import DeduplicatedStorage
-from ram.models import BaseModel, Image, PropertyInstance
+from ram.models import Image, PropertyInstance
-from ram.managers import BookManager, CatalogManager, MagazineIssueManager
-from metadata.models import Scale, Manufacturer, Shop, Tag
 
 
 class Publisher(models.Model):
@@ -37,53 +35,65 @@ class Author(models.Model):
     def __str__(self):
         return f"{self.last_name}, {self.first_name}"
 
-    @property
     def short_name(self):
         return f"{self.last_name} {self.first_name[0]}."
 
 
-class BaseBook(BaseModel):
+class Book(models.Model):
+    uuid = models.UUIDField(primary_key=True, default=uuid4, editable=False)
+    title = models.CharField(max_length=200)
+    authors = models.ManyToManyField(Author)
+    publisher = models.ForeignKey(Publisher, on_delete=models.CASCADE)
     ISBN = models.CharField(max_length=17, blank=True)  # 13 + dashes
     language = models.CharField(
         max_length=7,
-        choices=sorted(settings.LANGUAGES, key=lambda s: s[1]),
+        choices=settings.LANGUAGES,
-        default="en",
+        default='en'
     )
     number_of_pages = models.SmallIntegerField(null=True, blank=True)
     publication_year = models.SmallIntegerField(null=True, blank=True)
-    shop = models.ForeignKey(
-        Shop, on_delete=models.CASCADE, null=True, blank=True
-    )
-    price = models.DecimalField(
-        max_digits=10,
-        decimal_places=2,
-        null=True,
-        blank=True,
-    )
     purchase_date = models.DateField(null=True, blank=True)
-    tags = models.ManyToManyField(Tag, related_name="bookshelf", blank=True)
+    tags = models.ManyToManyField(
+        Tag, related_name="bookshelf", blank=True
+    )
+    notes = tinymce.HTMLField(blank=True)
+    creation_time = models.DateTimeField(auto_now_add=True)
+    updated_time = models.DateTimeField(auto_now=True)
+
+    class Meta:
+        ordering = ["title"]
+
+    def __str__(self):
+        return self.title
+
+    def publisher_name(self):
+        return self.publisher.name
+
+    def get_absolute_url(self):
+        return reverse("book", kwargs={"uuid": self.uuid})
 
     def delete(self, *args, **kwargs):
         shutil.rmtree(
             os.path.join(
                 settings.MEDIA_ROOT, "images", "books", str(self.uuid)
             ),
-            ignore_errors=True,
+            ignore_errors=True
         )
-        super(BaseBook, self).delete(*args, **kwargs)
+        super(Book, self).delete(*args, **kwargs)
 
 
 def book_image_upload(instance, filename):
-    return os.path.join("images", "books", str(instance.book.uuid), filename)
+    return os.path.join(
+        "images",
+        "books",
+        str(instance.book.uuid),
+        filename
+    )
 
 
-def magazine_image_upload(instance, filename):
+class BookImage(Image):
-    return os.path.join("images", "magazines", str(instance.uuid), filename)
-
-
-class BaseBookImage(Image):
     book = models.ForeignKey(
-        BaseBook, on_delete=models.CASCADE, related_name="image"
+        Book, on_delete=models.CASCADE, related_name="image"
     )
     image = models.ImageField(
         upload_to=book_image_upload,
@@ -91,236 +101,11 @@ class BaseBookImage(Image):
     )
 
 
-class BaseBookProperty(PropertyInstance):
+class BookProperty(PropertyInstance):
     book = models.ForeignKey(
-        BaseBook,
+        Book,
         on_delete=models.CASCADE,
         null=False,
         blank=False,
         related_name="property",
     )
-
-
-class Book(BaseBook):
-    title = models.CharField(max_length=200)
-    authors = models.ManyToManyField(Author, blank=True)
-    publisher = models.ForeignKey(Publisher, on_delete=models.CASCADE)
-
-    objects = BookManager()
-
-    class Meta:
-        ordering = ["title"]
-        indexes = [
-            # Index for title searches (local field)
-            models.Index(fields=["title"], name="book_title_idx"),
-            # Note: published and publication_year are inherited from BaseBook/BaseModel
-            # and cannot be indexed here due to multi-table inheritance
-        ]
-
-    def __str__(self):
-        return self.title
-
-    @property
-    def publisher_name(self):
-        return self.publisher.name
-
-    @property
-    def authors_list(self):
-        return ", ".join(a.short_name for a in self.authors.all())
-
-    def get_absolute_url(self):
-        return reverse(
-            "bookshelf_item", kwargs={"selector": "book", "uuid": self.uuid}
-        )
-
-
-class Catalog(BaseBook):
-    manufacturer = models.ForeignKey(
-        Manufacturer,
-        on_delete=models.CASCADE,
-        related_name="catalogs",
-    )
-    years = models.CharField(max_length=12)
-    scales = models.ManyToManyField(Scale, related_name="catalogs")
-
-    objects = CatalogManager()
-
-    class Meta:
-        ordering = ["manufacturer", "publication_year"]
-        indexes = [
-            # Index for manufacturer filtering (local field)
-            models.Index(
-                fields=["manufacturer"], name="catalog_mfr_idx"
-            ),
-            # Note: published and publication_year are inherited from BaseBook/BaseModel
-            # and cannot be indexed here due to multi-table inheritance
-        ]
-
-    def __str__(self):
-        # if the object is new, return an empty string to avoid
-        # calling self.scales.all() which would raise a infinite recursion
-        if self.pk is None:
-            return str()  # empty string
-        scales = self.get_scales()
-        return "%s %s %s" % (self.manufacturer.name, self.years, scales)
-
-    def get_absolute_url(self):
-        return reverse(
-            "bookshelf_item", kwargs={"selector": "catalog", "uuid": self.uuid}
-        )
-
-    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)
-    website = models.URLField(blank=True)
-    ISBN = models.CharField(max_length=17, blank=True)  # 13 + dashes
-    image = models.ImageField(
-        blank=True,
-        upload_to=magazine_image_upload,
-        storage=DeduplicatedStorage,
-    )
-    language = models.CharField(
-        max_length=7,
-        choices=sorted(settings.LANGUAGES, key=lambda s: s[1]),
-        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 = [Lower("name")]
-        indexes = [
-            # Index for published filtering
-            models.Index(fields=["published"], name="magazine_published_idx"),
-            # Index for name searches (case-insensitive via db_collation if needed)
-            models.Index(fields=["name"], name="magazine_name_idx"),
-        ]
-
-    def __str__(self):
-        return self.name
-
-    def get_absolute_url(self):
-        return reverse("magazine", kwargs={"uuid": self.uuid})
-
-    def get_cover(self):
-        if self.image:
-            return self.image
-        else:
-            cover_issue = self.issue.filter(published=True).first()
-            if cover_issue and cover_issue.image.exists():
-                return cover_issue.image.first().image
-        return None
-
-    def website_short(self):
-        if self.website:
-            return urlparse(self.website).netloc.replace("www.", "")
-
-
-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()
-    )
-
-    objects = MagazineIssueManager()
-
-    class Meta:
-        unique_together = ("magazine", "issue_number")
-        ordering = [
-            "magazine",
-            "publication_year",
-            "publication_month",
-            "issue_number",
-        ]
-        indexes = [
-            # Index for magazine filtering (local field)
-            models.Index(fields=["magazine"], name="mag_issue_mag_idx"),
-            # Index for publication month (local field)
-            models.Index(
-                fields=["publication_month"],
-                name="mag_issue_pub_month_idx",
-            ),
-            # Note: published and publication_year are inherited from BaseBook/BaseModel
-            # and cannot be indexed here due to multi-table inheritance
-        ]
-
-    def __str__(self):
-        return f"{self.magazine.name} - {self.issue_number}"
-
-    def clean(self):
-        if self.magazine.published is False and self.published is True:
-            raise ValidationError(
-                "Cannot set an issue as published if the magazine is not "
-                "published."
-            )
-
-    @property
-    def obj_label(self):
-        return "Magazine Issue"
-
-    def preview(self):
-        return self.image.first().image_thumbnail(100)
-
-    @property
-    def publisher(self):
-        return self.magazine.publisher
-
-    def get_absolute_url(self):
-        return reverse(
-            "issue", kwargs={"uuid": self.uuid, "magazine": self.magazine.uuid}
-        )
-
-
-class TocEntry(BaseModel):
-    book = models.ForeignKey(
-        BaseBook, on_delete=models.CASCADE, related_name="toc"
-    )
-    title = models.CharField()
-    subtitle = models.CharField(blank=True)
-    authors = models.CharField(blank=True)
-    page = models.SmallIntegerField()
-    featured = models.BooleanField(
-        default=False,
-    )
-
-    class Meta:
-        ordering = ["page"]
-        verbose_name = "Table of Contents Entry"
-        verbose_name_plural = "Table of Contents Entries"
-
-    def __str__(self):
-        if self.subtitle:
-            title = f"{self.title}: {self.subtitle}"
-        else:
-            title = self.title
-        return f"{title} (p. {self.page})"
-
-    def clean(self):
-        if self.page is None:
-            raise ValidationError("Page number is required.")
-        if self.page < 1:
-            raise ValidationError("Page number is invalid.")
-        try:
-            if self.page > self.book.number_of_pages:
-                raise ValidationError(
-                    "Page number exceeds the publication's number of pages."
-                )
-        except TypeError:
-            pass  # number_of_pages is None

ram/bookshelf/serializers.py

@@ -1,10 +1,6 @@
 from rest_framework import serializers
-from bookshelf.models import Book, Catalog, Author, Publisher
+from bookshelf.models import Book, Author, Publisher
-from metadata.serializers import (
+from metadata.serializers import TagSerializer
-    ScaleSerializer,
-    ManufacturerSerializer,
-    TagSerializer
-)
 
 
 class AuthorSerializer(serializers.ModelSerializer):
@@ -26,28 +22,5 @@ class BookSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Book
-        exclude = (
+        fields = "__all__"
-            "notes",
-            "shop",
-            "purchase_date",
-            "price",
-        )
         read_only_fields = ("creation_time", "updated_time")
-
-
-class CatalogSerializer(serializers.ModelSerializer):
-    scales = ScaleSerializer(many=True)
-    manufacturer = ManufacturerSerializer()
-    tags = TagSerializer(many=True)
-
-    class Meta:
-        model = Catalog
-        exclude = (
-            "notes",
-            "shop",
-            "purchase_date",
-            "price",
-        )
-        read_only_fields = ("creation_time", "updated_time")
-
-# FIXME: add Magazine and MagazineIssue serializers

ram/bookshelf/static/admin/js/magazine_issue_defaults.js

@@ -1,16 +0,0 @@
-document.addEventListener('formset:added', function(event) {
-  const newForm = event.target; // the new inline form element
-
-  const defaultLanguage = document.querySelector('#id_language').value;
-  const defaultStatus = document.querySelector('#id_published').checked;
-
-  const languageInput = newForm.querySelector('select[name$="language"]');
-  const statusInput = newForm.querySelector('input[name$="published"]');
-
-  if (languageInput) {
-      languageInput.value = defaultLanguage;
-  }
-  if (statusInput) {
-    statusInput.checked = defaultStatus;
-  }
-});

ram/bookshelf/tests.py

@@ -1,436 +1,3 @@
-from decimal import Decimal
 from django.test import TestCase
-from django.core.exceptions import ValidationError
-from django.db import IntegrityError
 
-from bookshelf.models import (
+# Create your tests here.
-    Author,
-    Publisher,
-    Book,
-    Catalog,
-    Magazine,
-    MagazineIssue,
-    TocEntry,
-)
-from metadata.models import Manufacturer, Scale
-
-
-class AuthorTestCase(TestCase):
-    """Test cases for Author model."""
-
-    def test_author_creation(self):
-        """Test creating an author."""
-        author = Author.objects.create(
-            first_name="John",
-            last_name="Smith",
-        )
-
-        self.assertEqual(str(author), "Smith, John")
-        self.assertEqual(author.first_name, "John")
-        self.assertEqual(author.last_name, "Smith")
-
-    def test_author_short_name(self):
-        """Test author short name property."""
-        author = Author.objects.create(
-            first_name="John",
-            last_name="Smith",
-        )
-
-        self.assertEqual(author.short_name, "Smith J.")
-
-    def test_author_ordering(self):
-        """Test author ordering by last name, first name."""
-        a1 = Author.objects.create(first_name="John", last_name="Smith")
-        a2 = Author.objects.create(first_name="Jane", last_name="Doe")
-        a3 = Author.objects.create(first_name="Bob", last_name="Smith")
-
-        authors = list(Author.objects.all())
-        self.assertEqual(authors[0], a2)  # Doe comes first
-        self.assertEqual(authors[1], a3)  # Smith, Bob
-        self.assertEqual(authors[2], a1)  # Smith, John
-
-
-class PublisherTestCase(TestCase):
-    """Test cases for Publisher model."""
-
-    def test_publisher_creation(self):
-        """Test creating a publisher."""
-        publisher = Publisher.objects.create(
-            name="Model Railroader",
-            country="US",
-            website="https://www.modelrailroader.com",
-        )
-
-        self.assertEqual(str(publisher), "Model Railroader")
-        self.assertEqual(publisher.country.code, "US")
-
-    def test_publisher_ordering(self):
-        """Test publisher ordering by name."""
-        p1 = Publisher.objects.create(name="Zebra Publishing")
-        p2 = Publisher.objects.create(name="Alpha Books")
-        p3 = Publisher.objects.create(name="Model Railroader")
-
-        publishers = list(Publisher.objects.all())
-        self.assertEqual(publishers[0], p2)
-        self.assertEqual(publishers[1], p3)
-        self.assertEqual(publishers[2], p1)
-
-
-class BookTestCase(TestCase):
-    """Test cases for Book model."""
-
-    def setUp(self):
-        """Set up test data."""
-        self.publisher = Publisher.objects.create(
-            name="Kalmbach Publishing",
-            country="US",
-        )
-
-        self.author = Author.objects.create(
-            first_name="Tony",
-            last_name="Koester",
-        )
-
-    def test_book_creation(self):
-        """Test creating a book."""
-        book = Book.objects.create(
-            title="Model Railroad Planning",
-            publisher=self.publisher,
-            ISBN="978-0-89024-567-8",
-            language="en",
-            number_of_pages=128,
-            publication_year=2010,
-            price=Decimal("24.95"),
-        )
-
-        self.assertEqual(str(book), "Model Railroad Planning")
-        self.assertEqual(book.publisher_name, "Kalmbach Publishing")
-        self.assertTrue(book.published)  # Default from BaseModel
-
-    def test_book_authors_relationship(self):
-        """Test many-to-many relationship with authors."""
-        book = Book.objects.create(
-            title="Test Book",
-            publisher=self.publisher,
-        )
-
-        author2 = Author.objects.create(
-            first_name="John",
-            last_name="Doe",
-        )
-
-        book.authors.add(self.author, author2)
-
-        self.assertEqual(book.authors.count(), 2)
-        self.assertIn(self.author, book.authors.all())
-
-    def test_book_authors_list_property(self):
-        """Test authors_list property."""
-        book = Book.objects.create(
-            title="Test Book",
-            publisher=self.publisher,
-        )
-
-        book.authors.add(self.author)
-
-        self.assertEqual(book.authors_list, "Koester T.")
-
-    def test_book_ordering(self):
-        """Test book ordering by title."""
-        b1 = Book.objects.create(
-            title="Zebra Book",
-            publisher=self.publisher,
-        )
-        b2 = Book.objects.create(
-            title="Alpha Book",
-            publisher=self.publisher,
-        )
-
-        books = list(Book.objects.all())
-        self.assertEqual(books[0], b2)
-        self.assertEqual(books[1], b1)
-
-
-class CatalogTestCase(TestCase):
-    """Test cases for Catalog model."""
-
-    def setUp(self):
-        """Set up test data."""
-        self.manufacturer = Manufacturer.objects.create(
-            name="Bachmann",
-            category="model",
-            country="US",
-        )
-
-        self.scale_ho = Scale.objects.create(
-            scale="HO",
-            ratio="1:87",
-            tracks=16.5,
-        )
-
-        self.scale_n = Scale.objects.create(
-            scale="N",
-            ratio="1:160",
-            tracks=9.0,
-        )
-
-    def test_catalog_creation(self):
-        """Test creating a catalog."""
-        catalog = Catalog.objects.create(
-            manufacturer=self.manufacturer,
-            years="2023",
-            publication_year=2023,
-        )
-        catalog.scales.add(self.scale_ho)
-
-        # Refresh to get the correct string representation
-        catalog.refresh_from_db()
-
-        self.assertIn("Bachmann", str(catalog))
-        self.assertIn("2023", str(catalog))
-
-    def test_catalog_multiple_scales(self):
-        """Test catalog with multiple scales."""
-        catalog = Catalog.objects.create(
-            manufacturer=self.manufacturer,
-            years="2023",
-        )
-
-        catalog.scales.add(self.scale_ho, self.scale_n)
-
-        scales_str = catalog.get_scales()
-        self.assertIn("HO", scales_str)
-        self.assertIn("N", scales_str)
-
-    def test_catalog_ordering(self):
-        """Test catalog ordering by manufacturer and year."""
-        man2 = Manufacturer.objects.create(
-            name="Atlas",
-            category="model",
-        )
-
-        c1 = Catalog.objects.create(
-            manufacturer=self.manufacturer,
-            years="2023",
-            publication_year=2023,
-        )
-        c2 = Catalog.objects.create(
-            manufacturer=man2,
-            years="2023",
-            publication_year=2023,
-        )
-        c3 = Catalog.objects.create(
-            manufacturer=self.manufacturer,
-            years="2022",
-            publication_year=2022,
-        )
-
-        catalogs = list(Catalog.objects.all())
-        # Should be ordered by manufacturer name, then year
-        self.assertEqual(catalogs[0], c2)  # Atlas
-
-
-class MagazineTestCase(TestCase):
-    """Test cases for Magazine model."""
-
-    def setUp(self):
-        """Set up test data."""
-        self.publisher = Publisher.objects.create(
-            name="Kalmbach Publishing",
-            country="US",
-        )
-
-    def test_magazine_creation(self):
-        """Test creating a magazine."""
-        magazine = Magazine.objects.create(
-            name="Model Railroader",
-            publisher=self.publisher,
-            website="https://www.modelrailroader.com",
-            ISBN="0746-9896",
-            language="en",
-        )
-
-        self.assertEqual(str(magazine), "Model Railroader")
-        self.assertEqual(magazine.publisher, self.publisher)
-
-    def test_magazine_website_short(self):
-        """Test website_short method."""
-        magazine = Magazine.objects.create(
-            name="Model Railroader",
-            publisher=self.publisher,
-            website="https://www.modelrailroader.com",
-        )
-
-        self.assertEqual(magazine.website_short(), "modelrailroader.com")
-
-    def test_magazine_get_cover_no_image(self):
-        """Test get_cover when magazine has no image."""
-        magazine = Magazine.objects.create(
-            name="Test Magazine",
-            publisher=self.publisher,
-        )
-
-        # Should return None if no cover image exists
-        self.assertIsNone(magazine.get_cover())
-
-
-class MagazineIssueTestCase(TestCase):
-    """Test cases for MagazineIssue model."""
-
-    def setUp(self):
-        """Set up test data."""
-        self.publisher = Publisher.objects.create(
-            name="Kalmbach Publishing",
-        )
-
-        self.magazine = Magazine.objects.create(
-            name="Model Railroader",
-            publisher=self.publisher,
-            published=True,
-        )
-
-    def test_magazine_issue_creation(self):
-        """Test creating a magazine issue."""
-        issue = MagazineIssue.objects.create(
-            magazine=self.magazine,
-            issue_number="January 2023",
-            publication_year=2023,
-            publication_month=1,
-            number_of_pages=96,
-        )
-
-        self.assertEqual(str(issue), "Model Railroader - January 2023")
-        self.assertEqual(issue.obj_label, "Magazine Issue")
-
-    def test_magazine_issue_unique_together(self):
-        """Test that magazine+issue_number must be unique."""
-        MagazineIssue.objects.create(
-            magazine=self.magazine,
-            issue_number="January 2023",
-        )
-
-        with self.assertRaises(IntegrityError):
-            MagazineIssue.objects.create(
-                magazine=self.magazine,
-                issue_number="January 2023",
-            )
-
-    def test_magazine_issue_validation(self):
-        """Test that published issue requires published magazine."""
-        unpublished_magazine = Magazine.objects.create(
-            name="Unpublished Magazine",
-            publisher=self.publisher,
-            published=False,
-        )
-
-        issue = MagazineIssue(
-            magazine=unpublished_magazine,
-            issue_number="Test Issue",
-            published=True,
-        )
-
-        with self.assertRaises(ValidationError):
-            issue.clean()
-
-    def test_magazine_issue_publisher_property(self):
-        """Test that issue inherits publisher from magazine."""
-        issue = MagazineIssue.objects.create(
-            magazine=self.magazine,
-            issue_number="January 2023",
-        )
-
-        self.assertEqual(issue.publisher, self.publisher)
-
-
-class TocEntryTestCase(TestCase):
-    """Test cases for TocEntry model."""
-
-    def setUp(self):
-        """Set up test data."""
-        publisher = Publisher.objects.create(name="Test Publisher")
-
-        self.book = Book.objects.create(
-            title="Test Book",
-            publisher=publisher,
-            number_of_pages=200,
-        )
-
-    def test_toc_entry_creation(self):
-        """Test creating a table of contents entry."""
-        entry = TocEntry.objects.create(
-            book=self.book,
-            title="Introduction to Model Railroading",
-            subtitle="Getting Started",
-            authors="John Doe",
-            page=10,
-        )
-
-        self.assertIn("Introduction to Model Railroading", str(entry))
-        self.assertIn("Getting Started", str(entry))
-        self.assertIn("p. 10", str(entry))
-
-    def test_toc_entry_without_subtitle(self):
-        """Test TOC entry without subtitle."""
-        entry = TocEntry.objects.create(
-            book=self.book,
-            title="Chapter One",
-            page=5,
-        )
-
-        self.assertEqual(str(entry), "Chapter One (p. 5)")
-
-    def test_toc_entry_page_validation_required(self):
-        """Test that page number is required."""
-        entry = TocEntry(
-            book=self.book,
-            title="Test Entry",
-            page=None,
-        )
-
-        with self.assertRaises(ValidationError):
-            entry.clean()
-
-    def test_toc_entry_page_validation_min(self):
-        """Test that page number must be >= 1."""
-        entry = TocEntry(
-            book=self.book,
-            title="Test Entry",
-            page=0,
-        )
-
-        with self.assertRaises(ValidationError):
-            entry.clean()
-
-    def test_toc_entry_page_validation_exceeds_book(self):
-        """Test that page number cannot exceed book's page count."""
-        entry = TocEntry(
-            book=self.book,
-            title="Test Entry",
-            page=250,  # Book has 200 pages
-        )
-
-        with self.assertRaises(ValidationError):
-            entry.clean()
-
-    def test_toc_entry_ordering(self):
-        """Test TOC entries are ordered by page number."""
-        e1 = TocEntry.objects.create(
-            book=self.book,
-            title="Chapter Three",
-            page=30,
-        )
-        e2 = TocEntry.objects.create(
-            book=self.book,
-            title="Chapter One",
-            page=10,
-        )
-        e3 = TocEntry.objects.create(
-            book=self.book,
-            title="Chapter Two",
-            page=20,
-        )
-
-        entries = list(TocEntry.objects.all())
-        self.assertEqual(entries[0], e2)  # Page 10
-        self.assertEqual(entries[1], e3)  # Page 20
-        self.assertEqual(entries[2], e1)  # Page 30

ram/bookshelf/urls.py

@@ -1,9 +1,7 @@
 from django.urls import path
-from bookshelf.views import BookList, BookGet, CatalogList, CatalogGet
+from bookshelf.views import BookList, BookGet
 
 urlpatterns = [
     path("book/list", BookList.as_view()),
-    path("book/get/<uuid:uuid>", BookGet.as_view()),
+    path("book/get/<str:uuid>", BookGet.as_view()),
-    path("catalog/list", CatalogList.as_view()),
-    path("catalog/get/<uuid:uuid>", CatalogGet.as_view()),
 ]

ram/bookshelf/views.py

@@ -1,42 +1,18 @@
 from rest_framework.generics import ListAPIView, RetrieveAPIView
 from rest_framework.schemas.openapi import AutoSchema
 
-from ram.views import CustomLimitOffsetPagination
+from bookshelf.models import Book
-from bookshelf.models import Book, Catalog
+from bookshelf.serializers import BookSerializer
-from bookshelf.serializers import BookSerializer, CatalogSerializer
 
 
 class BookList(ListAPIView):
+    queryset = Book.objects.all()
     serializer_class = BookSerializer
-    pagination_class = CustomLimitOffsetPagination
-
-    def get_queryset(self):
-        return Book.objects.get_published(self.request.user)
 
 
 class BookGet(RetrieveAPIView):
+    queryset = Book.objects.all()
     serializer_class = BookSerializer
     lookup_field = "uuid"
+
     schema = AutoSchema(operation_id_base="retrieveBookByUUID")
-
-    def get_queryset(self):
-        return Book.objects.get_published(self.request.user)
-
-
-class CatalogList(ListAPIView):
-    serializer_class = CatalogSerializer
-    pagination_class = CustomLimitOffsetPagination
-
-    def get_queryset(self):
-        return Catalog.objects.get_published(self.request.user)
-
-
-class CatalogGet(RetrieveAPIView):
-    serializer_class = CatalogSerializer
-    lookup_field = "uuid"
-    schema = AutoSchema(operation_id_base="retrieveCatalogByUUID")
-
-    def get_queryset(self):
-        return Book.objects.get_published(self.request.user)
-
-# FIXME: add Magazine and MagazineIssue views

ram/consist/admin.py

@@ -1,43 +1,14 @@
-import html
-
-from django.conf import settings
 from django.contrib import admin
+from adminsortable2.admin import SortableAdminBase, SortableInlineAdminMixin
 
-# from django.forms import BaseInlineFormSet  # for future reference
-from django.utils.html import format_html, strip_tags
-from adminsortable2.admin import (
-    SortableAdminBase,
-    SortableInlineAdminMixin,
-    # CustomInlineFormSetMixin,  # for future reference
-)
-
-from ram.admin import publish, unpublish
-from ram.utils import generate_csv
 from consist.models import Consist, ConsistItem
 
 
-# for future reference
-# class ConsistItemInlineFormSet(CustomInlineFormSetMixin, BaseInlineFormSet):
-#     def clean(self):
-#         super().clean()
-
-
 class ConsistItemInline(SortableInlineAdminMixin, admin.TabularInline):
     model = ConsistItem
     min_num = 1
     extra = 0
-    autocomplete_fields = ("rolling_stock",)
+    readonly_fields = ("address", "type", "company", "era")
-    readonly_fields = (
-        "preview",
-        "published",
-        "scale",
-        "manufacturer",
-        "item_number",
-        "company",
-        "type",
-        "era",
-        "address",
-    )
 
 
 @admin.register(Consist)
@@ -47,50 +18,26 @@ class ConsistAdmin(SortableAdminBase, admin.ModelAdmin):
         "creation_time",
         "updated_time",
     )
-    list_filter = ("published", "company__name", "era", "scale__scale")
+    list_display = ("identifier", "company", "era")
-    list_display = (
+    list_filter = list_display
-        "__str__",
+    search_fields = list_display
-        "company__name",
-        "era",
-        "scale",
-        "country_flag",
-        "published",
-    )
-    search_fields = ("identifier",) + list_filter
     save_as = True
 
-    def get_queryset(self, request):
-        """Optimize queryset with select_related and prefetch_related."""
-        qs = super().get_queryset(request)
-        return qs.with_related()
-
-    @admin.display(description="Country")
-    def country_flag(self, obj):
-        return format_html(
-            '<img src="{}" title="{}" />', obj.country.flag, obj.country.name
-        )
-
     fieldsets = (
         (
             None,
             {
                 "fields": (
-                    "published",
                     "identifier",
-                    "company",
-                    "scale",
-                    "era",
                     "consist_address",
-                    "description",
+                    "company",
+                    "era",
                     "image",
+                    "notes",
                     "tags",
                 )
             },
         ),
-        (
-            "Notes",
-            {"classes": ("collapse",), "fields": ("notes",)},
-        ),
         (
             "Audit",
             {
@@ -102,69 +49,3 @@ class ConsistAdmin(SortableAdminBase, admin.ModelAdmin):
             },
         ),
     )
-
-    def download_csv(modeladmin, request, queryset):
-        header = [
-            "ID",
-            "Name",
-            "Published",
-            "Company",
-            "Country",
-            "Address",
-            "Scale",
-            "Era",
-            "Description",
-            "Tags",
-            "Length",
-            "Composition",
-            "Item name",
-            "Item type",
-            "Item ID",
-        ]
-        data = []
-
-        # Prefetch related data to avoid N+1 queries
-        queryset = queryset.select_related(
-            'company', 'scale'
-        ).prefetch_related(
-            'tags',
-            'consist_item__rolling_stock__rolling_class__type'
-        )
-
-        for obj in queryset:
-            # Cache the type count to avoid recalculating for each item
-            types = " + ".join(
-                "{}x {}".format(t["count"], t["type"])
-                for t in obj.get_type_count()
-            )
-            # Cache tags to avoid repeated queries
-            tags_str = settings.CSV_SEPARATOR_ALT.join(
-                t.name for t in obj.tags.all()
-            )
-
-            for item in obj.consist_item.all():
-                data.append(
-                    [
-                        obj.uuid,
-                        obj.__str__(),
-                        "X" if obj.published else "",
-                        obj.company.name,
-                        obj.company.country,
-                        obj.consist_address,
-                        obj.scale.scale,
-                        obj.era,
-                        html.unescape(strip_tags(obj.description)),
-                        tags_str,
-                        obj.length,
-                        types,
-                        item.rolling_stock.__str__(),
-                        item.type,
-                        item.rolling_stock.uuid,
-                    ]
-                )
-
-        return generate_csv(header, data, "consists.csv")
-
-    download_csv.short_description = "Download selected items as CSV"
-
-    actions = [publish, unpublish, download_csv]

ram/consist/migrations/0005_alter_consist_notes.py

@@ -1,7 +1,6 @@
 # Generated by Django 4.1 on 2022-08-23 15:54
 
-# ckeditor removal
+import ckeditor_uploader.fields
-# import ckeditor_uploader.fields
 from django.db import migrations
 
 
@@ -12,9 +11,9 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        # migrations.AlterField(
+        migrations.AlterField(
-        #     model_name="consist",
+            model_name="consist",
-        #     name="notes",
+            name="notes",
-        #     field=ckeditor_uploader.fields.RichTextUploadingField(blank=True),
+            field=ckeditor_uploader.fields.RichTextUploadingField(blank=True),
-        # ),
+        ),
     ]

ram/consist/migrations/0011_alter_consist_consist_address_alter_consist_era.py

@@ -1,30 +0,0 @@
-# Generated by Django 5.0.4 on 2024-04-20 12:49
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("consist", "0010_alter_consist_notes"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="consist",
-            name="consist_address",
-            field=models.SmallIntegerField(
-                blank=True,
-                default=None,
-                help_text="DCC consist address if enabled",
-                null=True,
-            ),
-        ),
-        migrations.AlterField(
-            model_name="consist",
-            name="era",
-            field=models.CharField(
-                blank=True, help_text="Era or epoch of the consist", max_length=32
-            ),
-        ),
-    ]

ram/consist/migrations/0012_consist_published.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.1.2 on 2024-11-04 12:37
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("consist", "0011_alter_consist_consist_address_alter_consist_era"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="consist",
-            name="published",
-            field=models.BooleanField(default=True),
-        ),
-    ]

ram/consist/migrations/0013_consistitem_one_stock_per_consist.py

@@ -1,20 +0,0 @@
-# Generated by Django 5.1.4 on 2025-01-08 21:50
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("consist", "0012_consist_published"),
-        ("roster", "0030_rollingstock_price"),
-    ]
-
-    operations = [
-        migrations.AddConstraint(
-            model_name="consistitem",
-            constraint=models.UniqueConstraint(
-                fields=("consist", "rolling_stock"), name="one_stock_per_consist"
-            ),
-        ),
-    ]

ram/consist/migrations/0014_alter_consistitem_order.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.1.4 on 2025-01-08 22:22
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("consist", "0013_consistitem_one_stock_per_consist"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="consistitem",
-            name="order",
-            field=models.PositiveIntegerField(default=1000),
-        ),
-    ]

ram/consist/migrations/0015_consist_description.py

@@ -1,19 +0,0 @@
-# Generated by Django 5.1.4 on 2025-01-27 21:15
-
-import tinymce.models
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("consist", "0014_alter_consistitem_order"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="consist",
-            name="description",
-            field=tinymce.models.HTMLField(blank=True),
-        ),
-    ]

ram/consist/migrations/0016_alter_consistitem_order.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.1.4 on 2025-04-27 19:53
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("consist", "0015_consist_description"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="consistitem",
-            name="order",
-            field=models.PositiveIntegerField(),
-        ),
-    ]

ram/consist/migrations/0017_consist_scale.py

@@ -1,42 +0,0 @@
-# Generated by Django 5.1.4 on 2025-05-01 09:51
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-def set_scale(apps, schema_editor):
-    Consist = apps.get_model("consist", "Consist")
-
-    for consist in Consist.objects.all():
-        try:
-            consist.scale = consist.consist_item.first().rolling_stock.scale
-            consist.save()
-        except AttributeError:
-            pass
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("consist", "0016_alter_consistitem_order"),
-        (
-            "metadata",
-            "0024_remove_genericdocument_tags_delete_decoderdocument_and_more",
-        ),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="consist",
-            name="scale",
-            field=models.ForeignKey(
-                null=True,
-                on_delete=django.db.models.deletion.CASCADE,
-                to="metadata.scale",
-            ),
-        ),
-        migrations.RunPython(
-            set_scale,
-            reverse_code=migrations.RunPython.noop
-        ),
-    ]

ram/consist/migrations/0018_alter_consist_scale.py

@@ -1,25 +0,0 @@
-# Generated by Django 5.1.4 on 2025-05-02 11:33
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("consist", "0017_consist_scale"),
-        (
-            "metadata",
-            "0024_remove_genericdocument_tags_delete_decoderdocument_and_more",
-        ),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="consist",
-            name="scale",
-            field=models.ForeignKey(
-                on_delete=django.db.models.deletion.CASCADE, to="metadata.scale"
-            ),
-        ),
-    ]

ram/consist/migrations/0019_consistitem_load.py

@@ -1,18 +0,0 @@
-# Generated by Django 6.0 on 2026-01-03 12:31
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("consist", "0018_alter_consist_scale"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="consistitem",
-            name="load",
-            field=models.BooleanField(default=False),
-        ),
-    ]

ram/consist/migrations/0020_consist_consist_published_idx_and_more.py

@@ -1,50 +0,0 @@
-# Generated by Django 6.0.1 on 2026-01-18 13:42
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("consist", "0019_consistitem_load"),
-        (
-            "metadata",
-            "0027_company_company_slug_idx_company_company_country_idx_and_more",
-        ),
-        ("roster", "0041_rollingclass_roster_rc_company_idx_and_more"),
-    ]
-
-    operations = [
-        migrations.AddIndex(
-            model_name="consist",
-            index=models.Index(fields=["published"], name="consist_published_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="consist",
-            index=models.Index(fields=["scale"], name="consist_scale_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="consist",
-            index=models.Index(fields=["company"], name="consist_company_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="consist",
-            index=models.Index(
-                fields=["published", "scale"], name="consist_pub_scale_idx"
-            ),
-        ),
-        migrations.AddIndex(
-            model_name="consistitem",
-            index=models.Index(fields=["load"], name="consist_item_load_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="consistitem",
-            index=models.Index(fields=["order"], name="consist_item_order_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="consistitem",
-            index=models.Index(
-                fields=["consist", "load"], name="consist_item_con_load_idx"
-            ),
-        ),
-    ]

ram/consist/models.py

@@ -1,42 +1,34 @@
 import os
 
+from uuid import uuid4
 from django.db import models
 from django.urls import reverse
-from django.utils.text import Truncator
-from django.dispatch import receiver
-from django.core.exceptions import ValidationError
 
-from ram.models import BaseModel
+from tinymce import models as tinymce
+
 from ram.utils import DeduplicatedStorage
-from ram.managers import ConsistManager
+from metadata.models import Company, Tag
-from metadata.models import Company, Scale, Tag
 from roster.models import RollingStock
 
 
-class Consist(BaseModel):
+class Consist(models.Model):
+    uuid = models.UUIDField(primary_key=True, default=uuid4, editable=False)
     identifier = models.CharField(max_length=128, unique=False)
     tags = models.ManyToManyField(Tag, related_name="consist", blank=True)
     consist_address = models.SmallIntegerField(
-        default=None,
+        default=None, null=True, blank=True
-        null=True,
-        blank=True,
-        help_text="DCC consist address if enabled",
     )
     company = models.ForeignKey(Company, on_delete=models.CASCADE)
-    era = models.CharField(
+    era = models.CharField(max_length=32, blank=True)
-        max_length=32,
-        blank=True,
-        help_text="Era or epoch of the consist",
-    )
-    scale = models.ForeignKey(Scale, on_delete=models.CASCADE)
     image = models.ImageField(
         upload_to=os.path.join("images", "consists"),
         storage=DeduplicatedStorage,
         null=True,
         blank=True,
     )
-
+    notes = tinymce.HTMLField(blank=True)
-    objects = ConsistManager()
+    creation_time = models.DateTimeField(auto_now_add=True)
+    updated_time = models.DateTimeField(auto_now=True)
 
     def __str__(self):
         return "{0} {1}".format(self.company, self.identifier)
@@ -44,53 +36,8 @@ class Consist(BaseModel):
     def get_absolute_url(self):
         return reverse("consist", kwargs={"uuid": self.uuid})
 
-    @property
-    def length(self):
-        return self.consist_item.filter(load=False).count()
-
-    @property
-    def loads_count(self):
-        """Count of loads in this consist using database aggregation."""
-        return self.consist_item.filter(load=True).count()
-
-    def get_type_count(self):
-        return self.consist_item.filter(load=False).annotate(
-            type=models.F("rolling_stock__rolling_class__type__type")
-        ).values(
-            "type"
-        ).annotate(
-            count=models.Count("rolling_stock"),
-            category=models.F("rolling_stock__rolling_class__type__category"),
-            order=models.Max("order"),
-        ).order_by("order")
-
-    def get_cover(self):
-        if self.image:
-            return self.image
-        else:
-            consist_item = self.consist_item.first()
-            if consist_item and consist_item.rolling_stock.image.exists():
-                return consist_item.rolling_stock.image.first().image
-        return None
-
-    @property
-    def country(self):
-        return self.company.country
-
     class Meta:
         ordering = ["company", "-creation_time"]
-        indexes = [
-            # Index for published filtering
-            models.Index(fields=["published"], name="consist_published_idx"),
-            # Index for scale filtering
-            models.Index(fields=["scale"], name="consist_scale_idx"),
-            # Index for company filtering
-            models.Index(fields=["company"], name="consist_company_idx"),
-            # Composite index for published+scale filtering
-            models.Index(
-                fields=["published", "scale"], name="consist_pub_scale_idx"
-            ),
-        ]
 
 
 class ConsistItem(models.Model):
@@ -98,97 +45,22 @@ class ConsistItem(models.Model):
         Consist, on_delete=models.CASCADE, related_name="consist_item"
     )
     rolling_stock = models.ForeignKey(RollingStock, on_delete=models.CASCADE)
-    load = models.BooleanField(default=False)
+    order = models.PositiveIntegerField(default=0, blank=False, null=False)
-    order = models.PositiveIntegerField(blank=False, null=False)
 
-    class Meta:
+    class Meta(object):
         ordering = ["order"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["consist", "rolling_stock"],
-                name="one_stock_per_consist",
-            )
-        ]
-        indexes = [
-            # Index for filtering by load status
-            models.Index(fields=["load"], name="consist_item_load_idx"),
-            # Index for ordering
-            models.Index(fields=["order"], name="consist_item_order_idx"),
-            # Composite index for consist+load filtering
-            models.Index(
-                fields=["consist", "load"], name="consist_item_con_load_idx"
-            ),
-        ]
 
     def __str__(self):
         return "{0}".format(self.rolling_stock)
 
-    def clean(self):
-        rolling_stock = getattr(self, "rolling_stock", False)
-        if not rolling_stock:
-            return  # exit if no inline are present
-
-        # FIXME this does not work when creating a new consist,
-        # because the consist is not saved yet and it must be moved
-        # to the admin form validation via InlineFormSet.clean()
-        consist = self.consist
-        # Scale must match, but allow loads of any scale
-        if rolling_stock.scale != consist.scale and not self.load:
-            raise ValidationError(
-                "The rolling stock and consist must be of the same scale."
-            )
-        if self.load and rolling_stock.scale.ratio != consist.scale.ratio:
-            raise ValidationError(
-                "The load and consist must be of the same scale ratio."
-            )
-        if self.consist.published and not rolling_stock.published:
-            raise ValidationError(
-                "You must unpublish the the consist before using this item."
-            )
-
-    def published(self):
-        return self.rolling_stock.published
-    published.boolean = True
-
-    def preview(self):
-        return self.rolling_stock.image.first().image_thumbnail(100)
-
-    @property
-    def manufacturer(self):
-        return Truncator(self.rolling_stock.manufacturer).chars(10)
-
-    @property
-    def item_number(self):
-        return self.rolling_stock.item_number
-
-    @property
-    def scale(self):
-        return self.rolling_stock.scale
-
-    @property
     def type(self):
-        return self.rolling_stock.rolling_class.type.type
+        return self.rolling_stock.rolling_class.type
 
-    @property
     def address(self):
         return self.rolling_stock.address
 
-    @property
     def company(self):
-        return self.rolling_stock.company
+        return self.rolling_stock.company()
 
-    @property
     def era(self):
         return self.rolling_stock.era
-
-
-# Unpublish any consist that contains an unpublished rolling stock
-# this signal is called after a rolling stock is saved
-# it is hosted here to avoid circular imports
-@receiver(models.signals.post_save, sender=RollingStock)
-def post_save_unpublish_consist(sender, instance, *args, **kwargs):
-    if not instance.published:
-        consists = Consist.objects.filter(consist_item__rolling_stock=instance)
-        for consist in consists:
-            consist.published = False
-            consist.save()

ram/consist/serializers.py

@@ -21,5 +21,4 @@ class ConsistSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Consist
-        exclude = ("notes",)
+        fields = "__all__"
-        read_only_fields = ("creation_time", "updated_time")

ram/consist/tests.py

@@ -1,315 +1,3 @@
 from django.test import TestCase
-from django.core.exceptions import ValidationError
-from django.db import IntegrityError
 
-from consist.models import Consist, ConsistItem
+# Create your tests here.
-from roster.models import RollingClass, RollingStock
-from metadata.models import Company, Scale, RollingStockType
-
-
-class ConsistTestCase(TestCase):
-    """Test cases for Consist model."""
-
-    def setUp(self):
-        """Set up test data."""
-        self.company = Company.objects.create(
-            name="Rio Grande Southern",
-            country="US",
-        )
-
-        self.scale = Scale.objects.create(
-            scale="HOn3",
-            ratio="1:87",
-            tracks=10.5,
-        )
-
-    def test_consist_creation(self):
-        """Test creating a consist."""
-        consist = Consist.objects.create(
-            identifier="RGS Freight #1",
-            company=self.company,
-            scale=self.scale,
-            era="1930s",
-        )
-
-        self.assertEqual(str(consist), "Rio Grande Southern RGS Freight #1")
-        self.assertEqual(consist.identifier, "RGS Freight #1")
-        self.assertEqual(consist.era, "1930s")
-
-    def test_consist_country_property(self):
-        """Test that consist inherits country from company."""
-        consist = Consist.objects.create(
-            identifier="Test Consist",
-            company=self.company,
-            scale=self.scale,
-        )
-
-        self.assertEqual(consist.country, self.company.country)
-
-    def test_consist_dcc_address(self):
-        """Test consist with DCC address."""
-        consist = Consist.objects.create(
-            identifier="DCC Consist",
-            company=self.company,
-            scale=self.scale,
-            consist_address=99,
-        )
-
-        self.assertEqual(consist.consist_address, 99)
-
-    def test_consist_get_absolute_url(self):
-        """Test get_absolute_url returns correct URL."""
-        consist = Consist.objects.create(
-            identifier="Test Consist",
-            company=self.company,
-            scale=self.scale,
-        )
-
-        url = consist.get_absolute_url()
-        self.assertIn(str(consist.uuid), url)
-
-
-class ConsistItemTestCase(TestCase):
-    """Test cases for ConsistItem model."""
-
-    def setUp(self):
-        """Set up test data."""
-        self.company = Company.objects.create(name="RGS", country="US")
-
-        self.scale_hon3 = Scale.objects.create(
-            scale="HOn3",
-            ratio="1:87",
-            tracks=10.5,
-        )
-
-        self.scale_ho = Scale.objects.create(
-            scale="HO",
-            ratio="1:87",
-            tracks=16.5,
-        )
-
-        self.stock_type = RollingStockType.objects.create(
-            type="Steam Locomotive",
-            category="locomotive",
-            order=1,
-        )
-
-        self.rolling_class = RollingClass.objects.create(
-            identifier="C-19",
-            type=self.stock_type,
-            company=self.company,
-        )
-
-        self.consist = Consist.objects.create(
-            identifier="Test Consist",
-            company=self.company,
-            scale=self.scale_hon3,
-            published=True,
-        )
-
-        self.rolling_stock = RollingStock.objects.create(
-            rolling_class=self.rolling_class,
-            road_number="340",
-            scale=self.scale_hon3,
-            published=True,
-        )
-
-    def test_consist_item_creation(self):
-        """Test creating a consist item."""
-        item = ConsistItem.objects.create(
-            consist=self.consist,
-            rolling_stock=self.rolling_stock,
-            order=1,
-            load=False,
-        )
-
-        self.assertEqual(str(item), "RGS C-19 340")
-        self.assertEqual(item.order, 1)
-        self.assertFalse(item.load)
-
-    def test_consist_item_unique_constraint(self):
-        """Test that consist+rolling_stock must be unique."""
-        ConsistItem.objects.create(
-            consist=self.consist,
-            rolling_stock=self.rolling_stock,
-            order=1,
-        )
-
-        # Cannot add same rolling stock to same consist twice
-        with self.assertRaises(IntegrityError):
-            ConsistItem.objects.create(
-                consist=self.consist,
-                rolling_stock=self.rolling_stock,
-                order=2,
-            )
-
-    def test_consist_item_scale_validation(self):
-        """Test that consist item scale must match consist scale."""
-        different_scale_stock = RollingStock.objects.create(
-            rolling_class=self.rolling_class,
-            road_number="341",
-            scale=self.scale_ho,  # Different scale
-        )
-
-        item = ConsistItem(
-            consist=self.consist,
-            rolling_stock=different_scale_stock,
-            order=1,
-            load=False,
-        )
-
-        with self.assertRaises(ValidationError):
-            item.clean()
-
-    def test_consist_item_load_ratio_validation(self):
-        """Test that load ratio must match consist ratio."""
-        different_scale = Scale.objects.create(
-            scale="N",
-            ratio="1:160",  # Different ratio
-            tracks=9.0,
-        )
-
-        load_stock = RollingStock.objects.create(
-            rolling_class=self.rolling_class,
-            road_number="342",
-            scale=different_scale,
-        )
-
-        item = ConsistItem(
-            consist=self.consist,
-            rolling_stock=load_stock,
-            order=1,
-            load=True,
-        )
-
-        with self.assertRaises(ValidationError):
-            item.clean()
-
-    def test_consist_item_published_validation(self):
-        """Test that unpublished stock cannot be in published consist."""
-        unpublished_stock = RollingStock.objects.create(
-            rolling_class=self.rolling_class,
-            road_number="343",
-            scale=self.scale_hon3,
-            published=False,
-        )
-
-        item = ConsistItem(
-            consist=self.consist,
-            rolling_stock=unpublished_stock,
-            order=1,
-        )
-
-        with self.assertRaises(ValidationError):
-            item.clean()
-
-    def test_consist_item_properties(self):
-        """Test consist item properties."""
-        item = ConsistItem.objects.create(
-            consist=self.consist,
-            rolling_stock=self.rolling_stock,
-            order=1,
-        )
-
-        self.assertEqual(item.scale, self.rolling_stock.scale)
-        self.assertEqual(item.company, self.rolling_stock.company)
-        self.assertEqual(item.type, self.stock_type.type)
-
-    def test_consist_length_calculation(self):
-        """Test consist length calculation."""
-        # Add three items (not loads)
-        for i in range(3):
-            stock = RollingStock.objects.create(
-                rolling_class=self.rolling_class,
-                road_number=str(340 + i),
-                scale=self.scale_hon3,
-            )
-            ConsistItem.objects.create(
-                consist=self.consist,
-                rolling_stock=stock,
-                order=i + 1,
-                load=False,
-            )
-
-        self.assertEqual(self.consist.length, 3)
-
-    def test_consist_length_excludes_loads(self):
-        """Test that consist length excludes loads."""
-        # Add one regular item
-        ConsistItem.objects.create(
-            consist=self.consist,
-            rolling_stock=self.rolling_stock,
-            order=1,
-            load=False,
-        )
-
-        # Add one load (same ratio, different scale tracks OK for loads)
-        load_stock = RollingStock.objects.create(
-            rolling_class=self.rolling_class,
-            road_number="LOAD-1",
-            scale=self.scale_hon3,
-        )
-        ConsistItem.objects.create(
-            consist=self.consist,
-            rolling_stock=load_stock,
-            order=2,
-            load=True,
-        )
-
-        # Length should only count non-load items
-        self.assertEqual(self.consist.length, 1)
-
-    def test_consist_item_ordering(self):
-        """Test consist items are ordered by order field."""
-        stock2 = RollingStock.objects.create(
-            rolling_class=self.rolling_class,
-            road_number="341",
-            scale=self.scale_hon3,
-        )
-        stock3 = RollingStock.objects.create(
-            rolling_class=self.rolling_class,
-            road_number="342",
-            scale=self.scale_hon3,
-        )
-
-        item3 = ConsistItem.objects.create(
-            consist=self.consist,
-            rolling_stock=stock3,
-            order=3,
-        )
-        item1 = ConsistItem.objects.create(
-            consist=self.consist,
-            rolling_stock=self.rolling_stock,
-            order=1,
-        )
-        item2 = ConsistItem.objects.create(
-            consist=self.consist,
-            rolling_stock=stock2,
-            order=2,
-        )
-
-        items = list(self.consist.consist_item.all())
-        self.assertEqual(items[0], item1)
-        self.assertEqual(items[1], item2)
-        self.assertEqual(items[2], item3)
-
-    def test_unpublish_consist_signal(self):
-        """Test that unpublishing rolling stock unpublishes consists."""
-        # Create a consist item
-        ConsistItem.objects.create(
-            consist=self.consist,
-            rolling_stock=self.rolling_stock,
-            order=1,
-        )
-
-        self.assertTrue(self.consist.published)
-
-        # Unpublish the rolling stock
-        self.rolling_stock.published = False
-        self.rolling_stock.save()
-
-        # Reload consist from database
-        self.consist.refresh_from_db()
-
-        # Consist should now be unpublished
-        self.assertFalse(self.consist.published)

ram/consist/views.py

@@ -1,21 +1,15 @@
 from rest_framework.generics import ListAPIView, RetrieveAPIView
 
-from ram.views import CustomLimitOffsetPagination
 from consist.models import Consist
 from consist.serializers import ConsistSerializer
 
 
 class ConsistList(ListAPIView):
+    queryset = Consist.objects.all()
     serializer_class = ConsistSerializer
-    pagination_class = CustomLimitOffsetPagination
-
-    def get_queryset(self):
-        return Consist.objects.get_published(self.request.user)
 
 
 class ConsistGet(RetrieveAPIView):
+    queryset = Consist.objects.all()
     serializer_class = ConsistSerializer
     lookup_field = "uuid"
-
-    def get_queryset(self):
-        return Consist.objects.get_published(self.request.user)

ram/metadata/admin.py

@@ -1,13 +1,11 @@
 from django.contrib import admin
-from django.utils.html import format_html
 from adminsortable2.admin import SortableAdminMixin
 
-from repository.models import DecoderDocument
 from metadata.models import (
     Property,
     Decoder,
+    DecoderDocument,
     Scale,
-    Shop,
     Manufacturer,
     Company,
     Tag,
@@ -24,7 +22,7 @@ class PropertyAdmin(admin.ModelAdmin):
 class DecoderDocInline(admin.TabularInline):
     model = DecoderDocument
     min_num = 0
-    extra = 1
+    extra = 0
     classes = ["collapse"]
 
 
@@ -47,30 +45,18 @@ class ScaleAdmin(admin.ModelAdmin):
 @admin.register(Company)
 class CompanyAdmin(admin.ModelAdmin):
     readonly_fields = ("logo_thumbnail",)
-    list_display = ("name", "country_flag_name")
+    list_display = ("name", "country")
-    list_filter = ("name", "country")
+    list_filter = list_display
     search_fields = ("name",)
 
-    @admin.display(description="Country")
-    def country_flag_name(self, obj):
-        return format_html(
-            '<img src="{}" /> {}', obj.country.flag, obj.country.name
-        )
-
 
 @admin.register(Manufacturer)
 class ManufacturerAdmin(admin.ModelAdmin):
     readonly_fields = ("logo_thumbnail",)
-    list_display = ("name", "category", "country_flag_name")
+    list_display = ("name", "category")
     list_filter = ("category",)
     search_fields = ("name",)
 
-    @admin.display(description="Country")
-    def country_flag_name(self, obj):
-        return format_html(
-            '<img src="{}" /> {}', obj.country.flag, obj.country.name
-        )
-
 
 @admin.register(Tag)
 class TagAdmin(admin.ModelAdmin):
@@ -84,16 +70,3 @@ class RollingStockTypeAdmin(SortableAdminMixin, admin.ModelAdmin):
     list_display = ("__str__",)
     list_filter = ("type", "category")
     search_fields = ("type", "category")
-
-
-@admin.register(Shop)
-class ShopAdmin(admin.ModelAdmin):
-    list_display = ("name", "on_line", "active", "country_flag_name")
-    list_filter = ("on_line", "active")
-    search_fields = ("name",)
-
-    @admin.display(description="Country")
-    def country_flag_name(self, obj):
-        return format_html(
-            '<img src="{}" /> {}', obj.country.flag, obj.country.name
-        )

ram/metadata/migrations/0017_alter_property_private.py

@@ -1,20 +0,0 @@
-# Generated by Django 5.0.4 on 2024-04-20 12:49
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("metadata", "0016_alter_decoderdocument_file"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="property",
-            name="private",
-            field=models.BooleanField(
-                default=False, help_text="Property will be only visible to logged users"
-            ),
-        ),
-    ]

ram/metadata/migrations/0018_alter_decoder_options_alter_scale_options_and_more.py

@@ -1,69 +0,0 @@
-# Generated by Django 5.1.2 on 2024-11-04 21:17
-
-import django.db.migrations.operations.special
-import metadata.models
-from django.db import migrations, models
-
-
-def gen_ratio(apps, schema_editor):
-    Scale = apps.get_model('metadata', 'Scale')
-    for row in Scale.objects.all():
-        row.ratio_int = metadata.models.calculate_ratio(row.ratio)
-        row.save(update_fields=['ratio_int'])
-
-
-def convert_tarcks(apps, schema_editor):
-    Scale = apps.get_model("metadata", "Scale")
-    for row in Scale.objects.all():
-        row.tracks = "".join(
-            filter(
-                lambda x: str.isdigit(x) or x == "." or x == ",",
-                row.tracks
-            )
-        )
-        row.save(update_fields=["tracks"])
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('metadata', '0017_alter_property_private'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='decoder',
-            options={'ordering': ['manufacturer__name', 'name']},
-        ),
-        migrations.AlterModelOptions(
-            name='scale',
-            options={'ordering': ['ratio_int', 'scale']},
-        ),
-        migrations.AddField(
-            model_name='scale',
-            name='ratio_int',
-            field=models.SmallIntegerField(default=0, editable=False),
-        ),
-        migrations.RunPython(
-            code=gen_ratio,
-            reverse_code=django.db.migrations.operations.special.RunPython.noop,
-        ),
-        migrations.AlterField(
-            model_name='scale',
-            name='ratio',
-            field=models.CharField(max_length=16, validators=[metadata.models.calculate_ratio]),
-        ),
-        migrations.AlterModelOptions(
-            name='scale',
-            options={'ordering': ['-ratio_int', '-tracks', 'scale']},
-        ),
-        migrations.RunPython(
-            code=convert_tarcks,
-            reverse_code=django.db.migrations.operations.special.RunPython.noop,
-        ),
-        migrations.AlterField(
-            model_name='scale',
-            name='tracks',
-            field=models.FloatField(help_text='Distance between model tracks in mm'),
-        ),
-    ]

ram/metadata/migrations/0019_alter_scale_gauge.py

@@ -1,22 +0,0 @@
-# Generated by Django 5.1.2 on 2024-11-04 21:32
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("metadata", "0018_alter_decoder_options_alter_scale_options_and_more"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="scale",
-            name="gauge",
-            field=models.CharField(
-                blank=True,
-                help_text="Distance between real tracks. Please specify the unit (mm, in, ...)",
-                max_length=16,
-            ),
-        ),
-    ]

ram/metadata/migrations/0020_alter_decoderdocument_unique_together_and_more.py

@@ -1,33 +0,0 @@
-# Generated by Django 5.1.4 on 2025-01-08 22:25
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("metadata", "0019_alter_scale_gauge"),
-    ]
-
-    operations = [
-        migrations.AlterUniqueTogether(
-            name="decoderdocument",
-            unique_together=set(),
-        ),
-        migrations.AlterUniqueTogether(
-            name="rollingstocktype",
-            unique_together=set(),
-        ),
-        migrations.AddConstraint(
-            model_name="decoderdocument",
-            constraint=models.UniqueConstraint(
-                fields=("decoder", "file"), name="unique_decoder_file"
-            ),
-        ),
-        migrations.AddConstraint(
-            model_name="rollingstocktype",
-            constraint=models.UniqueConstraint(
-                fields=("category", "type"), name="unique_category_type"
-            ),
-        ),
-    ]

ram/metadata/migrations/0021_genericdocument.py

@@ -1,40 +0,0 @@
-# Generated by Django 5.1.4 on 2025-01-17 09:31
-
-import ram.utils
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("metadata", "0020_alter_decoderdocument_unique_together_and_more"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="GenericDocument",
-            fields=[
-                (
-                    "id",
-                    models.BigAutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                ("description", models.CharField(blank=True, max_length=128)),
-                (
-                    "file",
-                    models.FileField(
-                        storage=ram.utils.DeduplicatedStorage(), upload_to="files/"
-                    ),
-                ),
-                ("private", models.BooleanField(default=False)),
-                ("tags", models.ManyToManyField(blank=True, to="metadata.tag")),
-            ],
-            options={
-                "verbose_name_plural": "Generic Documents",
-            },
-        ),
-    ]

ram/metadata/migrations/0022_decoderdocument_creation_time_and_more.py

@@ -1,66 +0,0 @@
-# Generated by Django 5.1.4 on 2025-01-18 11:20
-
-import django.utils.timezone
-import django_countries.fields
-import tinymce.models
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("metadata", "0021_genericdocument"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="decoderdocument",
-            name="creation_time",
-            field=models.DateTimeField(
-                auto_now_add=True, default=django.utils.timezone.now
-            ),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name="decoderdocument",
-            name="updated_time",
-            field=models.DateTimeField(auto_now=True),
-        ),
-        migrations.AddField(
-            model_name="genericdocument",
-            name="creation_time",
-            field=models.DateTimeField(
-                auto_now_add=True, default=django.utils.timezone.now
-            ),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name="genericdocument",
-            name="notes",
-            field=tinymce.models.HTMLField(blank=True),
-        ),
-        migrations.AddField(
-            model_name="genericdocument",
-            name="updated_time",
-            field=models.DateTimeField(auto_now=True),
-        ),
-        migrations.AddField(
-            model_name="manufacturer",
-            name="country",
-            field=django_countries.fields.CountryField(blank=True, max_length=2),
-        ),
-        migrations.AlterField(
-            model_name="decoderdocument",
-            name="private",
-            field=models.BooleanField(
-                default=False, help_text="Document will be visible only to logged users"
-            ),
-        ),
-        migrations.AlterField(
-            model_name="genericdocument",
-            name="private",
-            field=models.BooleanField(
-                default=False, help_text="Document will be visible only to logged users"
-            ),
-        ),
-    ]

ram/metadata/migrations/0023_shop.py

@@ -1,40 +0,0 @@
-# Generated by Django 5.1.4 on 2025-01-26 14:27
-
-import django_countries.fields
-import django.db.models.functions.text
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("metadata", "0022_decoderdocument_creation_time_and_more"),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name="Shop",
-            fields=[
-                (
-                    "id",
-                    models.BigAutoField(
-                        auto_created=True,
-                        primary_key=True,
-                        serialize=False,
-                        verbose_name="ID",
-                    ),
-                ),
-                ("name", models.CharField(max_length=128, unique=True)),
-                (
-                    "country",
-                    django_countries.fields.CountryField(blank=True, max_length=2),
-                ),
-                ("website", models.URLField(blank=True)),
-                ("on_line", models.BooleanField(default=True)),
-                ("active", models.BooleanField(default=True)),
-            ],
-            options={
-                "ordering": [django.db.models.functions.text.Lower("name")],
-            },
-        ),
-    ]

ram/metadata/migrations/0024_remove_genericdocument_tags_delete_decoderdocument_and_more.py

@@ -1,24 +0,0 @@
-# Generated by Django 5.1.4 on 2025-02-09 13:47
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("metadata", "0023_shop"),
-        ("repository", "0001_initial"),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name="genericdocument",
-            name="tags",
-        ),
-        migrations.DeleteModel(
-            name="DecoderDocument",
-        ),
-        migrations.DeleteModel(
-            name="GenericDocument",
-        ),
-    ]

ram/metadata/migrations/0025_alter_company_options_alter_manufacturer_options_and_more.py

@@ -1,28 +0,0 @@
-# Generated by Django 5.1.4 on 2025-05-04 20:45
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        (
-            "metadata",
-            "0024_remove_genericdocument_tags_delete_decoderdocument_and_more",
-        ),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name="company",
-            options={"ordering": ["slug"], "verbose_name_plural": "Companies"},
-        ),
-        migrations.AlterModelOptions(
-            name="manufacturer",
-            options={"ordering": ["category", "slug"]},
-        ),
-        migrations.AlterModelOptions(
-            name="tag",
-            options={"ordering": ["slug"]},
-        ),
-    ]

ram/metadata/migrations/0026_alter_manufacturer_name_and_more.py

@@ -1,24 +0,0 @@
-# Generated by Django 6.0 on 2026-01-09 12:08
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("metadata", "0025_alter_company_options_alter_manufacturer_options_and_more"),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name="manufacturer",
-            name="name",
-            field=models.CharField(max_length=128),
-        ),
-        migrations.AddConstraint(
-            model_name="manufacturer",
-            constraint=models.UniqueConstraint(
-                fields=("name", "category"), name="unique_name_category"
-            ),
-        ),
-    ]

ram/metadata/migrations/0027_company_company_slug_idx_company_company_country_idx_and_more.py

@@ -1,51 +0,0 @@
-# Generated by Django 6.0.1 on 2026-01-18 13:42
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("metadata", "0026_alter_manufacturer_name_and_more"),
-    ]
-
-    operations = [
-        migrations.AddIndex(
-            model_name="company",
-            index=models.Index(fields=["slug"], name="company_slug_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="company",
-            index=models.Index(fields=["country"], name="company_country_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="company",
-            index=models.Index(fields=["freelance"], name="company_freelance_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="manufacturer",
-            index=models.Index(fields=["category"], name="mfr_category_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="manufacturer",
-            index=models.Index(fields=["slug"], name="mfr_slug_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="manufacturer",
-            index=models.Index(fields=["category", "slug"], name="mfr_cat_slug_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="scale",
-            index=models.Index(fields=["slug"], name="scale_slug_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="scale",
-            index=models.Index(fields=["ratio_int"], name="scale_ratio_idx"),
-        ),
-        migrations.AddIndex(
-            model_name="scale",
-            index=models.Index(
-                fields=["-ratio_int", "-tracks"], name="scale_ratio_tracks_idx"
-            ),
-        ),
-    ]

ram/metadata/models.py

@@ -1,23 +1,17 @@
 import os
-from urllib.parse import urlparse
 from django.db import models
 from django.urls import reverse
 from django.conf import settings
 from django.dispatch.dispatcher import receiver
-from django.core.exceptions import ValidationError
 from django_countries.fields import CountryField
 
-from ram.models import SimpleBaseModel
+from ram.models import Document
 from ram.utils import DeduplicatedStorage, get_image_preview, slugify
-from ram.managers import PublicManager
 
 
-class Property(SimpleBaseModel):
+class Property(models.Model):
     name = models.CharField(max_length=128, unique=True)
-    private = models.BooleanField(
+    private = models.BooleanField(default=False)
-        default=False,
-        help_text="Property will be only visible to logged users",
-    )
 
     class Meta:
         verbose_name_plural = "Properties"
@@ -26,16 +20,13 @@ class Property(SimpleBaseModel):
     def __str__(self):
         return self.name
 
-    objects = PublicManager()
 
-
+class Manufacturer(models.Model):
-class Manufacturer(SimpleBaseModel):
+    name = models.CharField(max_length=128, unique=True)
-    name = models.CharField(max_length=128)
     slug = models.CharField(max_length=128, unique=True, editable=False)
     category = models.CharField(
         max_length=64, choices=settings.MANUFACTURER_TYPES
     )
-    country = CountryField(blank=True)
     website = models.URLField(blank=True)
     logo = models.ImageField(
         upload_to=os.path.join("images", "manufacturers"),
@@ -45,46 +36,26 @@ class Manufacturer(SimpleBaseModel):
     )
 
     class Meta:
-        ordering = ["category", "slug"]
+        ordering = ["category", "name"]
-        constraints = [
-            models.UniqueConstraint(
-                fields=["name", "category"], name="unique_name_category"
-            )
-        ]
-        indexes = [
-            # Index for category filtering
-            models.Index(fields=["category"], name="mfr_category_idx"),
-            # Index for slug lookups
-            models.Index(fields=["slug"], name="mfr_slug_idx"),
-            # Composite index for category+slug (already in ordering)
-            models.Index(
-                fields=["category", "slug"], name="mfr_cat_slug_idx"
-            ),
-        ]
 
     def __str__(self):
         return self.name
 
     def get_absolute_url(self):
         return reverse(
-            "filtered",
+            "filtered", kwargs={
-            kwargs={
                 "_filter": "manufacturer",
                 "search": self.slug,
-            },
+            }
         )
 
-    def website_short(self):
-        if self.website:
-            return urlparse(self.website).netloc.replace("www.", "")
-
     def logo_thumbnail(self):
         return get_image_preview(self.logo.url)
 
     logo_thumbnail.short_description = "Preview"
 
 
-class Company(SimpleBaseModel):
+class Company(models.Model):
     name = models.CharField(max_length=64, unique=True)
     slug = models.CharField(max_length=64, unique=True, editable=False)
     extended_name = models.CharField(max_length=128, blank=True)
@@ -99,26 +70,17 @@ class Company(SimpleBaseModel):
 
     class Meta:
         verbose_name_plural = "Companies"
-        ordering = ["slug"]
+        ordering = ["name"]
-        indexes = [
-            # Index for slug lookups (used frequently in URLs)
-            models.Index(fields=["slug"], name="company_slug_idx"),
-            # Index for country filtering
-            models.Index(fields=["country"], name="company_country_idx"),
-            # Index for freelance filtering
-            models.Index(fields=["freelance"], name="company_freelance_idx"),
-        ]
 
     def __str__(self):
         return self.name
 
     def get_absolute_url(self):
         return reverse(
-            "filtered",
+            "filtered", kwargs={
-            kwargs={
                 "_filter": "company",
                 "search": self.slug,
-            },
+            }
         )
 
     def extended_name_pp(self):
@@ -130,7 +92,7 @@ class Company(SimpleBaseModel):
     logo_thumbnail.short_description = "Preview"
 
 
-class Decoder(SimpleBaseModel):
+class Decoder(models.Model):
     name = models.CharField(max_length=128, unique=True)
     manufacturer = models.ForeignKey(
         Manufacturer,
@@ -146,8 +108,8 @@ class Decoder(SimpleBaseModel):
         blank=True,
     )
 
-    class Meta:
+    class Meta(object):
-        ordering = ["manufacturer__name", "name"]
+        ordering = ["manufacturer", "name"]
 
     def __str__(self):
         return "{0} - {1}".format(self.manufacturer, self.name)
@@ -158,60 +120,38 @@ class Decoder(SimpleBaseModel):
     image_thumbnail.short_description = "Preview"
 
 
-def calculate_ratio(ratio):
+class DecoderDocument(Document):
-    try:
+    decoder = models.ForeignKey(
-        num, den = ratio.split(":")
+        Decoder, on_delete=models.CASCADE, related_name="document"
-        return int(num) / float(den) * 10000
-    except (ValueError, ZeroDivisionError):
-        raise ValidationError("Invalid ratio format")
-
-
-class Scale(SimpleBaseModel):
-    scale = models.CharField(max_length=32, unique=True)
-    slug = models.CharField(max_length=32, unique=True, editable=False)
-    ratio = models.CharField(max_length=16, validators=[calculate_ratio])
-    ratio_int = models.SmallIntegerField(editable=False, default=0)
-    tracks = models.FloatField(
-        help_text="Distance between model tracks in mm",
-    )
-    gauge = models.CharField(
-        max_length=16,
-        blank=True,
-        help_text="Distance between real tracks. Please specify the unit (mm, in, ...)",  # noqa: E501
     )
 
     class Meta:
-        ordering = ["-ratio_int", "-tracks", "scale"]
+        unique_together = ("decoder", "file")
-        indexes = [
+
-            # Index for slug lookups
+
-            models.Index(fields=["slug"], name="scale_slug_idx"),
+class Scale(models.Model):
-            # Index for ratio_int ordering and filtering
+    scale = models.CharField(max_length=32, unique=True)
-            models.Index(fields=["ratio_int"], name="scale_ratio_idx"),
+    slug = models.CharField(max_length=32, unique=True, editable=False)
-            # Composite index for common ordering pattern
+    ratio = models.CharField(max_length=16, blank=True)
-            models.Index(
+    gauge = models.CharField(max_length=16, blank=True)
-                fields=["-ratio_int", "-tracks"], name="scale_ratio_tracks_idx"
+    tracks = models.CharField(max_length=16, blank=True)
-            ),
+
-        ]
+    class Meta:
+        ordering = ["scale"]
 
     def get_absolute_url(self):
         return reverse(
-            "filtered",
+            "filtered", kwargs={
-            kwargs={
                 "_filter": "scale",
                 "search": self.slug,
-            },
+            }
         )
 
     def __str__(self):
         return str(self.scale)
 
 
-@receiver(models.signals.pre_save, sender=Scale)
+class RollingStockType(models.Model):
-def scale_save(sender, instance, **kwargs):
-    instance.ratio_int = calculate_ratio(instance.ratio)
-
-
-class RollingStockType(SimpleBaseModel):
     type = models.CharField(max_length=64)
     order = models.PositiveSmallIntegerField()
     category = models.CharField(
@@ -219,62 +159,41 @@ class RollingStockType(SimpleBaseModel):
     )
     slug = models.CharField(max_length=128, unique=True, editable=False)
 
-    class Meta:
+    class Meta(object):
-        constraints = [
+        unique_together = ("category", "type")
-            models.UniqueConstraint(
-                fields=["category", "type"],
-                name="unique_category_type"
-            )
-        ]
         ordering = ["order"]
 
     def get_absolute_url(self):
         return reverse(
-            "filtered",
+            "filtered", kwargs={
-            kwargs={
                 "_filter": "type",
                 "search": self.slug,
-            },
+            }
         )
 
     def __str__(self):
         return "{0} {1}".format(self.type, self.category)
 
 
-class Tag(SimpleBaseModel):
+class Tag(models.Model):
     name = models.CharField(max_length=128, unique=True)
     slug = models.CharField(max_length=128, unique=True)
 
-    class Meta:
+    class Meta(object):
-        ordering = ["slug"]
+        ordering = ["name"]
 
     def __str__(self):
         return self.name
 
     def get_absolute_url(self):
         return reverse(
-            "filtered",
+            "filtered", kwargs={
-            kwargs={
                 "_filter": "tag",
                 "search": self.slug,
-            },
+            }
         )
 
 
-class Shop(SimpleBaseModel):
-    name = models.CharField(max_length=128, unique=True)
-    country = CountryField(blank=True)
-    website = models.URLField(blank=True)
-    on_line = models.BooleanField(default=True)
-    active = models.BooleanField(default=True)
-
-    class Meta:
-        ordering = [models.functions.Lower("name"),]
-
-    def __str__(self):
-        return self.name
-
-
 @receiver(models.signals.pre_save, sender=Manufacturer)
 @receiver(models.signals.pre_save, sender=Company)
 @receiver(models.signals.pre_save, sender=Scale)

ram/metadata/tests.py

@@ -1,371 +1,3 @@
 from django.test import TestCase
-from django.core.exceptions import ValidationError
-from django.db import IntegrityError
 
-from metadata.models import (
+# Create your tests here.
-    Manufacturer,
-    Company,
-    Scale,
-    RollingStockType,
-    Decoder,
-    Shop,
-    Tag,
-    calculate_ratio,
-)
-
-
-class ManufacturerTestCase(TestCase):
-    """Test cases for Manufacturer model."""
-
-    def test_manufacturer_creation(self):
-        """Test creating a manufacturer."""
-        manufacturer = Manufacturer.objects.create(
-            name="Blackstone Models",
-            category="model",
-            country="US",
-            website="https://www.blackstonemodels.com",
-        )
-
-        self.assertEqual(str(manufacturer), "Blackstone Models")
-        self.assertEqual(manufacturer.slug, "blackstone-models")
-        self.assertEqual(manufacturer.category, "model")
-
-    def test_manufacturer_slug_auto_generation(self):
-        """Test that slug is automatically generated."""
-        manufacturer = Manufacturer.objects.create(
-            name="Baldwin Locomotive Works",
-            category="real",
-        )
-
-        self.assertEqual(manufacturer.slug, "baldwin-locomotive-works")
-
-    def test_manufacturer_unique_constraint(self):
-        """Test that name+category must be unique."""
-        Manufacturer.objects.create(
-            name="Baldwin",
-            category="real",
-        )
-
-        # Should not be able to create another with same name+category
-        with self.assertRaises(IntegrityError):
-            Manufacturer.objects.create(
-                name="Baldwin",
-                category="real",
-            )
-
-    def test_manufacturer_different_categories(self):
-        """Test that same name is allowed with different categories."""
-        Manufacturer.objects.create(
-            name="Baldwin",
-            category="real",
-        )
-
-        # Should be able to create with different category
-        manufacturer2 = Manufacturer.objects.create(
-            name="Alco",
-            category="model",
-        )
-
-        self.assertEqual(manufacturer2.name, "Alco")
-        self.assertIsNotNone(manufacturer2.pk)
-
-    def test_manufacturer_website_short(self):
-        """Test website_short extracts domain."""
-        manufacturer = Manufacturer.objects.create(
-            name="Test Manufacturer",
-            category="model",
-            website="https://www.example.com/path",
-        )
-
-        self.assertEqual(manufacturer.website_short(), "example.com")
-
-    def test_manufacturer_ordering(self):
-        """Test manufacturer ordering by category and slug."""
-        m1 = Manufacturer.objects.create(name="Zebra", category="model")
-        m2 = Manufacturer.objects.create(name="Alpha", category="accessory")
-        m3 = Manufacturer.objects.create(name="Beta", category="model")
-
-        manufacturers = list(Manufacturer.objects.all())
-        # Ordered by category, then slug
-        self.assertEqual(manufacturers[0], m2)  # accessory comes first
-        self.assertTrue(manufacturers.index(m3) < manufacturers.index(m1))
-
-
-class CompanyTestCase(TestCase):
-    """Test cases for Company model."""
-
-    def test_company_creation(self):
-        """Test creating a company."""
-        company = Company.objects.create(
-            name="RGS",
-            extended_name="Rio Grande Southern Railroad",
-            country="US",
-            freelance=False,
-        )
-
-        self.assertEqual(str(company), "RGS")
-        self.assertEqual(company.slug, "rgs")
-        self.assertEqual(company.extended_name, "Rio Grande Southern Railroad")
-
-    def test_company_slug_generation(self):
-        """Test automatic slug generation."""
-        company = Company.objects.create(
-            name="Denver & Rio Grande Western",
-            country="US",
-        )
-
-        self.assertEqual(company.slug, "denver-rio-grande-western")
-
-    def test_company_unique_name(self):
-        """Test that company name must be unique."""
-        Company.objects.create(name="RGS", country="US")
-
-        with self.assertRaises(IntegrityError):
-            Company.objects.create(name="RGS", country="GB")
-
-    def test_company_extended_name_pp(self):
-        """Test extended name pretty print."""
-        company = Company.objects.create(
-            name="RGS",
-            extended_name="Rio Grande Southern Railroad",
-            country="US",
-        )
-
-        self.assertEqual(
-            company.extended_name_pp(),
-            "(Rio Grande Southern Railroad)"
-        )
-
-    def test_company_extended_name_pp_empty(self):
-        """Test extended name pretty print when empty."""
-        company = Company.objects.create(name="RGS", country="US")
-
-        self.assertEqual(company.extended_name_pp(), "")
-
-    def test_company_freelance_flag(self):
-        """Test freelance flag."""
-        company = Company.objects.create(
-            name="Fake Railroad",
-            country="US",
-            freelance=True,
-        )
-
-        self.assertTrue(company.freelance)
-
-
-class ScaleTestCase(TestCase):
-    """Test cases for Scale model."""
-
-    def test_scale_creation(self):
-        """Test creating a scale."""
-        scale = Scale.objects.create(
-            scale="HOn3",
-            ratio="1:87",
-            tracks=10.5,
-            gauge="3 ft",
-        )
-
-        self.assertEqual(str(scale), "HOn3")
-        self.assertEqual(scale.slug, "hon3")
-        self.assertEqual(scale.ratio, "1:87")
-        self.assertEqual(scale.tracks, 10.5)
-
-    def test_scale_ratio_calculation(self):
-        """Test automatic ratio_int calculation."""
-        scale = Scale.objects.create(
-            scale="HO",
-            ratio="1:87",
-            tracks=16.5,
-        )
-
-        # 1/87 * 10000 = 114.94...
-        self.assertAlmostEqual(scale.ratio_int, 114, delta=1)
-
-    def test_scale_ratio_validation_valid(self):
-        """Test that valid ratios are accepted."""
-        ratios = ["1:87", "1:160", "1:22.5", "1:48"]
-
-        for ratio in ratios:
-            result = calculate_ratio(ratio)
-            self.assertIsInstance(result, (int, float))
-
-    def test_scale_ratio_validation_invalid(self):
-        """Test that invalid ratios raise ValidationError."""
-        with self.assertRaises(ValidationError):
-            calculate_ratio("invalid")
-
-        with self.assertRaises(ValidationError):
-            calculate_ratio("1:0")  # Division by zero
-
-    def test_scale_ordering(self):
-        """Test scale ordering by ratio_int (descending)."""
-        s1 = Scale.objects.create(scale="G", ratio="1:22.5", tracks=45.0)
-        s2 = Scale.objects.create(scale="HO", ratio="1:87", tracks=16.5)
-        s3 = Scale.objects.create(scale="N", ratio="1:160", tracks=9.0)
-
-        scales = list(Scale.objects.all())
-        # Ordered by -ratio_int (larger ratios first)
-        self.assertEqual(scales[0], s1)  # G scale (largest)
-        self.assertEqual(scales[1], s2)  # HO scale
-        self.assertEqual(scales[2], s3)  # N scale (smallest)
-
-
-class RollingStockTypeTestCase(TestCase):
-    """Test cases for RollingStockType model."""
-
-    def test_rolling_stock_type_creation(self):
-        """Test creating a rolling stock type."""
-        stock_type = RollingStockType.objects.create(
-            type="Steam Locomotive",
-            category="locomotive",
-            order=1,
-        )
-
-        self.assertEqual(str(stock_type), "Steam Locomotive locomotive")
-        self.assertEqual(stock_type.slug, "steam-locomotive-locomotive")
-
-    def test_rolling_stock_type_unique_constraint(self):
-        """Test that category+type must be unique."""
-        RollingStockType.objects.create(
-            type="Steam Locomotive",
-            category="locomotive",
-            order=1,
-        )
-
-        with self.assertRaises(IntegrityError):
-            RollingStockType.objects.create(
-                type="Steam Locomotive",
-                category="locomotive",
-                order=2,
-            )
-
-    def test_rolling_stock_type_ordering(self):
-        """Test ordering by order field."""
-        t3 = RollingStockType.objects.create(
-            type="Caboose", category="railcar", order=3
-        )
-        t1 = RollingStockType.objects.create(
-            type="Steam", category="locomotive", order=1
-        )
-        t2 = RollingStockType.objects.create(
-            type="Boxcar", category="railcar", order=2
-        )
-
-        types = list(RollingStockType.objects.all())
-        self.assertEqual(types[0], t1)
-        self.assertEqual(types[1], t2)
-        self.assertEqual(types[2], t3)
-
-
-class DecoderTestCase(TestCase):
-    """Test cases for Decoder model."""
-
-    def setUp(self):
-        """Set up test data."""
-        self.manufacturer = Manufacturer.objects.create(
-            name="ESU",
-            category="accessory",
-            country="DE",
-        )
-
-    def test_decoder_creation(self):
-        """Test creating a decoder."""
-        decoder = Decoder.objects.create(
-            name="LokSound 5",
-            manufacturer=self.manufacturer,
-            version="5.0",
-            sound=True,
-        )
-
-        self.assertEqual(str(decoder), "ESU - LokSound 5")
-        self.assertTrue(decoder.sound)
-
-    def test_decoder_without_sound(self):
-        """Test creating a non-sound decoder."""
-        decoder = Decoder.objects.create(
-            name="LokPilot 5",
-            manufacturer=self.manufacturer,
-            sound=False,
-        )
-
-        self.assertFalse(decoder.sound)
-
-    def test_decoder_ordering(self):
-        """Test decoder ordering by manufacturer name and decoder name."""
-        man2 = Manufacturer.objects.create(
-            name="Digitrax",
-            category="accessory",
-        )
-
-        d1 = Decoder.objects.create(
-            name="LokSound 5",
-            manufacturer=self.manufacturer,
-        )
-        d2 = Decoder.objects.create(
-            name="DZ123",
-            manufacturer=man2,
-        )
-        d3 = Decoder.objects.create(
-            name="LokPilot 5",
-            manufacturer=self.manufacturer,
-        )
-
-        decoders = list(Decoder.objects.all())
-        # Ordered by manufacturer name, then decoder name
-        self.assertEqual(decoders[0], d2)  # Digitrax
-        self.assertTrue(decoders.index(d3) < decoders.index(d1))  # LokPilot before LokSound
-
-
-class ShopTestCase(TestCase):
-    """Test cases for Shop model."""
-
-    def test_shop_creation(self):
-        """Test creating a shop."""
-        shop = Shop.objects.create(
-            name="Caboose Hobbies",
-            country="US",
-            website="https://www.caboosehobbies.com",
-            on_line=True,
-            active=True,
-        )
-
-        self.assertEqual(str(shop), "Caboose Hobbies")
-        self.assertTrue(shop.on_line)
-        self.assertTrue(shop.active)
-
-    def test_shop_defaults(self):
-        """Test shop default values."""
-        shop = Shop.objects.create(name="Local Shop")
-
-        self.assertTrue(shop.on_line)  # Default True
-        self.assertTrue(shop.active)   # Default True
-
-    def test_shop_offline(self):
-        """Test creating an offline shop."""
-        shop = Shop.objects.create(
-            name="Brick and Mortar Store",
-            on_line=False,
-        )
-
-        self.assertFalse(shop.on_line)
-
-
-class TagTestCase(TestCase):
-    """Test cases for Tag model."""
-
-    def test_tag_creation(self):
-        """Test creating a tag."""
-        tag = Tag.objects.create(
-            name="Narrow Gauge",
-            slug="narrow-gauge",
-        )
-
-        self.assertEqual(str(tag), "Narrow Gauge")
-        self.assertEqual(tag.slug, "narrow-gauge")
-
-    def test_tag_unique_name(self):
-        """Test that tag name must be unique."""
-        Tag.objects.create(name="Narrow Gauge", slug="narrow-gauge")
-
-        with self.assertRaises(IntegrityError):
-            Tag.objects.create(name="Narrow Gauge", slug="narrow-gauge")

ram/portal/admin.py

@@ -1,15 +1,12 @@
-from django.conf import settings
 from django.contrib import admin
 from solo.admin import SingletonModelAdmin
-from tinymce.widgets import TinyMCE
 
-from ram.admin import publish, unpublish
 from portal.models import SiteConfiguration, Flatpage
 
 
 @admin.register(SiteConfiguration)
 class SiteConfigurationAdmin(SingletonModelAdmin):
-    readonly_fields = ("site_name", "rest_api", "version")
+    readonly_fields = ("site_name",)
     fieldsets = (
         (
             None,
@@ -20,11 +17,8 @@ class SiteConfigurationAdmin(SingletonModelAdmin):
                     "about",
                     "items_per_page",
                     "items_ordering",
-                    "featured_items_ordering",
-                    "currency",
                     "footer",
                     "footer_extended",
-                    "disclaimer",
                 )
             },
         ),
@@ -35,32 +29,12 @@ class SiteConfigurationAdmin(SingletonModelAdmin):
                 "fields": (
                     "show_version",
                     "use_cdn",
-                    "extra_html",
+                    "extra_head",
-                    "extra_js",
-                    "rest_api",
-                    "version",
                 ),
             },
         ),
     )
 
-    @admin.display(description="REST API enabled", boolean=True)
-    def rest_api(self, obj):
-        return settings.REST_ENABLED
-
-    @admin.display()
-    def version(self, obj):
-        return "{} (Django {})".format(obj.version, obj.django_version)
-
-    def formfield_for_dbfield(self, db_field, **kwargs):
-        if db_field.name in ("footer", "footer_extended", "disclaimer"):
-            return db_field.formfield(
-                widget=TinyMCE(
-                    mce_attrs={"height": "200"},
-                )
-            )
-        return super().formfield_for_dbfield(db_field, **kwargs)
-
 
 @admin.register(Flatpage)
 class FlatpageAdmin(admin.ModelAdmin):
@@ -92,4 +66,3 @@ class FlatpageAdmin(admin.ModelAdmin):
             },
         ),
     )
-    actions = [publish, unpublish]

ram/portal/migrations/0011_alter_flatpage_content_alter_siteconfiguration_about_and_more.py

@@ -1,8 +1,7 @@
 # Generated by Django 4.1 on 2022-08-23 15:54
 
-# ckeditor dependency removal
+import ckeditor.fields
-# import ckeditor.fields
+import ckeditor_uploader.fields
-# import ckeditor_uploader.fields
 from django.db import migrations
 
 
@@ -13,24 +12,24 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-#         migrations.AlterField(
+        migrations.AlterField(
-#             model_name="flatpage",
+            model_name="flatpage",
-#             name="content",
+            name="content",
-#             field=ckeditor_uploader.fields.RichTextUploadingField(),
+            field=ckeditor_uploader.fields.RichTextUploadingField(),
-#         ),
+        ),
-#         migrations.AlterField(
+        migrations.AlterField(
-#             model_name="siteconfiguration",
+            model_name="siteconfiguration",
-#             name="about",
+            name="about",
-#             field=ckeditor.fields.RichTextField(blank=True),
+            field=ckeditor.fields.RichTextField(blank=True),
-#         ),
+        ),
-#         migrations.AlterField(
+        migrations.AlterField(
-#             model_name="siteconfiguration",
+            model_name="siteconfiguration",
-#             name="footer",
+            name="footer",
-#             field=ckeditor.fields.RichTextField(blank=True),
+            field=ckeditor.fields.RichTextField(blank=True),
-#         ),
+        ),
-#         migrations.AlterField(
+        migrations.AlterField(
-#             model_name="siteconfiguration",
+            model_name="siteconfiguration",
-#             name="footer_extended",
+            name="footer_extended",
-#             field=ckeditor.fields.RichTextField(blank=True),
+            field=ckeditor.fields.RichTextField(blank=True),
-#         ),
+        ),
     ]

ram/portal/migrations/0018_siteconfiguration_currency.py

@@ -1,21 +0,0 @@
-# Generated by Django 5.1.4 on 2024-12-29 15:18
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        (
-            "portal",
-            "0017_alter_flatpage_content_alter_siteconfiguration_about_and_more",
-        ),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="siteconfiguration",
-            name="currency",
-            field=models.CharField(default="EUR", max_length=3),
-        ),
-    ]

ram/portal/migrations/0019_siteconfiguration_disclaimer.py

@@ -1,19 +0,0 @@
-# Generated by Django 5.1.4 on 2025-01-30 16:39
-
-import tinymce.models
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("portal", "0018_siteconfiguration_currency"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="siteconfiguration",
-            name="disclaimer",
-            field=tinymce.models.HTMLField(blank=True),
-        ),
-    ]

ram/portal/migrations/0020_alter_flatpage_options.py

@@ -1,17 +0,0 @@
-# Generated by Django 5.1.4 on 2025-02-01 23:26
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("portal", "0019_siteconfiguration_disclaimer"),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name="flatpage",
-            options={"verbose_name": "page", "verbose_name_plural": "pages"},
-        ),
-    ]

ram/portal/migrations/0021_siteconfiguration_featured_items_ordering_and_more.py

@@ -1,43 +0,0 @@
-# Generated by Django 6.0 on 2026-01-02 23:41
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("portal", "0020_alter_flatpage_options"),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name="siteconfiguration",
-            name="featured_items_ordering",
-            field=models.CharField(
-                choices=[
-                    ("type", "By rolling stock type and company"),
-                    ("class", "By rolling stock type and class"),
-                    ("company", "By company and type"),
-                    ("country", "By country and type"),
-                    ("cou+com", "By country and company"),
-                ],
-                default="type",
-                max_length=11,
-            ),
-        ),
-        migrations.AlterField(
-            model_name="siteconfiguration",
-            name="items_ordering",
-            field=models.CharField(
-                choices=[
-                    ("type", "By rolling stock type and company"),
-                    ("class", "By rolling stock type and class"),
-                    ("company", "By company and type"),
-                    ("country", "By country and type"),
-                    ("cou+com", "By country and company"),
-                ],
-                default="type",
-                max_length=11,
-            ),
-        ),
-    ]

ram/portal/migrations/0022_rename_siteconfiguration_extra_head_and_more.py

@@ -1,34 +0,0 @@
-# Generated by Django 6.0.1 on 2026-01-15 11:32
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("portal", "0021_siteconfiguration_featured_items_ordering_and_more"),
-    ]
-
-    operations = [
-        migrations.RenameField(
-            model_name="siteconfiguration",
-            old_name="extra_head",
-            new_name="extra_html",
-        ),
-        migrations.AlterField(
-            model_name="siteconfiguration",
-            name="extra_html",
-            field=models.TextField(
-                blank=True,
-                help_text="Extra HTML to be dinamically loaded into the site.",
-            ),
-        ),
-        migrations.AddField(
-            model_name="siteconfiguration",
-            name="extra_js",
-            field=models.TextField(
-                blank=True,
-                help_text="Extra JS to be dinamically loaded into the site."
-            ),
-        ),
-    ]

ram/portal/models.py

@@ -9,7 +9,6 @@ from solo.models import SingletonModel
 from tinymce import models as tinymce
 
 from ram import __version__ as app_version
-from ram.managers import PublicManager
 from ram.utils import slugify
 
 
@@ -22,31 +21,19 @@ class SiteConfiguration(SingletonModel):
         default="6",
     )
     items_ordering = models.CharField(
-        max_length=11,
+        max_length=10,
         choices=[
-            ("type", "By rolling stock type and company"),
+            ("type", "By rolling stock type"),
-            ("class", "By rolling stock type and class"),
+            ("company", "By company name"),
-            ("company", "By company and type"),
+            ("identifier", "By rolling stock class"),
-            ("country", "By country and type"),
-            ("cou+com", "By country and company"),
         ],
         default="type",
     )
-    featured_items_ordering = items_ordering.clone()
-    currency = models.CharField(max_length=3, default="EUR")
     footer = tinymce.HTMLField(blank=True)
     footer_extended = tinymce.HTMLField(blank=True)
-    disclaimer = tinymce.HTMLField(blank=True)
     show_version = models.BooleanField(default=True)
     use_cdn = models.BooleanField(default=True)
-    extra_html = models.TextField(
+    extra_head = models.TextField(blank=True)
-        blank=True,
-        help_text="Extra HTML to be dinamically loaded into the site.",
-    )
-    extra_js = models.TextField(
-        blank=True,
-        help_text="Extra JS to be dinamically loaded into the site.",
-    )
 
     class Meta:
         verbose_name = "Site Configuration"
@@ -57,11 +44,9 @@ class SiteConfiguration(SingletonModel):
     def site_name(self):
         return settings.SITE_NAME
 
-    @property
     def version(self):
         return app_version
 
-    @property
     def django_version(self):
         return django.get_version()
 
@@ -74,10 +59,6 @@ class Flatpage(models.Model):
     creation_time = models.DateTimeField(auto_now_add=True)
     updated_time = models.DateTimeField(auto_now=True)
 
-    class Meta:
-        verbose_name = "page"
-        verbose_name_plural = "pages"
-
     def __str__(self):
         return self.name
 
@@ -91,8 +72,6 @@ class Flatpage(models.Model):
             )
         )
 
-    objects = PublicManager()
-
 
 @receiver(models.signals.pre_save, sender=Flatpage)
 def tag_pre_save(sender, instance, **kwargs):