aandres/cineclub-site
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refacto [api]: black formatting

Browse source
This commit is contained in:
Alice 2022-04-03 01:20:54 +02:00
parent 2d996b322f
commit a396b5be5b
14 changed files with 113 additions and 95 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/manage.py
View file

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

4
server/myapi/apps.py
View file

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

61
server/myapi/migrations/0001_initial.py
View file

@ -7,29 +7,52 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
]
dependencies = []
operations = [
migrations.CreateModel(
name='Film',
name="Film",
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('projection_date', models.DateTimeField()),
('title', models.CharField(max_length=60)),
('actors', models.JSONField(default='[]')),
('director', models.CharField(max_length=60)),
('duration', models.DurationField()),
('synopsis', models.TextField()),
('origin_country', models.CharField(max_length=60)),
('release_year', models.SmallIntegerField()),
('trailer_link', models.URLField()),
('is_in_color', models.BooleanField()),
('movie_format', models.CharField(choices=[('35mm', 'Analog 35'), ('DVD', 'Dvd'), ('Blu ray', 'Blu Ray')], max_length=20)),
('language_subtitles', models.CharField(choices=[('VOF', 'French'), ('VOSTFR', 'Foreign')], max_length=20)),
('poster_link', models.URLField()),
('banner_link', models.URLField()),
('is_confirmed', models.BooleanField(default=False)),
(
"id",
models.BigAutoField(
auto_created=True,
primary_key=True,
serialize=False,
verbose_name="ID",
),
),
("projection_date", models.DateTimeField()),
("title", models.CharField(max_length=60)),
("actors", models.JSONField(default="[]")),
("director", models.CharField(max_length=60)),
("duration", models.DurationField()),
("synopsis", models.TextField()),
("origin_country", models.CharField(max_length=60)),
("release_year", models.SmallIntegerField()),
("trailer_link", models.URLField()),
("is_in_color", models.BooleanField()),
(
"movie_format",
models.CharField(
choices=[
("35mm", "Analog 35"),
("DVD", "Dvd"),
("Blu ray", "Blu Ray"),
],
max_length=20,
),
),
(
"language_subtitles",
models.CharField(
choices=[("VOF", "French"), ("VOSTFR", "Foreign")],
max_length=20,
),
),
("poster_link", models.URLField()),
("banner_link", models.URLField()),
("is_confirmed", models.BooleanField(default=False)),
],
),
]

6
server/myapi/migrations/0002_alter_film_actors.py
View file

@ -6,13 +6,13 @@ from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('myapi', '0001_initial'),
("myapi", "0001_initial"),
]
operations = [
migrations.AlterField(
model_name='film',
name='actors',
model_name="film",
name="actors",
field=models.JSONField(default=list),
),
]

14
server/myapi/models.py
View file

@ -8,13 +8,13 @@ TODO implement validators
class Film(models.Model):
class MovieFormat(models.TextChoices):
ANALOG_35 = '35mm'
DVD = 'DVD'
BLU_RAY = 'Blu ray'
ANALOG_35 = "35mm"
DVD = "DVD"
BLU_RAY = "Blu ray"
class LanguageSubtitles(models.TextChoices):
FRENCH = 'VOF'
FOREIGN = 'VOSTFR'
FRENCH = "VOF"
FOREIGN = "VOSTFR"
projection_date = models.DateTimeField()
title = models.CharField(max_length=60)
@ -27,7 +27,9 @@ class Film(models.Model):
trailer_link = models.URLField()
is_in_color = models.BooleanField()
movie_format = models.CharField(max_length=20, choices=MovieFormat.choices)
language_subtitles = models.CharField(max_length=20, choices=LanguageSubtitles.choices)
language_subtitles = models.CharField(
max_length=20, choices=LanguageSubtitles.choices
)
poster_link = models.URLField()
banner_link = models.URLField()
is_confirmed = models.BooleanField(default=False)

8
server/myapi/renderers.py
View file

@ -3,13 +3,13 @@ from rest_framework import renderers
class PlainTextRenderer(renderers.BaseRenderer):
media_type = 'text/plain'
format = 'txt'
media_type = "text/plain"
format = "txt"
def render(self, data, media_type=None, renderer_context=None):
return smart_str(data, encoding=self.charset)
class LatexRenderer(PlainTextRenderer):
media_type = 'text/x-tex'
format = 'tex'
media_type = "text/x-tex"
format = "tex"

3
server/myapi/serializers.py
View file

@ -1,7 +1,8 @@
from rest_framework import serializers
from .models import Film
class FilmSerializer(serializers.HyperlinkedModelSerializer):
class Meta:
model = Film
fields = '__all__' # TODO also send id
fields = "__all__" # TODO also send id

9
server/myapi/services/com_service.py
View file

@ -2,12 +2,7 @@ from django.template.loader import render_to_string
from myapi.models import Film
prices = {
'one_cof': 4,
'one_exte': 5,
'card_cof': 30,
'card_exte': 35
}
prices = {"one_cof": 4, "one_exte": 5, "card_cof": 30, "card_exte": 35}
def render_com(template_name, film: Film) -> str:
@ -15,4 +10,4 @@ def render_com(template_name, film: Film) -> str:
def bocal(film: Film) -> str:
return render_com('bocal.tex', film)
return render_com("bocal.tex", film)

8
server/myapi/urls.py
View file

@ -1,13 +1,13 @@
from django.urls import include, path
from rest_framework import routers
from .views.std_views import (FilmViewSet)
from .views.std_views import FilmViewSet
router = routers.DefaultRouter()
router.register(r'films', FilmViewSet)
router.register(r"films", FilmViewSet)
# Wire up our API using automatic URL routing.
# Additionally, we include login URLs for the browsable API.
urlpatterns = [
path('', include(router.urls)),
path('api-auth/', include('rest_framework.urls', namespace='rest_framework'))
path("", include(router.urls)),
path("api-auth/", include("rest_framework.urls", namespace="rest_framework")),
]

6
server/myapi/views/std_views.py
View file

@ -3,18 +3,18 @@ from rest_framework import viewsets
from rest_framework.decorators import action
from rest_framework.response import Response
from myapi.renderers import LatexRenderer
from myapi.renderers import LatexRenderer, PlainTextRenderer
from myapi.serializers import FilmSerializer
from myapi.models import Film
import myapi.services.com_service as com
class FilmViewSet(viewsets.ModelViewSet):
queryset = Film.objects.all().order_by('projection_date')
queryset = Film.objects.all().order_by("projection_date")
serializer_class = FilmSerializer
# TODO confirm that latex renderer is not a problem
@action(detail=True, renderer_classes=[LatexRenderer], methods=['GET'])
@action(detail=True, renderer_classes=[LatexRenderer], methods=["GET"])
def bocal(self, request, pk=None):
film: Film = self.get_object()
bocal_text = com.bocal(film)

2
server/ulm_cine_club_api/asgi.py
View file

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

76
server/ulm_cine_club_api/settings.py
View file

@ -20,7 +20,7 @@ BASE_DIR = Path(__file__).resolve().parent.parent
# See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/
# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = 'django-insecure-)3^d_7xfyv3#+oz#8rj9tym2=g*n!+-sp#_v!t&h+i0y+gv(8u'
SECRET_KEY = "django-insecure-)3^d_7xfyv3#+oz#8rj9tym2=g*n!+-sp#_v!t&h+i0y+gv(8u"
# SECURITY WARNING: don't run with debug turned on in production!
DEBUG = True
@ -31,54 +31,54 @@ ALLOWED_HOSTS = []
# Application definition
INSTALLED_APPS = [
'django.contrib.admin',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles',
'myapi.apps.MyapiConfig',
'rest_framework'
"django.contrib.admin",
"django.contrib.auth",
"django.contrib.contenttypes",
"django.contrib.sessions",
"django.contrib.messages",
"django.contrib.staticfiles",
"myapi.apps.MyapiConfig",
"rest_framework",
]
MIDDLEWARE = [
'django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
"django.middleware.security.SecurityMiddleware",
"django.contrib.sessions.middleware.SessionMiddleware",
"django.middleware.common.CommonMiddleware",
"django.middleware.csrf.CsrfViewMiddleware",
"django.contrib.auth.middleware.AuthenticationMiddleware",
"django.contrib.messages.middleware.MessageMiddleware",
"django.middleware.clickjacking.XFrameOptionsMiddleware",
]
ROOT_URLCONF = 'ulm_cine_club_api.urls'
ROOT_URLCONF = "ulm_cine_club_api.urls"
TEMPLATES = [
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'DIRS': [],
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
'django.template.context_processors.debug',
'django.template.context_processors.request',
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
"BACKEND": "django.template.backends.django.DjangoTemplates",
"DIRS": [],
"APP_DIRS": True,
"OPTIONS": {
"context_processors": [
"django.template.context_processors.debug",
"django.template.context_processors.request",
"django.contrib.auth.context_processors.auth",
"django.contrib.messages.context_processors.messages",
],
},
},
]
WSGI_APPLICATION = 'ulm_cine_club_api.wsgi.application'
WSGI_APPLICATION = "ulm_cine_club_api.wsgi.application"
# Database
# https://docs.djangoproject.com/en/3.2/ref/settings/#databases
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.sqlite3',
'NAME': BASE_DIR / 'db.sqlite3',
"default": {
"ENGINE": "django.db.backends.sqlite3",
"NAME": BASE_DIR / "db.sqlite3",
}
}
@ -88,16 +88,16 @@ DATABASES = {
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",
},
]
@ -105,9 +105,9 @@ AUTH_PASSWORD_VALIDATORS = [
# Internationalization
# https://docs.djangoproject.com/en/3.2/topics/i18n/
LANGUAGE_CODE = 'fr-fr'
LANGUAGE_CODE = "fr-fr"
TIME_ZONE = 'UTC'
TIME_ZONE = "UTC"
USE_I18N = True
@ -119,9 +119,9 @@ USE_TZ = True
# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/3.2/howto/static-files/
STATIC_URL = '/static/'
STATIC_URL = "/static/"
# Default primary key field type
# https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field
DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"

5
server/ulm_cine_club_api/urls.py
View file

@ -16,7 +16,4 @@ Including another URLconf
from django.contrib import admin
from django.urls import path, include
urlpatterns = [
path('admin/', admin.site.urls),
path('api/', include('myapi.urls'))
]
urlpatterns = [path("admin/", admin.site.urls), path("api/", include("myapi.urls"))]

2
server/ulm_cine_club_api/wsgi.py
View file

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