ynerant
/
med
mirror of https://gitlab.crans.org/mediatek/med.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Side identifiers cannot begin with le/la/les/l'/the

This commit is contained in:
Yohann D'ANELLO 2020-02-10 17:51:09 +01:00
parent 53ea1288c1
commit 3d81977dbd
3 changed files with 24 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
entrypoint.sh
View File

@ -11,19 +11,21 @@ sleep 2
python manage.py migrate python manage.py migrate
python manage.py collectstatic --no-input python manage.py collectstatic --no-input
python manage.py runserver 0.0.0.0:8000
# harakiri parameter respawns processes taking more than 20 seconds # harakiri parameter respawns processes taking more than 20 seconds
# max-requests parameter respawns processes after serving 5000 requests # max-requests parameter respawns processes after serving 5000 requests
# vacuum parameter cleans up when stopped # vacuum parameter cleans up when stopped
uwsgi --chdir="$(pwd)" \ #uwsgi --chdir="$(pwd)" \
--module=med.wsgi:application \ # --module=med.wsgi:application \
--env DJANGO_SETTINGS_MODULE=med.settings \ # --env DJANGO_SETTINGS_MODULE=med.settings \
--master \ # --master \
--pidfile="$(pwd)/uwsgi.pid" \ # --pidfile="$(pwd)/uwsgi.pid" \
--socket="$(pwd)/uwsgi.sock" \ # --socket="$(pwd)/uwsgi.sock" \
--processes=5 \ # --processes=5 \
--chmod-socket=600 \ # --chmod-socket=600 \
--harakiri=20 \ # --harakiri=20 \
--max-requests=5000 \ # --max-requests=5000 \
--vacuum \ # --vacuum \
--daemonize="$(pwd)/uwsgi.log" \ # --daemonize="$(pwd)/uwsgi.log" \
--protocol=fastcgi # --protocol=fastcgi

9
media/forms.py
View File

@ -3,6 +3,7 @@
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
import json import json
import re
import urllib.request import urllib.request
import unicodedata import unicodedata
@ -109,9 +110,15 @@ class MediaAdminForm(ModelForm):
author_name = self.cleaned_data['authors'][0].name author_name = self.cleaned_data['authors'][0].name
if ',' not in author_name and ' ' in author_name: if ',' not in author_name and ' ' in author_name:
author_name = author_name.split(' ')[-1] author_name = author_name.split(' ')[-1]
title_normalized = self.cleaned_data['title'].upper()
title_normalized = re.sub(r'^LE ', '', title_normalized)
title_normalized = re.sub(r'^LA ', '', title_normalized)
title_normalized = re.sub(r'^LES ', '', title_normalized)
title_normalized = re.sub(r'^L\'', '', title_normalized)
title_normalized = re.sub(r'^THE ', '', title_normalized)
side_identifier = "{:.3} {:.3}".format( side_identifier = "{:.3} {:.3}".format(
author_name, author_name,
self.cleaned_data['title'], ) title_normalized.replace(' ', ''), )
if self.cleaned_data['subtitle']: if self.cleaned_data['subtitle']:
start = self.cleaned_data['subtitle'].split(' ')[0] \ start = self.cleaned_data['subtitle'].split(' ')[0] \

2
requirements.txt
View File

@ -9,6 +9,6 @@ python-stdnum==1.10
djangorestframework==3.9.2 djangorestframework==3.9.2
pyyaml==3.13 pyyaml==3.13
coreapi==2.3.3 coreapi==2.3.3
psycopg2==2.7.7 psycopg2
uwsgi==2.0.18 uwsgi==2.0.18
mysqlclient==1.4.3 mysqlclient==1.4.3