dani/django-ram
1
0
Fork 0
mirror of https://github.com/daniviga/django-ram.git synced 2025-08-04 13:17:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Run black

Browse Source
This commit is contained in:
Daniele Viganò
2022-04-02 22:58:42 +02:00
parent 6478800f77
commit b598e38f70
27 changed files with 318 additions and 259 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
dcc/consist/admin.py
View File

@@ -8,28 +8,42 @@ class ConsistItemInline(SortableInlineAdminMixin, admin.TabularInline):
model = ConsistItem model = ConsistItem
min_num = 1 min_num = 1
extra = 0 extra = 0
readonly_fields = ('address', 'type', 'company', 'era') readonly_fields = ("address", "type", "company", "era")
@admin.register(Consist) @admin.register(Consist)
class ConsistAdmin(admin.ModelAdmin): class ConsistAdmin(admin.ModelAdmin):
inlines = (ConsistItemInline,) inlines = (ConsistItemInline,)
readonly_fields = ('creation_time', 'updated_time',) readonly_fields = (
list_display = ('identifier', 'company', 'era') "creation_time",
"updated_time",
)
list_display = ("identifier", "company", "era")
list_filter = list_display list_filter = list_display
search_fields = list_display search_fields = list_display
fieldsets = ( fieldsets = (
(None, { (
'fields': ('identifier', None,
'consist_address', {
'company', "fields": (
'era', "identifier",
'notes', "consist_address",
'tags') "company",
}), "era",
('Audit', { "notes",
'classes': ('collapse',), "tags",
'fields': ('creation_time', 'updated_time',) )
}), },
),
(
"Audit",
{
"classes": ("collapse",),
"fields": (
"creation_time",
"updated_time",
),
},
),
) )

4
dcc/consist/apps.py
View File

@@ -2,5 +2,5 @@ from django.apps import AppConfig
class ConsistConfig(AppConfig): class ConsistConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField' default_auto_field = "django.db.models.BigAutoField"
name = 'consist' name = "consist"

24
dcc/consist/models.py
View File

@@ -6,19 +6,15 @@ from roster.models import RollingStock
class Consist(models.Model): class Consist(models.Model):
uuid = models.UUIDField( uuid = models.UUIDField(primary_key=True, default=uuid4, editable=False)
primary_key=True, default=uuid4,
editable=False)
identifier = models.CharField(max_length=128, unique=False) identifier = models.CharField(max_length=128, unique=False)
tags = models.ManyToManyField( tags = models.ManyToManyField(Tag, related_name="consist", blank=True)
Tag,
related_name='consist',
blank=True)
consist_address = models.SmallIntegerField( consist_address = models.SmallIntegerField(
default=None, null=True, blank=True) default=None, null=True, blank=True
)
company = models.ForeignKey( company = models.ForeignKey(
Company, on_delete=models.CASCADE, Company, on_delete=models.CASCADE, null=True, blank=True
null=True, blank=True) )
era = models.CharField(max_length=32, blank=True) era = models.CharField(max_length=32, blank=True)
notes = models.TextField(blank=True) notes = models.TextField(blank=True)
creation_time = models.DateTimeField(auto_now_add=True) creation_time = models.DateTimeField(auto_now_add=True)
@@ -29,14 +25,12 @@ class Consist(models.Model):
class ConsistItem(models.Model): class ConsistItem(models.Model):
consist = models.ForeignKey( consist = models.ForeignKey(Consist, on_delete=models.CASCADE)
Consist, on_delete=models.CASCADE) rolling_stock = models.ForeignKey(RollingStock, on_delete=models.CASCADE)
rolling_stock = models.ForeignKey(
RollingStock, on_delete=models.CASCADE)
order = models.PositiveIntegerField(default=0, blank=False, null=False) order = models.PositiveIntegerField(default=0, blank=False, null=False)
class Meta(object): class Meta(object):
ordering = ['order'] ordering = ["order"]
def __str__(self): def __str__(self):
return "{0}".format(self.rolling_stock) return "{0}".format(self.rolling_stock)

2
dcc/dcc/asgi.py
View File

@@ -11,6 +11,6 @@ import os
from django.core.asgi import get_asgi_application from django.core.asgi import get_asgi_application
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'dcc.settings') os.environ.setdefault("DJANGO_SETTINGS_MODULE", "dcc.settings")
application = get_asgi_application() application = get_asgi_application()

2
dcc/dcc/parsers.py
View File

@@ -2,7 +2,7 @@ from rest_framework.parsers import BaseParser
class PlainTextParser(BaseParser): class PlainTextParser(BaseParser):
media_type = 'text/plain' media_type = "text/plain"
def parse(self, stream, media_type=None, parser_context=None): def parse(self, stream, media_type=None, parser_context=None):
return stream.read() return stream.read()

112
dcc/dcc/settings.py
View File

@@ -21,7 +21,9 @@ BASE_DIR = Path(__file__).resolve().parent.parent
# See https://docs.djangoproject.com/en/4.0/howto/deployment/checklist/ # See https://docs.djangoproject.com/en/4.0/howto/deployment/checklist/
# SECURITY WARNING: keep the secret key used in production secret! # SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = 'django-insecure-1fgtf05rwp0qp05@ef@a7%x#o+t6vk6063py=vhdmut0j!8s4u' SECRET_KEY = (
"django-insecure-1fgtf05rwp0qp05@ef@a7%x#o+t6vk6063py=vhdmut0j!8s4u"
)
# SECURITY WARNING: don't run with debug turned on in production! # SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True DEBUG = True
@@ -32,63 +34,63 @@ ALLOWED_HOSTS = []
# Application definition # Application definition
INSTALLED_APPS = [ INSTALLED_APPS = [
'django.contrib.admin', "django.contrib.admin",
'django.contrib.auth', "django.contrib.auth",
'django.contrib.contenttypes', "django.contrib.contenttypes",
'django.contrib.sessions', "django.contrib.sessions",
'django.contrib.messages', "django.contrib.messages",
'django.contrib.staticfiles', "django.contrib.staticfiles",
'health_check', "health_check",
'health_check.db', "health_check.db",
'django_countries', "django_countries",
'solo', "solo",
'rest_framework', "rest_framework",
'adminsortable2', "adminsortable2",
'dcc', "dcc",
'driver', "driver",
'metadata', "metadata",
'roster', "roster",
'consist', "consist",
] ]
MIDDLEWARE = [ MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware', "django.middleware.security.SecurityMiddleware",
'django.contrib.sessions.middleware.SessionMiddleware', "django.contrib.sessions.middleware.SessionMiddleware",
'django.middleware.common.CommonMiddleware', "django.middleware.common.CommonMiddleware",
# 'django.middleware.csrf.CsrfViewMiddleware', # 'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware', "django.contrib.auth.middleware.AuthenticationMiddleware",
'django.contrib.messages.middleware.MessageMiddleware', "django.contrib.messages.middleware.MessageMiddleware",
'django.middleware.clickjacking.XFrameOptionsMiddleware', "django.middleware.clickjacking.XFrameOptionsMiddleware",
] ]
ROOT_URLCONF = 'dcc.urls' ROOT_URLCONF = "dcc.urls"
TEMPLATES = [ TEMPLATES = [
{ {
'BACKEND': 'django.template.backends.django.DjangoTemplates', "BACKEND": "django.template.backends.django.DjangoTemplates",
'DIRS': [], "DIRS": [],
'APP_DIRS': True, "APP_DIRS": True,
'OPTIONS': { "OPTIONS": {
'context_processors': [ "context_processors": [
'django.template.context_processors.debug', "django.template.context_processors.debug",
'django.template.context_processors.request', "django.template.context_processors.request",
'django.contrib.auth.context_processors.auth', "django.contrib.auth.context_processors.auth",
'django.contrib.messages.context_processors.messages', "django.contrib.messages.context_processors.messages",
], ],
}, },
}, },
] ]
WSGI_APPLICATION = 'dcc.wsgi.application' WSGI_APPLICATION = "dcc.wsgi.application"
# Database # Database
# https://docs.djangoproject.com/en/4.0/ref/settings/#databases # https://docs.djangoproject.com/en/4.0/ref/settings/#databases
DATABASES = { DATABASES = {
'default': { "default": {
'ENGINE': 'django.db.backends.sqlite3', "ENGINE": "django.db.backends.sqlite3",
'NAME': BASE_DIR / 'db.sqlite3', "NAME": BASE_DIR / "db.sqlite3",
} }
} }
@@ -98,16 +100,16 @@ DATABASES = {
AUTH_PASSWORD_VALIDATORS = [ AUTH_PASSWORD_VALIDATORS = [
{ {
'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator",
}, },
{ {
'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator",
}, },
{ {
'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator",
}, },
{ {
'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator",
}, },
] ]
@@ -115,9 +117,9 @@ AUTH_PASSWORD_VALIDATORS = [
# Internationalization # Internationalization
# https://docs.djangoproject.com/en/4.0/topics/i18n/ # https://docs.djangoproject.com/en/4.0/topics/i18n/
LANGUAGE_CODE = 'en-us' LANGUAGE_CODE = "en-us"
TIME_ZONE = 'UTC' TIME_ZONE = "UTC"
USE_I18N = True USE_I18N = True
@@ -127,26 +129,26 @@ USE_TZ = True
# Static files (CSS, JavaScript, Images) # Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/4.0/howto/static-files/ # https://docs.djangoproject.com/en/4.0/howto/static-files/
STATIC_URL = 'static/' STATIC_URL = "static/"
# Default primary key field type # Default primary key field type
# https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field # https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
MEDIA_URL = 'media/' MEDIA_URL = "media/"
MEDIA_ROOT = os.path.join(BASE_DIR, 'media') MEDIA_ROOT = os.path.join(BASE_DIR, "media")
COUNTRIES_OVERRIDE = { COUNTRIES_OVERRIDE = {
'ZZ': "Freelance", "ZZ": "Freelance",
} }
DECODER_INTERFACES = [ DECODER_INTERFACES = [
(1, "NEM651"), (1, "NEM651"),
(2, "NEM652"), (2, "NEM652"),
(3, "PluX"), (3, "PluX"),
(4, "21MTC"), (4, "21MTC"),
(5, "Next18/Next18S") (5, "Next18/Next18S"),
] ]
ROLLING_STOCK_TYPES = [ ROLLING_STOCK_TYPES = [
@@ -154,5 +156,5 @@ ROLLING_STOCK_TYPES = [
("car", "Car"), ("car", "Car"),
("railcar", "Railcar"), ("railcar", "Railcar"),
("equipment", "Equipment"), ("equipment", "Equipment"),
("other", "Other") ("other", "Other"),
] ]

8
dcc/dcc/urls.py
View File

@@ -24,10 +24,10 @@ from driver import urls as driver_urls
admin.site.site_header = "Trains assets manager" admin.site.site_header = "Trains assets manager"
urlpatterns = [ urlpatterns = [
path('ht/', include('health_check.urls')), path("ht/", include("health_check.urls")),
path('admin/', admin.site.urls), path("admin/", admin.site.urls),
path('api/v1/roster/', include(roster_urls)), path("api/v1/roster/", include(roster_urls)),
path('api/v1/dcc/', include(driver_urls)), path("api/v1/dcc/", include(driver_urls)),
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
# if settings.DEBUG: # if settings.DEBUG:

7
dcc/dcc/utils.py
View File

@@ -5,12 +5,13 @@ from django.utils.text import slugify as django_slugify
def get_image_preview(url): def get_image_preview(url):
return format_html( return format_html(
'<img src="%s" style="max-width: 150px; max-height: 150px;' '<img src="%s" style="max-width: 150px; max-height: 150px;'
'background-color: #eee;" />' % url) 'background-color: #eee;" />' % url
)
def slugify(string, custom_separator=None): def slugify(string, custom_separator=None):
# Make slug 'flat', both '-' and '_' are replaced with '-' # Make slug 'flat', both '-' and '_' are replaced with '-'
string = django_slugify(string).replace('_', '-') string = django_slugify(string).replace("_", "-")
if custom_separator is not None: if custom_separator is not None:
string = string.replace('-', custom_separator) string = string.replace("-", custom_separator)
return string return string

2
dcc/dcc/wsgi.py
View File

@@ -11,6 +11,6 @@ import os
from django.core.wsgi import get_wsgi_application from django.core.wsgi import get_wsgi_application
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'dcc.settings') os.environ.setdefault("DJANGO_SETTINGS_MODULE", "dcc.settings")
application = get_wsgi_application() application = get_wsgi_application()

5
dcc/driver/apps.py
View File

@@ -3,9 +3,10 @@ from health_check.plugins import plugin_dir
class DriverConfig(AppConfig): class DriverConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField' default_auto_field = "django.db.models.BigAutoField"
name = 'driver' name = "driver"
def ready(self): def ready(self):
from driver.health import DriverHealthCheck from driver.health import DriverHealthCheck
plugin_dir.register(DriverHealthCheck) plugin_dir.register(DriverHealthCheck)

14
dcc/driver/connector.py
View File

@@ -8,7 +8,7 @@ class Connector:
self.config = DriverConfiguration.get_solo() self.config = DriverConfiguration.get_solo()
def __send_data(self, message): def __send_data(self, message):
resp = b'' resp = b""
# convert to binary if str is received # convert to binary if str is received
if isinstance(message, str): if isinstance(message, str):
message = message.encode() message = message.encode()
@@ -30,10 +30,12 @@ class Connector:
def ops(self, address, data, function=False): def ops(self, address, data, function=False):
if function: if function:
message = "<F {0} {1} {2}>".format( message = "<F {0} {1} {2}>".format(
address, data['function'], data['state']) address, data["function"], data["state"]
)
else: else:
message = "<t 1 {0} {1} {2}>".format( message = "<t 1 {0} {1} {2}>".format(
address, data['speed'], data['direction']) address, data["speed"], data["direction"]
)
self.__send_data(message) self.__send_data(message)
def infra(self, data): def infra(self, data):
@@ -43,9 +45,9 @@ class Connector:
track = "" track = ""
if data["power"]: if data["power"]:
self.__send_data('<1{}>'.format(track)) self.__send_data("<1{}>".format(track))
else: else:
self.__send_data('<0{}>'.format(track)) self.__send_data("<0{}>".format(track))
def emergency(self): def emergency(self):
self.__send_data('<!>') self.__send_data("<!>")

8
dcc/driver/health.py
View File

@@ -1,6 +1,8 @@
from health_check.backends import BaseHealthCheckBackend from health_check.backends import BaseHealthCheckBackend
from health_check.exceptions import (ServiceUnavailable, from health_check.exceptions import (
ServiceReturnedUnexpectedResult) ServiceUnavailable,
ServiceReturnedUnexpectedResult,
)
from driver.connector import Connector from driver.connector import Connector
@@ -10,7 +12,7 @@ class DriverHealthCheck(BaseHealthCheckBackend):
def check_status(self): def check_status(self):
try: try:
Connector().passthrough(b'<s>') Connector().passthrough(b"<s>")
except ConnectionRefusedError as e: except ConnectionRefusedError as e:
self.add_error(ServiceUnavailable("IOError"), e) self.add_error(ServiceUnavailable("IOError"), e)
except Exception as e: except Exception as e:

3
dcc/driver/models.py
View File

@@ -4,7 +4,8 @@ from solo.models import SingletonModel
class DriverConfiguration(SingletonModel): class DriverConfiguration(SingletonModel):
remote_host = models.GenericIPAddressField( remote_host = models.GenericIPAddressField(
protocol="IPv4", default="192.168.4.1") protocol="IPv4", default="192.168.4.1"
)
remote_port = models.SmallIntegerField(default=2560) remote_port = models.SmallIntegerField(default=2560)
timeout = models.SmallIntegerField(default=250) timeout = models.SmallIntegerField(default=250)

5
dcc/driver/serializers.py
View File

@@ -14,5 +14,6 @@ class CabSerializer(serializers.Serializer):
class InfraSerializer(serializers.Serializer): class InfraSerializer(serializers.Serializer):
power = serializers.BooleanField(required=True) power = serializers.BooleanField(required=True)
track = serializers.ChoiceField( track = serializers.ChoiceField(
choices=('main', 'prog', 'join', 'MAIN', 'PROG', 'JOIN'), choices=("main", "prog", "join", "MAIN", "PROG", "JOIN"),
required=False) required=False,
)

12
dcc/driver/urls.py
View File

@@ -2,10 +2,10 @@ from django.urls import path
from driver.views import SendCommand, Function, Cab, Emergency, Infra, Test from driver.views import SendCommand, Function, Cab, Emergency, Infra, Test
urlpatterns = [ urlpatterns = [
path('test', Test.as_view()), path("test", Test.as_view()),
path('emergency', Emergency.as_view()), path("emergency", Emergency.as_view()),
path('infra', Infra.as_view()), path("infra", Infra.as_view()),
path('command', SendCommand.as_view()), path("command", SendCommand.as_view()),
path('<int:address>/cab', Cab.as_view()), path("<int:address>/cab", Cab.as_view()),
path('<int:address>/function', Function.as_view()), path("<int:address>/function", Function.as_view()),
] ]

61
dcc/driver/views.py
View File

@@ -7,7 +7,10 @@ from rest_framework.response import Response
from dcc.parsers import PlainTextParser from dcc.parsers import PlainTextParser
from driver.connector import Connector from driver.connector import Connector
from driver.serializers import ( from driver.serializers import (
FunctionSerializer, CabSerializer, InfraSerializer) FunctionSerializer,
CabSerializer,
InfraSerializer,
)
from roster.models import RollingStock from roster.models import RollingStock
@@ -15,10 +18,12 @@ def addresschecker(f):
""" """
Check if DCC address does exist in the database Check if DCC address does exist in the database
""" """
def addresslookup(request, address, *args): def addresslookup(request, address, *args):
if not RollingStock.objects.filter(address=address): if not RollingStock.objects.filter(address=address):
raise Http404 raise Http404
return f(request, address, *args) return f(request, address, *args)
return addresslookup return addresslookup
@@ -26,32 +31,38 @@ class Test(APIView):
""" """
Send a test <s> command Send a test <s> command
""" """
parser_classes = [PlainTextParser] parser_classes = [PlainTextParser]
def get(self, request): def get(self, request):
response = Connector().passthrough("<s>") response = Connector().passthrough("<s>")
return Response({"response": response.decode()}, return Response(
status=status.HTTP_202_ACCEPTED) {"response": response.decode()}, status=status.HTTP_202_ACCEPTED
)
class SendCommand(APIView): class SendCommand(APIView):
""" """
Command passthrough Command passthrough
""" """
parser_classes = [PlainTextParser] parser_classes = [PlainTextParser]
def put(self, request): def put(self, request):
data = request.data data = request.data
if not data: if not data:
raise serializers.ValidationError({ raise serializers.ValidationError(
"error": "a string is expected"}) {"error": "a string is expected"}
)
cmd = data.decode().strip() cmd = data.decode().strip()
if not (cmd.startswith("<") and cmd.endswith(">")): if not (cmd.startswith("<") and cmd.endswith(">")):
raise serializers.ValidationError({ raise serializers.ValidationError(
"error": "please provide a valid command"}) {"error": "please provide a valid command"}
)
response = Connector().passthrough(cmd) response = Connector().passthrough(cmd)
return Response({"response": response.decode()}, return Response(
status=status.HTTP_202_ACCEPTED) {"response": response.decode()}, status=status.HTTP_202_ACCEPTED
)
@method_decorator(addresschecker, name="put") @method_decorator(addresschecker, name="put")
@@ -59,15 +70,14 @@ class Function(APIView):
""" """
Send "Function" commands to a valid DCC address Send "Function" commands to a valid DCC address
""" """
def put(self, request, address): def put(self, request, address):
serializer = FunctionSerializer(data=request.data) serializer = FunctionSerializer(data=request.data)
if serializer.is_valid(): if serializer.is_valid():
Connector().ops(address, serializer.data, function=True) Connector().ops(address, serializer.data, function=True)
return Response(serializer.data, return Response(serializer.data, status=status.HTTP_202_ACCEPTED)
status=status.HTTP_202_ACCEPTED)
return Response(serializer.errors, return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
status=status.HTTP_400_BAD_REQUEST)
@method_decorator(addresschecker, name="put") @method_decorator(addresschecker, name="put")
@@ -75,42 +85,43 @@ class Cab(APIView):
""" """
Send "Cab" commands to a valid DCC address Send "Cab" commands to a valid DCC address
""" """
def put(self, request, address): def put(self, request, address):
serializer = CabSerializer(data=request.data) serializer = CabSerializer(data=request.data)
if serializer.is_valid(): if serializer.is_valid():
Connector().ops(address, serializer.data) Connector().ops(address, serializer.data)
return Response(serializer.data, return Response(serializer.data, status=status.HTTP_202_ACCEPTED)
status=status.HTTP_202_ACCEPTED)
return Response(serializer.errors, return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
status=status.HTTP_400_BAD_REQUEST)
class Infra(APIView): class Infra(APIView):
""" """
Send "Infra" commands to a valid DCC address Send "Infra" commands to a valid DCC address
""" """
def put(self, request): def put(self, request):
serializer = InfraSerializer(data=request.data) serializer = InfraSerializer(data=request.data)
if serializer.is_valid(): if serializer.is_valid():
Connector().infra(serializer.data) Connector().infra(serializer.data)
return Response(serializer.data, return Response(serializer.data, status=status.HTTP_202_ACCEPTED)
status=status.HTTP_202_ACCEPTED)
return Response(serializer.errors, return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
status=status.HTTP_400_BAD_REQUEST)
class Emergency(APIView): class Emergency(APIView):
""" """
Send an "Emergency" stop, no matter the HTTP method used Send an "Emergency" stop, no matter the HTTP method used
""" """
def put(self, request): def put(self, request):
Connector().emergency() Connector().emergency()
return Response({"response": "emergency stop"}, return Response(
status=status.HTTP_202_ACCEPTED) {"response": "emergency stop"}, status=status.HTTP_202_ACCEPTED
)
def get(self, request): def get(self, request):
Connector().emergency() Connector().emergency()
return Response({"response": "emergency stop"}, return Response(
status=status.HTTP_202_ACCEPTED) {"response": "emergency stop"}, status=status.HTTP_202_ACCEPTED
)

4
dcc/manage.py
View File

@@ -6,7 +6,7 @@ import sys
def main(): def main():
"""Run administrative tasks.""" """Run administrative tasks."""
os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'dcc.settings') os.environ.setdefault("DJANGO_SETTINGS_MODULE", "dcc.settings")
try: try:
from django.core.management import execute_from_command_line from django.core.management import execute_from_command_line
except ImportError as exc: except ImportError as exc:
@@ -18,5 +18,5 @@ def main():
execute_from_command_line(sys.argv) execute_from_command_line(sys.argv)
if __name__ == '__main__': if __name__ == "__main__":
main() main()

32
dcc/metadata/admin.py
View File

@@ -1,40 +1,46 @@
from django.contrib import admin from django.contrib import admin
from metadata.models import ( from metadata.models import (
Decoder, Scale, Manufacturer, Company, Tag, RollingStockType) Decoder,
Scale,
Manufacturer,
Company,
Tag,
RollingStockType,
)
@admin.register(Decoder) @admin.register(Decoder)
class DecoderAdmin(admin.ModelAdmin): class DecoderAdmin(admin.ModelAdmin):
readonly_fields = ('image_thumbnail',) readonly_fields = ("image_thumbnail",)
list_display = ('__str__', 'interface') list_display = ("__str__", "interface")
list_filter = ('manufacturer', 'interface') list_filter = ("manufacturer", "interface")
@admin.register(Scale) @admin.register(Scale)
class ScaleAdmin(admin.ModelAdmin): class ScaleAdmin(admin.ModelAdmin):
list_display = ('scale', 'ratio', 'gauge') list_display = ("scale", "ratio", "gauge")
list_filter = ('ratio', 'gauge') list_filter = ("ratio", "gauge")
@admin.register(Company) @admin.register(Company)
class CompanyAdmin(admin.ModelAdmin): class CompanyAdmin(admin.ModelAdmin):
readonly_fields = ('logo_thumbnail',) readonly_fields = ("logo_thumbnail",)
list_display = ('name', 'country') list_display = ("name", "country")
list_filter = list_display list_filter = list_display
@admin.register(Manufacturer) @admin.register(Manufacturer)
class ManufacturerAdmin(admin.ModelAdmin): class ManufacturerAdmin(admin.ModelAdmin):
readonly_fields = ('logo_thumbnail',) readonly_fields = ("logo_thumbnail",)
@admin.register(Tag) @admin.register(Tag)
class TagAdmin(admin.ModelAdmin): class TagAdmin(admin.ModelAdmin):
readonly_fields = ('slug',) readonly_fields = ("slug",)
list_display = ('name', 'slug') list_display = ("name", "slug")
@admin.register(RollingStockType) @admin.register(RollingStockType)
class RollingStockTypeAdmin(admin.ModelAdmin): class RollingStockTypeAdmin(admin.ModelAdmin):
list_display = ('__str__',) list_display = ("__str__",)
list_filter = ('type', 'category') list_filter = ("type", "category")

4
dcc/metadata/apps.py
View File

@@ -2,5 +2,5 @@ from django.apps import AppConfig
class MetadataConfig(AppConfig): class MetadataConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField' default_auto_field = "django.db.models.BigAutoField"
name = 'metadata' name = "metadata"

35
dcc/metadata/models.py
View File

@@ -9,16 +9,14 @@ from dcc.utils import get_image_preview, slugify
class Manufacturer(models.Model): class Manufacturer(models.Model):
name = models.CharField(max_length=128, unique=True) name = models.CharField(max_length=128, unique=True)
website = models.URLField(blank=True) website = models.URLField(blank=True)
logo = models.ImageField( logo = models.ImageField(upload_to="images/", null=True, blank=True)
upload_to='images/',
null=True,
blank=True)
def __str__(self): def __str__(self):
return self.name return self.name
def logo_thumbnail(self): def logo_thumbnail(self):
return get_image_preview(self.logo.url) return get_image_preview(self.logo.url)
logo_thumbnail.short_description = "Preview" logo_thumbnail.short_description = "Preview"
@@ -27,45 +25,37 @@ class Company(models.Model):
extended_name = models.CharField(max_length=128, blank=True) extended_name = models.CharField(max_length=128, blank=True)
country = CountryField() country = CountryField()
freelance = models.BooleanField(default=False) freelance = models.BooleanField(default=False)
logo = models.ImageField( logo = models.ImageField(upload_to="images/", null=True, blank=True)
upload_to='images/',
null=True,
blank=True)
class Meta: class Meta:
verbose_name_plural = "Companies" verbose_name_plural = "Companies"
ordering = ['name'] ordering = ["name"]
def __str__(self): def __str__(self):
return self.name return self.name
def logo_thumbnail(self): def logo_thumbnail(self):
return get_image_preview(self.logo.url) return get_image_preview(self.logo.url)
logo_thumbnail.short_description = "Preview" logo_thumbnail.short_description = "Preview"
class Decoder(models.Model): class Decoder(models.Model):
name = models.CharField(max_length=128, unique=True) name = models.CharField(max_length=128, unique=True)
manufacturer = models.ForeignKey( manufacturer = models.ForeignKey(Manufacturer, on_delete=models.CASCADE)
Manufacturer,
on_delete=models.CASCADE)
version = models.CharField(max_length=64, blank=True) version = models.CharField(max_length=64, blank=True)
interface = models.PositiveSmallIntegerField( interface = models.PositiveSmallIntegerField(
choices=settings.DECODER_INTERFACES, choices=settings.DECODER_INTERFACES, null=True, blank=True
null=True,
blank=True
) )
sound = models.BooleanField(default=False) sound = models.BooleanField(default=False)
image = models.ImageField( image = models.ImageField(upload_to="images/", null=True, blank=True)
upload_to='images/',
null=True,
blank=True)
def __str__(self): def __str__(self):
return "{0} - {1}".format(self.manufacturer, self.name) return "{0} - {1}".format(self.manufacturer, self.name)
def image_thumbnail(self): def image_thumbnail(self):
return get_image_preview(self.image.url) return get_image_preview(self.image.url)
image_thumbnail.short_description = "Preview" image_thumbnail.short_description = "Preview"
@@ -75,7 +65,7 @@ class Scale(models.Model):
gauge = models.CharField(max_length=16, blank=True) gauge = models.CharField(max_length=16, blank=True)
class Meta: class Meta:
ordering = ['scale'] ordering = ["scale"]
def __str__(self): def __str__(self):
return str(self.scale) return str(self.scale)
@@ -97,10 +87,11 @@ def tag_pre_save(sender, instance, **kwargs):
class RollingStockType(models.Model): class RollingStockType(models.Model):
type = models.CharField(max_length=64) type = models.CharField(max_length=64)
category = models.CharField( category = models.CharField(
max_length=64, choices=settings.ROLLING_STOCK_TYPES) max_length=64, choices=settings.ROLLING_STOCK_TYPES
)
class Meta(object): class Meta(object):
unique_together = ('category', 'type') unique_together = ("category", "type")
def __str__(self): def __str__(self):
return "{0} {1}".format(self.type, self.category) return "{0} {1}".format(self.type, self.category)

9
dcc/metadata/serializers.py
View File

@@ -1,7 +1,12 @@
from rest_framework import serializers from rest_framework import serializers
from metadata.models import ( from metadata.models import (
RollingStockType, Scale, Manufacturer, RollingStockType,
Company, Decoder, Tag) Scale,
Manufacturer,
Company,
Decoder,
Tag,
)
class RollingStockTypeSerializer(serializers.ModelSerializer): class RollingStockTypeSerializer(serializers.ModelSerializer):

78
dcc/roster/admin.py
View File

@@ -1,12 +1,16 @@
from django.contrib import admin from django.contrib import admin
from roster.models import ( from roster.models import (
RollingClass, RollingStock, RollingStockImage, RollingStockDocument) RollingClass,
RollingStock,
RollingStockImage,
RollingStockDocument,
)
@admin.register(RollingClass) @admin.register(RollingClass)
class RollingClass(admin.ModelAdmin): class RollingClass(admin.ModelAdmin):
list_display = ('__str__', 'type', 'company') list_display = ("__str__", "type", "company")
list_filter = ('company', 'type__category', 'type') list_filter = ("company", "type__category", "type")
search_fields = list_display search_fields = list_display
@@ -20,38 +24,58 @@ class RollingStockImageInline(admin.TabularInline):
model = RollingStockImage model = RollingStockImage
min_num = 0 min_num = 0
extra = 0 extra = 0
readonly_fields = ('image_thumbnail',) readonly_fields = ("image_thumbnail",)
@admin.register(RollingStock) @admin.register(RollingStock)
class RollingStockAdmin(admin.ModelAdmin): class RollingStockAdmin(admin.ModelAdmin):
inlines = (RollingStockImageInline, RollingStockDocInline) inlines = (RollingStockImageInline, RollingStockDocInline)
readonly_fields = ('creation_time', 'updated_time') readonly_fields = ("creation_time", "updated_time")
list_display = ( list_display = (
'__str__', 'address', 'manufacturer', "__str__",
'scale', 'sku', 'company', 'country') "address",
"manufacturer",
"scale",
"sku",
"company",
"country",
)
list_filter = ( list_filter = (
'rolling_class__type__category', 'rolling_class__type', "rolling_class__type__category",
'scale', 'manufacturer') "rolling_class__type",
"scale",
"manufacturer",
)
search_fields = list_display search_fields = list_display
fieldsets = ( fieldsets = (
(None, { (
'fields': ('rolling_class', None,
'road_number', {
'manufacturer', "fields": (
'scale', "rolling_class",
'sku', "road_number",
'decoder', "manufacturer",
'address', "scale",
'era', "sku",
'production_year', "decoder",
'purchase_date', "address",
'notes', "era",
'tags') "production_year",
}), "purchase_date",
('Audit', { "notes",
'classes': ('collapse',), "tags",
'fields': ('creation_time', 'updated_time',) )
}), },
),
(
"Audit",
{
"classes": ("collapse",),
"fields": (
"creation_time",
"updated_time",
),
},
),
) )

4
dcc/roster/apps.py
View File

@@ -2,5 +2,5 @@ from django.apps import AppConfig
class RosterConfig(AppConfig): class RosterConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField' default_auto_field = "django.db.models.BigAutoField"
name = 'roster' name = "roster"

72
dcc/roster/models.py
View File

@@ -2,12 +2,19 @@ import os
from uuid import uuid4 from uuid import uuid4
from django.db import models from django.db import models
from django.urls import reverse from django.urls import reverse
# from django.core.files.storage import FileSystemStorage # from django.core.files.storage import FileSystemStorage
# from django.dispatch import receiver # from django.dispatch import receiver
from dcc.utils import get_image_preview from dcc.utils import get_image_preview
from metadata.models import ( from metadata.models import (
Scale, Manufacturer, Decoder, Company, Tag, RollingStockType) Scale,
Manufacturer,
Decoder,
Company,
Tag,
RollingStockType,
)
# class OverwriteMixin(FileSystemStorage): # class OverwriteMixin(FileSystemStorage):
# def get_available_name(self, name, max_length): # def get_available_name(self, name, max_length):
@@ -18,15 +25,15 @@ from metadata.models import (
class RollingClass(models.Model): class RollingClass(models.Model):
identifier = models.CharField(max_length=128, unique=False) identifier = models.CharField(max_length=128, unique=False)
type = models.ForeignKey( type = models.ForeignKey(
RollingStockType, on_delete=models.CASCADE, RollingStockType, on_delete=models.CASCADE, null=True, blank=True
null=True, blank=True) )
description = models.CharField(max_length=256, blank=True) description = models.CharField(max_length=256, blank=True)
company = models.ForeignKey( company = models.ForeignKey(
Company, on_delete=models.CASCADE, Company, on_delete=models.CASCADE, null=True, blank=True
null=True, blank=True) )
class Meta: class Meta:
ordering = ['company', 'identifier'] ordering = ["company", "identifier"]
verbose_name = "Class" verbose_name = "Class"
verbose_name_plural = "Classes" verbose_name_plural = "Classes"
@@ -35,37 +42,36 @@ class RollingClass(models.Model):
class RollingStock(models.Model): class RollingStock(models.Model):
uuid = models.UUIDField( uuid = models.UUIDField(primary_key=True, default=uuid4, editable=False)
primary_key=True, default=uuid4,
editable=False)
rolling_class = models.ForeignKey( rolling_class = models.ForeignKey(
RollingClass, on_delete=models.CASCADE, RollingClass,
null=False, blank=False, on_delete=models.CASCADE,
verbose_name="Class") null=False,
blank=False,
verbose_name="Class",
)
road_number = models.CharField(max_length=128, unique=False) road_number = models.CharField(max_length=128, unique=False)
manufacturer = models.ForeignKey( manufacturer = models.ForeignKey(
Manufacturer, on_delete=models.CASCADE, Manufacturer, on_delete=models.CASCADE, null=True, blank=True
null=True, blank=True) )
scale = models.ForeignKey( scale = models.ForeignKey(Scale, on_delete=models.CASCADE)
Scale, on_delete=models.CASCADE)
sku = models.CharField(max_length=32, blank=True) sku = models.CharField(max_length=32, blank=True)
decoder = models.ForeignKey( decoder = models.ForeignKey(
Decoder, on_delete=models.CASCADE, Decoder, on_delete=models.CASCADE, null=True, blank=True
null=True, blank=True) )
address = models.SmallIntegerField(default=None, null=True, blank=True) address = models.SmallIntegerField(default=None, null=True, blank=True)
era = models.CharField(max_length=32, blank=True) era = models.CharField(max_length=32, blank=True)
production_year = models.SmallIntegerField(null=True, blank=True) production_year = models.SmallIntegerField(null=True, blank=True)
purchase_date = models.DateField(null=True, blank=True) purchase_date = models.DateField(null=True, blank=True)
notes = models.TextField(blank=True) notes = models.TextField(blank=True)
tags = models.ManyToManyField( tags = models.ManyToManyField(
Tag, Tag, related_name="rolling_stock", blank=True
related_name='rolling_stock', )
blank=True)
creation_time = models.DateTimeField(auto_now_add=True) creation_time = models.DateTimeField(auto_now_add=True)
updated_time = models.DateTimeField(auto_now=True) updated_time = models.DateTimeField(auto_now=True)
class Meta: class Meta:
ordering = ['rolling_class', 'road_number'] ordering = ["rolling_class", "road_number"]
verbose_name_plural = "Rolling stock" verbose_name_plural = "Rolling stock"
def __str__(self): def __str__(self):
@@ -79,16 +85,12 @@ class RollingStock(models.Model):
class RollingStockDocument(models.Model): class RollingStockDocument(models.Model):
rolling_stock = models.ForeignKey( rolling_stock = models.ForeignKey(RollingStock, on_delete=models.CASCADE)
RollingStock, on_delete=models.CASCADE)
description = models.CharField(max_length=128, blank=True) description = models.CharField(max_length=128, blank=True)
file = models.FileField( file = models.FileField(upload_to="files/", null=True, blank=True)
upload_to='files/',
null=True,
blank=True)
class Meta(object): class Meta(object):
unique_together = ('rolling_stock', 'file') unique_together = ("rolling_stock", "file")
def __str__(self): def __str__(self):
return "{0}".format(os.path.basename(self.file.name)) return "{0}".format(os.path.basename(self.file.name))
@@ -96,23 +98,21 @@ class RollingStockDocument(models.Model):
class RollingStockImage(models.Model): class RollingStockImage(models.Model):
rolling_stock = models.ForeignKey( rolling_stock = models.ForeignKey(RollingStock, on_delete=models.CASCADE)
RollingStock, on_delete=models.CASCADE) image = models.ImageField(upload_to="images/", null=True, blank=True)
image = models.ImageField(
upload_to='images/',
null=True,
blank=True)
def image_thumbnail(self): def image_thumbnail(self):
return get_image_preview(self.image.url) return get_image_preview(self.image.url)
image_thumbnail.short_description = "Preview" image_thumbnail.short_description = "Preview"
class Meta(object): class Meta(object):
unique_together = ('rolling_stock', 'image') unique_together = ("rolling_stock", "image")
def __str__(self): def __str__(self):
return "{0}".format(os.path.basename(self.image.name)) return "{0}".format(os.path.basename(self.image.name))
# @receiver(models.signals.post_delete, sender=Cab) # @receiver(models.signals.post_delete, sender=Cab)
# def post_save_image(sender, instance, *args, **kwargs): # def post_save_image(sender, instance, *args, **kwargs):
# try: # try:

9
dcc/roster/serializers.py
View File

@@ -1,8 +1,13 @@
from rest_framework import serializers from rest_framework import serializers
from roster.models import RollingClass, RollingStock from roster.models import RollingClass, RollingStock
from metadata.serializers import ( from metadata.serializers import (
RollingStockTypeSerializer, ManufacturerSerializer, ScaleSerializer, RollingStockTypeSerializer,
CompanySerializer, DecoderSerializer, TagSerializer) ManufacturerSerializer,
ScaleSerializer,
CompanySerializer,
DecoderSerializer,
TagSerializer,
)
class RollingClassSerializer(serializers.ModelSerializer): class RollingClassSerializer(serializers.ModelSerializer):

11
dcc/roster/urls.py
View File

@@ -1,10 +1,9 @@
from django.urls import path from django.urls import path
from roster.views import ( from roster.views import RosterList, RosterGet, RosterAddress, RosterIdentifier
RosterList, RosterGet, RosterAddress, RosterIdentifier)
urlpatterns = [ urlpatterns = [
path('list', RosterList.as_view()), path("list", RosterList.as_view()),
path('get/<str:uuid>', RosterGet.as_view()), path("get/<str:uuid>", RosterGet.as_view()),
path('address/<int:address>', RosterAddress.as_view()), path("address/<int:address>", RosterAddress.as_view()),
path('identifier/<str:identifier>', RosterIdentifier.as_view()), path("identifier/<str:identifier>", RosterIdentifier.as_view()),
] ]

6
dcc/roster/views.py
View File

@@ -12,16 +12,16 @@ class RosterList(ListAPIView):
class RosterGet(RetrieveAPIView): class RosterGet(RetrieveAPIView):
queryset = RollingStock.objects.all() queryset = RollingStock.objects.all()
serializer_class = RollingStockSerializer serializer_class = RollingStockSerializer
lookup_field = 'uuid' lookup_field = "uuid"
class RosterAddress(ListAPIView): class RosterAddress(ListAPIView):
queryset = RollingStock.objects.all() queryset = RollingStock.objects.all()
serializer_class = RollingStockSerializer serializer_class = RollingStockSerializer
lookup_field = 'address' lookup_field = "address"
class RosterIdentifier(RetrieveAPIView): class RosterIdentifier(RetrieveAPIView):
queryset = RollingStock.objects.all() queryset = RollingStock.objects.all()
serializer_class = RollingStockSerializer serializer_class = RollingStockSerializer
lookup_field = 'identifier' lookup_field = "identifier"