Update site icon

Still to be improved, see FIXME

.github/workflows/django.yml

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

.gitignore

@@ -10,7 +10,6 @@ __pycache__/
 .Python
 build/
 develop-eggs/
-dist/
 downloads/
 eggs/
 .eggs/
@@ -132,3 +131,4 @@ dmypy.json
 ram/storage/
 !ram/storage/.gitignore
 arduino/CommandStation-EX/build/
+utils

README.md

@@ -2,7 +2,7 @@
 
 [![Django CI](https://github.com/daniviga/django-rma/actions/workflows/django.yml/badge.svg)](https://github.com/daniviga/django-rma/actions/workflows/django.yml)
 
-![Screenshot 2022-07-23 at 22-40-17 Railroad Assets Manager](https://user-images.githubusercontent.com/1818657/180622177-a4bba00e-47da-42b3-a7f6-b24773e69936.png)
+![Screenshot 2023-09-18 at 21-57-33 Company RGS - Railroad Assets Manager](https://github.com/daniviga/django-ram/assets/1818657/d20fbe27-1192-4ab1-a19f-8d2ae50cf781)
 
 A `jff` (just for fun) project that aims to create a
 model railroad assets manager that allows to:
@@ -23,7 +23,8 @@ security assesment, pentest, ISO certification, etc.
 
 This project probably doesn't match your needs nor expectations. Be aware.
 
-Your model train may also catch fire while using this software.
+> [!CAUTION]
+> Your model train may catch fire while using this software.
 
 Check out [my own instance](https://daniele.mynarrowgauge.org).
 
@@ -40,23 +41,49 @@ Project is based on the following technologies and components:
 
 It has been developed with:
 
-- [vim](https://www.vim.org/): because it rocks
+- [neovim](https://neovim.io/): because `vim` rocks, `neovim` rocks more
 - [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 toast!
+- [QEMU (avr)](https://qemu-project.gitlab.io/qemu/system/target-avr.html): QEMU can even make toasts!
 
+## 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.9+
+- Python 3.11+
 - A USB port when running Arduino hardware (and adaptors if you have a Mac)
 
 ## Web portal installation
 
 ### Using containers
 
-coming soon
+Do it yourself, otherwise, raise a request :)
 
 ### Manual installation
 
@@ -83,6 +110,8 @@ $ 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
@@ -96,63 +125,71 @@ Browse to `http://localhost:8000`
 
 The DCC++ EX connector exposes an Arduino board running DCC++ EX Command Station,
 connected via serial port, to the network, allowing commands to be sent via a
-TCP socket.
+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
-using an ESP8266 module or a [Mega+WiFi board](https://dcc-ex.com/advanced-setup/supported-microcontrollers/wifi-mega.html)).
+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
+[ESP32](https://dcc-ex.com/reference/hardware/microcontrollers/esp32.html) (recommended).
 
-### Customize the settings
+### Manual setup
 
-The daemon comes with default settings in `config.ini`.
-Settings may need to be customized based on your setup.
+You'll need [namp-ncat](https://nmap.org/ncat/) , and `stty` to setup the serial port.
+
+> [!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 daemons
-$ podman build -t dcc/net-to-serial .
-$ podman run -d -p 2560:2560 dcc/net-to-serial
-```
-
-### Manual setup
-
-```bash
-$ cd daemons
-$ pip install -r requirements.txt
-$ python ./net-to-serial.py
+$ cd connector
+$ podman build -t dcc/connector .
+$ podman run -d --group-add keep-groups --device /dev/ttyACM0:/dev/arduino -p 2560:2560 dcc/connector
 ```
 
 ### Test with a simulator
 
-A [QEMU AVR based simulator](daemons/simulator/README.md) running DCC++ EX is bundled togheter with the `net-to-serial.py`
-daemon into a container. To run it:
+A [QEMU AVR based simulator](daemons/simulator/README.md) running DCC++ EX is bundled togheter with the connector
+into a container. To run it:
 
 ```bash
-$ cd daemons/simulator
-$ podman build -t dcc/net-to-serial:sim .
-$ podman run --init --cpus 0.1 -d -p 2560:2560 dcc/net-to-serial:sim
+$ cd connector/simulator
+$ podman build -t dcc/connector:sim .
+$ podman run --init --cpus 0.1 -d -p 2560:2560 dcc/connector:sim
 ```
 
-To be continued ...
+> [!WARNING]
+> The simulator is intended for light development and testing purposes only and far from being a complete replacement for a real hardware.
 
 ## Screenshots
 
 ### Frontend
-![Screenshot 2022-07-23 at 22-41-44 Railroad Assets Manager](https://user-images.githubusercontent.com/1818657/180622406-760774a9-f028-44fc-b332-fa74e43307df.png)
+
+![Screenshot 2023-09-18 at 22-00-39 RGS C-19 #40 - Railroad Assets Manager](https://github.com/daniviga/django-ram/assets/1818657/94834b89-5b17-46e7-9494-a1651d72c072)
 ---
-![Screenshot 2022-07-23 at 22-44-35 Railroad Assets Manager](https://user-images.githubusercontent.com/1818657/180622342-40586d75-239a-400c-93a1-1cb9583a7d17.png)
----
-![Screenshot 2022-07-23 at 22-44-46 Railroad Assets Manager](https://user-images.githubusercontent.com/1818657/180622321-1ab76440-9c6e-4667-9247-dbbcf6c6055c.png)
+![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 2022-07-23 at 22-53-43 Railroad Assets Manager](https://user-images.githubusercontent.com/1818657/180622629-65d81eaf-cca4-4f44-b39b-3b0077b43a34.png)
+![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)
@@ -164,8 +201,3 @@ To be continued ...
 ### Rest API
 
 ![image](https://user-images.githubusercontent.com/1818657/180622471-ade06c84-c73b-41d5-a2a7-02a95b2ffc02.png)
-
-
-
-
-

connector/Dockerfile

@@ -0,0 +1,9 @@
+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/README.md

@@ -0,0 +1,19 @@
+# Use a container to implement a serial to net bridge
+
+This uses `ncat` from [nmap](https://nmap.org/ncat/) to bridge a serial port to a network port. The serial port is passed to the Podman command (eg. `/dev/ttyACM0`) and the network port is `2560`.
+
+> [!IMPORTANT]
+> Other variants of `nc` or `ncat` may not work as expected.
+
+## Build and run the container
+
+```bash
+$ podman buil -t dcc/bridge .
+$ podman run -d --group-add keep-groups --device=/dev/ttyACM0:/dev/arduino -p 2560:2560 --name dcc-bridge dcc/bridge
+```
+
+It can be tested with `telnet`:
+
+```bash
+$ telnet localhost 2560
+```

connector/simulator/Dockerfile

@@ -0,0 +1,8 @@
+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

@@ -0,0 +1,13 @@
+# 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/simulator/start.sh

@@ -7,7 +7,5 @@ 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
-/opt/dcc/net-to-serial.py
+ncat -n -k -l 2560 -o /dev/stderr </dev/pts/${PTY} >/dev/pts/${PTY}

daemons/Dockerfile

@@ -1,9 +0,0 @@
-FROM python:3.10-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/config.ini

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

daemons/net-to-serial.py

@@ -1,100 +0,0 @@
-#!/usr/bin/env python3
-import re
-import time
-import logging
-import serial
-import asyncio
-import configparser
-
-from pathlib import Path
-
-
-class SerialDaemon:
-    def __init__(self, config):
-        self.ser = serial.Serial(
-            config["Serial"]["Port"],
-            timeout=int(config["Serial"]["Timeout"])/1000)
-        self.ser.baudrate = config["Serial"]["Baudrate"]
-
-    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"""
-        while 1:  # keep connection to client open
-            data = await reader.read(100)
-            if not data:  # client has disconnected
-                break
-
-            addr = writer.get_extra_info('peername')
-            logging.info("Received {} from {}".format(data, addr[0]))
-
-            self.__write_serial(data)
-            response = self.__read_serial()
-            writer.write(response)
-            await writer.drain()
-            logging.info("Sent: {}".format(response))
-
-        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.warning("Serving on {} port {}".format(addr[0], addr[1]))
-    logging.warning(
-        "Proxying to {} (Baudrate: {}, Timeout: {})".format(
-            config["Serial"]["Port"],
-            config["Serial"]["Baudrate"],
-            config["Serial"]["Timeout"]))
-    logging.warning("Initializing board")
-    logging.warning("Board {} ready".format(
-        await sd.return_board()))
-
-    async with server:
-        await server.serve_forever()
-
-if __name__ == "__main__":
-    asyncio.run(main())

daemons/requirements.txt

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

daemons/simulator/Dockerfile

@@ -1,7 +0,0 @@
-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

@@ -1,8 +0,0 @@
-# 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
-```

ram/bookshelf/admin.py

@@ -0,0 +1,346 @@
+import html
+
+from django.conf import settings
+from django.contrib import admin
+from django.utils.html import format_html, strip_tags
+from adminsortable2.admin import SortableAdminBase, SortableInlineAdminMixin
+
+from ram.admin import publish, unpublish
+from ram.utils import generate_csv
+from portal.utils import get_site_conf
+from repository.models import BookDocument, CatalogDocument
+from bookshelf.models import (
+    BaseBookProperty,
+    BaseBookImage,
+    Book,
+    Author,
+    Publisher,
+    Catalog,
+)
+
+
+class BookImageInline(SortableInlineAdminMixin, admin.TabularInline):
+    model = BaseBookImage
+    min_num = 0
+    extra = 0
+    readonly_fields = ("image_thumbnail",)
+    classes = ["collapse"]
+    verbose_name = "Image"
+
+
+class BookPropertyInline(admin.TabularInline):
+    model = BaseBookProperty
+    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 = 0
+    classes = ["collapse"]
+
+
+class CatalogDocInline(BookDocInline):
+    model = CatalogDocument
+
+
+@admin.register(Book)
+class BookAdmin(SortableAdminBase, admin.ModelAdmin):
+    inlines = (
+        BookPropertyInline,
+        BookImageInline,
+        BookDocInline,
+    )
+    list_display = (
+        "title",
+        "get_authors",
+        "get_publisher",
+        "publication_year",
+        "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")
+
+    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 = "<br>".join(
+                "<a href=\"{}\" target=\"_blank\">{}</a>".format(
+                    i.file.url, i
+                ) for i in obj.invoice.all())
+        else:
+            html = "-"
+        return format_html(html)
+
+    @admin.display(description="Publisher")
+    def get_publisher(self, obj):
+        return obj.publisher.name
+
+    @admin.display(description="Authors")
+    def get_authors(self, obj):
+        return obj.authors_list
+
+    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 = []
+        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 = (
+        "first_name",
+        "last_name",
+    )
+    list_filter = ("last_name",)
+
+
+@admin.register(Publisher)
+class PublisherAdmin(admin.ModelAdmin):
+    list_display = ("name", "country_flag")
+    search_fields = ("name",)
+
+    @admin.display(description="Country")
+    def country_flag(self, obj):
+        return format_html(
+            '<img src="{}" /> {}'.format(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 = ("manufacturer__name", "publication_year", "scales__scale")
+
+    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 = "<br>".join(
+                "<a href=\"{}\" target=\"_blank\">{}</a>".format(
+                    i.file.url, i
+                ) for i in obj.invoice.all())
+        else:
+            html = "-"
+        return format_html(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 = []
+        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]

ram/bookshelf/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class BookshelfConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "bookshelf"

ram/bookshelf/migrations/0001_initial.py

@@ -0,0 +1,121 @@
+# Generated by Django 4.2.5 on 2023-10-01 20:16
+
+# ckeditor removal
+# import ckeditor_uploader.fields
+from django.db import migrations, models
+import django.db.models.deletion
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ("metadata", "0012_alter_decoder_manufacturer_decoderdocument"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="Author",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("first_name", models.CharField(max_length=100)),
+                ("last_name", models.CharField(max_length=100)),
+            ],
+        ),
+        migrations.CreateModel(
+            name="Book",
+            fields=[
+                (
+                    "uuid",
+                    models.UUIDField(
+                        default=uuid.uuid4,
+                        editable=False,
+                        primary_key=True,
+                        serialize=False,
+                    ),
+                ),
+                ("title", models.CharField(max_length=200)),
+                ("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", 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")),
+            ],
+        ),
+        migrations.CreateModel(
+            name="Publisher",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=200)),
+                ("website", models.URLField()),
+            ],
+        ),
+        migrations.CreateModel(
+            name="BookProperty",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("value", models.CharField(max_length=256)),
+                (
+                    "book",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="property",
+                        to="bookshelf.book",
+                    ),
+                ),
+                (
+                    "property",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="metadata.property",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name_plural": "Properties",
+            },
+        ),
+        migrations.AddField(
+            model_name="book",
+            name="publisher",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE, to="bookshelf.publisher"
+            ),
+        ),
+        migrations.AddField(
+            model_name="book",
+            name="tags",
+            field=models.ManyToManyField(
+                blank=True, related_name="bookshelf", to="metadata.tag"
+            ),
+        ),
+    ]

ram/bookshelf/migrations/0002_book_language_book_numbers_of_pages_and_more.py

@@ -0,0 +1,142 @@
+# Generated by Django 4.2.5 on 2023-10-01 21:33
+
+from django.db import migrations, models
+import django_countries.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookshelf", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="book",
+            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"),
+                    ("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"),
+                    ("uk", "Ukrainian"),
+                    ("ur", "Urdu"),
+                    ("uz", "Uzbek"),
+                    ("vi", "Vietnamese"),
+                    ("zh-hans", "Simplified Chinese"),
+                    ("zh-hant", "Traditional Chinese"),
+                ],
+                default="en",
+                max_length=7,
+            ),
+        ),
+        migrations.AddField(
+            model_name="book",
+            name="numbers_of_pages",
+            field=models.SmallIntegerField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name="publisher",
+            name="country",
+            field=django_countries.fields.CountryField(blank=True, max_length=2),
+        ),
+        migrations.AlterField(
+            model_name="book",
+            name="ISBN",
+            field=models.CharField(blank=True, max_length=13),
+        ),
+        migrations.AlterField(
+            model_name="publisher",
+            name="website",
+            field=models.URLField(blank=True),
+        ),
+    ]

ram/bookshelf/migrations/0003_bookimage.py

@@ -0,0 +1,51 @@
+# Generated by Django 4.2.5 on 2023-10-02 10:36
+
+from django.db import migrations, models
+import django.db.models.deletion
+import ram.utils
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookshelf", "0002_book_language_book_numbers_of_pages_and_more"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="BookImage",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("order", models.PositiveIntegerField(default=0)),
+                (
+                    "image",
+                    models.ImageField(
+                        blank=True,
+                        null=True,
+                        storage=ram.utils.DeduplicatedStorage,
+                        upload_to="images/books/",
+                    ),
+                ),
+                (
+                    "book",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="image",
+                        to="bookshelf.book",
+                    ),
+                ),
+            ],
+            options={
+                "ordering": ["order"],
+                "abstract": False,
+            },
+        ),
+    ]

ram/bookshelf/migrations/0004_rename_numbers_of_pages_book_number_of_pages.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.5 on 2023-10-02 20:38
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookshelf", "0003_bookimage"),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name="book",
+            old_name="numbers_of_pages",
+            new_name="number_of_pages",
+        ),
+    ]

ram/bookshelf/migrations/0005_alter_book_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.5 on 2023-10-03 19:57
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookshelf", "0004_rename_numbers_of_pages_book_number_of_pages"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="book",
+            options={"ordering": ["authors__last_name", "title"]},
+        ),
+    ]

ram/bookshelf/migrations/0006_alter_book_isbn.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.5 on 2023-10-03 20:43
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookshelf", "0005_alter_book_options"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="book",
+            name="ISBN",
+            field=models.CharField(blank=True, max_length=17),
+        ),
+    ]

ram/bookshelf/migrations/0007_alter_book_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.5 on 2023-10-03 21:07
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookshelf", "0006_alter_book_isbn"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="book",
+            options={"ordering": ["title"]},
+        ),
+    ]

ram/bookshelf/migrations/0008_alter_author_options_alter_publisher_options.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.6 on 2023-10-09 21:08
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("bookshelf", "0007_alter_book_options"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="author",
+            options={"ordering": ["last_name", "first_name"]},
+        ),
+        migrations.AlterModelOptions(
+            name="publisher",
+            options={"ordering": ["name"]},
+        ),
+    ]

ram/bookshelf/migrations/0009_alter_bookimage_image.py

@@ -0,0 +1,51 @@
+# Generated by Django 4.2.6 on 2023-10-30 13:16
+
+import os
+import sys
+import shutil
+import ram.utils
+import bookshelf.models
+
+from django.db import migrations, models
+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():
+        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)
+        os.makedirs(os.path.dirname(new_path), exist_ok=True)
+        try:
+            shutil.move(r.image.path, new_path)
+        except FileNotFoundError:
+            sys.stderr.write("  !! FileNotFoundError: {}\n".format(new_image))
+            pass
+        r.image.name = new_image
+        r.save()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("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(
+        #         model_name="bookimage",
+        #         name="image",
+        #         field=models.ImageField(
+        #             blank=True,
+        #             null=True,
+        #             storage=ram.utils.DeduplicatedStorage,
+        #             upload_to=bookshelf.models.book_image_upload,
+        #         ),
+        #     ),
+        #     migrations.RunPython(
+        #         move_images,
+        #         reverse_code=migrations.RunPython.noop
+        #     ),
+    ]

ram/bookshelf/migrations/0010_alter_bookimage_image.py

@@ -0,0 +1,22 @@
+# Generated by Django 4.2.6 on 2023-11-04 22:53
+
+import bookshelf.models
+from django.db import migrations, models
+import ram.utils
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("bookshelf", "0009_alter_bookimage_image"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="bookimage",
+            name="image",
+            field=models.ImageField(
+                storage=ram.utils.DeduplicatedStorage,
+                upload_to=bookshelf.models.book_image_upload,
+            ),
+        ),
+    ]

ram/bookshelf/migrations/0011_alter_book_language.py

@@ -0,0 +1,121 @@
+# Generated by Django 5.0.1 on 2024-01-20 21:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("bookshelf", "0010_alter_bookimage_image"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="book",
+            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"),
+                    ("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/0012_alter_book_notes.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.0.2 on 2024-02-17 12:19
+
+import tinymce.models
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("bookshelf", "0011_alter_book_language"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="book",
+            name="notes",
+            field=tinymce.models.HTMLField(blank=True),
+        ),
+    ]

ram/bookshelf/migrations/0013_book_description.py

@@ -0,0 +1,19 @@
+# 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

@@ -0,0 +1,18 @@
+# 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

@@ -0,0 +1,18 @@
+# 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

@@ -0,0 +1,141 @@
+# Generated by Django 5.1.2 on 2024-11-27 16:35
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+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())
+
+
+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_authors",
+        ),
+        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",),
+        ),
+    ]

ram/bookshelf/migrations/0017_alter_basebook_options_basebookdocument.py

@@ -0,0 +1,52 @@
+# 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

@@ -0,0 +1,17 @@
+# 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

@@ -0,0 +1,36 @@
+# 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

@@ -0,0 +1,23 @@
+# 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

@@ -0,0 +1,34 @@
+# 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

@@ -0,0 +1,50 @@
+# 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

@@ -0,0 +1,17 @@
+# 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/models.py

@@ -0,0 +1,155 @@
+import os
+import shutil
+from django.db import models
+from django.conf import settings
+from django.urls import reverse
+from django_countries.fields import CountryField
+
+from ram.utils import DeduplicatedStorage
+from ram.models import BaseModel, Image, PropertyInstance
+from metadata.models import Scale, Manufacturer, Shop, Tag
+
+
+class Publisher(models.Model):
+    name = models.CharField(max_length=200)
+    country = CountryField(blank=True)
+    website = models.URLField(blank=True)
+
+    class Meta:
+        ordering = ["name"]
+
+    def __str__(self):
+        return self.name
+
+
+class Author(models.Model):
+    first_name = models.CharField(max_length=100)
+    last_name = models.CharField(max_length=100)
+
+    class Meta:
+        ordering = ["last_name", "first_name"]
+
+    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):
+    ISBN = models.CharField(max_length=17, blank=True)  # 13 + dashes
+    language = models.CharField(
+        max_length=7,
+        choices=settings.LANGUAGES,
+        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
+    )
+
+    def delete(self, *args, **kwargs):
+        shutil.rmtree(
+            os.path.join(
+                settings.MEDIA_ROOT, "images", "books", str(self.uuid)
+            ),
+            ignore_errors=True
+        )
+        super(BaseBook, self).delete(*args, **kwargs)
+
+
+def book_image_upload(instance, filename):
+    return os.path.join(
+        "images",
+        "books",
+        str(instance.book.uuid),
+        filename
+    )
+
+
+class BaseBookImage(Image):
+    book = models.ForeignKey(
+        BaseBook, on_delete=models.CASCADE, related_name="image"
+    )
+    image = models.ImageField(
+        upload_to=book_image_upload,
+        storage=DeduplicatedStorage,
+    )
+
+
+class BaseBookProperty(PropertyInstance):
+    book = models.ForeignKey(
+        BaseBook,
+        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)
+
+    class Meta:
+        ordering = ["title"]
+
+    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,
+    )
+    years = models.CharField(max_length=12)
+    scales = models.ManyToManyField(Scale)
+
+    class Meta:
+        ordering = ["manufacturer", "publication_year"]
+
+    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"

ram/bookshelf/serializers.py

@@ -0,0 +1,51 @@
+from rest_framework import serializers
+from bookshelf.models import Book, Catalog, Author, Publisher
+from metadata.serializers import (
+    ScaleSerializer,
+    ManufacturerSerializer,
+    TagSerializer
+)
+
+
+class AuthorSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Author
+        fields = "__all__"
+
+
+class PublisherSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Publisher
+        fields = "__all__"
+
+
+class BookSerializer(serializers.ModelSerializer):
+    authors = AuthorSerializer(many=True)
+    publisher = PublisherSerializer()
+    tags = TagSerializer(many=True)
+
+    class Meta:
+        model = Book
+        exclude = (
+            "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")

ram/bookshelf/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

ram/bookshelf/urls.py

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

ram/bookshelf/views.py

@@ -0,0 +1,40 @@
+from rest_framework.generics import ListAPIView, RetrieveAPIView
+from rest_framework.schemas.openapi import AutoSchema
+
+from ram.views import CustomLimitOffsetPagination
+from bookshelf.models import Book, Catalog
+from bookshelf.serializers import BookSerializer, CatalogSerializer
+
+
+class BookList(ListAPIView):
+    serializer_class = BookSerializer
+    pagination_class = CustomLimitOffsetPagination
+
+    def get_queryset(self):
+        return Book.objects.get_published(self.request.user)
+
+
+class BookGet(RetrieveAPIView):
+    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)

ram/consist/admin.py

@@ -1,14 +1,42 @@
-from django.contrib import admin
-from adminsortable2.admin import SortableAdminBase, SortableInlineAdminMixin
+import html
 
+from django.conf import settings
+from django.contrib import admin
+# 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
-    readonly_fields = ("address", "type", "company", "era")
+    autocomplete_fields = ("rolling_stock",)
+    readonly_fields = (
+        "preview",
+        "published",
+        "scale",
+        "manufacturer",
+        "item_number",
+        "company",
+        "type",
+        "era",
+        "address",
+    )
 
 
 @admin.register(Consist)
@@ -18,26 +46,38 @@ class ConsistAdmin(SortableAdminBase, admin.ModelAdmin):
         "creation_time",
         "updated_time",
     )
-    list_display = ("identifier", "company", "era")
-    list_filter = list_display
-    search_fields = list_display
+    list_filter = ("company__name", "era", "scale", "published")
+    list_display = ("__str__",) + list_filter + ("country_flag",)
+    search_fields = ("identifier",) + list_filter
     save_as = True
 
+    @admin.display(description="Country")
+    def country_flag(self, obj):
+        return format_html(
+            '<img src="{}" /> {}'.format(obj.country.flag, obj.country)
+        )
+
     fieldsets = (
         (
             None,
             {
                 "fields": (
+                    "published",
                     "identifier",
-                    "consist_address",
                     "company",
+                    "scale",
                     "era",
+                    "consist_address",
+                    "description",
                     "image",
-                    "notes",
                     "tags",
                 )
             },
         ),
+        (
+            "Notes",
+            {"classes": ("collapse",), "fields": ("notes",)},
+        ),
         (
             "Audit",
             {
@@ -49,3 +89,55 @@ 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 = []
+        for obj in queryset:
+            for item in obj.consist_item.all():
+                types = " + ".join(
+                    "{}x {}".format(t["count"], t["type"])
+                    for t in obj.get_type_count()
+                )
+                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)),
+                        settings.CSV_SEPARATOR_ALT.join(
+                            t.name for t in obj.tags.all()
+                        ),
+                        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,6 +1,7 @@
 # Generated by Django 4.1 on 2022-08-23 15:54
 
-import ckeditor_uploader.fields
+# ckeditor removal
+# import ckeditor_uploader.fields
 from django.db import migrations
 
 
@@ -11,9 +12,9 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
-        migrations.AlterField(
-            model_name="consist",
-            name="notes",
-            field=ckeditor_uploader.fields.RichTextUploadingField(blank=True),
-        ),
+        # migrations.AlterField(
+        #     model_name="consist",
+        #     name="notes",
+        #     field=ckeditor_uploader.fields.RichTextUploadingField(blank=True),
+        # ),
     ]

ram/consist/migrations/0009_alter_consist_image.py

@@ -0,0 +1,51 @@
+# Generated by Django 4.2.6 on 2023-10-31 09:41
+
+import os
+import sys
+import shutil
+import ram.utils
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+def move_images(apps, schema_editor):
+    sys.stdout.write("\n  Processing files. Please await...")
+    model = apps.get_model("consist", "Consist")
+    for r in model.objects.all():
+        if not r.image:  # exit the loop if there's no image
+            continue
+        fname = os.path.basename(r.image.path)
+        new_image = os.path.join("images", "consists", fname)
+        new_path = os.path.join(settings.MEDIA_ROOT, new_image)
+        os.makedirs(os.path.dirname(new_path), exist_ok=True)
+        try:
+            shutil.move(r.image.path, new_path)
+        except FileNotFoundError:
+            sys.stderr.write("  !! FileNotFoundError: {}\n".format(new_image))
+            pass
+        r.image.name = new_image
+        r.save()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("consist", "0008_alter_consist_options"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="consist",
+            name="image",
+            field=models.ImageField(
+                blank=True,
+                null=True,
+                storage=ram.utils.DeduplicatedStorage,
+                upload_to="images/consists",
+            ),
+        ),
+        migrations.RunPython(
+            move_images,
+            reverse_code=migrations.RunPython.noop
+        ),
+    ]

ram/consist/migrations/0010_alter_consist_notes.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.0.2 on 2024-02-17 12:19
+
+import tinymce.models
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("consist", "0009_alter_consist_image"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="consist",
+            name="notes",
+            field=tinymce.models.HTMLField(blank=True),
+        ),
+    ]

ram/consist/migrations/0011_alter_consist_consist_address_alter_consist_era.py

@@ -0,0 +1,30 @@
+# 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

@@ -0,0 +1,18 @@
+# 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

@@ -0,0 +1,20 @@
+# 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

@@ -0,0 +1,18 @@
+# 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

@@ -0,0 +1,19 @@
+# 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

@@ -0,0 +1,18 @@
+# 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

@@ -0,0 +1,42 @@
+# 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

@@ -0,0 +1,25 @@
+# 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/models.py

@@ -1,29 +1,39 @@
-from uuid import uuid4
+import os
+
 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 ckeditor_uploader.fields import RichTextUploadingField
-
+from ram.models import BaseModel
 from ram.utils import DeduplicatedStorage
-from metadata.models import Company, Tag
+from metadata.models import Company, Scale, Tag
 from roster.models import RollingStock
 
 
-class Consist(models.Model):
-    uuid = models.UUIDField(primary_key=True, default=uuid4, editable=False)
+class Consist(BaseModel):
     identifier = models.CharField(max_length=128, unique=False)
     tags = models.ManyToManyField(Tag, related_name="consist", blank=True)
     consist_address = models.SmallIntegerField(
-        default=None, null=True, blank=True
+        default=None,
+        null=True,
+        blank=True,
+        help_text="DCC consist address if enabled",
     )
     company = models.ForeignKey(Company, on_delete=models.CASCADE)
-    era = models.CharField(max_length=32, blank=True)
-    image = models.ImageField(
-        upload_to="images/", storage=DeduplicatedStorage, null=True, blank=True
+    era = models.CharField(
+        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 = RichTextUploadingField(blank=True)
-    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)
@@ -31,6 +41,25 @@ class Consist(models.Model):
     def get_absolute_url(self):
         return reverse("consist", kwargs={"uuid": self.uuid})
 
+    @property
+    def length(self):
+        return self.consist_item.count()
+
+    def get_type_count(self):
+        return self.consist_item.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")
+
+    @property
+    def country(self):
+        return self.company.country
+
     class Meta:
         ordering = ["company", "-creation_time"]
 
@@ -40,22 +69,81 @@ class ConsistItem(models.Model):
         Consist, on_delete=models.CASCADE, related_name="consist_item"
     )
     rolling_stock = models.ForeignKey(RollingStock, on_delete=models.CASCADE)
-    order = models.PositiveIntegerField(default=0, blank=False, null=False)
+    order = models.PositiveIntegerField(blank=False, null=False)
 
-    class Meta(object):
+    class Meta:
         ordering = ["order"]
+        constraints = [
+            models.UniqueConstraint(
+                fields=["consist", "rolling_stock"],
+                name="one_stock_per_consist"
+            )
+        ]
 
     def __str__(self):
         return "{0}".format(self.rolling_stock)
 
-    def type(self):
-        return self.rolling_stock.rolling_class.type
+    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
+        if rolling_stock.scale != consist.scale:
+            raise ValidationError(
+                "The rolling stock and consist must be of the same scale."
+            )
+        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
+
+    @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,4 +21,5 @@ class ConsistSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Consist
-        fields = "__all__"
+        exclude = ("notes",)
+        read_only_fields = ("creation_time", "updated_time")

ram/consist/views.py

@@ -1,15 +1,21 @@
 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,10 +1,13 @@
 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,
     Scale,
+    Shop,
     Manufacturer,
     Company,
     Tag,
@@ -14,11 +17,20 @@ from metadata.models import (
 
 @admin.register(Property)
 class PropertyAdmin(admin.ModelAdmin):
+    list_display = ("name", "private")
     search_fields = ("name",)
 
 
+class DecoderDocInline(admin.TabularInline):
+    model = DecoderDocument
+    min_num = 0
+    extra = 0
+    classes = ["collapse"]
+
+
 @admin.register(Decoder)
 class DecoderAdmin(admin.ModelAdmin):
+    inlines = (DecoderDocInline,)
     readonly_fields = ("image_thumbnail",)
     list_display = ("__str__", "sound")
     list_filter = ("manufacturer", "sound")
@@ -35,18 +47,30 @@ class ScaleAdmin(admin.ModelAdmin):
 @admin.register(Company)
 class CompanyAdmin(admin.ModelAdmin):
     readonly_fields = ("logo_thumbnail",)
-    list_display = ("name", "country")
-    list_filter = list_display
+    list_display = ("name", "country_flag")
+    list_filter = ("name", "country")
     search_fields = ("name",)
 
+    @admin.display(description="Country")
+    def country_flag(self, obj):
+        return format_html(
+            '<img src="{}" /> {}'.format(obj.country.flag, obj.country.name)
+        )
+
 
 @admin.register(Manufacturer)
 class ManufacturerAdmin(admin.ModelAdmin):
     readonly_fields = ("logo_thumbnail",)
-    list_display = ("name", "category")
+    list_display = ("name", "category", "country_flag")
     list_filter = ("category",)
     search_fields = ("name",)
 
+    @admin.display(description="Country")
+    def country_flag(self, obj):
+        return format_html(
+            '<img src="{}" /> {}'.format(obj.country.flag, obj.country.name)
+        )
+
 
 @admin.register(Tag)
 class TagAdmin(admin.ModelAdmin):
@@ -60,3 +84,10 @@ 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")
+    list_filter = ("on_line", "active")
+    search_fields = ("name",)

ram/metadata/migrations/0010_alter_manufacturer_category.py

@@ -0,0 +1,26 @@
+# Generated by Django 4.1.5 on 2023-01-06 00:52
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("metadata", "0009_alter_company_logo_alter_decoder_image_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="manufacturer",
+            name="category",
+            field=models.CharField(
+                choices=[
+                    ("model", "Model"),
+                    ("real", "Real"),
+                    ("accessory", "Accessory"),
+                    ("other", "Other"),
+                ],
+                max_length=64,
+            ),
+        ),
+    ]

ram/metadata/migrations/0011_company_slug_and_more.py

@@ -0,0 +1,93 @@
+# Generated by Django 4.1.5 on 2023-01-09 11:22
+
+from django.db import migrations, models
+
+
+from ram.utils import slugify
+
+
+def create_slug(apps, schema_editor):
+    fields = ["Company", "Manufacturer", "RollingStockType", "Scale"]
+
+    for m in fields:
+        model = apps.get_model("metadata", m)
+
+        for row in model.objects.all():
+            if hasattr(row, "type"):
+                row.slug = slugify("{} {}".format(row.type, row.category))
+            elif hasattr(row, "scale"):
+                row.slug = slugify(row.scale)
+            else:
+                row.slug = slugify(row.name)
+
+            row.save(update_fields=["slug"])
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("metadata", "0010_alter_manufacturer_category"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="company",
+            name="slug",
+            field=models.CharField(
+                editable=False, max_length=64, blank=True
+            ),
+        ),
+        migrations.AddField(
+            model_name="manufacturer",
+            name="slug",
+            field=models.CharField(
+                editable=False, max_length=128, blank=True
+            ),
+        ),
+        migrations.AddField(
+            model_name="rollingstocktype",
+            name="slug",
+            field=models.CharField(
+                editable=False, max_length=128, blank=True
+            ),
+        ),
+        migrations.AddField(
+            model_name="scale",
+            name="slug",
+            field=models.CharField(
+                editable=False, max_length=32, blank=True
+            ),
+        ),
+        migrations.RunPython(
+            create_slug,
+            reverse_code=migrations.RunPython.noop
+        ),
+        migrations.AlterField(
+            model_name="company",
+            name="slug",
+            field=models.CharField(
+                editable=False, max_length=64, unique=True
+            ),
+        ),
+        migrations.AlterField(
+            model_name="manufacturer",
+            name="slug",
+            field=models.CharField(
+                editable=False, max_length=128, unique=True
+            ),
+        ),
+        migrations.AlterField(
+            model_name="rollingstocktype",
+            name="slug",
+            field=models.CharField(
+                editable=False, max_length=128, unique=True
+            ),
+        ),
+        migrations.AlterField(
+            model_name="scale",
+            name="slug",
+            field=models.CharField(
+                editable=False, max_length=32, unique=True
+            ),
+        ),
+    ]

ram/metadata/migrations/0012_alter_decoder_manufacturer_decoderdocument.py

@@ -0,0 +1,59 @@
+# Generated by Django 4.2 on 2023-09-30 21:54
+
+from django.db import migrations, models
+import django.db.models.deletion
+import ram.utils
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("metadata", "0011_company_slug_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="decoder",
+            name="manufacturer",
+            field=models.ForeignKey(
+                limit_choices_to={"category": "accessory"},
+                on_delete=django.db.models.deletion.CASCADE,
+                to="metadata.manufacturer",
+            ),
+        ),
+        migrations.CreateModel(
+            name="DecoderDocument",
+            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(
+                        blank=True,
+                        null=True,
+                        storage=ram.utils.DeduplicatedStorage(),
+                        upload_to="files/",
+                    ),
+                ),
+                (
+                    "decoder",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="document",
+                        to="metadata.decoder",
+                    ),
+                ),
+            ],
+            options={
+                "unique_together": {("decoder", "file")},
+            },
+        ),
+    ]

ram/metadata/migrations/0013_decoderdocument_private.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.5 on 2023-10-06 19:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("metadata", "0012_alter_decoder_manufacturer_decoderdocument"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="decoderdocument",
+            name="private",
+            field=models.BooleanField(default=False),
+        ),
+    ]

ram/metadata/migrations/0014_alter_decoder_options_alter_tag_options.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.6 on 2023-10-10 12:44
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("metadata", "0013_decoderdocument_private"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="decoder",
+            options={"ordering": ["manufacturer", "name"]},
+        ),
+        migrations.AlterModelOptions(
+            name="tag",
+            options={"ordering": ["name"]},
+        ),
+    ]

ram/metadata/migrations/0015_alter_company_logo_alter_decoder_image_and_more.py

@@ -0,0 +1,80 @@
+# Generated by Django 4.2.6 on 2023-10-30 13:16
+
+import os
+import sys
+import shutil
+import ram.utils
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+def move_images(apps, schema_editor):
+    fields = {
+        "Company": ["companies", "logo"],
+        "Decoder": ["decoders", "image"],
+        "Manufacturer": ["manufacturers", "logo"],
+    }
+    sys.stdout.write("\n  Processing files. Please await...")
+    for m in fields.items():
+        model = apps.get_model("metadata", m[0])
+        for r in model.objects.all():
+            field = getattr(r, m[1][1])
+            if not field:  # exit the loop if there's no image
+                continue
+            fname = os.path.basename(field.path)
+            new_image = os.path.join("images", m[1][0], fname)
+            new_path = os.path.join(settings.MEDIA_ROOT, new_image)
+            os.makedirs(os.path.dirname(new_path), exist_ok=True)
+            try:
+                shutil.move(field.path, new_path)
+            except FileNotFoundError:
+                sys.stderr.write(
+                    "  !! FileNotFoundError: {}\n".format(new_image)
+                )
+                pass
+            field.name = new_image
+            r.save()
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("metadata", "0014_alter_decoder_options_alter_tag_options"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="company",
+            name="logo",
+            field=models.ImageField(
+                blank=True,
+                null=True,
+                storage=ram.utils.DeduplicatedStorage,
+                upload_to="images/companies",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="decoder",
+            name="image",
+            field=models.ImageField(
+                blank=True,
+                null=True,
+                storage=ram.utils.DeduplicatedStorage,
+                upload_to="images/decoders",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="manufacturer",
+            name="logo",
+            field=models.ImageField(
+                blank=True,
+                null=True,
+                storage=ram.utils.DeduplicatedStorage,
+                upload_to="images/manufacturers",
+            ),
+        ),
+        migrations.RunPython(
+            move_images,
+            reverse_code=migrations.RunPython.noop
+        ),
+    ]

ram/metadata/migrations/0016_alter_decoderdocument_file.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.6 on 2023-11-04 22:53
+
+from django.db import migrations, models
+import ram.utils
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("metadata", "0015_alter_company_logo_alter_decoder_image_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="decoderdocument",
+            name="file",
+            field=models.FileField(
+                storage=ram.utils.DeduplicatedStorage(), upload_to="files/"
+            ),
+        ),
+    ]

ram/metadata/migrations/0017_alter_property_private.py

@@ -0,0 +1,20 @@
+# 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

@@ -0,0 +1,69 @@
+# 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

@@ -0,0 +1,22 @@
+# 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

@@ -0,0 +1,33 @@
+# 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

@@ -0,0 +1,40 @@
+# 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

@@ -0,0 +1,66 @@
+# 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

@@ -0,0 +1,40 @@
+# 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

@@ -0,0 +1,24 @@
+# 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

@@ -0,0 +1,28 @@
+# 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/models.py

@@ -1,14 +1,21 @@
+import os
 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.utils import DeduplicatedStorage, get_image_preview, slugify
+from ram.managers import PublicManager
 
 
 class Property(models.Model):
     name = models.CharField(max_length=128, unique=True)
-    private = models.BooleanField(default=False)
+    private = models.BooleanField(
+        default=False,
+        help_text="Property will be only visible to logged users",
+    )
 
     class Meta:
         verbose_name_plural = "Properties"
@@ -17,23 +24,39 @@ class Property(models.Model):
     def __str__(self):
         return self.name
 
+    objects = PublicManager()
+
 
 class Manufacturer(models.Model):
     name = models.CharField(max_length=128, unique=True)
+    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="images/", storage=DeduplicatedStorage, null=True, blank=True
+        upload_to=os.path.join("images", "manufacturers"),
+        storage=DeduplicatedStorage,
+        null=True,
+        blank=True,
     )
 
     class Meta:
-        ordering = ["category", "name"]
+        ordering = ["category", "slug"]
 
     def __str__(self):
         return self.name
 
+    def get_absolute_url(self):
+        return reverse(
+            "filtered",
+            kwargs={
+                "_filter": "manufacturer",
+                "search": self.slug,
+            },
+        )
+
     def logo_thumbnail(self):
         return get_image_preview(self.logo.url)
 
@@ -42,20 +65,36 @@ class Manufacturer(models.Model):
 
 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)
     country = CountryField()
     freelance = models.BooleanField(default=False)
     logo = models.ImageField(
-        upload_to="images/", storage=DeduplicatedStorage, null=True, blank=True
+        upload_to=os.path.join("images", "companies"),
+        storage=DeduplicatedStorage,
+        null=True,
+        blank=True,
     )
 
     class Meta:
         verbose_name_plural = "Companies"
-        ordering = ["name"]
+        ordering = ["slug"]
 
     def __str__(self):
         return self.name
 
+    def get_absolute_url(self):
+        return reverse(
+            "filtered",
+            kwargs={
+                "_filter": "company",
+                "search": self.slug,
+            },
+        )
+
+    def extended_name_pp(self):
+        return "({})".format(self.extended_name) if self.extended_name else ""
+
     def logo_thumbnail(self):
         return get_image_preview(self.logo.url)
 
@@ -67,14 +106,20 @@ class Decoder(models.Model):
     manufacturer = models.ForeignKey(
         Manufacturer,
         on_delete=models.CASCADE,
-        limit_choices_to={"category": "model"},
+        limit_choices_to={"category": "accessory"},
     )
     version = models.CharField(max_length=64, blank=True)
     sound = models.BooleanField(default=False)
     image = models.ImageField(
-        upload_to="images/", storage=DeduplicatedStorage, null=True, blank=True
+        upload_to=os.path.join("images", "decoders"),
+        storage=DeduplicatedStorage,
+        null=True,
+        blank=True,
     )
 
+    class Meta:
+        ordering = ["manufacturer__name", "name"]
+
     def __str__(self):
         return "{0} - {1}".format(self.manufacturer, self.name)
 
@@ -84,30 +129,47 @@ class Decoder(models.Model):
     image_thumbnail.short_description = "Preview"
 
 
+def calculate_ratio(ratio):
+    try:
+        num, den = ratio.split(":")
+        return int(num) / float(den) * 10000
+    except (ValueError, ZeroDivisionError):
+        raise ValidationError("Invalid ratio format")
+
+
 class Scale(models.Model):
     scale = models.CharField(max_length=32, unique=True)
-    ratio = models.CharField(max_length=16, blank=True)
-    gauge = models.CharField(max_length=16, blank=True)
-    tracks = models.CharField(max_length=16, blank=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 = ["scale"]
+        ordering = ["-ratio_int", "-tracks", "scale"]
+
+    def get_absolute_url(self):
+        return reverse(
+            "filtered",
+            kwargs={
+                "_filter": "scale",
+                "search": self.slug,
+            },
+        )
 
     def __str__(self):
         return str(self.scale)
 
 
-class Tag(models.Model):
-    name = models.CharField(max_length=128, unique=True)
-    slug = models.CharField(max_length=128, unique=True)
-
-    def __str__(self):
-        return self.name
-
-
-@receiver(models.signals.pre_save, sender=Tag)
-def tag_pre_save(sender, instance, **kwargs):
-    instance.slug = slugify(instance.name)
+@receiver(models.signals.pre_save, sender=Scale)
+def scale_save(sender, instance, **kwargs):
+    instance.ratio_int = calculate_ratio(instance.ratio)
 
 
 class RollingStockType(models.Model):
@@ -116,10 +178,68 @@ class RollingStockType(models.Model):
     category = models.CharField(
         max_length=64, choices=settings.ROLLING_STOCK_TYPES
     )
+    slug = models.CharField(max_length=128, unique=True, editable=False)
 
-    class Meta(object):
-        unique_together = ("category", "type")
+    class Meta:
+        constraints = [
+            models.UniqueConstraint(
+                fields=["category", "type"],
+                name="unique_category_type"
+            )
+        ]
         ordering = ["order"]
 
+    def get_absolute_url(self):
+        return reverse(
+            "filtered",
+            kwargs={
+                "_filter": "type",
+                "search": self.slug,
+            },
+        )
+
     def __str__(self):
         return "{0} {1}".format(self.type, self.category)
+
+
+class Tag(models.Model):
+    name = models.CharField(max_length=128, unique=True)
+    slug = models.CharField(max_length=128, unique=True)
+
+    class Meta:
+        ordering = ["slug"]
+
+    def __str__(self):
+        return self.name
+
+    def get_absolute_url(self):
+        return reverse(
+            "filtered",
+            kwargs={
+                "_filter": "tag",
+                "search": self.slug,
+            },
+        )
+
+
+class Shop(models.Model):
+    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)
+@receiver(models.signals.pre_save, sender=RollingStockType)
+@receiver(models.signals.pre_save, sender=Tag)
+def slug_pre_save(sender, instance, **kwargs):
+    instance.slug = slugify(instance.__str__())

ram/portal/admin.py

@@ -1,10 +1,15 @@
+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")
     fieldsets = (
         (
             None,
@@ -15,8 +20,10 @@ class SiteConfigurationAdmin(SingletonModelAdmin):
                     "about",
                     "items_per_page",
                     "items_ordering",
+                    "currency",
                     "footer",
                     "footer_extended",
+                    "disclaimer",
                 )
             },
         ),
@@ -28,11 +35,30 @@ class SiteConfigurationAdmin(SingletonModelAdmin):
                     "show_version",
                     "use_cdn",
                     "extra_head",
+                    "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):
@@ -64,3 +90,4 @@ class FlatpageAdmin(admin.ModelAdmin):
             },
         ),
     )
+    actions = [publish, unpublish]

ram/portal/context_processors.py

@@ -0,0 +1,5 @@
+from django.conf import settings
+
+
+def default_card_image(request):
+    return {"DEFAULT_CARD_IMAGE": settings.DEFAULT_CARD_IMAGE}

ram/portal/migrations/0011_alter_flatpage_content_alter_siteconfiguration_about_and_more.py

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

ram/portal/migrations/0016_remove_siteconfiguration_site_name.py

@@ -0,0 +1,16 @@
+# Generated by Django 5.0.1 on 2024-01-20 21:02
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("portal", "0015_siteconfiguration_use_cdn"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="siteconfiguration",
+            name="site_name",
+        ),
+    ]

ram/portal/migrations/0017_alter_flatpage_content_alter_siteconfiguration_about_and_more.py

@@ -0,0 +1,34 @@
+# Generated by Django 5.0.2 on 2024-02-17 12:19
+
+import tinymce.models
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("portal", "0016_remove_siteconfiguration_site_name"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="flatpage",
+            name="content",
+            field=tinymce.models.HTMLField(),
+        ),
+        migrations.AlterField(
+            model_name="siteconfiguration",
+            name="about",
+            field=tinymce.models.HTMLField(blank=True),
+        ),
+        migrations.AlterField(
+            model_name="siteconfiguration",
+            name="footer",
+            field=tinymce.models.HTMLField(blank=True),
+        ),
+        migrations.AlterField(
+            model_name="siteconfiguration",
+            name="footer_extended",
+            field=tinymce.models.HTMLField(blank=True),
+        ),
+    ]

ram/portal/migrations/0018_siteconfiguration_currency.py

@@ -0,0 +1,21 @@
+# 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

@@ -0,0 +1,19 @@
+# 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

@@ -0,0 +1,17 @@
+# 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/models.py

@@ -1,23 +1,21 @@
 import django
 from django.db import models
+from django.conf import settings
 from django.urls import reverse
 from django.dispatch.dispatcher import receiver
 from django.utils.safestring import mark_safe
 from solo.models import SingletonModel
 
-from ckeditor.fields import RichTextField
-from ckeditor_uploader.fields import RichTextUploadingField
+from tinymce import models as tinymce
 
 from ram import __version__ as app_version
+from ram.managers import PublicManager
 from ram.utils import slugify
 
 
 class SiteConfiguration(SingletonModel):
-    site_name = models.CharField(
-        max_length=256, default="Railroad Assets Manager"
-    )
     site_author = models.CharField(max_length=256, blank=True)
-    about = RichTextField(blank=True)
+    about = tinymce.HTMLField(blank=True)
     items_per_page = models.CharField(
         max_length=2,
         choices=[(str(x * 3), str(x * 3)) for x in range(2, 11)],
@@ -32,8 +30,10 @@ class SiteConfiguration(SingletonModel):
         ],
         default="type",
     )
-    footer = RichTextField(blank=True)
-    footer_extended = RichTextField(blank=True)
+    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_head = models.TextField(blank=True)
@@ -44,9 +44,14 @@ class SiteConfiguration(SingletonModel):
     def __str__(self):
         return "Site Configuration"
 
+    def site_name(self):
+        return settings.SITE_NAME
+
+    @property
     def version(self):
         return app_version
 
+    @property
     def django_version(self):
         return django.get_version()
 
@@ -55,10 +60,14 @@ class Flatpage(models.Model):
     name = models.CharField(max_length=256, unique=True)
     path = models.CharField(max_length=256, unique=True)
     published = models.BooleanField(default=False)
-    content = RichTextUploadingField()
+    content = tinymce.HTMLField()
     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
 
@@ -66,12 +75,13 @@ class Flatpage(models.Model):
         return reverse("flatpage", kwargs={"flatpage": self.path})
 
     def get_link(self):
-        if self.published:
-            return mark_safe(
-                '<a href="{0}" target="_blank">Link</a>'.format(
-                    self.get_absolute_url()
-                )
+        return mark_safe(
+            '<a href="{0}" target="_blank">Link</a>'.format(
+                self.get_absolute_url()
             )
+        )
+
+    objects = PublicManager()
 
 
 @receiver(models.signals.pre_save, sender=Flatpage)

ram/portal/static/bootstrap-icons@1.13.1/font/bootstrap-icons.css

@@ -1,8 +1,14 @@
+/*!
+ * Bootstrap Icons v1.13.1 (https://icons.getbootstrap.com/)
+ * Copyright 2019-2024 The Bootstrap Authors
+ * Licensed under MIT (https://github.com/twbs/icons/blob/main/LICENSE)
+ */
+
 @font-face {
   font-display: block;
   font-family: "bootstrap-icons";
-  src: url("./fonts/bootstrap-icons.woff2?24e3eb84d0bcaf83d77f904c78ac1f47") format("woff2"),
-url("./fonts/bootstrap-icons.woff?24e3eb84d0bcaf83d77f904c78ac1f47") format("woff");
+  src: url("./fonts/bootstrap-icons.woff2?e34853135f9e39acf64315236852cd5a") format("woff2"),
+url("./fonts/bootstrap-icons.woff?e34853135f9e39acf64315236852cd5a") format("woff");
 }
 
 .bi::before,
@@ -441,7 +447,6 @@ url("./fonts/bootstrap-icons.woff?24e3eb84d0bcaf83d77f904c78ac1f47") format("wof
 .bi-cloud-fog2::before { content: "\f2a2"; }
 .bi-cloud-hail-fill::before { content: "\f2a3"; }
 .bi-cloud-hail::before { content: "\f2a4"; }
-.bi-cloud-haze-1::before { content: "\f2a5"; }
 .bi-cloud-haze-fill::before { content: "\f2a6"; }
 .bi-cloud-haze::before { content: "\f2a7"; }
 .bi-cloud-haze2-fill::before { content: "\f2a8"; }
@@ -1437,21 +1442,16 @@ url("./fonts/bootstrap-icons.woff?24e3eb84d0bcaf83d77f904c78ac1f47") format("wof
 .bi-dpad::before { content: "\f687"; }
 .bi-ear-fill::before { content: "\f688"; }
 .bi-ear::before { content: "\f689"; }
-.bi-envelope-check-1::before { content: "\f68a"; }
 .bi-envelope-check-fill::before { content: "\f68b"; }
 .bi-envelope-check::before { content: "\f68c"; }
-.bi-envelope-dash-1::before { content: "\f68d"; }
 .bi-envelope-dash-fill::before { content: "\f68e"; }
 .bi-envelope-dash::before { content: "\f68f"; }
-.bi-envelope-exclamation-1::before { content: "\f690"; }
 .bi-envelope-exclamation-fill::before { content: "\f691"; }
 .bi-envelope-exclamation::before { content: "\f692"; }
 .bi-envelope-plus-fill::before { content: "\f693"; }
 .bi-envelope-plus::before { content: "\f694"; }
-.bi-envelope-slash-1::before { content: "\f695"; }
 .bi-envelope-slash-fill::before { content: "\f696"; }
 .bi-envelope-slash::before { content: "\f697"; }
-.bi-envelope-x-1::before { content: "\f698"; }
 .bi-envelope-x-fill::before { content: "\f699"; }
 .bi-envelope-x::before { content: "\f69a"; }
 .bi-explicit-fill::before { content: "\f69b"; }
@@ -1461,8 +1461,6 @@ url("./fonts/bootstrap-icons.woff?24e3eb84d0bcaf83d77f904c78ac1f47") format("wof
 .bi-list-columns-reverse::before { content: "\f69f"; }
 .bi-list-columns::before { content: "\f6a0"; }
 .bi-meta::before { content: "\f6a1"; }
-.bi-mortorboard-fill::before { content: "\f6a2"; }
-.bi-mortorboard::before { content: "\f6a3"; }
 .bi-nintendo-switch::before { content: "\f6a4"; }
 .bi-pc-display-horizontal::before { content: "\f6a5"; }
 .bi-pc-display::before { content: "\f6a6"; }
@@ -1481,7 +1479,6 @@ url("./fonts/bootstrap-icons.woff?24e3eb84d0bcaf83d77f904c78ac1f47") format("wof
 .bi-send-check::before { content: "\f6b3"; }
 .bi-send-dash-fill::before { content: "\f6b4"; }
 .bi-send-dash::before { content: "\f6b5"; }
-.bi-send-exclamation-1::before { content: "\f6b6"; }
 .bi-send-exclamation-fill::before { content: "\f6b7"; }
 .bi-send-exclamation::before { content: "\f6b8"; }
 .bi-send-fill::before { content: "\f6b9"; }
@@ -1493,7 +1490,6 @@ url("./fonts/bootstrap-icons.woff?24e3eb84d0bcaf83d77f904c78ac1f47") format("wof
 .bi-send-x::before { content: "\f6bf"; }
 .bi-send::before { content: "\f6c0"; }
 .bi-steam::before { content: "\f6c1"; }
-.bi-terminal-dash-1::before { content: "\f6c2"; }
 .bi-terminal-dash::before { content: "\f6c3"; }
 .bi-terminal-plus::before { content: "\f6c4"; }
 .bi-terminal-split::before { content: "\f6c5"; }
@@ -1523,7 +1519,6 @@ url("./fonts/bootstrap-icons.woff?24e3eb84d0bcaf83d77f904c78ac1f47") format("wof
 .bi-usb-symbol::before { content: "\f6dd"; }
 .bi-usb::before { content: "\f6de"; }
 .bi-boombox-fill::before { content: "\f6df"; }
-.bi-displayport-1::before { content: "\f6e0"; }
 .bi-displayport::before { content: "\f6e1"; }
 .bi-gpu-card::before { content: "\f6e2"; }
 .bi-memory::before { content: "\f6e3"; }
@@ -1536,8 +1531,6 @@ url("./fonts/bootstrap-icons.woff?24e3eb84d0bcaf83d77f904c78ac1f47") format("wof
 .bi-pci-card::before { content: "\f6ea"; }
 .bi-router-fill::before { content: "\f6eb"; }
 .bi-router::before { content: "\f6ec"; }
-.bi-ssd-fill::before { content: "\f6ed"; }
-.bi-ssd::before { content: "\f6ee"; }
 .bi-thunderbolt-fill::before { content: "\f6ef"; }
 .bi-thunderbolt::before { content: "\f6f0"; }
 .bi-usb-drive-fill::before { content: "\f6f1"; }
@@ -1644,7 +1637,6 @@ url("./fonts/bootstrap-icons.woff?24e3eb84d0bcaf83d77f904c78ac1f47") format("wof
 .bi-filetype-pdf::before { content: "\f756"; }
 .bi-filetype-php::before { content: "\f757"; }
 .bi-filetype-png::before { content: "\f758"; }
-.bi-filetype-ppt-1::before { content: "\f759"; }
 .bi-filetype-ppt::before { content: "\f75a"; }
 .bi-filetype-psd::before { content: "\f75b"; }
 .bi-filetype-py::before { content: "\f75c"; }
@@ -1660,7 +1652,6 @@ url("./fonts/bootstrap-icons.woff?24e3eb84d0bcaf83d77f904c78ac1f47") format("wof
 .bi-filetype-txt::before { content: "\f766"; }
 .bi-filetype-wav::before { content: "\f767"; }
 .bi-filetype-woff::before { content: "\f768"; }
-.bi-filetype-xls-1::before { content: "\f769"; }
 .bi-filetype-xls::before { content: "\f76a"; }
 .bi-filetype-xml::before { content: "\f76b"; }
 .bi-filetype-yml::before { content: "\f76c"; }
@@ -1703,56 +1694,38 @@ url("./fonts/bootstrap-icons.woff?24e3eb84d0bcaf83d77f904c78ac1f47") format("wof
 .bi-filetype-json::before { content: "\f791"; }
 .bi-filetype-pptx::before { content: "\f792"; }
 .bi-filetype-xlsx::before { content: "\f793"; }
-.bi-1-circle-1::before { content: "\f794"; }
-.bi-1-circle-fill-1::before { content: "\f795"; }
 .bi-1-circle-fill::before { content: "\f796"; }
 .bi-1-circle::before { content: "\f797"; }
 .bi-1-square-fill::before { content: "\f798"; }
 .bi-1-square::before { content: "\f799"; }
-.bi-2-circle-1::before { content: "\f79a"; }
-.bi-2-circle-fill-1::before { content: "\f79b"; }
 .bi-2-circle-fill::before { content: "\f79c"; }
 .bi-2-circle::before { content: "\f79d"; }
 .bi-2-square-fill::before { content: "\f79e"; }
 .bi-2-square::before { content: "\f79f"; }
-.bi-3-circle-1::before { content: "\f7a0"; }
-.bi-3-circle-fill-1::before { content: "\f7a1"; }
 .bi-3-circle-fill::before { content: "\f7a2"; }
 .bi-3-circle::before { content: "\f7a3"; }
 .bi-3-square-fill::before { content: "\f7a4"; }
 .bi-3-square::before { content: "\f7a5"; }
-.bi-4-circle-1::before { content: "\f7a6"; }
-.bi-4-circle-fill-1::before { content: "\f7a7"; }
 .bi-4-circle-fill::before { content: "\f7a8"; }
 .bi-4-circle::before { content: "\f7a9"; }
 .bi-4-square-fill::before { content: "\f7aa"; }
 .bi-4-square::before { content: "\f7ab"; }
-.bi-5-circle-1::before { content: "\f7ac"; }
-.bi-5-circle-fill-1::before { content: "\f7ad"; }
 .bi-5-circle-fill::before { content: "\f7ae"; }
 .bi-5-circle::before { content: "\f7af"; }
 .bi-5-square-fill::before { content: "\f7b0"; }
 .bi-5-square::before { content: "\f7b1"; }
-.bi-6-circle-1::before { content: "\f7b2"; }
-.bi-6-circle-fill-1::before { content: "\f7b3"; }
 .bi-6-circle-fill::before { content: "\f7b4"; }
 .bi-6-circle::before { content: "\f7b5"; }
 .bi-6-square-fill::before { content: "\f7b6"; }
 .bi-6-square::before { content: "\f7b7"; }
-.bi-7-circle-1::before { content: "\f7b8"; }
-.bi-7-circle-fill-1::before { content: "\f7b9"; }
 .bi-7-circle-fill::before { content: "\f7ba"; }
 .bi-7-circle::before { content: "\f7bb"; }
 .bi-7-square-fill::before { content: "\f7bc"; }
 .bi-7-square::before { content: "\f7bd"; }
-.bi-8-circle-1::before { content: "\f7be"; }
-.bi-8-circle-fill-1::before { content: "\f7bf"; }
 .bi-8-circle-fill::before { content: "\f7c0"; }
 .bi-8-circle::before { content: "\f7c1"; }
 .bi-8-square-fill::before { content: "\f7c2"; }
 .bi-8-square::before { content: "\f7c3"; }
-.bi-9-circle-1::before { content: "\f7c4"; }
-.bi-9-circle-fill-1::before { content: "\f7c5"; }
 .bi-9-circle-fill::before { content: "\f7c6"; }
 .bi-9-circle::before { content: "\f7c7"; }
 .bi-9-square-fill::before { content: "\f7c8"; }
@@ -1771,8 +1744,6 @@ url("./fonts/bootstrap-icons.woff?24e3eb84d0bcaf83d77f904c78ac1f47") format("wof
 .bi-browser-edge::before { content: "\f7d5"; }
 .bi-browser-firefox::before { content: "\f7d6"; }
 .bi-browser-safari::before { content: "\f7d7"; }
-.bi-c-circle-1::before { content: "\f7d8"; }
-.bi-c-circle-fill-1::before { content: "\f7d9"; }
 .bi-c-circle-fill::before { content: "\f7da"; }
 .bi-c-circle::before { content: "\f7db"; }
 .bi-c-square-fill::before { content: "\f7dc"; }
@@ -1783,8 +1754,6 @@ url("./fonts/bootstrap-icons.woff?24e3eb84d0bcaf83d77f904c78ac1f47") format("wof
 .bi-car-front::before { content: "\f7e1"; }
 .bi-cassette-fill::before { content: "\f7e2"; }
 .bi-cassette::before { content: "\f7e3"; }
-.bi-cc-circle-1::before { content: "\f7e4"; }
-.bi-cc-circle-fill-1::before { content: "\f7e5"; }
 .bi-cc-circle-fill::before { content: "\f7e6"; }
 .bi-cc-circle::before { content: "\f7e7"; }
 .bi-cc-square-fill::before { content: "\f7e8"; }
@@ -1803,8 +1772,6 @@ url("./fonts/bootstrap-icons.woff?24e3eb84d0bcaf83d77f904c78ac1f47") format("wof
 .bi-filetype-sql::before { content: "\f7f5"; }
 .bi-fire::before { content: "\f7f6"; }
 .bi-google-play::before { content: "\f7f7"; }
-.bi-h-circle-1::before { content: "\f7f8"; }
-.bi-h-circle-fill-1::before { content: "\f7f9"; }
 .bi-h-circle-fill::before { content: "\f7fa"; }
 .bi-h-circle::before { content: "\f7fb"; }
 .bi-h-square-fill::before { content: "\f7fc"; }
@@ -1813,8 +1780,6 @@ url("./fonts/bootstrap-icons.woff?24e3eb84d0bcaf83d77f904c78ac1f47") format("wof
 .bi-lungs-fill::before { content: "\f7ff"; }
 .bi-lungs::before { content: "\f800"; }
 .bi-microsoft-teams::before { content: "\f801"; }
-.bi-p-circle-1::before { content: "\f802"; }
-.bi-p-circle-fill-1::before { content: "\f803"; }
 .bi-p-circle-fill::before { content: "\f804"; }
 .bi-p-circle::before { content: "\f805"; }
 .bi-p-square-fill::before { content: "\f806"; }
@@ -1823,8 +1788,6 @@ url("./fonts/bootstrap-icons.woff?24e3eb84d0bcaf83d77f904c78ac1f47") format("wof
 .bi-pass::before { content: "\f809"; }
 .bi-prescription::before { content: "\f80a"; }
 .bi-prescription2::before { content: "\f80b"; }
-.bi-r-circle-1::before { content: "\f80c"; }
-.bi-r-circle-fill-1::before { content: "\f80d"; }
 .bi-r-circle-fill::before { content: "\f80e"; }
 .bi-r-circle::before { content: "\f80f"; }
 .bi-r-square-fill::before { content: "\f810"; }
@@ -2016,3 +1979,128 @@ url("./fonts/bootstrap-icons.woff?24e3eb84d0bcaf83d77f904c78ac1f47") format("wof
 .bi-sina-weibo::before { content: "\f8ca"; }
 .bi-tencent-qq::before { content: "\f8cb"; }
 .bi-wikipedia::before { content: "\f8cc"; }
+.bi-alphabet-uppercase::before { content: "\f2a5"; }
+.bi-alphabet::before { content: "\f68a"; }
+.bi-amazon::before { content: "\f68d"; }
+.bi-arrows-collapse-vertical::before { content: "\f690"; }
+.bi-arrows-expand-vertical::before { content: "\f695"; }
+.bi-arrows-vertical::before { content: "\f698"; }
+.bi-arrows::before { content: "\f6a2"; }
+.bi-ban-fill::before { content: "\f6a3"; }
+.bi-ban::before { content: "\f6b6"; }
+.bi-bing::before { content: "\f6c2"; }
+.bi-cake::before { content: "\f6e0"; }
+.bi-cake2::before { content: "\f6ed"; }
+.bi-cookie::before { content: "\f6ee"; }
+.bi-copy::before { content: "\f759"; }
+.bi-crosshair::before { content: "\f769"; }
+.bi-crosshair2::before { content: "\f794"; }
+.bi-emoji-astonished-fill::before { content: "\f795"; }
+.bi-emoji-astonished::before { content: "\f79a"; }
+.bi-emoji-grimace-fill::before { content: "\f79b"; }
+.bi-emoji-grimace::before { content: "\f7a0"; }
+.bi-emoji-grin-fill::before { content: "\f7a1"; }
+.bi-emoji-grin::before { content: "\f7a6"; }
+.bi-emoji-surprise-fill::before { content: "\f7a7"; }
+.bi-emoji-surprise::before { content: "\f7ac"; }
+.bi-emoji-tear-fill::before { content: "\f7ad"; }
+.bi-emoji-tear::before { content: "\f7b2"; }
+.bi-envelope-arrow-down-fill::before { content: "\f7b3"; }
+.bi-envelope-arrow-down::before { content: "\f7b8"; }
+.bi-envelope-arrow-up-fill::before { content: "\f7b9"; }
+.bi-envelope-arrow-up::before { content: "\f7be"; }
+.bi-feather::before { content: "\f7bf"; }
+.bi-feather2::before { content: "\f7c4"; }
+.bi-floppy-fill::before { content: "\f7c5"; }
+.bi-floppy::before { content: "\f7d8"; }
+.bi-floppy2-fill::before { content: "\f7d9"; }
+.bi-floppy2::before { content: "\f7e4"; }
+.bi-gitlab::before { content: "\f7e5"; }
+.bi-highlighter::before { content: "\f7f8"; }
+.bi-marker-tip::before { content: "\f802"; }
+.bi-nvme-fill::before { content: "\f803"; }
+.bi-nvme::before { content: "\f80c"; }
+.bi-opencollective::before { content: "\f80d"; }
+.bi-pci-card-network::before { content: "\f8cd"; }
+.bi-pci-card-sound::before { content: "\f8ce"; }
+.bi-radar::before { content: "\f8cf"; }
+.bi-send-arrow-down-fill::before { content: "\f8d0"; }
+.bi-send-arrow-down::before { content: "\f8d1"; }
+.bi-send-arrow-up-fill::before { content: "\f8d2"; }
+.bi-send-arrow-up::before { content: "\f8d3"; }
+.bi-sim-slash-fill::before { content: "\f8d4"; }
+.bi-sim-slash::before { content: "\f8d5"; }
+.bi-sourceforge::before { content: "\f8d6"; }
+.bi-substack::before { content: "\f8d7"; }
+.bi-threads-fill::before { content: "\f8d8"; }
+.bi-threads::before { content: "\f8d9"; }
+.bi-transparency::before { content: "\f8da"; }
+.bi-twitter-x::before { content: "\f8db"; }
+.bi-type-h4::before { content: "\f8dc"; }
+.bi-type-h5::before { content: "\f8dd"; }
+.bi-type-h6::before { content: "\f8de"; }
+.bi-backpack-fill::before { content: "\f8df"; }
+.bi-backpack::before { content: "\f8e0"; }
+.bi-backpack2-fill::before { content: "\f8e1"; }
+.bi-backpack2::before { content: "\f8e2"; }
+.bi-backpack3-fill::before { content: "\f8e3"; }
+.bi-backpack3::before { content: "\f8e4"; }
+.bi-backpack4-fill::before { content: "\f8e5"; }
+.bi-backpack4::before { content: "\f8e6"; }
+.bi-brilliance::before { content: "\f8e7"; }
+.bi-cake-fill::before { content: "\f8e8"; }
+.bi-cake2-fill::before { content: "\f8e9"; }
+.bi-duffle-fill::before { content: "\f8ea"; }
+.bi-duffle::before { content: "\f8eb"; }
+.bi-exposure::before { content: "\f8ec"; }
+.bi-gender-neuter::before { content: "\f8ed"; }
+.bi-highlights::before { content: "\f8ee"; }
+.bi-luggage-fill::before { content: "\f8ef"; }
+.bi-luggage::before { content: "\f8f0"; }
+.bi-mailbox-flag::before { content: "\f8f1"; }
+.bi-mailbox2-flag::before { content: "\f8f2"; }
+.bi-noise-reduction::before { content: "\f8f3"; }
+.bi-passport-fill::before { content: "\f8f4"; }
+.bi-passport::before { content: "\f8f5"; }
+.bi-person-arms-up::before { content: "\f8f6"; }
+.bi-person-raised-hand::before { content: "\f8f7"; }
+.bi-person-standing-dress::before { content: "\f8f8"; }
+.bi-person-standing::before { content: "\f8f9"; }
+.bi-person-walking::before { content: "\f8fa"; }
+.bi-person-wheelchair::before { content: "\f8fb"; }
+.bi-shadows::before { content: "\f8fc"; }
+.bi-suitcase-fill::before { content: "\f8fd"; }
+.bi-suitcase-lg-fill::before { content: "\f8fe"; }
+.bi-suitcase-lg::before { content: "\f8ff"; }
+.bi-suitcase::before { content: "\f900"; }
+.bi-suitcase2-fill::before { content: "\f901"; }
+.bi-suitcase2::before { content: "\f902"; }
+.bi-vignette::before { content: "\f903"; }
+.bi-bluesky::before { content: "\f7f9"; }
+.bi-tux::before { content: "\f904"; }
+.bi-beaker-fill::before { content: "\f905"; }
+.bi-beaker::before { content: "\f906"; }
+.bi-flask-fill::before { content: "\f907"; }
+.bi-flask-florence-fill::before { content: "\f908"; }
+.bi-flask-florence::before { content: "\f909"; }
+.bi-flask::before { content: "\f90a"; }
+.bi-leaf-fill::before { content: "\f90b"; }
+.bi-leaf::before { content: "\f90c"; }
+.bi-measuring-cup-fill::before { content: "\f90d"; }
+.bi-measuring-cup::before { content: "\f90e"; }
+.bi-unlock2-fill::before { content: "\f90f"; }
+.bi-unlock2::before { content: "\f910"; }
+.bi-battery-low::before { content: "\f911"; }
+.bi-anthropic::before { content: "\f912"; }
+.bi-apple-music::before { content: "\f913"; }
+.bi-claude::before { content: "\f914"; }
+.bi-openai::before { content: "\f915"; }
+.bi-perplexity::before { content: "\f916"; }
+.bi-css::before { content: "\f917"; }
+.bi-javascript::before { content: "\f918"; }
+.bi-typescript::before { content: "\f919"; }
+.bi-fork-knife::before { content: "\f91a"; }
+.bi-globe-americas-fill::before { content: "\f91b"; }
+.bi-globe-asia-australia-fill::before { content: "\f91c"; }
+.bi-globe-central-south-asia-fill::before { content: "\f91d"; }
+.bi-globe-europe-africa-fill::before { content: "\f91e"; }