Added linting and got tests passing

This commit is contained in:
2026-05-12 13:26:56 +10:00
parent ca62ed693a
commit cfd6d45189
13 changed files with 53 additions and 48 deletions
+1 -2
View File
@@ -345,12 +345,11 @@ class Work(models.Model):
@property
def identifier(self):
if self.code:
return self.code
composer = self.composer or "Anon"
composer = re.sub("[^\w]", "", composer)
composer = re.sub(r"[^\w]", "", composer)
words = self.name.split()
work = words[0][:3]
+4 -5
View File
@@ -1,4 +1,5 @@
from collections import namedtuple
import re
GENERAL = """
mvmt Movement
@@ -195,8 +196,8 @@ class MusicTag(namedtuple("MusicTag", ("name", "variant"), defaults=[None])):
@property
def tag(self):
l = self.name.lower()
return MUSIC_TAG_BY_NAME.get(l, l)
lc = self.name.lower()
return MUSIC_TAG_BY_NAME.get(lc, lc)
@property
def is_general(self):
@@ -232,9 +233,7 @@ class MusicTag(namedtuple("MusicTag", ("name", "variant"), defaults=[None])):
return self.name
import re
PATTERNS = [re.compile("([A-Za-z]+)[_\- ]*(\d+)"), re.compile("([A-Za-z]+)()")]
PATTERNS = [re.compile(r"([A-Za-z]+)[_\- ]*(\d+)"), re.compile(r"([A-Za-z]+)()")]
def auto_tag(filename):
@@ -1,7 +1,7 @@
from interface.tests import AccessTestCase
from byostorage.user import UserStorage
from . import models
from library import models
import tempfile
import json
+8
View File
@@ -0,0 +1,8 @@
from doctest import DocTestSuite
from library import music_tags
def load_tests(loader, tests, ignore):
tests.addTests(DocTestSuite(music_tags))
return tests
+2 -2
View File
@@ -477,7 +477,7 @@ class WorkAddDocumentView(CollectionMixin, CreateView):
doc.sections.create(tag=inst.abbreviate())
if self.request.headers["Accept"] == "application/json":
filename = os.path.basename(doc.upload.name)
os.path.basename(doc.upload.name)
return JsonResponse(
{
"message": "created",
@@ -541,7 +541,7 @@ class DocumentAnnotateView(DocumentMixin, DetailView):
for tag, start, end in data:
# pages.sort()
# end = pages[-1] if len(pages) > 1 else None
o = self.object.sections.create(tag=tag, start=start, end=end)
self.object.sections.create(tag=tag, start=start, end=end)
return HttpResponse(status=204)
+17 -19
View File
@@ -1,3 +1,20 @@
from interface.views import AuthorizedResourceMixin
from rest_framework import serializers
from rest_framework.exceptions import APIException
from rest_framework import generics
from library.models import Collection, Work, Document, Section, WorkMeta
import requests
import urllib
import shutil
import os.path
from django.db import transaction
from django.core.files.uploadedfile import TemporaryUploadedFile
"""
Views relating to importing and exporting collection items
"""
@@ -33,22 +50,6 @@ class WorkExportView(EnsembleMixin, WorkMixin, View):
"""
from interface.views import AuthorizedResourceMixin
from rest_framework import serializers
from rest_framework.exceptions import APIException
from library.models import Collection, Work, Document, Section, WorkMeta
import requests
import urllib
import shutil
import os.path
from django.db import transaction
from django.core.files.uploadedfile import TemporaryUploadedFile
class WorkMetaSerializer(serializers.ModelSerializer):
class Meta:
@@ -176,9 +177,6 @@ class CollectionSerializer(serializers.Serializer):
return Collection.objects.get(pk=collection)
from rest_framework import generics
class CollectionExportView(AuthorizedResourceMixin, generics.RetrieveAPIView):
serializer_class = CollectionSerializer