Got collection links working and tested

.dockerignore

@@ -0,0 +1,2 @@
+local_settings.py
+db.sqlite3

.gitignore

@@ -2,8 +2,12 @@ __pycache__
 *.pyc
 db.sqlite3
 credentials
-polyphonic/settings.py
+local_settings.py
 env
+old
 test.*
 static
-teststore
+teststore
+cache
+local_storage
+media

Dockerfile

@@ -0,0 +1,21 @@
+FROM alpine:3.14
+
+RUN apk add --no-cache python3 git ghostscript sqlite
+
+WORKDIR /root
+RUN python3 -m ensurepip
+RUN pip3 install -U pip --no-cache-dir
+
+COPY app/requirements.txt .
+RUN pip3 install -r requirements.txt --no-cache-dir
+
+COPY app /opt/polyphonic
+WORKDIR /opt/polyphonic
+
+COPY docker_settings.py polyphonic/local_settings.py
+RUN SECRET_KEY=_ python3 manage.py collectstatic --noinput
+
+VOLUME ["/var/polyphonic"]
+
+ENTRYPOINT ["python3", "manage.py"]
+CMD ["runserver", "0.0.0.0:8000", "--insecure"]

Makefile

@@ -35,4 +35,3 @@ start_s3_storage:
 stop_s3_storage:
 	kill `cat teststore/pid` | true
 	rm teststore/pid
-

README.md

@@ -1,6 +1,18 @@
 ## Polyphonic
 
-A simple web app for managing video uploads to an S3 bucket for virtual ensembles.
+A simple web app managing scores, large files and submissions in a manor tailored to musical ensembles.
+
+No registration required for ensemble participants - just a one time code and passphrase.
+
+### Library App
+
+Store all your scores on your own cloud account (Amazon S3, Google Files etc).  Tag up the scores so you can generate
+custom part sets and assign them to projects so people can easily print just their parts.
+
+### Submissions App
+
+Accept video/audio submissions direct to your cloud storage.  Was developed and used during 2020 lockdown period for
+virtual choirs/orchestras but could have more uses.
 
 ### S3 Setup
 

app/dev-requirements.txt

@@ -0,0 +1,2 @@
+pylint==2.6.0
+django-debug-toolbar

app/interface/admin.py

@@ -1,20 +1,19 @@
 from django.contrib import admin
 
-# Register your models here.
-
 from . import models
 
 class EnsembleAdmin(admin.ModelAdmin):
-    list_display = ['name', 'ensemble_code']
+    list_display = ['name', 'slug']
+
+class ModuleInline(admin.StackedInline):
+    model = models.Module
+    extra = 0
 
 class ProjectAdmin(admin.ModelAdmin):
 
-    list_display = ['name', 'ensemble', 'deadline', 'active']
+    list_display = ['name', 'ensemble', 'event_date', 'active']
     list_filter = ['ensemble', 'active']
-
+    inlines = [ModuleInline]
-class SubmissionAdmin(admin.ModelAdmin):
-    list_display = ['name', 'instrument', 'date', 'complete']
-    list_filter = ['project', 'complete']
 
 class ResourceAdmin(admin.ModelAdmin):
     list_display = ['name', 'media_type', 'project']
@@ -26,6 +25,5 @@ class WikiPageAdmin(admin.ModelAdmin):
 
 admin.site.register(models.Ensemble, EnsembleAdmin)
 admin.site.register(models.Project, ProjectAdmin)
-admin.site.register(models.Submission, SubmissionAdmin)
 admin.site.register(models.Resource, ResourceAdmin)
 admin.site.register(models.WikiPage, WikiPageAdmin)

app/interface/fields.py

@@ -0,0 +1,4 @@
+from crispy_forms.layout import Field
+
+class BulmaFileUpload(Field):
+    template = 'bulma/file_upload.html'

app/interface/forms.py

@@ -0,0 +1,60 @@
+from django import forms
+from crispy_forms.helper import FormHelper
+from crispy_forms.layout import Submit, HTML, Div
+from crispy_bulma.layout import FormGroup
+
+from . import models, fields
+
+class BaseForm(forms.Form):
+    
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.helper = self.get_form_helper()
+
+    def get_form_helper(self):
+        helper = FormHelper(self)
+        #helper.add_input(Submit('submit', 'Submit', css_class='button is-link'))
+        #helper.layout.subm append(HTML('<a class="button is-light">Cancel</a>'))
+        #print(helper.layout)
+        helper.layout.append(FormGroup(
+            Submit('submit', 'Save', css_class="button is-primary"),
+            HTML('{% if view.cancel_url %}<div class="control"><a href="{{ view.cancel_url }}" class="button is-light">Cancel</a></div>{% endif %}')
+        ))
+        return helper
+
+
+class ProjectForm(forms.ModelForm, BaseForm):
+
+
+    class Meta:
+        model = models.Project
+        fields = ['name', 'description', 'event_date']
+        #widgets = {
+        #    'event_date': forms.DateTimeInput(attrs={'type': 'date'})
+        #}
+
+class ResourceForm(forms.ModelForm, BaseForm):
+
+    class Meta:
+        model = models.Resource
+        fields = ['name', 'media_type', 'description', 'file']
+
+    def get_form_helper(self):
+        helper = super().get_form_helper()
+        helper[3].wrap(fields.BulmaFileUpload)
+        return helper
+
+class WikiForm(forms.ModelForm, BaseForm):
+
+    class Meta:
+        model = models.WikiPage
+        fields = ['title', 'markdown']
+
+class CodeForm(BaseForm):
+    code = forms.CharField(max_length=14,
+        widget=forms.TextInput(attrs={'placeholder': 'xxx-xxx-xxx', 'inputmode': 'numeric'}))
+    passphrase = forms.CharField(max_length=32)
+
+class ResourceUploadForm(forms.Form):
+    pass
+#    file = S3UploadField()

app/interface/migrations/0001_initial.py

@@ -0,0 +1,80 @@
+# Generated by Django 3.2.7 on 2022-11-19 01:24
+
+import byostorage.user
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import interface.models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('byostorage', '0006_alter_userstorage_settings_data'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Ensemble',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(help_text='Display name', max_length=100)),
+                ('slug', models.SlugField(editable=False, help_text='Short name for the ensemble - used for folders', max_length=100, unique=True)),
+                ('code', models.CharField(default=interface.models.generate_code, help_text='Ensemble registration code', max_length=9)),
+                ('passphrase', models.CharField(help_text='Used to register ensembles', max_length=100)),
+                ('details', models.TextField(blank=True, help_text='Description of the ensemble (markdown)')),
+                ('admins', models.ManyToManyField(related_name='ensembles', to=settings.AUTH_USER_MODEL)),
+                ('storage', models.ForeignKey(help_text='Default storage for this ensemble', null=True, on_delete=django.db.models.deletion.SET_NULL, to='byostorage.userstorage')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Project',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100)),
+                ('description', models.TextField(blank=True, help_text='Markdown format')),
+                ('active', models.BooleanField(default=True)),
+                ('event_date', models.DateTimeField(blank=True, null=True)),
+                ('owner', models.CharField(blank=True, max_length=255)),
+                ('ensemble', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='projects', to='interface.ensemble')),
+            ],
+            options={
+                'ordering': ['active', '-pk'],
+            },
+        ),
+        migrations.CreateModel(
+            name='WikiPage',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(max_length=255)),
+                ('markdown', models.TextField()),
+                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='wiki_pages', to='interface.project')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Resource',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100)),
+                ('description', models.TextField(blank=True)),
+                ('file', models.FileField(storage=byostorage.user.BYOStorage(), upload_to=interface.models.resource_key)),
+                ('media_type', models.CharField(choices=[('audio', 'Audio'), ('video', 'Video'), ('general', 'General')], default='*', max_length=10)),
+                ('visible', models.BooleanField(default=True)),
+                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='resources', to='interface.project')),
+            ],
+            options={
+                'ordering': ['-visible', '-pk'],
+            },
+        ),
+        migrations.CreateModel(
+            name='Module',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.SlugField(choices=[('library', 'Library')], max_length=20)),
+                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='modules', to='interface.project')),
+            ],
+        ),
+    ]

app/interface/migrations/0002_auto_20230202_0804.py

@@ -0,0 +1,25 @@
+# Generated by Django 3.2.7 on 2023-02-01 21:04
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('interface', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='project',
+            options={'ordering': ['active', 'event_date']},
+        ),
+        migrations.RemoveField(
+            model_name='ensemble',
+            name='code',
+        ),
+        migrations.RemoveField(
+            model_name='ensemble',
+            name='passphrase',
+        ),
+    ]

app/interface/migrations/0003_auto_20230209_0910.py

@@ -0,0 +1,27 @@
+# Generated by Django 3.2.7 on 2023-02-08 22:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('interface', '0002_auto_20230202_0804'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='ensemble',
+            options={'ordering': ('slug',)},
+        ),
+        migrations.AddField(
+            model_name='ensemble',
+            name='auth',
+            field=models.SmallIntegerField(default=1, help_text='Increment this to reset the authentication links'),
+        ),
+        migrations.AddField(
+            model_name='project',
+            name='auth',
+            field=models.SmallIntegerField(default=1, help_text='Increment this to reset the authentication links'),
+        ),
+    ]

app/interface/migrations/0004_auto_20230210_0938.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.7 on 2023-02-09 22:38
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('interface', '0003_auto_20230209_0910'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='ensemble',
+            old_name='auth',
+            new_name='nonce',
+        ),
+        migrations.RenameField(
+            model_name='project',
+            old_name='auth',
+            new_name='nonce',
+        ),
+    ]

app/interface/models.py

@@ -0,0 +1,184 @@
+from django.db import models
+from django.utils.text import slugify
+from django.utils import timezone
+from django.conf import settings
+from django.shortcuts import resolve_url
+
+from byostorage.user import BYOStorage
+
+import random
+
+from urllib.parse import urlparse
+
+import os.path
+from .utils import sign_data
+
+MEDIA_TYPES = [
+    ('audio', "Audio"),
+    ('video', "Video"),
+    ('general', "General"),
+]
+
+def rough_date(d):
+    if not d:
+        return False, "sometime..."
+    days = (d - timezone.now()).days
+    in_past = days < 0
+    if in_past:
+        days = abs(days)
+    if days == 0:
+        m = int((d-timezone.now()).seconds/60)
+        if m > 60:
+            return in_past, "{0:d} hours".format(int(m / 60))
+        return in_past, "{0:d} minutes!".format(int(m % 60))
+    if days >= 14:
+        return in_past, "{0:d} weeks".format(int(days/7))
+    if days >= 7:
+        return in_past, "{0:d} weeks, {1:d} days".format(int(days / 7), int(days % 7))
+    return in_past, f"{days} days"
+
+
+def generate_code(length=9):
+    return "".join([ random.choice('0123456789') for _ in range(length) ])
+
+class Ensemble(models.Model):
+    ''' A group that plays together
+    
+    '''
+    name = models.CharField(max_length=100,
+            help_text="Display name")
+    slug = models.SlugField(max_length=100, editable=False, unique=True,
+            help_text="Short name for the ensemble - used for folders")
+    admins = models.ManyToManyField('auth.User', related_name='ensembles')
+    details = models.TextField(blank=True, 
+            help_text="Description of the ensemble (markdown)")
+    storage = models.ForeignKey('byostorage.UserStorage', null=True, on_delete=models.SET_NULL,
+            help_text="Default storage for this ensemble")
+    nonce = models.SmallIntegerField(default=1,
+            help_text="Increment this to reset the authentication links")
+
+    class Meta:
+        ordering = ('slug', )
+
+    def active_projects(self):
+        return self.projects.filter(active=True, event_date__gte=timezone.now())
+
+    def has_admin(self, user):
+        if not user.is_authenticated:
+            return False
+        if user.is_superuser:
+            return True
+        return user.pk in self.admins.values_list('pk', flat=True)
+
+    def save(self, **kwargs):
+        if not self.slug:
+            self.slug = slugify(self.name)
+        super(Ensemble, self).save(**kwargs)
+
+    def get_absolute_url(self):
+        return resolve_url('ensemble_detail', ensemble=self.slug)
+
+    def auth(self):
+        return sign_data(f'{self.pk}-{self.nonce}', 12)
+
+    def __str__(self):
+        return self.name
+
+
+class Project(models.Model):
+    ''' A Project linked to an ensemble
+    '''
+    name = models.CharField(max_length=100)
+    ensemble = models.ForeignKey(Ensemble, related_name='projects', on_delete=models.CASCADE, null=True)
+    description = models.TextField(blank=True, 
+            help_text="Markdown format")
+    active = models.BooleanField(default=True)
+    event_date =models.DateTimeField(null=True, blank=True)
+    owner = models.CharField(max_length=255, blank=True)
+    nonce = models.SmallIntegerField(default=1,
+            help_text="Increment this to reset the authentication links")
+
+    class Meta:
+        ordering = ['active', 'event_date']
+
+    @property
+    def days(self):
+        return (self.event_date - timezone.now().date()).days
+
+    @property
+    def has_happened(self):
+        if not self.event_date:
+            return False
+        return self.event_date < timezone.now()
+
+    @property
+    def rough_date(self):
+        in_past, s = rough_date(self.event_date)
+        if in_past:
+            return f"{s} ago"
+        return f"In {s}"
+
+    @property
+    def folder(self):
+        project = slugify(self.name)
+        print(f"{self.ensemble.storage_id}:{self.ensemble.slug}/{project}")
+        return f"{self.ensemble.storage_id}:{self.ensemble.slug}/{project}"
+
+    @property
+    def active_modules(self):
+        return self.modules.values_list('name', flat=True)
+
+    def get_absolute_url(self):
+        return resolve_url('project_detail', project=self.pk)
+    
+    def auth(self):
+        return sign_data(f'{self.pk}-{self.nonce}', 12)
+
+    def __str__(self):
+        return self.name
+
+class Module(models.Model):
+    ''' Enable modules on a oriject
+    '''
+    name = models.SlugField(max_length=20, choices=[ (x, x.title()) for x in settings.POLYPHONIC_MODULES ])
+    project = models.ForeignKey(Project, related_name="modules", on_delete=models.CASCADE)
+
+def resource_key(resource, filename):
+    return f'{resource.project.folder}/resources/{filename}'
+
+class Resource(models.Model):
+    ''' A viewable file resource attached to a project
+
+    e.g PDF instructions, MP3 backing track
+    '''
+    project = models.ForeignKey(Project, related_name='resources', on_delete=models.CASCADE)
+    name = models.CharField(max_length=100)
+    description = models.TextField(blank=True)
+    file = models.FileField(storage=BYOStorage(), upload_to=resource_key)
+    media_type = models.CharField(max_length=10, choices=MEDIA_TYPES, default='*')
+    visible = models.BooleanField(default=True)
+
+    class Meta:
+        ordering = ['-visible', '-pk']
+
+    def accept(self):
+        if self.media_type == 'general':
+            return ".*"
+        return f"{self.media_type}/*"
+
+    def __str__(self):
+        return self.name
+
+class WikiPage(models.Model):
+    ''' An editable wiki page for the project in markdown format
+    
+    '''
+    project = models.ForeignKey(Project, related_name='wiki_pages', on_delete=models.CASCADE)
+    title = models.CharField(max_length=255)
+    markdown = models.TextField()
+
+    def get_absolute_url(self):
+        return resolve_url('wiki', project=self.project_id, pk=self.pk)
+
+    def __str__(self):
+        return self.title

app/interface/static/interface/css/polyphonic.css

@@ -0,0 +1,63 @@
+@font-face {
+    font-family: MartinHand;
+    src: url('/static/fonts/Martinhand3.ttf');  
+}
+
+:root {
+    --primary: #485fc7;
+}
+
+.fancy {
+    font-family: MartinHand;
+    color: var(--primary);
+}
+
+.has-text-shadow {
+    text-shadow: 1px 1px 2px #000;
+}
+
+.is-form-group {
+    max-width: 600px;
+    align-self: center;
+}
+
+.is-centered {
+    margin: auto;
+}
+
+.is-action {
+    cursor: pointer;
+}
+
+.menu-label {
+    color: var(--primary);
+}
+
+.button.is-primary, .button.is-primary:hover {
+    background-color: var(--primary);
+}
+
+A.admin-link:after {
+    content: "*";
+}
+
+TEXTAREA.input {
+    height: 400px;
+}
+
+.control INPUT[type='file'] {
+    border: none;
+    width: 80%;
+    text-align: center;
+    margin: auto 10%;
+}
+
+.project-footer {
+    position: fixed;
+    bottom: 0px;
+    right: 0px;
+    background-color: #EEE;
+    padding: 10px 10px;
+    margin-top: 30px;
+    border-top-left-radius: 6px;
+}

app/interface/templates/403.html

@@ -0,0 +1,8 @@
+{% extends "interface/project_base.html" %}
+
+{% block page %}
+<div class="hero">
+<h3 class="is-size-3">Sorry, you do not have permission to do that!</h3>
+<p>{{ exception }}</p>
+</div>
+{% endblock %}

app/interface/templates/404.html

@@ -0,0 +1,8 @@
+{% extends "interface/project_base.html" %}
+
+{% block page %}
+<div class="hero">
+<h3 class="is-size-3">Sorry, that resource is not found.</h3>
+<p>{{ exception }}</p>
+</div>
+{% endblock %}

app/interface/templates/base.html

@@ -0,0 +1,55 @@
+{% load static %}
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <!-- Required meta tags -->
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="icon" type="image/png" href="{% static 'interface/icon.png' %}" />
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bulma@0.9.3/css/bulma.min.css">
+    <link rel="stylesheet" href="{% static 'interface/css/polyphonic.css' %}"></link>
+    <script src="{% static 'interface/js/interface.js' %}"></script>
+    <title>{% block title %}Polyphonic{% endblock %}</title>
+    {% block media %}{% endblock %}
+  </head>
+  <body>
+
+  {% block navigation %}
+  <nav class="navbar" role="navigation">
+    <div class="navbar-brand has-text-primary">
+      <a class="navbar-item" href="/">
+        <span class="icon fancy is-size-2 mx-4"><i class="fas fa-random"></i></span>
+        <span class="fancy is-size-2">Polyphonic</span>
+      </a>
+      <span class="navbar-item is-hidden-mobile fancy is-size-5">Musical Ensemble Manager</span>
+
+
+      <a role="button" class="navbar-burger" aria-label="menu" aria-expanded="false" data-target="projectMenu">
+        <span aria-hidden="true"></span>
+        <span aria-hidden="true"></span>
+        <span aria-hidden="true"></span>
+      </a>
+    </div>
+
+    <div id="navbarMain" class="navbar-menu">
+
+      <div class="navbar-end">
+        <span class="navbar-item is-size-4">{% firstof ensemble project.ensemble %}</span>
+      </div>
+
+    </div>
+    
+  </nav>
+  {% endblock %}
+
+{% block content %}
+<h1>No content!</h1>
+{% endblock %}
+
+  <!-- late load scripts -->
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
+  <script src="https://kit.fontawesome.com/c837098e5b.js" crossorigin="anonymous"></script>
+  {% block scripts %}
+  {% endblock %} 
+  </body>
+</html>

app/interface/templates/bulma/file_upload.html

@@ -0,0 +1,28 @@
+{% load crispy_forms_field %}
+
+<div class="field">
+<div id="div_id_{{ field.name }}" class="file has-name is-fullwidth">
+    <label class="file-label">
+        {% crispy_field field 'class' 'file-input'%}
+        <span class="file-cta">
+            <span class="file-icon">
+            <i class="fas fa-upload"></i>
+            </span>
+            <span class="file-label">
+            Choose a file…
+            </span>
+        </span>
+        <span class="file-name"></span>
+    </label>
+  </div>
+</div>
+
+<script>
+    const fileInput = document.querySelector('#div_id_{{ field.name }} input[type=file]');
+    fileInput.onchange = () => {
+      if (fileInput.files.length > 0) {
+        const fileName = document.querySelector('#div_id_{{ field.name }} .file-name');
+        fileName.textContent = fileInput.files[0].name;
+      }
+    }
+  </script>

app/interface/templates/interface/default_form.html

@@ -0,0 +1,18 @@
+{% extends "interface/project_base.html" %}
+{% load crispy_forms_tags %}
+
+{% block media %}
+{{ form.media }}
+{% endblock %}
+
+{% block page %}
+<h3 class="subtitle">{% firstof title view.title %}</h3>
+<div class="columns is-centered">
+    <div class="column is-two-thirds">
+        {% if instructions %}
+        <p>{{ instructions }}</p>
+        {% endif %}
+      {% crispy form %}
+    </div>
+</div>
+{% endblock %}

app/interface/templates/interface/ensemble_detail.html

@@ -0,0 +1,56 @@
+{% extends "interface/project_base.html" %}
+{% load md2 %}
+
+{% block admin %}
+<a href="{% url 'project_create' object.slug %}" class="button is-link">
+    <span class="icon"><i class="fas fa-plus-circle"></i></span>
+    <span>Add project</span>
+</a>
+{% if inactive %}
+<a href="?" class="button is-link">
+    <span class="icon"><i class="fas fa-archive"></i></span>
+    <span>Hide old</span>
+</a>
+{% else %}
+<a href="?inactive" class="button is-link">
+    <span class="icon"><i class="fas fa-archive"></i></span>
+    <span>Show all</span>
+</a>
+{% endif %}
+{% endblock %}
+
+{% block page %}
+<h3 class="title">Projects for {{ensemble.name }}</h3>
+<p>{{ ensemble.details|markdown }}</p>
+
+<h4>Administrators</h4>
+<ul>
+    {% for admin in ensemble.admins.all %}
+    <li><a href="mailto:{{ admin.email }}">{% firstof admin.get_full_name admin.get_username %}</a></li>
+    {% endfor %}
+</ul>
+
+{% include 'interface/project_items.html' %}
+
+{% if request.is_admin %}
+<div class="">
+    <div class="card">
+        <header class="card header">
+            <p class="card-header-title">Admin Details</p>
+        </header>
+        <div class="card-content">
+
+            <p>
+                Joining instructions for participants<br/><br/>
+                URL: <a href="{{ ensemble_link }}">{{ ensemble_link }}</a><br/>
+            </p>
+        </div>
+    </div>
+</div>
+{% endif %}
+
+<div>
+<a href="{% url 'forget_resource' 'ensemble' ensemble.slug %}">Forget this ensemble</a>
+</div>
+
+{% endblock %}

app/interface/templates/interface/ensemble_list.html

@@ -0,0 +1,52 @@
+{% extends "interface/project_base.html" %}
+{% load md2 %}
+
+{% block page %}
+{% comment %}
+<div class="admin-tools is-pulled-right">
+<a class="button is-link" href="{% url 'register' %}">
+    <span class="icon"><i class="fas fa-plus-circle"></i></span>
+    <span>Register another</span>
+</a>
+</div>
+{% endcomment %}
+
+<h3 class="title">My Ensembles</h3>
+
+<div class="columns is-multiline">
+{% for ensemble in object_list %}
+    <div class="column is-half-tablet is-one-third-widescreen">
+        <div class="card">
+            <div class="card-content">
+                <div class="media">
+                    <div class="media-left">
+                        <figure class="image is-48x48">
+                        <img src="https://bulma.io/images/placeholders/96x96.png" alt="Placeholder image">
+                        </figure>
+                    </div>
+                    <div class="media-content">
+                        <a href="{% url 'ensemble_detail' ensemble.slug %}">
+                            <p class="title is-4">{{ ensemble.name }}</p>
+                        </a>
+                    </div>
+                </div>
+                {% if ensemble.details %}
+                    <div class="content">
+                        {{ ensemble.details | markdown }}
+                    </div>
+                {% endif %}
+            </div>
+            <div class="card-footer">
+                {% with projects=ensemble.active_projects.count %}
+                <a class="card-footer-item" href="{% url 'ensemble_detail' ensemble.slug %}">{{ projects }} active project{{ projects|pluralize }}</a>
+                {% endwith %}
+            </div>
+        </div>
+    </div>
+{% empty %}
+    <div class="hero">
+        You don't currently have access to any ensembles - ask your administrator for a link.
+    </div>
+{% endfor %}
+</div>
+{% endblock %}

app/interface/templates/interface/manage.html

@@ -8,6 +8,9 @@
         URL: <a href="{{ ensemble_url }}">{{ ensemble_url }}</a><br/>
         Passphrase: {{ ensemble.passphrase }}
     </p>
+    <ul>
+        <li><a href="{% url 'work_list' %}">Library</a></li>
+    </ul>
     <p>
         Sorry, not much you can do here yet.  
         <ul>

app/interface/templates/interface/project_base.html

@@ -0,0 +1,94 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+
+
+<div class="columns">
+    <div class="column is-narrow is-hidden-touch" id="projectMenu">
+        <div style="margin: auto 2em;">
+            <aside class="menu">
+    
+                <p class="menu-label">My Things</p>
+                <ul class="menu-list">
+                    <li><a href="{% url 'ensemble_list' %}">Ensembles</a></li>
+                    <li><a href="{% url 'project_list' %}">Projects</a></li>
+                    {% if request.user.is_authenticated %}
+                    <li><a href="{% url 'work_list' %}">Library</a></li>
+                    <li><a href="{% url 'collection_list' %}">Collections</a></li>
+                    {% endif %}
+                </ul>
+
+                {% if project %}
+                <p class="menu-label">This Project</p>
+                    <ul class="menu-list">
+                        <li><a role="tab" href="{% url 'project_detail' project=project.id %}">Project Info</a></li>
+                        {% if 'library' in modules %}
+                            <li><a class="nav-link" href="{% url 'item_list' project=project.pk %}">My Music</a></li>
+                        {% endif %}
+                        {% for page in project.wiki_pages.all %}
+                            <li><a class="nav-link 
+                                href="{% url 'wiki' project=project.id pk=page.id %}">{{ page.title }}</a></li>
+                        {% endfor %}
+                        <li><a role="tab" href="{% url 'resource_list' project=project.pk %}">Resources</a></li>
+                    </ul>                
+                {% endif %}
+
+                <p class="menu-label">Admin</p>
+                <ul class="menu-list">
+                    {% if request.user.is_staff %}
+                    <li><a href="/admin" target="polyphonic_admin" rel="noopener noreferrer">Django Admin</a></li>
+                    {% endif %}
+                </ul>
+
+                <ul class="menu-list">
+                {% if request.user.is_authenticated %}
+                    <li><a href="{% url 'logout' %}">Logout</a></li>
+                {% else %}
+                    <li><a href="{% url 'login' %}">Login</a></li>
+                {% endif %}
+                </ul>
+
+
+
+            </aside>
+        </div>
+    </div>
+
+    <div class="column">
+        {% if project %}
+        <div class="tabs is-centered is-hidden-desktop">
+            <ul>
+                <li><a href="">Info</a></li>
+                {% if project.wiki_pages.count %}
+                <li><a href="">Pages</a></li>
+                {% endif %}
+                {% if project.resources.count %}
+                <li><a href="{% url 'resource_list' project=project.pk %}">Resources</a></li>
+                {% endif %}
+                {% if 'library' in modules %}
+                <li><a href="{% url 'item_list' project=project.pk %}">My Music</a></li>
+                {% endif %}
+                {% if 'submission' in modules %}
+                    <li><a href="{% url 'submission_create' project=project.pk %}">Send File</a></li>
+                {% endif %}
+            </ul>
+        </div>
+
+        {% endif %}
+        <section class="section">
+            {% if request.is_admin %}
+            <div class="admin-tools is-pulled-right">
+            {% block admin %}
+            {% endblock %}
+            </div>
+            {% endif %}
+            {% if project %}<h3 class="title">{{ project.name }}</h3>{% endif %}
+            {% block page %}
+            No content
+            {% endblock %}
+        </section>
+    </div>
+</div>
+
+{% endblock %}

app/interface/templates/interface/project_detail.html

@@ -0,0 +1,73 @@
+{% extends "interface/project_base.html" %}
+{% load md2 %}
+{% load polyphonic %}
+
+{% block admin %}
+<a href="{% url 'wiki_create' project=project.pk %}" class="button is-link">
+    <span class="icon"><i class="fas fa-file"></i></span>
+    <span>Add Page</span>
+</a>
+<a href="{% url 'project_edit' project=project.pk %}" class="button is-link">
+    <span class="icon"><i class="fas fa-edit"></i></span>
+    <span>Edit</span>
+</a>
+{% endblock %}
+
+{% block page %}
+<div class="box">
+    {% if project.event_date %}
+        <h3 class="subtitle is-centered">
+            <b>{{ project.event_date|date:"l jS F Y, g:i A" }}</b>
+            {% if project.has_happened %}
+                ({{ project.event_date|roughtimesince }} ago)
+            {% else %}
+                (in {{ project.event_date|roughtimeuntil }})
+            {% endif %}
+        </h3>
+    {% endif %}
+
+    <div class="block">
+        {% if project.description %}
+            <p class="content">{{ project.description|markdown }}</p>
+        {% else %}
+           <p>No description</p>
+        {% endif %}
+    </div>
+
+
+
+    {% if 'library' in modules %}
+        <div class="block">
+        {% include 'library/project_detail.html' %}
+        </div>
+    {% endif %}
+
+    {% if 'submission' in modules %}
+        <div class="block">
+        {% include 'submissions/project_detail.html' %}
+        </div>
+    {% endif %}
+    
+    {% if project.owner %}
+        <div class="block">
+        {% if project.owner.email %}
+            The project owner is <a href="mailto:{{ project.owner.email }}">{{ project.owner }}</a>
+        {% else %}
+            The project owner is {{ project.owner }}.
+        {% endif %}
+        </div>
+    {% endif %}
+
+    {% if request.is_admin %}
+        <div class="block">
+            <a href="{{ project_link }}">Project Link</a>
+        </div>
+    {% endif %}
+
+</div>
+
+<div>
+<a href="{% url 'forget_resource' 'project' project.pk %}">Forget this project</a>
+</div>
+
+{% endblock %}

app/interface/templates/interface/project_items.html

@@ -0,0 +1,33 @@
+{% load md2 %}
+
+<div class="columns is-multiline">
+{% for project in object_list %}
+    <div class="column is-half-tablet is-one-third-widescreen">
+        <div class="card">
+            <a class="" href="{% url 'project_detail' project=project.id %}">
+            <header class="card-header{% if not project.active %} has-background-light{% endif %}">
+                    <p class="card-header-title">
+                        {{ project.name }}
+                    </p>
+                    <p class="card-header-icon" style="color: black;">{{ project.rough_date }}</p>
+            </header>
+            </a>
+            <div class="card-content">
+                <div class="content" style="height: 100px; overflow: hidden">
+                    {{ project.description | markdown }}
+                    {% if not ensemble %}
+                    <div class="has-text-centered"><i><small>With {{ project.ensemble }}</small></i></div>
+                    {% endif %}
+                </div>
+            </div>
+        </div>
+    </div>
+{% empty %}
+    <div class="hero">
+        <div class="hero-body">
+            <p class="title">No projects currently planned</p>
+            <p class="subtitle">Go put your feet up!</p>
+        </div>
+    </div>
+{% endfor %}
+</div>

app/interface/templates/interface/project_list.html

@@ -0,0 +1,8 @@
+{% extends "interface/project_base.html" %}
+{% load md2 %}
+
+{% block page %}
+<h3 class="title">My Projects</h3>
+
+{% include 'interface/project_items.html' %}
+{% endblock %}

app/interface/templates/interface/register.html

@@ -0,0 +1,24 @@
+{% extends "base.html" %}
+{% load crispy_forms_tags %}
+
+{% block content %}
+<section class="section">
+{% if not request.user.is_authenticated %}
+<a href="{% url 'login' %}" style="float: right"><i class="fa fa-key"></i></a>
+{% endif %}
+<div class="columns is-centered">
+<div class="box is-half">
+    <h3 class="title">Join an ensemble</h3>
+    <form action="" method="POST">
+        {% csrf_token %}
+        {{ form | crispy }}
+        <div class="field is-grouped">
+            <div class="control">
+              <button class="button is-link">Register</button>
+            </div>
+          </div>
+    </form>
+</div>
+</div>
+</section>
+{% endblock %}

app/interface/templates/interface/resource_list.html

@@ -0,0 +1,58 @@
+{% extends "interface/project_base.html" %}
+{% load md2 %}
+
+{% block admin %}
+<a class="button is-link" href="{% url 'resource_create' project=project.pk %}">
+    <span class="icon"><i class="fas fa-plus-circle"></i></span>
+    <span>Add new</span>
+</a>
+{% endblock %}
+
+{% block page %}
+<div class="columns is-multiline">
+{% for resource in object_list %}
+    {% with download=resource.file.url %}
+    <div class="column is-half">
+        <div class="card {% if not object.visible %}disabled{% endif %}">
+            <div class="card-header">
+
+                <div class="card-header-title">
+                    {% if download %}
+                    <a href="{{ download }}">{{ resource.name }}</a>
+                    {% else %}
+                    {{ resource.name }}
+                    {% endif %}
+                </div>
+
+                <div class="card-header-icon">
+                    {% if request.is_admin %}
+                    <a href="{% url 'resource_upload' project=project.pk pk=resource.pk %}" class="icon" title="Upload">
+                        <i class="fas fa-upload"></i>
+                    </a>
+                    <a href="{% url 'resource_edit' project=project.pk pk=resource.pk %}" class="icon" title="Edit">
+                        <i class="fas fa-edit"></i>
+                    </a>
+                    {% endif %}
+                </div>
+            </div>
+            <div class="card-content">
+            <p>
+                <small>{{ resource.description|markdown }}</small>
+                {% if not resource.visible %}
+                <br/>(This resource is hidden from participants)
+                {% endif %}
+            </p>
+            {% if download and resource.media_type == 'audio' %}
+                <audio class="resource-player" controls src="{{ download }}" style="width: 100%;"></audio>
+            {% endif %}
+            </div>
+        </div>
+    </div>
+    {% endwith %}
+{% empty %}
+    <div class="column">
+    <p>There are resources for this project</p>
+    </div>
+{% endfor %}
+</div>
+{% endblock %}

app/interface/templates/interface/wiki.html

@@ -0,0 +1,15 @@
+{% extends "interface/project_base.html" %}
+
+{% block admin %}
+<a href="{% url 'wiki_edit' project=project.pk pk=wikipage.pk %}" class="button is-link">
+    <span class="icon"><i class="fas fa-edit"></i></span>
+    <span>Edit</span>
+</a>
+{% endblock %}
+
+{% block page %}
+<h3 class="subtitle">{{ wikipage.title }}</h3>
+<div class="box content wiki-page">
+{{ wiki_html|safe }}
+</div>
+{% endblock %}

app/interface/templates/interface/wikipage_form.html

@@ -0,0 +1,18 @@
+{% extends "interface/project_base.html" %}
+{% load crispy_forms_tags %}
+
+{% block media %}
+{{ form.media }}
+{% endblock %}
+
+{% block page %}
+<h3 class="subtitle">{% firstof title view.title %}</h3>
+<div class="columns is-centered">
+    <div class="column">
+        {% if instructions %}
+        <p>{{ instructions }}</p>
+        {% endif %}
+      {% crispy form %}
+    </div>
+</div>
+{% endblock %}

app/interface/templates/registration/login.html

@@ -0,0 +1,24 @@
+{% extends "base.html" %}
+{% load crispy_forms_tags %}
+
+{% block content %}
+<section class="section">
+<div class="columns is-centered">
+<div class="box is-half">
+<p class="block">
+    Login is only required to administer a project.<br/>
+</p>
+<form method="POST" class="vertical">
+    {% csrf_token %}
+    {{ form | crispy }}
+    <div class="field is-grouped">
+        <div class="control">
+            <button class="button is-link">Login</button>
+            <a href="{% url 'home' %}" class="button is-light">Cancel</a>
+        </div>
+    </div>
+</form>
+</div>
+</div>
+</section>
+{% endblock %}

app/interface/templatetags/path_filters.py

@@ -0,0 +1,9 @@
+from django import template
+import os.path
+
+register = template.Library()
+
+def basename(value):
+    return os.path.basename(value)
+
+register.filter('basename', basename)

app/interface/templatetags/polyphonic.py

@@ -0,0 +1,14 @@
+from django import template
+from django.utils import timesince
+
+register = template.Library()
+
+def roughtimesince(value):
+    return timesince.timesince(value, depth=1)
+
+register.filter('roughtimesince', roughtimesince)
+
+def roughtimeuntil(value):
+    return timesince.timeuntil(value, depth=1)
+
+register.filter('roughtimeuntil', roughtimeuntil)

app/interface/templatetags/url_tools.py

@@ -0,0 +1,10 @@
+from django import template
+
+register = template.Library()
+
+@register.simple_tag(takes_context=True)
+def url_update(context, **kwargs):
+    params = context.request.GET.copy()
+    for k in kwargs:
+        params[k] = kwargs[k]
+    return "?" + params.urlencode()

app/interface/tests/__init__.py

@@ -0,0 +1,56 @@
+from django.test import TestCase
+from interface import models, utils
+from django.contrib.auth.models import User
+from django.utils import timezone
+from datetime import timedelta
+
+class AccessTestCase(TestCase):
+
+    USERS = ()
+
+    ENSEMBLES = ()
+
+    PROJECTS = ()
+
+    @classmethod
+    def setUpTestData(cls):
+
+        cls.users = {}
+        for details in cls.USERS:
+            cls.users[details['username']] = User.objects.create_user(**details)
+
+        now = timezone.now()
+
+        cls.ensembles = {}
+        for details in cls.ENSEMBLES:
+            admins = details.pop('admins', [])
+            obj = models.Ensemble.objects.create(**details)
+            for admin in admins:
+                obj.admins.add(cls.users[admin])
+            cls.ensembles[obj.slug] = obj
+
+        cls.projects = {}
+        for name, ensemble, when in cls.PROJECTS:
+            obj = cls.ensembles[ensemble].projects.create(name=name, event_date=now+timedelta(days=when))
+            cls.projects[name] = obj
+        
+        return
+
+    def login(self, user, passwd):
+        response = self.client.post('/login', {'username': user, 'password': passwd})
+        self.assertEqual(response.status_code, 302, f"Failed to login as {user}")
+
+    def authorize(self, model, **kwargs):
+        object = model.objects.get(**kwargs)
+        response = self.client.get(f'{object.get_absolute_url()}?auth={object.auth()}')
+        self.assertEqual(response.status_code, 302)
+
+    def assertAccess(self, urls):
+        for url, expected in urls.items():
+            response = self.client.get(url)
+            self.assertEqual(response.status_code == 200, expected, f"Expected {expected} for {url} (status: {response.status_code})")
+
+    def assertObjectList(self, response, expected, element='name'):
+        self.assertEqual(response.status_code, 200, "No result returned")
+        objects = response.context['object_list'].values_list(element, flat=True)
+        self.assertEqual(list(objects), expected) 

app/interface/tests/test_access.py

@@ -0,0 +1,168 @@
+from django.test import TestCase, Client
+
+from interface import models, utils
+from django.contrib.auth.models import User
+
+from . import AccessTestCase
+
+class InterfaceAccessTestCase(AccessTestCase):
+
+    USERS = (
+        {'username': 'admin', 'password': 'secret', 'is_superuser': True, 'is_staff': True},
+        {'username': 'homer', 'password': 'maggie'},
+    )
+
+    ENSEMBLES = (
+        {'name': 'The Be Sharps', 'slug': 'be-sharps', 'admins': ['homer']},
+        {'name': 'Lisa & the Bleeding Gums', 'slug': 'bleeding-gums'},
+        {'name': 'Party Posse'},
+    )
+
+    PROJECTS = (
+        ('Baker St', 'bleeding-gums', -12),
+        ('Navy Recruitment Day', 'party-posse', 6),
+        ('Barbershop Contest', 'be-sharps', 28),
+        ('Open Mic Night', 'bleeding-gums', 1)
+    )
+
+    def test_bad_login(self):
+        with self.assertRaisesMessage(self.failureException, 'Failed to login as admin'):
+            self.login('admin', 'admin')
+
+    def test_admin_ensembles(self):
+        self.login('admin', 'secret')
+        response = self.client.get('/ensembles')
+        self.assertObjectList(response, ['The Be Sharps', 'Lisa & the Bleeding Gums', 'Party Posse'])
+        self.assertContains(response, 'Django Admin')
+
+    def test_admin_ensemble_permissions(self):
+        self.login('admin', 'secret')
+        response = self.client.get('/ensembles/party-posse')
+        self.assertTrue(response.context['request'].is_admin)
+        self.assertContains(response, "Add project")
+        self.assertAccess({
+            '/ensembles/be-sharps': True,
+            '/ensembles/bleeding-gums': True,
+            '/ensembles/party-posse': True,
+            '/ensembles/unknown': False,
+            '/ensembles/be-sharps/new-project': True,
+        })
+
+    def test_admin_projects(self):
+        self.login('admin', 'secret')
+        response = self.client.get('/projects')
+        self.assertObjectList(response, ['Open Mic Night', 'Navy Recruitment Day', 'Barbershop Contest'])
+
+        self.assertObjectList(self.client.get('/ensembles/bleeding-gums'), ['Open Mic Night'])
+        self.assertObjectList(self.client.get('/ensembles/bleeding-gums?inactive'), ['Open Mic Night', 'Baker St'])
+
+
+    def test_user_ensembles(self):
+        self.login('homer', 'maggie')
+        response = self.client.get('/ensembles')
+        self.assertObjectList(response, ['The Be Sharps'])
+
+        self.assertNotContains(response, 'Django Admin')
+
+    def test_user_ensemble_permissions(self):
+        self.login('homer', 'maggie')
+        response = self.client.get('/ensembles/be-sharps')
+        self.assertTrue(response.context['request'].is_admin)
+        self.assertContains(response, "Add project")
+        self.assertContains(response, 'Show all')
+        self.assertAccess({
+            '/ensembles/be-sharps': True,
+            '/ensembles/bleeding-gums': False,
+            '/ensembles/party-posse': False,
+            '/ensembles/be-sharps/new-project': True,
+            '/ensembles/party-posse/new-project': False,
+        })
+
+        self.authorize(models.Ensemble, slug='bleeding-gums')
+        self.assertAccess({
+            '/ensembles/be-sharps': True,
+            '/ensembles/bleeding-gums': True,
+            '/ensembles/party-posse': False,
+            '/ensembles/be-sharps/new-project': True,
+            '/ensembles/party-posse/new-project': False,
+        })
+        response = self.client.get('/ensembles/bleeding-gums')
+        self.assertFalse(response.context['request'].is_admin)
+        self.assertNotContains(response, 'Add project')
+        self.assertNotContains(response, 'Show all')
+
+    def test_user_projects(self):
+        self.login('homer', 'maggie')
+        response = self.client.get('/projects')
+        self.assertObjectList(response, ['Barbershop Contest'])
+        response = self.client.get('/projects/3')
+        self.assertTrue(response.context['request'].is_admin)
+
+
+        self.assertAccess({
+            '/projects/3': True,
+            '/projects/3/resources': True,
+            '/projects/3/resources/add': True,
+            '/projects/4': False,
+            '/projects/4/resources': False,
+            '/projects/4/resources/add': False,
+        })
+
+        self.authorize(models.Project, pk=4)
+        response = self.client.get('/projects')
+        self.assertObjectList(response, ['Open Mic Night', 'Barbershop Contest'])
+        response = self.client.get('/projects/4')
+        self.assertFalse(response.context['request'].is_admin)
+
+    def test_anon_ensembles(self):
+        response = self.client.get('/ensembles')
+        self.assertObjectList(response, [])
+        self.assertContains(response, 'You don\'t currently have access to any ensembles')
+
+    def test_anon_authorized_ensemble(self):
+        self.authorize(models.Ensemble, slug='party-posse')
+        response = self.client.get('/ensembles/party-posse')
+        self.assertContains(response, 'Party Posse')
+        
+        response = self.client.get('/ensembles')
+        self.assertObjectList(response, ['Party Posse'])
+
+        self.assertAccess({
+            '/ensembles/be-sharps': False,
+            '/ensembles/party-posse': True,
+            '/ensembles/bleeding-gums': False,
+            '/ensembles/unknown': False,
+        })
+        response = self.client.get('/projects')
+        self.assertObjectList(response, ['Navy Recruitment Day'])
+    
+    def test_anon_authorized_project(self):
+        self.authorize(models.Project, pk=4)
+        self.assertObjectList(self.client.get('/projects'), ['Open Mic Night'])
+        self.assertObjectList(self.client.get('/ensembles'), ['Lisa & the Bleeding Gums'])
+
+        self.assertAccess({
+            '/projects/4': True,
+            '/projects/4/resources': True,
+            '/projects/1': False,
+            '/projects/1/resources': False,
+        })
+
+    def test_anon_permission_denied(self):
+        self.assertAccess({
+            '/ensembles': True,
+            '/ensembles/be-sharps': False,
+            '/ensembles/party-posse': False,
+            '/ensembles/bleeding-gums': False,
+            '/ensembles/unknown': False,
+        })
+
+    def test_anon_deauthorize_project(self):
+        self.authorize(models.Project, pk=4)
+        self.assertAccess({
+            '/projects/4': True
+        })
+        models.Project.objects.filter(pk=4).update(nonce=2)
+        self.assertAccess({
+            '/projects/4': False
+        })

app/interface/tests/test_integration.py

@@ -0,0 +1,6 @@
+from django.test import TestCase
+
+class IntegrationTestCase(TestCase):
+
+    def test_runs(self):
+        self.assertTrue(True)

app/interface/urls.py

@@ -0,0 +1,37 @@
+from django.urls import path
+from django.contrib.auth import views as auth_views
+from django.views.generic.base import RedirectView
+
+from . import views
+
+urlpatterns = [
+
+    path('', RedirectView.as_view(url='projects', permanent=False), name='home'),
+    
+    path('login', auth_views.LoginView.as_view(), name='login'),
+    path('logout', auth_views.LogoutView.as_view(), name='logout'),
+    path('forget/<resource>/<key>', views.ForgetResourceView.as_view(), name="forget_resource"),
+
+    path('ensembles', views.EnsembleListView.as_view(), name="ensemble_list"),
+    path('ensembles/<slug:ensemble>', views.EnsembleDetailView.as_view(), name='ensemble_detail'),
+    path('ensembles/<slug:ensemble>/new-project', views.ProjectCreateView.as_view(), name="project_create"),
+
+    path('projects', views.ProjectListView.as_view(), name="project_list"),
+    path('projects/<int:project>', views.ProjectDetailView.as_view(), name="project_detail"),
+    path('projects/<int:project>/edit', views.ProjectUpdateView.as_view(), name="project_edit"),
+    #path('projects/<int:project>/submissions.mk', views.ProjectMakefileView.as_view(), name="project_makefile"),
+
+    path('projects/<int:project>/page/create', views.WikiCreateView.as_view(), name="wiki_create"),
+    path('projects/<int:project>/page/<int:pk>', views.WikiView.as_view(), name="wiki"),
+    path('projects/<int:project>/page/<int:pk>/edit', views.WikiEditView.as_view(), name="wiki_edit"),
+
+    path('projects/<int:project>/resources', views.ResourceListView.as_view(), name="resource_list"),
+    path('projects/<int:project>/resources/add', views.ResourceCreateView.as_view(), name="resource_create"),
+    path('projects/<int:project>/resources/<int:pk>/upload', views.ResourceUploadView.as_view(), name="resource_upload"),
+    path('projects/<int:project>/resources/<int:pk>/edit', views.ResourceEditView.as_view(), name="resource_edit"),
+]
+
+from django.conf import settings
+if settings.DEBUG:
+    from django.views.static import serve
+    urlpatterns.append(path('local_storage/<path:path>', serve, {'document_root': 'local_storage'}))

app/interface/utils.py

@@ -0,0 +1,38 @@
+from django.shortcuts import resolve_url
+from django.core.signing import Signer
+from django.core.exceptions import SuspiciousOperation
+
+signer = Signer()
+
+import logging
+logger = logging.getLogger(__name__)
+
+def sign_data(data, l=None):
+    sig = signer.sign(data)
+    p = len(data) + 1
+    if l:
+        l += p
+    return sig[p:l]
+
+def signed_url(name, **kwargs):
+    """
+    >>> signed_url('foo/bar')
+    """
+    url = resolve_url(name, **kwargs)
+    sig = signer.sign(url)
+    sep = "&" if "?" in url else "?"
+    return sig.replace(":", f"{sep}auth=")
+
+def check_signed_url(full_path):
+    p = full_path.rfind('auth')
+    url = full_path[:p-1]
+    logger.debug("check_signed_url: %s", url)
+    signed = signed_url(url)
+    if signed != full_path:
+        logger.debug("Mismatch: %s != %s", full_path, signed)
+        signed = "_HIDDEN_"
+        raise SuspiciousOperation("Bad auth code")
+    
+if __name__ == '__main__':
+    import doctest
+    print(doctest.testmod())

app/interface/views.py

@@ -0,0 +1,422 @@
+"""
+
+"""
+
+
+from django.shortcuts import get_object_or_404, redirect, resolve_url
+from django.views.generic import RedirectView
+from django.views.generic.detail import DetailView, SingleObjectMixin
+from django.views.generic.list import ListView
+from django.views.generic.edit import CreateView, UpdateView, FormMixin
+from django.core.exceptions import SuspiciousOperation
+from django.http import Http404, HttpResponseRedirect
+from django.db.models import Q
+from django.utils import timezone
+
+from markdown2 import markdown
+
+from . import models, forms
+from interface.utils import check_signed_url
+
+import logging
+logger = logging.getLogger(__name__)
+
+class AuthorizedResourceMixin(object):
+    """
+    Handles these parts of the permission system:
+        * signed urls
+        * persistent authenticated resources
+        * Admin enforcing
+    """
+
+    SESSION_KEY = 'authorized'
+    admin_required = False
+
+    def is_authorized(self):
+        "By default check if superuser or a signed request"
+        if self.request.is_admin:
+            logger.debug("is_authorized: superuser")
+            return True
+        
+        if 'sig' in self.request.GET:
+            check_signed_url(self.request.get_full_path())
+            self.on_signed_request()
+            return True
+
+        return False
+    
+    def on_signed_request(self):
+        pass
+
+    def is_authorized_key(self, resource, key, auth):
+        current = self.get_authorized_keys(resource).get(str(key), None)
+        if current is None:
+            logger.debug("is_authorized_key: %s %s not in session", resource, key)
+            return False
+        if auth == current:
+            return True
+
+        logger.info("Authorisation revoked")
+        self.del_authorized_key(resource, key)
+        return False
+
+    def get_authorized_keys(self, resource):
+        'Returns a set of authorized keys for this resource'
+        return self._authorized.get(resource, {})
+    
+    def add_authorized_key(self, resource, key, auth):
+        'Adds a key to the authorized list for this resource'
+        current = self.get_authorized_keys(resource)
+        current[str(key)] = auth
+        self._authorized[resource] = current
+        self.request.session[self.SESSION_KEY] = self._authorized
+
+    def del_authorized_key(self, resource, key):
+        logger.info("Revoking authorization for %s %s", resource, key)
+        current = self.get_authorized_keys(resource)
+        if current.pop(key, None) is None:
+            return False
+        if current:
+            self._authorized[resource] = current
+        else:
+            self._authorized.pop(resource)
+        self.request.session[self.SESSION_KEY] = self._authorized
+        return True
+
+    def request_denied(self):
+        raise Http404("Either the given resource doesn't exist or you dont have access to it.")
+
+    def dispatch(self, request, *args, **kwargs):
+
+        self._authorized = request.session.get('authorized', {})
+        request.is_admin = request.user.is_superuser
+
+        if not self.is_authorized():
+            return self.request_denied()
+        
+        if self.admin_required and not request.is_admin:
+            return self.request_denied()
+
+        return super().dispatch(request, *args, **kwargs)
+
+# TODO: RevokeResourceView - increment nonce
+
+class ForgetResourceView(AuthorizedResourceMixin, RedirectView):
+    
+    def is_authorized(self):
+        return True
+
+    def get_redirect_url(self, resource, key):
+        self.del_authorized_key(resource, key)
+        return "/" 
+
+class EnsembleMixin(AuthorizedResourceMixin):
+
+    ensemble_slug_kwarg = 'ensemble'
+    limited_project_access = False
+
+    def is_authorized(self):
+        ensemble_slug = self.kwargs[self.ensemble_slug_kwarg]
+        self.ensemble = get_object_or_404(models.Ensemble, slug=ensemble_slug)
+
+        if super().is_authorized():
+            return True
+        
+        if self.ensemble.has_admin(self.request.user):
+            self.request.is_admin = True
+            return True
+
+        if self.is_authorized_key('ensemble', ensemble_slug, self.ensemble.nonce):
+            return True
+        
+        authorized = set([ int(x) for x in self.get_authorized_keys('project').keys() ])
+        projects = set(self.ensemble.projects.values_list('pk', flat=True))
+        logger.debug("is_authorized: %r & %r", authorized, projects)
+        if authorized & projects:
+            self.limited_project_access = True
+            logger.debug("is_authorized: allowing due to project link")
+            return True
+        return False
+
+    def get_object(self):
+        return self.ensemble
+
+
+class ProjectMixin(AuthorizedResourceMixin):
+
+    project_kwarg = 'project'
+
+    def is_authorized(self):
+        project_id = self.kwargs[self.project_kwarg]
+        self.project = get_object_or_404(models.Project.objects.select_related('ensemble'), pk=project_id)
+
+        if super().is_authorized():
+            return True
+        
+        
+        # check if the current user is an admin on the ensemble
+        if self.project.ensemble.has_admin(self.request.user):
+            logger.debug("is_authorized: ensemble admin for project")
+            self.request.is_admin = True
+            return True
+        
+        if self.is_authorized_key('ensemble', self.project.ensemble.pk, self.project.ensemble.nonce):
+            logger.debug('is_authorized: has ensemble link for project')
+            return True
+
+        if self.is_authorized_key('project', project_id, self.project.nonce):
+            logger.debug('is_authorized: has project link')
+            return True
+
+        return False
+
+    # filter any generated querysets
+    def get_queryset(self):
+        return super().get_queryset().filter(project=self.project)
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        if 'project' in self.kwargs:
+            context['project'] = self.project
+            context['modules'] = self.project.active_modules
+        return context
+
+class CrispyFormMixin(object):
+
+    cancel_url = None
+
+    def get_cancel_url(self):
+        return self.cancel_url
+
+""" ENSEMBLE VIEWS """
+
+class EnsembleListView(AuthorizedResourceMixin, ListView):
+
+    def is_authorized(self):
+        return True
+    
+    def get_queryset(self):
+        ensembles = models.Ensemble.objects.all()
+
+        if self.request.is_admin:
+            return ensembles
+
+        # limit to registered ensembles
+        f = Q(slug__in=self.get_authorized_keys('ensemble').keys()) | Q(projects__in=self.get_authorized_keys('project').keys())
+        
+        # or ensembles where the user is admin
+        if self.request.user.is_authenticated:
+            f |= Q(admins=self.request.user.pk)
+
+        return ensembles.filter(f).distinct()
+
+class EnsembleDetailView(EnsembleMixin, DetailView):
+
+    def request_denied(self):
+        if 'auth' in self.request.GET:
+            if self.request.GET['auth'] != self.ensemble.auth():
+                raise SuspiciousOperation("Bad ensemble link")    
+            self.add_authorized_key('ensemble', self.ensemble.slug, self.ensemble.nonce)
+            return HttpResponseRedirect(resolve_url('ensemble_detail', self.ensemble.slug))
+        
+        return super().request_denied()
+    
+    def get_context_data(self, **kwargs):
+        data = super().get_context_data(**kwargs)
+        inactive = 'inactive' in self.request.GET and self.request.is_admin
+
+        projects = self.ensemble.projects.all()
+        if self.limited_project_access:
+            projects = projects.filter(pk__in=self.get_authorized_keys('project').keys())
+
+        if inactive:
+            projects = projects.order_by('-pk')
+        else:
+            projects = projects.filter(active=True, event_date__gte=timezone.now()-timezone.timedelta(7))
+
+        data['inactive'] = inactive
+        data['object_list'] = projects
+        if self.request.is_admin:
+            #data['ensemble_link'] = signed_url(f'{self.request.path}?nonce={self.ensemble.nonce}')
+            data['ensemble_link'] = self.request.path + "?auth=" + self.ensemble.auth()
+        return data
+
+class EnsembleRevokeView(SingleObjectMixin, RedirectView):
+
+    def get_redirect_url(self):
+        return 
+
+""" PROJECT VIEWS """
+
+class ProjectListView(ProjectMixin, ListView):
+
+    def is_authorized(self):
+        return True
+    
+    def get_project_queryset(self):
+        projects = models.Project.objects.select_related('ensemble')
+        if self.request.is_admin:
+            return projects
+
+        f = Q(pk__in=self.get_authorized_keys('project').keys()) | Q(ensemble__slug__in=self.get_authorized_keys('ensemble').keys())
+        
+        if self.request.user.is_authenticated:
+            f |= Q(ensemble__admins=self.request.user.pk)
+
+        return projects.filter(f)
+
+    def get_queryset(self):
+        qs = self.get_project_queryset()
+        return qs.filter(active=True, event_date__gte=timezone.now()-timezone.timedelta(7))
+
+class ProjectCreateView(EnsembleMixin, CreateView):
+    admin_required = True
+    model = models.Project
+    template_name = "interface/default_form.html"
+    title = "Add a new project"
+    form_class = forms.ProjectForm
+
+    def form_valid(self, form):
+        self.object = form.save(commit=False)
+        self.object.ensemble = self.ensemble
+        self.object.owner = self.request.user
+        self.object.save()
+        return redirect('project_detail', project=self.object.pk)
+
+class ProjectDetailView(ProjectMixin, DetailView):
+
+    def request_denied(self):
+        if 'auth' in self.request.GET:
+            if self.request.GET['auth'] != self.project.auth():
+                raise SuspiciousOperation("Bad project link")
+            self.add_authorized_key('project', self.project.pk, self.project.nonce)
+            return HttpResponseRedirect(resolve_url('project_detail', self.project.pk))
+        return super().request_denied()
+
+    def get_object(self, queryset=None):
+        return self.project
+
+    def get_context_data(self, **kwargs):
+        data = super().get_context_data(**kwargs)
+        if self.request.is_admin:
+            #data['project_link'] = signed_url(f'{self.request.path}?nonce={self.project.nonce}')
+            data['project_link'] = self.request.path + "?auth=" + self.project.auth()
+        return data
+
+class ProjectUpdateView(ProjectMixin, UpdateView):
+    admin_required = True
+    template_name = "interface/default_form.html"
+    pk_url_kwarg = 'project'
+    form_class = forms.ProjectForm
+
+    def get_object(self):
+        return self.project
+
+    @property
+    def cancel_url(self):
+        return self.get_success_url()
+
+    def get_success_url(self):
+        return resolve_url('project_detail', project=self.kwargs['project'])
+
+# Old Makefile from submission module
+#class ProjectMakefileView(EnsembleMixin, DetailView):
+#    template_name = 'interface/project_submissions.mk'
+#    content_type = 'text/plain'
+#
+#    def get_queryset(self):
+#        if self.request.is_admin:
+#            return models.Project.objects.all()
+#
+#        return models.Project.objects.filter(ensemble=self.request.ensemble_id)
+#
+#    def get_context_data(self, **kwargs):
+#        data = super().get_context_data(**kwargs)
+#
+#        data['submissions'] = []
+#        data['targets'] = []
+#        for s in self.object.submissions:
+#            name = s.short_name
+#            data['targets'].append(name)
+#            data['submissions'].append({
+#                'url': self.request.build_absolute_uri(signed_url('submission_download', project=self.kwargs['pk'], pk=s.pk)),
+#                'name': name,
+#            })
+#
+#        return data
+
+""" WIKI VIEWS """
+
+class WikiView(ProjectMixin, DetailView):
+    template_name = 'interface/wiki.html'
+    model = models.WikiPage
+
+    def get_context_data(self, **kwargs):
+        data = super().get_context_data(**kwargs)
+        data['wiki_html'] = markdown(self.object.markdown)
+        return data
+
+class WikiCreateView(ProjectMixin, CreateView):
+    admin_required = True
+    model = models.WikiPage
+    template_name = 'interface/default_form.html'
+    form_class = forms.WikiForm
+
+    def cancel_url(self):
+        return resolve_url('project_detail', self.kwargs['project'])
+
+    def form_valid(self, form):
+        self.object = form.save(commit=False)
+        self.object.project = self.project
+        self.object.save()
+        return redirect('wiki', project=self.object.project_id, pk=self.object.pk)
+
+class WikiEditView(ProjectMixin, UpdateView):
+    admin_required = True
+    model = models.WikiPage
+    form_class = forms.WikiForm
+
+    def cancel_url(self):
+        return resolve_url('wiki', self.kwargs['project'], self.kwargs['pk'])
+
+""" RESOURCE VIEWS """
+
+class ResourceCreateView(ProjectMixin, CreateView):
+    admin_required = True
+    model = models.Resource
+    form_class = forms.ResourceForm
+    template_name = 'interface/default_form.html'
+    title = "Add a new resource"
+
+    def form_valid(self, form):
+        self.object = form.save(commit=False)
+        self.object.project = self.project
+        self.object.save()
+        return redirect('resource_upload', project=self.object.project_id, pk=self.object.pk)
+
+class ResourceUploadView(ProjectMixin, UpdateView):
+    admin_required = True
+    model = models.Resource
+    fields = ['file']
+    template_name = 'interface/default_form.html'
+
+    def get_success_url(self):
+        return resolve_url('resource_list', project=self.kwargs['project'])
+
+class ResourceListView(ProjectMixin, ListView):
+    model = models.Resource
+
+    def get_queryset(self):
+        qs = super().get_queryset()
+        if not self.request.is_admin:
+            qs = qs.filter(visible=True)
+        return qs
+
+class ResourceEditView(ProjectMixin, UpdateView):
+    admin_required = True
+    model = models.Resource
+    fields = ['name', 'description', 'visible']
+    template_name = 'interface/default_form.html'
+
+    def get_success_url(self):
+        return resolve_url('resource_list', project=self.kwargs['project'])

app/library/README.md

@@ -0,0 +1,13 @@
+
+# Model overview
+
+Collections contain Works
+Only the collection's administrators can add/remove/edit items
+Collections can be enabled for Ensembles which makes everything availble in the Library
+
+
+## How do loans work?
+
+1. Project admins need to be able to search for available music - list with access type
+2. Item can be attached to Project
+

app/library/admin.py

@@ -0,0 +1,61 @@
+from django.contrib import admin
+
+from . import models
+
+class EnsembleAccessInline(admin.StackedInline):
+    model = models.EnsembleAccess
+    extra = 0
+
+class CollectionAdmin(admin.ModelAdmin):
+    list_display = ['name', 'location', 'storage', 'prefix']
+    inlines = [EnsembleAccessInline]
+
+admin.site.register(models.Collection, CollectionAdmin)
+
+class ItemInline(admin.TabularInline):
+    model = models.ProjectItem
+    extra = 0
+
+class DocInline(admin.TabularInline):
+    model = models.Document
+    extra = 0
+
+class MetaInline(admin.TabularInline):
+    model = models.WorkMeta
+    extra = 0
+
+class WorkAdmin(admin.ModelAdmin):
+    list_display = ['name', 'composer', 'edition', 'identifier', 'running_time']
+    list_filter = ['collection']
+    search_fields = ['name', 'composer']
+    inlines = [MetaInline, DocInline, ItemInline]
+
+admin.site.register(models.Work, WorkAdmin)
+
+class SectionInline(admin.TabularInline):
+    model = models.Section
+    fields = ['type', 'tag', 'ordinal', 'start', 'end', 'page']
+
+class DocumentAdmin(admin.ModelAdmin):
+    list_display = ['work', '__str__']
+    list_filter = ['work__collection']
+    inlines = [SectionInline]
+
+admin.site.register(models.Document, DocumentAdmin)
+
+class ItemAdmin(admin.ModelAdmin):
+    list_display = ['project', 'work', 'order']
+    list_filter = ['project']
+
+admin.site.register(models.ProjectItem, ItemAdmin)
+
+class EnsembleAccessAdmin(admin.ModelAdmin):
+    list_display = ['ensemble', 'collection', 'access_type']
+    list_filter = ['ensemble']
+
+admin.site.register(models.EnsembleAccess, EnsembleAccessAdmin)
+
+class OrchestrationAdmin(admin.ModelAdmin):
+    list_display = ['name', 'instruments']
+
+admin.site.register(models.Orchestration, OrchestrationAdmin)

app/library/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class LibraryConfig(AppConfig):
+    name = 'library'

app/library/fixtures/default_orchestrations.json

@@ -0,0 +1,38 @@
+[
+{
+ "model": "library.orchestration",
+ "pk": 2,
+ "fields": {
+  "ensemble": null,
+  "name": "SATB",
+  "instruments": "score sop alt ten bass"
+ }
+},
+{
+ "model": "library.orchestration",
+ "pk": 3,
+ "fields": {
+  "ensemble": null,
+  "name": "String Quartet",
+  "instruments": "score vn-1 vn-2 va vc"
+ }
+},
+{
+ "model": "library.orchestration",
+ "pk": 4,
+ "fields": {
+  "ensemble": null,
+  "name": "Chamber Orchestra",
+  "instruments": "score fl cl ob bn vn-1 vn-2 va vc db"
+ }
+},
+{
+ "model": "library.orchestration",
+ "pk": 5,
+ "fields": {
+  "ensemble": null,
+  "name": "Full Orchestra",
+  "instruments": "score picc fl-1 fl-2 ob cl-1 cl-2 bcl bn tpt-1 tpt-2 tpt-3 hn-1 hn-2 hn-3 hn-4 tbn-1 tbn-2 tbn-3 tba timp perc-1 perc-2 mall pf vn-1 vn-2 va vc db"
+ }
+}
+]

app/library/forms.py

@@ -0,0 +1,29 @@
+from django import forms
+from .models import Work
+from interface.models import Project
+from interface.forms import BaseForm
+
+
+class WorkCreateForm(forms.ModelForm, BaseForm):
+
+    class Meta:
+        model = Work
+        fields = ['name', 'composer', 'edition', 'code', 'orchestration', 'licence', 'running_time', 'notes']    
+
+class PlaylistAddForm(forms.Form):
+    work = forms.ModelChoiceField(queryset=Work.objects.all())
+
+    def __init__(self, instance, *args, **kwargs):
+         super(PlaylistAddForm, self).__init__(*args, **kwargs)
+
+         existing = [ x[0] for x in instance.works.values_list('pk') ]
+
+         qs = Work.objects.filter(ensemble_id=instance.ensemble_id).exclude(id__in=existing)
+         self.fields['work'].queryset = qs
+         self.instance = instance
+    
+    def save(self):
+        self.instance.works.add(self.cleaned_data['work'])
+
+class ProjectSelectForm(forms.Form):
+    project = forms.ModelChoiceField(queryset=Project.objects.all())

app/library/management/commands/import_works.py

@@ -0,0 +1,20 @@
+from django.core.management.base import BaseCommand, CommandError
+import argparse
+import csv
+
+from library import models
+
+class Command(BaseCommand):
+    help = 'Imports works from a csv file'
+
+    def add_arguments(self, parser):
+        parser.add_argument('collection', type=int, help="Collection ID")
+        parser.add_argument('source', type=argparse.FileType('r'), help="Source CSV")
+
+    def handle(self, *args, **options):
+
+        collection = models.Collection.objects.get(pk=options['collection'])
+
+        reader = csv.DictReader(options['source'])
+        for row in reader:
+            collection.works.create(name=row['Piece'], composer=row['Composer'], notes=row['Notes'])

app/library/migrations/0001_initial.py

@@ -0,0 +1,122 @@
+# Generated by Django 3.2.7 on 2022-11-19 01:24
+
+import byostorage.user
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import library.models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('byostorage', '0006_alter_userstorage_settings_data'),
+        ('interface', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Collection',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(help_text='Name of the collection', max_length=255)),
+                ('prefix', models.SlugField(default='default', help_text='Folder to store works in', max_length=30)),
+                ('location', models.CharField(blank=True, help_text='Physical location (institution, town...)', max_length=100)),
+                ('notes', models.TextField(blank=True, help_text='Publicly visible notes about collection and loans policy (markdown format)')),
+                ('administrators', models.ManyToManyField(help_text='Administrators for this collection', related_name='collections', to=settings.AUTH_USER_MODEL)),
+                ('storage', models.ForeignKey(blank=True, help_text='User storage for documents', null=True, on_delete=django.db.models.deletion.CASCADE, to='byostorage.userstorage')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Document',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('doctype', models.PositiveSmallIntegerField(choices=[(1, 'PDF'), (2, 'Audio'), (3, 'Video'), (4, 'Source')], default=1)),
+                ('upload', models.FileField(storage=byostorage.user.BYOStorage(), upload_to=library.models.doc_upload_filename)),
+                ('created', models.DateTimeField(auto_now_add=True)),
+                ('version', models.CharField(blank=True, max_length=30)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='ProjectItem',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('checkout', models.DateTimeField()),
+                ('due', models.DateTimeField(blank=True, null=True)),
+                ('returned', models.DateTimeField(blank=True, null=True)),
+                ('order', models.SmallIntegerField(default=0)),
+                ('section', models.CharField(blank=True, max_length=100)),
+                ('approved_by', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='items', to='interface.project')),
+            ],
+            options={
+                'ordering': ['order', 'work'],
+            },
+        ),
+        migrations.CreateModel(
+            name='Work',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('slug', models.SlugField(editable=False, help_text='Used as folder name', max_length=100)),
+                ('name', models.CharField(help_text='Original name of the work', max_length=255)),
+                ('edition', models.CharField(blank=True, help_text='Edition details to distinguish multiple versions', max_length=255)),
+                ('composer', models.CharField(blank=True, help_text='Surname, First Name/Initials', max_length=255)),
+                ('original_parts', models.JSONField(blank=True, default=dict, help_text='Original printed parts (IMSLP format)')),
+                ('code', models.CharField(blank=True, help_text='Collection specific code or number', max_length=100)),
+                ('licence', models.PositiveSmallIntegerField(choices=[(2, 'Public Domain'), (4, 'Copyright Expired'), (6, 'Copyrighted'), (10, 'Internal use only')], default=6, help_text='Copyright status')),
+                ('max_projects', models.IntegerField(default=1, help_text='How many active projects can this work be attached to')),
+                ('running_time', models.DurationField(blank=True, help_text='Running time in seconds', null=True)),
+                ('notes', models.TextField(blank=True)),
+                ('collection', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='works', to='library.collection')),
+                ('parent', models.ForeignKey(blank=True, help_text='Arrangement of another work or part of an anthology', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='related_works', to='library.work')),
+                ('projects', models.ManyToManyField(help_text='Current usage', related_name='works', through='library.ProjectItem', to='interface.Project')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='WorkMeta',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.SlugField(choices=[('tag', 'Tag'), ('arr', 'Arranger'), ('lyrics', 'Lyracist'), ('genre', 'Genre'), ('style', 'Style'), ('orchestration', 'Orchestration')], max_length=20)),
+                ('value', models.CharField(max_length=255)),
+                ('work', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='meta_info', to='library.work')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Section',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('tag', models.CharField(max_length=50)),
+                ('start', models.SmallIntegerField(blank=True, null=True)),
+                ('end', models.SmallIntegerField(blank=True, null=True)),
+                ('doc', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='sections', to='library.document')),
+            ],
+            options={
+                'ordering': ['doc', 'start', 'pk'],
+            },
+        ),
+        migrations.AddField(
+            model_name='projectitem',
+            name='work',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='project_items', to='library.work'),
+        ),
+        migrations.CreateModel(
+            name='EnsembleAccess',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('access_type', models.PositiveSmallIntegerField(choices=[(1, 'Unlimited'), (2, 'Approval required')], default=2)),
+                ('collection', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='allowed_ensembles', to='library.collection')),
+                ('ensemble', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='allowed_collections', to='interface.ensemble')),
+            ],
+            options={
+                'verbose_name_plural': 'Ensemble access',
+            },
+        ),
+        migrations.AddField(
+            model_name='document',
+            name='work',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='docs', to='library.work'),
+        ),
+    ]

app/library/migrations/0002_auto_20221201_0934.py

@@ -0,0 +1,28 @@
+# Generated by Django 3.2.7 on 2022-11-30 22:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('library', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='work',
+            name='slug',
+        ),
+        migrations.AddField(
+            model_name='work',
+            name='path',
+            field=models.CharField(default='', editable=False, help_text='Used as folder name', max_length=255),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='work',
+            name='composer',
+            field=models.CharField(default='Anon', help_text='Surname, Initials', max_length=255),
+        ),
+    ]

app/library/migrations/0003_auto_20221201_1540.py

@@ -0,0 +1,21 @@
+# Generated by Django 3.2.7 on 2022-12-01 04:40
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('library', '0002_auto_20221201_0934'),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='work',
+            unique_together={('collection', 'composer', 'name', 'edition')},
+        ),
+        migrations.RemoveField(
+            model_name='work',
+            name='path',
+        ),
+    ]

app/library/migrations/0004_auto_20230101_1535.py

@@ -0,0 +1,40 @@
+# Generated by Django 3.2.7 on 2023-01-01 04:35
+
+import byostorage.cached
+import byostorage.user
+from django.db import migrations, models
+import library.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('library', '0003_auto_20221201_1540'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='section',
+            options={'ordering': ['doc', 'type', 'start', 'pk']},
+        ),
+        migrations.AddField(
+            model_name='section',
+            name='type',
+            field=models.SmallIntegerField(choices=[(1, 'Instrument'), (2, 'Movement')], default=1),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='document',
+            name='upload',
+            field=models.FileField(storage=byostorage.cached.CachedStorage(byostorage.user.BYOStorage()), upload_to=library.models.doc_upload_filename),
+        ),
+        migrations.AlterField(
+            model_name='work',
+            name='original_parts',
+            field=models.JSONField(default=dict, help_text='Original printed parts (IMSLP format)'),
+        ),
+        migrations.AlterUniqueTogether(
+            name='work',
+            unique_together=set(),
+        ),
+    ]

app/library/migrations/0005_auto_20230101_1547.py

@@ -0,0 +1,22 @@
+# Generated by Django 3.2.7 on 2023-01-01 04:47
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('library', '0004_auto_20230101_1535'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='section',
+            options={'ordering': ['type', 'ordinal', 'doc', 'start', 'pk']},
+        ),
+        migrations.AddField(
+            model_name='section',
+            name='ordinal',
+            field=models.IntegerField(default=0),
+        ),
+    ]

app/library/migrations/0006_auto_20230202_0804.py

@@ -0,0 +1,28 @@
+# Generated by Django 3.2.7 on 2023-02-01 21:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('library', '0005_auto_20230101_1547'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='section',
+            name='tag',
+            field=models.CharField(blank=True, max_length=50),
+        ),
+        migrations.AlterField(
+            model_name='section',
+            name='type',
+            field=models.SmallIntegerField(choices=[(1, 'Instrument'), (2, 'Movement'), (3, 'Excerpt')]),
+        ),
+        migrations.AlterField(
+            model_name='work',
+            name='licence',
+            field=models.PositiveSmallIntegerField(choices=[(2, 'Public Domain'), (4, 'Copyright Expired'), (5, 'Recording Licence'), (6, 'Performance Licence'), (8, 'Perusal Licence'), (10, 'Internal use only')], default=6, help_text='Copyright status'),
+        ),
+    ]

app/library/migrations/0007_orchestration.py

@@ -0,0 +1,33 @@
+# Generated by Django 3.2.7 on 2023-02-14 04:54
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+def add_default_orchestration(apps, schema_editor):
+    m = apps.get_model('library', 'Orchestration').objects
+    m.create(pk=1, name="Custom", instruments="")
+
+
+def remove_default_orchestration(apps, schema_editor):
+    m = apps.get_model('library', 'Orchestration').objects
+    m.filter(pk=1).delete()
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('interface', '0004_auto_20230210_0938'),
+        ('library', '0006_auto_20230202_0804'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Orchestration',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100)),
+                ('instruments', models.TextField()),
+                ('ensemble', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='orchestrations', to='interface.ensemble')),
+            ],
+        ),
+        migrations.RunPython(add_default_orchestration, remove_default_orchestration),
+    ]

app/library/migrations/0010_work_orchestration.py

@@ -0,0 +1,19 @@
+# Generated by Django 3.2.7 on 2023-02-14 05:05
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('library', '0007_orchestration'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='work',
+            name='orchestration',
+            field=models.ForeignKey(default=1, help_text='Orchestration for the work', on_delete=django.db.models.deletion.SET_DEFAULT, to='library.orchestration'),
+        ),
+    ]

app/library/migrations/0011_section_page.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.7 on 2023-02-15 03:54
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('library', '0010_work_orchestration'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='section',
+            name='page',
+            field=models.SmallIntegerField(choices=[(0, 'auto'), (1, 'left'), (2, 'right')], default=0),
+        ),
+    ]

app/library/migrations/0012_auto_20230220_1013.py

@@ -0,0 +1,33 @@
+# Generated by Django 3.2.7 on 2023-02-19 23:13
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('library', '0011_section_page'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='orchestration',
+            name='ensemble',
+        ),
+        migrations.AddField(
+            model_name='orchestration',
+            name='collection',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='custom_orchestrations', to='library.collection'),
+        ),
+        migrations.AlterField(
+            model_name='work',
+            name='original_parts',
+            field=models.JSONField(blank=True, default=dict, help_text='Original printed parts (IMSLP format)'),
+        ),
+        migrations.AlterField(
+            model_name='work',
+            name='running_time',
+            field=models.DurationField(blank=True, help_text='Running time in mm:ss format', null=True),
+        ),
+    ]

app/library/migrations/0013_auto_20230223_1322.py

@@ -0,0 +1,25 @@
+# Generated by Django 3.2.7 on 2023-02-23 02:22
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('library', '0012_auto_20230220_1013'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='section',
+            options={'ordering': ['doc', 'start', 'pk']},
+        ),
+        migrations.RemoveField(
+            model_name='section',
+            name='ordinal',
+        ),
+        migrations.RemoveField(
+            model_name='section',
+            name='type',
+        ),
+    ]

app/library/migrations/0014_auto_20230223_1422.py

@@ -0,0 +1,28 @@
+# Generated by Django 3.2.7 on 2023-02-23 03:22
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('library', '0013_auto_20230223_1322'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='collection',
+            name='nonce',
+            field=models.SmallIntegerField(default=1, help_text='Increment this to reset the authentication links'),
+        ),
+        migrations.AlterField(
+            model_name='work',
+            name='code',
+            field=models.CharField(blank=True, help_text='Collection specific code or number. Will be auto-generated if not supplied', max_length=100),
+        ),
+        migrations.AlterField(
+            model_name='work',
+            name='composer',
+            field=models.CharField(default='Anon', help_text='Composer or compilation editor. Use <b>Surname, Initial</b> for easy searching', max_length=255),
+        ),
+    ]

app/library/models.py

@@ -0,0 +1,390 @@
+from os import SCHED_OTHER
+from django.conf import settings
+from django.shortcuts import resolve_url
+from django.db import models
+from django.utils.text import slugify
+from django.utils.timezone import now
+from django.utils.functional import cached_property
+from django.core.files.storage import get_storage_class
+from django.db.models import Q, Count, Min, Max
+
+import re
+
+from byostorage.user import BYOStorage
+from byostorage.cached import CachedStorage
+
+from library.music_tags import MusicTag
+from interface.utils import sign_data
+
+import logging
+
+#from polyphonic.settings import LIBRARY_STORAGE
+logger = logging.getLogger(__name__)
+
+#try:
+#    library_storage = get_storage_class(settings.LIBRARY_STORAGE)()
+#except (ImportError, AttributeError):
+#    logger.exception("Failed to load library storage")
+#    library_storage = get_storage_class()()
+#logger.info("Library storage: %s", library_storage.__class__.__name__)
+
+# FIXME: move back to settings
+library_storage = CachedStorage(BYOStorage())
+
+class Orchestration(models.Model):
+    """
+    Stores a list of instrument codes as a single entry (space delimited).
+    Can be global or ensemble specific
+    """
+    # TODO: change ensemble to collection
+    #ensemble = models.ForeignKey('interface.Ensemble', on_delete=models.CASCADE, related_name="orchestrations", null=True, blank=True)
+    collection = models.ForeignKey('Collection', on_delete=models.CASCADE, related_name="custom_orchestrations", null=True, blank=True)
+    name = models.CharField(max_length=100)
+    instruments = models.TextField()
+
+    def as_list(self):
+        tags = [ t.strip() for t in self.instruments.split(' ') ]
+        return [ (t, MusicTag.from_tag(t)) for t in tags if t ]
+    
+    def tag_order(self):
+        tags = [ t.strip() for t in self.instruments.split(' ') if t ]
+        order = {'score': 0}
+        for i, t in enumerate(tags):
+            order.setdefault(t.strip('-0123456789'), i*2+1)
+            
+        return order
+
+    def sorter(self):
+        tag_order = self.tag_order()
+        def f(x):
+            return (tag_order.get(x[0].strip('-0123456789'), 1000), x[0])
+        return f
+
+    def save(self):
+        self.as_list()
+        super(Orchestration, self).save()
+
+    def __str__(self):
+        return self.name
+
+class ProjectItem(models.Model):
+    """
+    ProjectItem represents a Work attached to a Project e.g. item in set list or programme
+    It also allows works to be shared from one ensemble to another on a per-project basis.
+    """
+    project = models.ForeignKey('interface.Project', on_delete=models.CASCADE, related_name='items')
+    work = models.ForeignKey('Work', on_delete=models.CASCADE, related_name='project_items')
+    checkout = models.DateTimeField()
+    due = models.DateTimeField(null=True, blank=True)
+    returned = models.DateTimeField(null=True, blank=True)
+    approved_by = models.ForeignKey('auth.User', on_delete=models.CASCADE)
+    order = models.SmallIntegerField(default=0)
+    section = models.CharField(max_length=100, blank=True)
+    
+
+    class Meta:
+        ordering = ['order', 'work']
+
+    def __str__(self):
+        return f"<{self.project_id}:{slugify(self.work.name)}>"
+
+class Collection(models.Model):
+    """
+    A logical collection of works, typically owned by an organisation or person (physical or virtual)
+    """
+    name = models.CharField(max_length=255,
+            help_text="Name of the collection")
+    prefix = models.SlugField(max_length=30, default="default",
+            help_text="Folder to store works in")
+    administrators = models.ManyToManyField('auth.User', related_name="collections", 
+            help_text="Administrators for this collection")
+    location = models.CharField(max_length=100, 
+            help_text="Physical location (institution, town...)", blank=True)
+    storage = models.ForeignKey('byostorage.UserStorage', on_delete=models.CASCADE, null=True, blank=True, 
+            help_text="User storage for documents")
+    notes = models.TextField(blank=True, 
+            help_text="Publicly visible notes about collection and loans policy (markdown format)")
+    nonce = models.SmallIntegerField(default=1,
+            help_text="Increment this to reset the authentication links")
+
+    def meta(self, name):
+        items = WorkMeta.objects.filter(work__collection=self.pk, name=name).values_list('value', flat=True).distinct()
+        return items
+
+    @property
+    def tags(self):
+        return self.meta('tag')
+
+    @property
+    def genres(self):
+        return self.meta('genre')    
+    
+    def has_administrator(self, user):
+        if not user.is_authenticated:
+            return False
+        if user.is_superuser:
+            return True
+        return user.pk in self.administrators.values_list('pk', flat=True)
+
+    def get_absolute_url(self):
+        return resolve_url('collection_work_list', self.pk)
+
+    def auth(self):
+        return sign_data(f'{self.pk}-{self.nonce}', 12)
+    
+    def __str__(self):
+        return self.name
+
+class EnsembleAccess(models.Model):
+    """
+    Can have different access levels to a collection
+    """
+
+    ACCESS_UNLIMITED = 1
+    ACCESS_APPROVED = 2
+
+    ACCESS_TYPES = (
+        (ACCESS_UNLIMITED, 'Unlimited'),
+        (ACCESS_APPROVED, 'Approval required'),
+    )
+
+    ensemble = models.ForeignKey('interface.Ensemble', on_delete=models.CASCADE, related_name="allowed_collections")
+    collection = models.ForeignKey(Collection, on_delete=models.CASCADE, related_name="allowed_ensembles")
+    access_type = models.PositiveSmallIntegerField(choices=ACCESS_TYPES, default=2)
+
+    class Meta:
+        verbose_name_plural = "Ensemble access"
+
+
+class Work(models.Model):
+    """
+    A musical work 'owned' by a collection from a licencing perspective.
+    """
+    LICENCE_PUBLIC = 2
+    LICENCE_EXPIRED = 4
+    LICENCE_RECORDING = 5
+    LICENCE_PERFORMANCE = 6
+    LICENCE_PERUSAL = 8
+    LICENCE_NONE = 10
+
+    LICENCE_TYPES = (
+        (LICENCE_PUBLIC, 'Public Domain'),
+        (LICENCE_EXPIRED, 'Copyright Expired'),
+        (LICENCE_RECORDING, 'Recording Licence'),
+        (LICENCE_PERFORMANCE, 'Performance Licence'),
+        (LICENCE_PERUSAL, 'Perusal Licence'),
+        (LICENCE_NONE, 'Internal use only'),
+    )
+    
+    name = models.CharField(max_length=255, help_text="Original name of the work")
+    edition = models.CharField(max_length=255, blank=True,
+            help_text="Edition details to distinguish multiple versions")
+    parent = models.ForeignKey('Work', null=True, blank=True, on_delete=models.SET_NULL, related_name="related_works",
+            help_text="Arrangement of another work or part of an anthology")
+    composer = models.CharField(max_length=255, default='Anon',
+            help_text="Composer or compilation editor. Use <b>Surname, Initial</b> for easy searching")
+
+    orchestration = models.ForeignKey(Orchestration, on_delete=models.SET_DEFAULT, default=1, help_text="Orchestration for the work")
+    original_parts = models.JSONField(default=dict, blank=True, help_text="Original printed parts (IMSLP format)")
+
+    # Collection details
+    collection = models.ForeignKey(Collection, on_delete=models.CASCADE, related_name="works")
+    code = models.CharField(max_length=100, blank=True, help_text="Collection specific code or number. Will be auto-generated if not supplied")
+    licence = models.PositiveSmallIntegerField(choices=LICENCE_TYPES, default=6, help_text="Copyright status")
+    max_projects = models.IntegerField(default=1, help_text="How many active projects can this work be attached to")
+    
+    # Extra info
+    running_time = models.DurationField(null=True, blank=True, help_text="Running time in mm:ss format")
+    notes = models.TextField(blank=True)
+
+    # Allocation to projects 
+    projects = models.ManyToManyField('interface.Project', through='ProjectItem', related_name="works", help_text="Current usage")
+
+    @property
+    def folder(self):
+        return f"{slugify(self.composer)}/{slugify(self.name)}-{self.pk:04d}"
+
+    def extract(self, *tags):
+
+        qs = self.docs.filter(sections__tag__in=tags)
+        qs = qs.annotate(Count('sections'), end=Min('sections__end'), start=Max('sections__start')) \
+            .filter(sections__count=len(tags))
+        
+        return list(qs.values_list('upload', 'start', 'end'))
+
+    @property
+    def digital_parts(self):
+        sections = [ (s.tag, s) for s in Section.objects.filter(doc__work=self.pk) ]
+        sections.sort(key=self.orchestration.sorter())
+        return [ s[1] for s in sections ]
+
+    @property
+    def physical_parts(self):
+        if not self.original_parts:
+            return []
+        parts = list(self.original_parts.items())
+        parts.sort(key=self.orchestration.sorter())
+        return [ (MusicTag.from_tag(x[0]), x[1]) for x in parts ]
+
+    @property
+    def tags(self):
+        return self.meta_info.filter(name='tag').values_list('value', flat=True)
+
+    @property
+    def meta(self):
+        return self.meta_info.exclude(name='tag')
+
+    @property
+    def active_projects(self):
+        return self.projects.filter(active=True)
+
+    @property
+    def current_loans(self):
+        return self.project_items.filter(checkout__lte=now(), returned=None).select_related('project')
+
+    @cached_property
+    def loans(self):
+        try:
+            return self.loan_count
+        except AttributeError:
+            return self.project_items.filter(checkout__lte=now(), returned=None).count()
+
+    @property
+    def is_available(self):
+        if self.max_projects < 0:
+            return True
+        return self.max_projects > self.loans
+
+    @property
+    def available(self):
+        if self.max_projects < 0:
+            return 'Unlimited'
+        a = self.max_projects - self.loans
+        return '{0} of {1}'.format(max(a, 0), self.max_projects)
+
+    @property
+    def identifier(self):
+
+        if self.code:
+            return self.code;
+
+        composer = self.composer or "Anon"
+        composer = re.sub('[^\w]', '', composer)
+        words = self.name.split()
+        work = words[0][:3]
+
+        return f"{composer[:4]}-{work}-{self.pk:05d}".upper()
+
+    def assigned_instruments(self):
+        return Section.objects.filter(doc__work_id=self.pk, type=Section.TYPE_INSTRUMENT).values_list('tag', flat=True)
+
+    def unassigned_instruments(self):
+        assigned = set(self.assigned_instruments())
+        return [ x for x in self.orchestration.as_list() if not x[0] in assigned ]
+
+    def __str__(self):
+        return f"{self.name} ({self.composer})"
+
+class WorkMeta(models.Model):
+
+    META_CHOICES = (
+        ('tag', 'Tag'),
+        ('arr', 'Arranger'),
+        ('lyrics', 'Lyracist'),
+        ('genre', 'Genre'),
+        ('style', 'Style'),
+        ('orchestration', 'Orchestration'),
+    )
+    
+    work = models.ForeignKey(Work, on_delete=models.CASCADE, related_name='meta_info')
+    name = models.SlugField(max_length=20, choices=META_CHOICES)
+    value = models.CharField(max_length=255)
+
+def doc_upload_filename(doc, filename):
+    collection = doc.work.collection
+    storage = collection.storage
+    if not storage:
+        raise RuntimeError("Collection has no storage attached")
+    return f'{storage}:library/{collection.prefix}/{doc.work.folder}/{filename}'
+
+class Document(models.Model):
+    """
+    Document represents a single file stored in the storage backend.
+    """
+
+    DOCTYPE_PDF = 1
+    DOCTYPE_AUDIO = 2
+    DOCTYPE_VIDEO = 3
+    DOCTYPE_SOURCE = 4
+
+    DOCTYPES = (
+        (DOCTYPE_PDF, 'PDF'),
+        (DOCTYPE_AUDIO, 'Audio'),
+        (DOCTYPE_VIDEO, 'Video'),
+        (DOCTYPE_SOURCE, 'Source'),
+    )
+
+    work = models.ForeignKey('Work', on_delete=models.CASCADE, related_name="docs")
+    doctype = models.PositiveSmallIntegerField(choices=DOCTYPES, default=DOCTYPE_PDF)
+    upload = models.FileField(upload_to=doc_upload_filename, storage=library_storage)
+    created = models.DateTimeField(auto_now_add=True)
+    version = models.CharField(max_length=30, blank=True)
+
+    def delete(self, *args, **kwargs):
+        self.upload.delete(save=False)
+        return super().delete(*args, **kwargs)
+
+    def __str__(self):
+        return self.upload.name
+
+class Section(models.Model):
+    """
+    Section is a tagged portion of a Document
+    """
+    
+    PAGE_AUTO = 0
+    PAGE_LEFT = 1
+    PAGE_RIGHT = 2
+
+    PAGE_PREFERENCE = (
+        (PAGE_AUTO, 'auto'),
+        (PAGE_LEFT, 'left'),
+        (PAGE_RIGHT, 'right'),
+    )
+
+
+    doc = models.ForeignKey(Document, on_delete=models.CASCADE, related_name="sections")
+    tag = models.CharField(max_length=50, blank=True)
+    start = models.SmallIntegerField(null=True, blank=True)
+    end = models.SmallIntegerField(null=True, blank=True)
+    page = models.SmallIntegerField(default=PAGE_AUTO, choices=PAGE_PREFERENCE) # NOT CURRENTLY USED
+
+    class Meta:
+        ordering = ['doc', 'start', 'pk']
+
+    @property
+    def music_tag(self):
+        return MusicTag.from_tag(self.tag)
+
+    @property
+    def name(self):
+        return str(self.music_tag)
+
+    @property
+    def bulma_class(self):
+        return "success" if self.music_tag.is_general else 'info'
+
+    @property
+    def filename(self):
+        return slugify(f'{self.doc.work.name} - {self.name}').title() + '.pdf'
+
+    @property 
+    def pagerange(self):
+        if self.start:
+            if self.end:
+                return f"{self.start}-{self.end}"
+            return str(self.start)
+        return "all"
+
+    def __str__(self):
+        return self.name

app/library/music_tags.py

@@ -0,0 +1,233 @@
+
+from collections import namedtuple
+
+GENERAL = """
+mvmt    Movement
+ex      Excerpt
+sec     Section
+pce     Piece
+"""
+
+# taken from https://imslp.org/wiki/IMSLP:Abbreviations_for_MusicTags
+# Abbreviations at the top will take precidence in reverse lookups
+
+INSTRUMENTS = """
+score   Score
+
+cb      Double bass
+mall    Mallet percussion
+
+acc 	Accordion 
+afl 	Alto flute 
+alt 	Alto (voice) (contralto) 
+arp 	Arpeggione 
+bag 	Bagpipe 
+bar 	Baritone (voice) 
+bass 	Bass (voice) 
+bbar 	Bass baritone (voice) 
+bc 	    Continuo (Basso continuo) 
+bcl 	Bass clarinet 
+bell 	Bell (Chimes) 
+bfl 	Bass flute 
+bgtr 	Bass guitar 
+bjo 	Banjo 
+bn 	    Bassoon 
+bob 	Bass oboe (Baritone oboe) 
+br 	    Brass MusicTags 
+bryt 	Baryton 
+bstcl 	Basset clarinet 
+bsthn 	Basset horn 
+bug 	Bugle 
+cbcl 	Contrabass clarinet 
+cbn 	Contrabassoon 
+cch 	Children's chorus 
+cel 	Celesta 
+ch 	    Mixed chorus 
+cimb 	Cimbalom 
+cit 	Cittern 
+cl 	    Clarinet 
+clvd 	Clavichord 
+cm 	    Chalumeau 
+conc 	Concertina 
+crh 	Crumhorn 
+crt 	Cornet 
+crtt 	Cornett (Zink) 
+cv 	    Child's voice 
+db 	    Double Bass 
+drum    Drumset
+dlcn 	Dulcian 
+dom 	Domra 
+dulc 	Dulcimer 
+egtr 	Electric guitar 
+eh 	    English horn (Cor anglais) 
+elec 	Electronic MusicTags 
+epf 	Electric piano 
+eq 	    Equal voices 
+erhu 	Erhu 
+euph 	Euphonium 
+fch 	Female chorus 
+fda 	Flute d'amore (Tenor flute) 
+fgh 	Flugelhorn 
+fife 	Fife 
+fl 	    Flute 
+flag 	Flageolet 
+ghca 	Glass harmonica (Bowl organ) 
+gl 	    Glockenspiel 
+gtr 	Guitar 
+harm 	Harmonium 
+hca 	Harmonica (Mouth Organ) 
+heck 	Heckelphone 
+hn 	    Horn 
+hp 	    Harp 
+hpd 	Harpsichord 
+kbd 	Keyboard MusicTag 
+lute 	Lute 
+lyre 	Lyre 
+mand 	Mandolin 
+mar 	Marimba 
+mch 	Male chorus 
+mez 	Mezzo-soprano 
+mus 	Musette 
+nar 	Narrator (Reciter) 
+ob 	    Oboe 
+oca 	Ocarina 
+oda 	Oboe d'amore 
+om 	    Ondes Martenot 
+oph 	Ophicleide 
+orch 	Orchestra 
+org 	Organ 
+oud 	Oud 
+pan 	Pan flute (Pan-pipes) 
+perc 	Percussion 
+pf 	    Piano 
+pf3h 	Piano 3 hands 
+pf4h 	Piano 4 hands 
+pf5h 	Piano 5 hands 
+pf6h 	Piano 6 hands 
+pflh 	Piano left hand 
+pfped 	Pedal piano 
+pfrh 	Piano right hand 
+picc 	Piccolo 
+pipa 	Pipa 
+pk 	    Timpani 
+ptpt 	Piccolo trumpet 
+reb 	Rebec 
+rec 	Recorder 
+sar 	Sarrusophone 
+sax 	Saxophone 
+sheng 	Sheng 
+shw 	Shawm 
+sit 	Sitar 
+skbt 	Sackbut 
+sop 	Soprano (voice) 
+srp 	Serpent 
+stpt 	Slide trumpet 
+str 	String MusicTags 
+sxh 	Saxhorn 
+syn 	Synthesizer 
+tba 	Tuba 
+tbn 	Trombone 
+ten 	Tenor 
+thrm 	Theremin 
+timp 	Timpani 
+tpt 	Trumpet 
+uch 	Unison chorus 
+uke 	Ukelele (Ukulele) 
+v 	    Voice (solo) 
+va 	    Viola 
+vap 	Viola pomposa 
+vc 	    Cello 
+vda 	Viola d'amore 
+vib 	Vibraphone 
+vie 	Vielle (Hurdy-Gurdy) 
+viol 	Viol (Viola da gamba) 
+vlne 	Violone 
+vn 	    Violin 
+vuv 	Vuvuzela 
+vv 	    Voices (multiple soloists) 
+wag 	Wagner tuba 
+ww 	    Woodwind MusicTags 
+xiao 	Xiao 
+xyl 	Xylophone 
+zith 	Zither 
+"""
+
+MUSIC_TAGS = []
+GENERAL_TAGS = set()
+for i, abbreviations in enumerate((GENERAL, INSTRUMENTS)):
+    for line in abbreviations.split('\n'):
+        parts = line.strip().split(maxsplit=1)
+        if len(parts) < 2: continue
+        name, _, _ = parts[1].partition('(')
+        MUSIC_TAGS.append((parts[0], name))
+        if i == 0:
+            GENERAL_TAGS.add(parts[0])
+
+
+MUSIC_NAME_BY_TAG = dict(MUSIC_TAGS)
+MUSIC_TAG_BY_NAME = dict( ( (x[1].lower(), x[0]) for x in MUSIC_TAGS ) )
+
+class MusicTag(namedtuple('MusicTag', ('name', 'variant'), defaults=[None])):
+
+    @classmethod
+    def from_tag(cls, tag):
+        """
+        >>> MusicTag.from_tag('vn-1')
+        MusicTag(name='Violin', variant='1')
+        >>> MusicTag.from_tag('db')
+        MusicTag(name='Double Bass', variant=None)
+        >>> MusicTag.from_tag('Jaws Harp')
+        MusicTag(name='Jaws Harp', variant=None)
+        >>> MusicTag.from_tag('mvmt-2')
+        MusicTag(name='Movement', variant='2')
+        >>> MusicTag.from_tag('pce-A2')
+        MusicTag(name='Piece', variant='A2')
+        """
+        abbr, _, variant = tag.partition('-')
+        name = MUSIC_NAME_BY_TAG.get(abbr.lower(), abbr)
+
+        if variant:
+            return cls(name, variant)
+        return cls(name, None)
+    
+    @property
+    def tag(self):
+        l = self.name.lower()
+        return MUSIC_TAG_BY_NAME.get(l, l)
+
+    @property
+    def is_general(self):
+        """
+        >>> MusicTag('Piece', 'A3').is_general
+        True
+        >>> MusicTag('Violin', 2).is_general
+        False
+        """
+        return self.tag in GENERAL_TAGS 
+
+    def abbreviate(self):
+        """
+        >>> MusicTag('Violin', 1).abbreviate()
+        'vn-1'
+        >>> MusicTag('Double Bass').abbreviate()
+        'db'
+        """
+        tag = MUSIC_TAG_BY_NAME.get(self.name.lower())
+        if self.variant:
+            tag = f"{tag}-{self.variant}"
+        return tag
+
+    def __str__(self):
+        """
+        >>> str(MusicTag('Violin', 1))
+        'Violin 1'
+        >>> str(MusicTag('Double Bass'))
+        'Double Bass'
+        """
+        if self.variant:
+            return f"{self.name} {self.variant}"
+        return self.name
+
+if __name__ == "__main__":
+    import doctest
+    print(doctest.testmod())

app/library/pdf_utils.py

@@ -0,0 +1,65 @@
+import tempfile
+import subprocess
+import os.path
+import string
+
+SAFECHARS = string.ascii_letters + string.digits + " _-"
+
+def extract_pages(source, bookmark, start=None, end=None, count=1):
+
+    return extract_and_concat([(source, bookmark, start, end, count)])
+
+def extract_and_concat(items):
+    
+    # create a temporary directory for our sections
+    d = tempfile.TemporaryDirectory(prefix="polyphonic_")
+    pdfmarks = os.path.join(d.name, 'pdfmarks.txt')
+    marks = open(pdfmarks, 'w')
+
+    sections = []
+    current_page = 1
+
+    for i, (source, bookmark, start, end, count) in enumerate(items):
+
+        if count == 0:
+            continue
+
+        if start is None:
+            sections.append(source)
+
+        else:
+
+            if end is None:
+                end = start
+
+            dest = os.path.join(d.name, f'section_{i}.pdf')
+
+            cmd = ['gs', '-sDEVICE=pdfwrite', '-dBATCH', '-dNOPAUSE', 
+                f'-dFirstPage={start}', f'-dLastPage={end}', 
+                f'-sOutputFile={dest}',
+                source]
+
+            bookmark = "".join(filter(lambda c: c in SAFECHARS, bookmark))
+
+            marks.write(f'[/Title ({bookmark}) /Page {current_page} /OUT pdfmark\n')
+
+            p = subprocess.run(cmd, check=True, capture_output=True)
+            pages = len([ x for x in p.stdout.splitlines() if x.decode('utf8').startswith('Page ')])
+            for j in range(count):
+                sections.append(dest)
+                current_page += pages
+
+    marks.close()
+
+    # concat the items
+    output = tempfile.NamedTemporaryFile(prefix="polyphonic_", suffix='.pdf')
+
+    cmd = ['gs', '-sDEVICE=pdfwrite', '-q', '-dBATCH', '-dNOPAUSE',
+           '-sOutputFile=-']
+    cmd.extend(sections)
+    cmd.append(pdfmarks)
+
+    subprocess.run(cmd, stdout=output)
+
+    output.seek(0)
+    return output

app/library/templates/library/collection_list.html

@@ -0,0 +1,37 @@
+{% extends "interface/project_base.html" %}
+
+{% block page %}
+<h3 class="title">Library collections for {% firstof request.user.first_name request.user.username %}</h3>
+
+<div class="columns is-multiline">
+{% for collection in object_list %}
+    <div class="column is-half">
+        <div class="card">
+            <header class="card-header">
+                <a class="" href="{% url 'collection_work_list' collection=collection.id %}">
+                    <p class="card-header-title">{{ collection.name }}</p>
+                </a>
+            </header>
+            <div class="card-content">
+                <p>
+                    {% if collection.location %}{{ collection.location }},{% endif %}
+                    {{ collection.works.count }} item{{ collection.works.count|pluralize }}.
+                </p>
+                <p>
+                    {% for tag in collection.tags %}
+                    <a href="{% url 'collection_work_list' collection.pk %}?filter=tag:{{ tag }}" class="tag is-success">{{ tag }}</a>
+                    {% endfor %}
+                    {% for genre in collection.genres %}
+                    <a href="{% url 'collection_work_list' collection.pk %}?filter=genre:{{ genre }}" class="tag is-warning">{{ genre }}</a>
+                    {% endfor %}
+                </p>
+            </div>
+        </div>
+    </div>
+    {% endfor %}
+</div>
+
+<div>
+    <small>{{ ensemble.ensemble_code }}</small>
+</div>
+{% endblock %}

app/library/templates/library/document_annotate.html

@@ -0,0 +1,448 @@
+{% extends "interface/project_base.html" %}
+
+{% block admin %}
+<a href="#" onclick="saveTags()" class="button is-link">
+  <span class="icon"><i class="fas fa-save"></i></span>
+  <span>Save</span>
+</a>
+<a href="{% url 'work_detail' collection=collection.pk pk=object.work_id %}" class="button is-link is-light">
+  <span>Cancel</span>
+</a>
+{% endblock %}
+
+{% block media %}
+<style>
+  .tag-grid {
+    display: flex;
+  }
+  .grid-column {
+    margin-left: 1em;
+    margin-right: 1em;
+  }
+  .grid-page {
+    height: 25px;
+    margin-bottom: 5px;
+    border: 1px solid #999;
+    border-radius: 5px;
+    text-align: center;
+    width: 50px;
+    cursor: pointer;
+  }
+  .grid-page.is-active {
+    background-color: var(--primary);
+    color: white;
+  }
+  .grid-tag {
+    border: 2px solid var(--primary);
+    background-color: rgba(240, 240, 240, 0.5);
+    border-radius: 5px;
+    padding-left: 1em;
+    padding-right: 1em;
+    margin-bottom: 5px;
+    min-width: 200px;
+    position: absolute;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: start;
+  }
+  #tag-area {
+    min-width: 220px;
+  }
+  .instrument {
+    display: list-item !important;
+  }
+  .instrument:hover {
+    background-color: var(--primary);
+    color: white;
+  }
+</style>
+{% endblock %}
+
+{% block page %}
+<h3 class="subtitle"><a href="{% url 'work_detail' collection.pk document.work_id %}">{{ document.work.name }}</a></h3>
+<div id="annotation-area" class="columns is-centered">
+  <div class="column is-narrow">
+  <div class="columns">
+    <div class="column is-narrow">
+      <button class="button is-small is-primary" id="prev">&lt;</button>
+    </div>
+    <div class="column">
+      <span id="page-num">-</span> / <span id="page-count">-</span>
+    </div>
+    <div class="column is-narrow">
+      <button class="button is-small is-primary" id="next">&gt;</button>
+    </div>
+  </div>
+  <ul id="unassigned-area">
+  {% for tag, inst in document.work.unassigned_instruments %}
+    <li class="is-clickable" onclick="assignInstrument('{{tag}}', this)")>{{ inst }}</li>
+  {% endfor %}
+    <li><a onclick="document.getElementById('add-modal').classList.add('is-active')">Add instrument</a></li>
+  </ul>
+  </div>
+  <div class="column is-narrow">
+    <div class="has-text-centered">
+      <div class="box" style="display: inline-block;">
+        <canvas id="inline-viewer" style="width: 500px;"></canvas>
+      </div>
+    </div>
+  </div>
+  <div class="column is-narrow">
+
+    <div class="tag-grid">
+      <div class="grid-column" id="page-list">
+      </div>
+      <div class="grid-column" id="tag-area">
+      </div>
+    </div>
+    <button class="button is-primary" style="width: 100%" onclick="expandEntries()">Expand</button>
+
+  </div>
+</div>
+
+<div class="modal" id="add-modal">
+  <div class="modal-background" onclick="closeAddModal()"></div>
+  <div class="modal-card">
+    <header class="modal-card-head">
+      <p class="modal-card-title">Add Instrument</p>
+      <button class="delete" aria-label="close" onclick="closeAddModal()"></button>
+    </header>
+    <section class="modal-card-body">
+      <div class="field has-addons">
+        <span class="control">
+          <input type="text" class="input" list="instrument-list" id="add-instrument-name"/>
+          <datalist id="instrument-list">
+            {% for inst in json_data.instruments.values %}
+            <option value="{{inst}}"/>
+            {% endfor %}
+          </datalist>
+        </span>
+        <span class="control">
+          <input type="number" class="input" max="4" min="1" size="3" id="add-instrument-variant"/>
+        </span>
+        <span class="control">
+          <button class="button is-primary" onclick="addInstrument()">Add</button>
+        </span>
+      </div>
+    </section>
+  </div>
+</div>
+
+<p>{{ document.upload.name }}</p>
+
+{% endblock %}
+
+{% block scripts %}
+<script src="https://cdnjs.cloudflare.com/ajax/libs/pdf.js/2.7.570/pdf.min.js"
+  integrity="sha512-g4FwCPWM/fZB1Eie86ZwKjOP+yBIxSBM/b2gQAiSVqCgkyvZ0XxYPDEcN2qqaKKEvK6a05+IPL1raO96RrhYDQ=="
+  crossorigin="anonymous"></script>
+{{ json_data|json_script:"data" }}
+<script type="text/javascript">
+  let url = "{{ document.upload.url|safe }}";
+
+  // Loaded via <script> tag, create shortcut to access PDF.js exports.
+  let pdfjsLib = window['pdfjs-dist/build/pdf'];
+
+  // The workerSrc property shall be specified.
+  pdfjsLib.GlobalWorkerOptions.workerSrc = 'https://cdnjs.cloudflare.com/ajax/libs/pdf.js/2.7.570/pdf.worker.min.js';
+
+  // get current page tags
+  let data = JSON.parse(document.getElementById('data').textContent);
+  let tagArea = document.getElementById('tag-area');
+  var dirty = false;
+
+  //document.getElementById('tag-list').onclick = (e) => setTag(e.target.dataset.tag);
+
+  var pdfDoc = null,
+    pageNum = 1,
+    pageRendering = false,
+    pageNumPending = null,
+    scale = 1,
+    canvas = document.getElementById('inline-viewer'),
+    ctx = canvas.getContext('2d');
+
+  /**
+   * Get page info from document, resize canvas accordingly, and render page.
+   * @param num Page number.
+   */
+  function renderPage(num) {
+    pageRendering = true;
+    // Using promise to fetch the page
+    pdfDoc.getPage(num).then(function (page) {
+      var viewport = page.getViewport({ scale: scale });
+      canvas.height = viewport.height;
+      canvas.width = viewport.width;
+
+      // Render PDF page into canvas context
+      var renderContext = {
+        canvasContext: ctx,
+        viewport: viewport
+      };
+      var renderTask = page.render(renderContext);
+
+      try {
+        document.getElementById('grid-page-' + pageNum).classList.remove('is-active');
+      } catch(e) {}
+
+      pageNum = num;
+      document.getElementById('grid-page-' + pageNum).classList.add('is-active');
+
+      // Wait for rendering to finish
+      renderTask.promise.then(function () {
+        pageRendering = false;
+        if (pageNumPending !== null) {
+          // New page rendering is pending
+          renderPage(pageNumPending);
+          pageNumPending = null;
+        }
+      });
+    });
+
+    // Update page counters
+    document.getElementById('page-num').textContent = num;
+
+  }
+
+  /**
+   * If another page rendering in progress, waits until the rendering is
+   * finised. Otherwise, executes rendering immediately.
+   */
+  function queueRenderPage(num) {
+    if (pageRendering) {
+      pageNumPending = num;
+    } else {
+      renderPage(num);
+    }
+  }
+
+  /**
+   * Displays previous page.
+   */
+  function onPrevPage() {
+    if (pageNum <= 1) {
+      return;
+    }
+    queueRenderPage(pageNum-1);
+  }
+  document.getElementById('prev').addEventListener('click', onPrevPage);
+
+  /**
+   * Displays next page.
+   */
+  function onNextPage() {
+    if (pageNum >= pdfDoc.numPages) {
+      return;
+    }
+    queueRenderPage(pageNum+1);
+  }
+  document.getElementById('next').addEventListener('click', onNextPage);
+
+  /**
+   * Asynchronously downloads PDF.
+   */
+  pdfjsLib.getDocument(url).promise.then(function (pdfDoc_) {
+    pdfDoc = pdfDoc_;
+
+    const pageList = document.getElementById('page-list');
+    pageList.innerHTML = '';
+    for (var i=0; i<pdfDoc.numPages; i++) {
+      let page = i+1;
+      let el = document.createElement('div');
+      el.className = 'grid-page';
+      el.id = 'grid-page-' + page;
+      el.innerHTML = page;
+      el.addEventListener('click', (evt) => {
+        queueRenderPage(page);
+      });
+      pageList.appendChild(el);
+    }
+
+    document.getElementById('page-count').textContent = pdfDoc.numPages;
+
+    // Initial/first page rendering
+    renderPage(pageNum);
+
+    tagArea.innerHTML = '';
+    for (let pageTag of data.pageTags) {
+      addTag(pageTag[0], pageTag[1], pageTag[2]);
+    }
+    dirty = false;
+  });
+
+  function closeAddModal() {
+    document.getElementById('add-modal').classList.remove('is-active');
+    document.getElementById('add-instrument-name').value = "";
+    document.getElementById('add-instrument-variant').value = "";
+  }
+
+  function addInstrument() {
+    let name = document.getElementById('add-instrument-name');
+    let variant = document.getElementById('add-instrument-variant');
+
+    let inst_name = name.value;
+    var tag = null;
+    for (let key in data.instruments) {
+      if (data.instruments[key] == inst_name) {
+        tag = key;
+        break;
+      }
+    }
+
+    if (!tag) {
+      alert("Unknown tag: " + name);
+      return;
+    }
+
+    if (variant.value) {
+      tag += "-" + variant.value;
+    }
+
+    variant.value = '';
+    name.value = '';
+
+    addTag(tag, pageNum, pageNum);
+  }
+
+  function assignInstrument(tag, el) {
+    addTag(tag, pageNum, pageNum);
+    el.remove();
+  }
+
+  function addTag(tag, start, end) {
+    console.log("addTag", tag, start, end);
+    const el = document.createElement('div');
+    el.className = 'grid-tag';
+    el.dataset.tag = tag;
+    el.dataset.start = start;
+    el.dataset.end = end;
+
+    let setStart = document.createElement('span');
+    setStart.className = "icon is-action";
+    setStart.innerHTML = '<i class="fas fa-sort-amount-down" title="Set start page"></i>';
+    setStart.addEventListener('click', () => setTagStart(el));
+    el.appendChild(setStart);
+    
+
+    let label = document.createElement('span');
+
+    let name = document.createElement('b');
+    name.innerHTML = get_instrument(tag);
+    label.appendChild(name);
+    
+    let del = document.createElement('span');
+    del.className = "icon is-action";
+    del.innerHTML = '<i class="fas fa-trash-alt" title="Remove this tag"></i>';
+    del.addEventListener('click', () => {
+      let li = document.createElement('li');
+      li.classList.add("is-clickable");
+      li.addEventListener('click', () => assignInstrument(tag, li));
+      li.innerHTML = get_instrument(el.dataset.tag);
+      document.getElementById('unassigned-area').appendChild(li);
+      el.remove();
+      dirty=true;
+    });
+    label.appendChild(del)
+    
+    el.appendChild(label);
+
+    
+    let setEnd = document.createElement('span');
+    setEnd.className = "icon is-action";
+    setEnd.innerHTML = '<i class="fas fa-sort-amount-up" title="Set end page"></i>';
+    setEnd.addEventListener('click', () => setTagEnd(el));
+    el.appendChild(setEnd);
+
+    updateTag(el);
+    tagArea.appendChild(el);
+  }
+
+  function updateTag(tag) {
+    let start = tag.dataset.start;
+    let end = tag.dataset.end;
+    let span = end-start+1;
+    let height = span * 25 + (span-1) * 5;
+    let top = (start-1) * 30;
+    
+    tag.style.height = height + 'px';
+    tag.style.marginTop = top + 'px';
+    dirty = true;
+  }
+
+  function setTagStart(el) {
+    if (pageNum > el.dataset.end) {
+      alert("Select the first page and click extend");
+      return;
+    }
+    el.dataset.start = pageNum;
+    updateTag(el);
+  }
+  
+  function setTagEnd(el) {
+    if (pageNum < el.dataset.start) {
+      alert("Select the last page and click extend");
+      return;
+    }
+    el.dataset.end = pageNum;
+    updateTag(el);
+  }
+
+  function expandEntries() {
+    const entries = Array.from(tagArea.children);
+    entries.sort((a, b) => a.dataset.start-b.dataset.start);
+    const c = entries.length;
+    for (let i=0; i<c-1; i++) {
+      entries[i].dataset.end = entries[i+1].dataset.start - 1;
+      updateTag(entries[i]);
+
+    }
+    entries[c-1].dataset.end = pdfDoc.numPages;
+    updateTag(entries[c-1]);
+  }
+
+  function saveTags() {
+    const pageTags = [];
+    for (let pageTag of tagArea.children ) {
+      let start = pageTag.dataset.start;
+      let end = pageTag.dataset.end;
+      if (start == 1 && end == pdfDoc.numPages) {
+        start = null;
+        end = null;
+      }
+      pageTags.push([pageTag.dataset.tag, start, end])
+    }
+
+    console.log(pageTags);
+    fetch("", {
+      method: "POST",
+      headers: { "Content-Type": "application/json", "X-CSRFToken": "{{ csrf_token }}" },
+      body: JSON.stringify(pageTags)
+    }
+    ).then((response) => {
+      if (response.ok) {
+        window.location = "{% url 'work_detail' collection.pk document.work_id %}"
+      } else {
+        alert("Failed: " + response.statusText)
+      }
+    });
+    dirty = false;
+  }
+
+  function get_instrument(s) {
+    let parts = s.split('-');
+    let instrument = data.instruments[parts[0]];
+    if (parts.length == 2) {
+      return instrument + " " + parts[1];
+    }
+    return instrument;
+  }
+
+  function checkSaved(e) {
+    if (dirty) {
+      e.preventDefault();
+    }
+  }
+  window.addEventListener('beforeunload', checkSaved);
+
+</script>
+{% endblock %}

app/library/templates/library/document_confirm_delete.html

@@ -0,0 +1,22 @@
+{% extends "interface/project_base.html" %}
+
+{% block page %}
+<div class="columns">
+    <div class="column is-half is-centered">
+        <div class="block"> 
+            <p>Are you sure you want to delete<br>
+            <b>"{{ object.upload.name }}"</b>?</p>
+        </div>
+        <form method="post">{% csrf_token %}
+            <div class="field is-grouped">
+                <div class="control">
+                <button class="button is-link">Yes</button>
+                </div>
+                <div class="control">
+                <a class="button is-link is-light" href="{% url 'work_detail' collection.pk object.work.pk %}">No</a>
+                </div>
+            </div>
+        </form>
+    </div>
+</div>
+{% endblock %}

app/library/templates/library/document_entry.html

@@ -0,0 +1,17 @@
+{% load path_filters %}
+<tr>
+    <td><a href="{{ doc.upload.url }}" target="_blank">
+            {{ doc.upload.name|basename }}</a></td>
+    <td>
+        {% for section in doc.sections.all %}
+            <a class="tag is-{{ section.bulma_class }}" target="_blank" href="{% url 'part_download' collection.pk section.pk section.filename %}">{{ section.name }}</a>
+        {% endfor %}
+    </td>
+    <td class="has-text-right" style="white-space: nowrap;">
+    {% if request.is_admin %}
+        <a href="{% url 'document_annotate' collection.pk doc.pk %}"><i class="fas fa-tags"
+                title="Manage Tags"></i></a>
+        <a href="{% url 'document_delete' collection.pk doc.pk %}"><i class="fas fa-trash-alt" title="Delete Document"></i></a>
+    {% endif %}
+    </td>
+</tr>

app/library/templates/library/folder_detail.html

@@ -0,0 +1,11 @@
+{% extends 'interface/project_base.html' %}
+
+{% block page %}
+<h2>{{ folder.name }}</h2>
+<h3>Works</h3>
+<ul>
+{% for work in folder.works.all %}
+    <li>{{ work.name }}</li>
+{% endfor %}
+</ul>
+{% endblock %}

app/library/templates/library/item_list.html

@@ -0,0 +1,163 @@
+{% extends "interface/project_base.html" %}
+
+{% block admin %}
+<a class="button is-link" href="{% url 'item_list_manage' project.pk %}">
+    <span class="icon"><i class="fas fa-list"></i></span>
+    <span>Change items</span>
+</a>
+{% endblock %}
+
+{% block page %}
+<form action="" method="post" target="_blank">
+{% csrf_token %}
+<div>
+    <div class="field is-grouped is-grouped-centered">
+        <div class="field has-addons control">
+            
+            <span class="control">
+                <a class="button is-static">Your Instrument</a>
+            </span>
+
+            <span class="control">
+                <input type="text" class="input" list="instrument-list" id="instrument-name" onchange="updateParts()"/>
+                <datalist id="instrument-list">
+                    {% for inst in instruments %}
+                    <option value="{{inst.1}}"/>
+                    {% endfor %}
+                </datalist>
+            </span>
+            <span class="control">
+                <span class="select" onchange="updateParts()">
+                <select id="part-preference">
+                    <option value="0">Any</option>
+                    <option value="1">1st</option>
+                    <option value="2">2nd</option>
+                    <option value="3">3rd</option>
+                    <option value="4">4th</option>
+                </select>
+                </span>
+            </span>
+        </div>
+        <span class="control">
+            <button type="submit" class="button is-primary">
+                <span class="icon"><i class="fas fa-copy"></i></span>
+                <span>Get My Parts!</span>
+            </button>
+        </span>
+    </div>
+</div>
+
+<table class="table is-striped is-fullwidth">
+    <thead>
+        <tr>
+            <th/>
+            <th>Piece</th>
+            <th>Running time</th>
+            <th>Part</th>
+            <th/>
+        </tr>
+    </thead>
+    <tbody>
+        {% for item in object_list %}
+            <tr>
+                <td>{{ forloop.counter }}.</td>
+                <td>
+                    {% if request.is_admin %}
+                    <a href="{% url 'work_detail' item.work.pk %}">{{ item.work.name }}</a>
+                    {% else %}
+                    {{ item.work.name }}
+                    {% endif %}
+                </td>
+                <td>{% firstof item.work.running_time "------" %}</td>
+                <td class="select-cell">
+                    <input type="hidden" name="works" value="{{ item.work.pk }}"/>
+                    <span class="select is-small">
+                    <select name="instruments">
+                        <option value='-'>None</option>
+                        {% for part in item.work.digital_parts %}
+                        <option value='{{ part.tag }}'>{{ part.instrument }}</option>
+                        {% endfor %}
+                    </select>
+                    </span>
+                </td>
+                <td>
+                    <a href=""><i class="fas fa-download"></i></a>
+                </td>
+            </tr>
+        {% endfor %}
+    </tbody>
+    <tfoot>
+        <tr>
+            <td/>
+            <td/>
+            <td>{{ running_time }}</td>
+            <td/>
+            <td>
+                <button class="button is-link is-small" type="submit"><span class="icon"><i class="fas fa-copy"></i></span><span>Single combined PDF</span></button>
+                <a class="button is-link is-small"><span class="icon"><i class="fas fa-archive"></i></span><span>Individual files (zipped)</span></a>
+            </td>
+        </tr>
+    </tfoot>
+</table>
+</form>
+
+<p class="content">
+    This page lets you download a complete set of music for your part by selecting your instrument
+    and optionally a part (e.g. Flute 1 or 2).<br/>
+    You can also tweak which parts you get for each piece, or click on a piece for more download options.
+</p>
+{% endblock %}
+
+{% block scripts %}
+{{ instruments|json_script:'instruments' }}
+<script type="text/javascript">
+
+const INSTRUMENTS = JSON.parse(document.getElementById('instruments').innerText);
+
+function updateParts() {
+    var inst = document.getElementById("instrument-name").value;
+    window.localStorage.setItem('instrument-name', inst);
+
+    for (let i of INSTRUMENTS) {
+        if (i[1] === inst) inst = i[0];
+    }
+
+
+    let part = document.getElementById("part-preference").value;
+    window.localStorage.setItem('part-preference', part);
+
+
+    selectParts(inst, part);
+    
+}
+
+function selectParts(inst, part) {
+
+    let prefix = inst + "-" + part;
+
+    let instruments = document.getElementsByName("instruments");
+    for(let i=0; i<instruments.length; i++) {
+        var result = "-"
+        let options = instruments[i].children;
+        for(let j=0; j<options.length; j++) {
+            let value = options[j].value;
+            if (value.startsWith(prefix)) {
+                result = value;
+                break;
+            }
+            if (result==="-" && value.startsWith(inst)) {
+                result = value;
+            }
+        }
+        instruments[i].value = result;
+    }
+
+}
+
+document.getElementById("instrument-name").value = localStorage.getItem('instrument-name', 'All');
+document.getElementById("part-preference").value = localStorage.getItem('part-preference', 'Any');
+updateParts();
+
+
+</script>
+{% endblock %}

app/library/templates/library/item_list_manage.html

@@ -0,0 +1,109 @@
+{% extends "interface/project_base.html" %}
+
+{% block admin %}
+<a href="{% url 'item_list_append' project.pk %}" class="button is-link">
+  <span class="icon"><i class="fas fa-plus-circle"></i></span>
+  <span>Add</span>
+</a>
+<a href="#" onclick="save()" class="button is-link">
+  <span class="icon"><i class="fas fa-save"></i></span>
+  <span>Save</span>
+</a>
+{% endblock %}
+
+{% block page %}
+<table style="max-width: 600px; margin: 10pt auto;" class="zebra">
+    <thead>
+        <tr>
+            <th>Item</th>
+            <th>Time</th>
+            <th/>
+        </tr>
+    </thead>
+    <tbody id="work-list">
+        {% for item in object_list %}
+            <tr data-pk="{{ item.pk }}" data-order="{{ forloop.counter }}">
+                <td>{{ item.work.name }}</td>
+                <td>{{ item.work.duration }}</td>
+                <td style="text-align: center;">
+                    <i class="fas fa-arrow-up clickable" title="Move up" onclick="moveItem({{ item.pk }}, -1)"></i>
+                    <i class="fas fa-arrow-down clickable" title="Move down" onclick="moveItem({{ item.pk }}, 1)"></i>
+                    <i class="fas fa-trash clickable" title="Remove" onClick="moveItem({{ item.pk }}, 0)"></i>
+                </td>
+
+            </tr>
+        {% empty %}
+            <tr><td colspan="2">No items</td></tr>
+        {% endfor %}
+    </tbody>
+</table>
+{% endblock %}
+
+{% block scripts %}
+<script type="text/javascript">
+
+let workList = document.getElementById('work-list');
+var dirty = false;
+
+function moveItem(pk, dir) {
+    let items = Array.prototype.slice.call(workList.children, 0);
+    var i=0;
+    pk = "" + pk;
+    for(i=0; i<items.length; i++) {
+        if(items[i].dataset.pk === pk) break; 
+    }
+    if(i >= items.length) return;
+
+    // check the direction is sensible
+    if (i + dir < 0 || i + dir >= items.length) return;
+
+    if (dir === 0) {
+        items[i].dataset.order = -1;
+        items[i].style = "display: none";
+    } else {
+        items[i].dataset.order = parseInt(items[i].dataset.order) + dir;
+        items[i+dir].dataset.order = parseInt(items[i+dir].dataset.order) - dir;
+    }
+    
+    items.sort((a, b) => parseInt(a.dataset.order) - parseInt(b.dataset.order))
+
+    workList.innerHTML = ""
+    for(let j=0; j<items.length; j++) {
+        workList.appendChild(items[j]);
+    }
+    dirty = true;
+}
+
+function save() {
+
+    let items = Array.prototype.slice.call(workList.children, 0);
+    let data = {};
+    for(var i=0; i<items.length; i++) {
+        let item = items[i].dataset;
+        data[item.pk] = item.order;
+    }
+    console.log(data);
+
+    fetch("", {
+        method: "POST", 
+        headers: {"Content-Type": "application/json", "X-CSRFToken": "{{ csrf_token }}"}, 
+        body: JSON.stringify(data)
+    }).then((response) => {
+        if (response.ok) {
+            dirty=false;
+            window.location = "{% url 'item_list' project=project.pk %}";
+        } else {
+            alert("Failed: " + response.statusText)
+        }
+    })
+}
+
+function checkSaved(e) {
+    if(dirty) {
+        e.preventDefault();
+    }
+}
+window.addEventListener('beforeunload', checkSaved);
+
+</script>
+{% endblock %}

app/library/templates/library/project_detail.html

@@ -0,0 +1,12 @@
+{% with project.items.count as items %}
+{% if items %}
+<p>
+There {{ items|pluralize:"is,are" }} currently {{ items}} item{{ items|pluralize }} for this project.<br/>
+Click the '<a href="{% url 'item_list' project=project.pk %}">My Music</a>' button below to access your parts...
+</p>
+{% else %}
+<p>
+There are no items listed yet for this project - please check back later... 
+</p>
+{% endif %}
+{% endwith %}

app/library/templates/library/project_menu.html

@@ -0,0 +1,10 @@
+<p class='menu-label'>Library</p>
+<ul class="menu-list">
+{% if project %}
+<li><a href="{% url 'item_list' project=project.pk %}">My Music</a></li>
+{% endif %}
+{% if request.user.is_authenticated %}
+<li><a href="{% url 'work_list' %}">Library</a></li>
+<li><a href="{% url 'collection_list' %}">Collections</a></li>
+{% endif %}
+</ul>

app/library/templates/library/work_detail.html

@@ -0,0 +1,207 @@
+{% extends 'interface/project_base.html' %}
+{% load path_filters %}
+
+{% block media %}
+<script src="https://unpkg.com/dropzone@5/dist/min/dropzone.min.js"></script>
+<link rel="stylesheet" href="https://unpkg.com/dropzone@5/dist/min/dropzone.min.css" type="text/css" />
+{% endblock %}
+
+{% block admin %}
+<a href="{% url 'work_edit' collection.pk work.pk %}" class="button is-link">
+    <span class="icon"><i class="fas fa-edit"></i></span>
+    <span>Edit</span>
+</a>
+<a href="{% url 'work_add_to_project' collection.pk work.pk %}" class="button is-link">
+    <span class="icon"><i class="fas fa-plus-circle"></i></span>
+    <span>Add to project</span>
+</a>
+{% endblock %}
+
+{% block page %}
+<h3 class="title">
+    {{ work.name }}
+    {% for tag in work.tags %}
+        <a href="{% url 'collection_work_list' work.collection.pk %}?filter=tag:{{ tag }}" class="tag is-success">{{ tag }}</a>
+    {% endfor %}
+</h3>
+<p class="subtitle">{% firstof work.composer "Unattributed" %}{% if work.edition %} - {{ work.edition }}{% endif %}</p>
+<section class="block">
+    <p class="block">{{ work.notes }}</p>
+
+    <p class="block">
+    <table class="table">
+        <tr>
+            <th>Location:</th><td><a href="{% url 'collection_work_list' work.collection.pk %}">{{ work.collection }}</a> [{{ work.identifier }}]</td>
+            <th>Orchestration:</th><td>{{ work.orchestration }}</td>
+        </tr><tr>
+            <th>Running time:</th><td>{% firstof work.duration 'Unknown' %}</td>
+            <th>Licence:</th><td>{{ work.get_licence_display }}</td>
+        </tr><tr>
+            <td colspan="4">
+    {% for meta in work.meta %}
+        <a href="{% url 'collection_work_list' work.collection.pk %}?filter={{ meta.name}}:{{ meta.value }}" class="tag" >
+            {{ meta.get_name_display }}:
+            {{ meta.value }}
+        </a>
+    {% endfor %}
+            </td>
+        </tr>
+    </table>
+
+    {% if work.parent %}
+    <p>From <a href="{% url 'work_detail' collection.pk work.parent.pk %}">{{ work.parent.name }} - {{ work.parent.composer }}</a>
+    </p>
+    {% endif %}
+
+    {% if work.related_works.count %}
+    <h3>Related</h3>
+    <ul>
+        {% for related in work.related_works.all %}
+        <li><a href="{% url 'work_detail' related.pk %}">{{ related.name }} - {{ related.composer }}</a></li>
+        {% endfor %}
+    </ul>
+    {% endif %}
+</section>
+<section class="block">
+
+    <div class="columns">
+        <div class="column is-half">
+            <div class="box">
+                <h4 class="subtitle is-size-4">
+                    <span class="icon"><i class="fas fa-book"></i></span>
+                    Printed Parts
+                </h4>
+                <div class="tags">
+                    {% for inst, c in work.physical_parts %}
+                    <span class="tag is-warning">{{ inst }}{% if c > 1 %} [<strong>{{ c }}</strong>]{% endif %}</span>
+                    {% empty %}
+                    <p class="is-italic">No printed parts listed</p>
+                    {% endfor %}
+                </div>
+            </div>
+        </div>
+        <div class="column is-half">
+            <div class="box">
+                <h4 class="subtitle is-size-4">
+                    <span class="icon"><i class="fas fa-print"></i></span>
+                    Digital Parts
+                </h4>
+                <div class="tags">
+                    {% if work.digital_parts %}
+                    <a class="tag is-danger" href="{% url 'work_partset' collection.pk work.pk %}">Full Set</a>
+                    {% endif %}
+                    {% for section in work.digital_parts %}
+                    <a class="tag is-info" href="{% url 'part_download' collection.pk section.pk section.filename %}"
+                        target="section_{{ section.pk }}" rel="">{{ section.name }}</a>
+                    {% empty %}
+                    <p class="is-italic">No digital parts available</p>
+                    {% endfor %}
+                </div>
+            </div>
+        </div>
+    </div>
+</section>
+<section class="block">
+    <div class="box">
+        <div class="level">
+            <h4 class="subtitle is-size-4">
+                <span class="icon"><i class="fas fa-file"></i></span>
+                Files
+            </h4>
+        </div>
+        <div class="columns">
+            <div class="column">
+                <table class="table is-fullwidth">
+                    <thead>
+                        <tr>
+                            <th>Filename</th>
+                            <th>Sections</th>
+                            <th/>
+                        </tr>
+                    </thead>
+                    <tbody id="doc-list">
+                        {% for doc in work.docs.all %}
+                            {% include 'library/document_entry.html' %}
+                        {% endfor %}
+                    </tbody>
+                </table>
+            </div>
+            {% if request.is_admin %}
+            <div class="column is-one-quarter">
+                <h4 class="is-size-5">Upload files</h4>
+                <form action="{% url 'document_add' collection.pk object.pk %}" class="dropzone" id="doc-upload">
+                    {% csrf_token %}
+                </form>
+            </div>
+            {% endif %}
+        </div>
+    </div>
+</section>
+{% if request.is_admin %}
+<section class="block">
+    <div class="box">
+    <div class="level">
+        <h4 class="is-size-4">
+            <span class="icon"><i class="fas fa-book-reader"></i></span>
+            Loans
+        </h4>
+        <span class="level-right">
+            <a class="icon-text" href="{% url 'work_add_to_project' collection.pk work.pk %}"><span class="icon"><i
+                        class="fas fa-plus-circle"></i></span> Checkout</a>
+        </span>
+    </div>
+    <table class="table is-fullwidth">
+        <thead>
+            <tr>
+                <th>Ensemble</th>
+                <th>Project</th>
+                <th>Checked Out</th>
+                <th>Due Back</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for item in work.current_loans %}
+            <tr>
+                <td><a href="{% url 'ensemble_detail' item.project.ensemble_id %}">
+                    {{ item.project.ensemble.name }}
+                </a></td>
+                <td><a href="{% url 'project_detail' item.project.pk %}">{{ item.project.name }}</a></td>
+                <td>{{ item.checkout.date|date:"d/m/Y" }}</td>
+                <td>{{ item.due.date|date:"d/m/Y" }}</td>
+            </tr>
+            {% empty %}
+            <tr>
+                <td>No current loans</td>
+            </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+    </div>
+</section>
+{% endif %}
+
+{% block scripts %}
+<script>
+    Dropzone.options.docUpload = { // camelized version of the `id`
+      paramName: "upload", // The name that will be used to transfer the file
+      maxFilesize: 50, // MB
+      createImageThumbnails: false,
+      thumbnailWidth: 60,
+      thumbnailHeight: 60,
+      init: function () {
+        this.on("complete", file => {
+            console.log(file);
+            let data = JSON.parse(file.xhr.response);
+            console.log(data);
+            let tbody = document.getElementById('doc-list');
+            let tr = document.createElement('tr');
+            tr.innerHTML = data.entry;
+            tbody.appendChild(tr);
+            this.removeFile(file);
+        });
+      }
+    };
+</script>
+{% endblock %}
+
+{% endblock %}

app/library/templates/library/work_list.html

@@ -0,0 +1,71 @@
+{% extends "interface/project_base.html" %}
+{% load url_tools %}
+
+{% block admin %}
+{% if collection %}
+<a href="{% url 'work_add' collection.pk %}" class="button is-link">
+    <span class="icon"><i class="fas fa-plus-circle"></i></span>
+    <span>Add a work</span>
+</a>
+{% endif %}
+{% endblock %}
+
+{% block page %}
+<h3 class="title">{{ title }}</h3>
+<form method="GET">
+    <div class="field has-addons">
+        <div class="control is-expanded">
+            <input class="input" name="filter" type="text" placeholder="Filter" value="{{ request.GET.filter }}"/>
+        </div>
+        <div class="control">
+            <a class="button" href="?"><i class="fas fa-times"></i></a>
+        </div>
+    </div>
+</form>
+
+<table class="table is-striped is-fullwidth">
+    <thead>
+        <tr>
+            <th>Work</th>
+            <th>Composer</th>
+            <th class="is-hidden-mobile">Edition</th>
+            <th class="is-hidden-touch">Collection</th>
+            {% if request.is_admin %}
+            <th class="is-hidden-mobile">Copies</th>
+            {% endif %}
+        </tr>
+    </thead>
+    <tbody>
+        {% for work in object_list %}
+            <tr>
+                <td><a href="{% url 'work_detail' collection=work.collection.pk pk=work.pk %}">{{ work.name }}</a></td>
+                <td title="{{ work.composer }}">{{ work.composer|truncatewords:3 }}</td>
+                <td class="is-hidden-mobile" title="{{ work.edition }}">{{ work.edition|truncatewords:2 }}</td>
+                <td class="is-hidden-touch">{{ work.collection.name }}</td>
+                {% if request.is_admin %}
+                <td class="is-hidden-mobile {{ work.is_available|yesno:'has-text-success,has-text-danger' }}">{{ work.available }}</td>
+                {% endif %}
+            </tr>
+        {% empty %}
+            <tr><td colspan="4">No works found</td></tr>
+        {% endfor %}
+    </tbody>
+</table>
+
+<nav class="pagination is-centered" role="navigation" aria-label="pagination">
+    {% if page_obj.has_previous %}
+    <a class="pagination-previous" href="{% url_update page=page_obj.prev_page_number %}">Previous</a>
+    {% endif %}
+    {% if page_obj.has_next %}
+    <a class="pagination-next" href="{% url_update page=page_obj.next_page_number %}">Next page</a>
+    {% endif %}
+    <ul class="pagination-list">
+      {% for page in page_obj.paginator.page_range %}
+        <li>
+            <a class="pagination-link {% if forloop.counter == page_obj.number %}is-current{% endif %}" href="{% url_update page=forloop.counter %}" aria-label="Goto page {{ forloop.counter }}">{{ forloop.counter }}</a>
+        </li>
+      {% endfor %}
+    </ul>
+</nav>
+
+{% endblock %}

app/library/templates/library/work_partset.html

@@ -0,0 +1,37 @@
+{% extends "interface/project_base.html" %}
+
+
+
+{% block page %}
+
+<form action="" method="post" target="_blank">
+    {% csrf_token %}
+
+    <div class="admin-tools is-pulled-right">
+    <button type="submit" class="button is-link">
+        <span class="icon"><i class="fas fa-print"></i></span>
+        <span>Print Set</span>
+    </button>
+    <a class="button is-link is-light" href="{% url 'work_detail' collection.pk object.pk %}">
+        <span>Cancel</span>
+    </a>
+    </div>
+
+
+    <h3 class="subtitle"><a href="{% url 'work_detail' collection.pk work.pk %}">{{ work.name }}</a></h3>
+
+    <p class="block">
+        You can generate a custom partset for printing - select the number of copies of each you want...
+    </p>
+
+    <div class="columns is-multiline is-mobile">
+        {% for part in work.digital_parts %}
+        <div class="column is-3 has-text-right">
+            <span style="white-space: nowrap">{{ part.name }}</span>
+            <input name="parts" type="hidden" value="{{ part.tag }}">
+            <input class="input" name="copies" type="number" value="{% if part.tag == 'score' %}0{% else %}1{% endif %}" size="1">
+        </div>
+        {% endfor %}
+    </div>
+</form>
+{% endblock %}

app/library/tests.py

@@ -0,0 +1,136 @@
+from interface.tests import AccessTestCase 
+
+from django.contrib.auth.models import User
+from interface.models import Ensemble, Project
+from . import models
+
+class IntegrationTestCase(AccessTestCase):
+
+    USERS = (
+        {'username': 'admin', 'password': 'secret', 'is_superuser': True, 'is_staff': True},
+        {'username': 'homer', 'password': 'maggie'},
+    )
+
+    ENSEMBLES = (
+        {'name': 'The Be Sharps', 'slug': 'be-sharps', 'admins': ['homer']},
+        {'name': 'Lisa & the Bleeding Gums', 'slug': 'bleeding-gums'},
+        {'name': 'Party Posse'},
+    )
+
+    PROJECTS = (
+        ('Baker St', 'bleeding-gums', -12),
+        ('Navy Recruitment Day', 'party-posse', 6),
+        ('Barbershop Contest', 'be-sharps', 28),
+        ('Open Mic Night', 'bleeding-gums', 1)
+    )
+
+    COLLECTIONS = (
+        {'name': 'Springfield Elementary Library', 'prefix': 'sel'},
+        {'name': 'Neds Library', 'prefix': 'ned', 'admins': ['homer']},
+    )
+
+    WORKS = (
+        {'name': 'Baby on Board', 'collection': 'ned'},
+    )
+
+    @classmethod
+    def setUpTestData(cls):
+        super().setUpTestData()
+        
+        cls.collections = {}
+        for details in cls.COLLECTIONS:
+            admins = details.pop('admins', [])
+            obj = models.Collection.objects.create(**details)
+            for admin in admins:
+                obj.administrators.add(cls.users[admin])
+            cls.collections[details['prefix']] = obj
+
+        cls.works = {}
+        for details in cls.WORKS:
+            collection = details.pop('collection')
+            cls.works[details['name']] = models.Work.objects.create(collection=cls.collections[collection], **details)
+
+    def oldSetUp(self):
+        self.homer = User.objects.create(username='homer')
+        self.ned = User.objects.create(username="ned")
+        self.lisa = User.objects.create(username="lisa")
+        self.dewey = User.objects.create(username="dewey")
+
+        self.be_sharps = self.homer.ensembles.create(name='Be Sharps', code="barbershop")
+        self.sesd = self.dewey.ensembles.create(name="Springfield Elementary School Band", code="sax")
+
+        self.sel = self.lisa.collections.create(name="Springfield Elementary Library")
+        self.flanders = self.ned.collections.create(name="Neds Shed")
+
+    def test_integration(self):
+        pass
+
+    def test_superuser_access(self):
+        self.login('admin', 'secret')
+        self.assertAccess({
+            '/collections': True,
+            '/collections/1': True,
+            '/collections/2/works/1': True,
+        })
+
+    def test_administrator_access(self):
+        self.login('homer', 'maggie')
+        self.assertAccess({
+            '/collections': True,
+            '/collections/1': False,
+            '/collections/2': True,
+            '/collections/2/works/1': True,
+        })
+
+    def test_link_access(self):
+        self.assertAccess({
+            '/collections': True,
+            '/collections/1': False,
+            '/collections/2': False,
+            '/collections/2/works/1': False,
+        })
+
+        self.authorize(models.Collection, pk=2)
+        self.assertAccess({
+            '/collections': True,
+            '/collections/1': False,
+            '/collections/2': True,
+            '/collections/2/works/1': True,
+        })
+
+    def test_anon_access(self):
+        self.assertAccess({
+            '/collections': True,
+            '/collections/1': False,
+            '/collections/2': False,
+            '/collections/2/works/1': False,
+        })
+        
+
+    def test_movement_from_large_work(self):
+        '''
+        Will be common to store a work which has several movements, but the project is only going to play one.
+        This also should give us the ability to store an anthology as one Work have Project reference 'no:23'
+        '''
+
+        work = self.collections['sel'].works.create(name="Some Quartet", composer="Beethoven")
+        for g in ('vl-1', 'vl-2', 'vla', 'vc'):
+            doc = work.docs.create(upload=f'sel/beethoven/some_quartet/some_quartet_{g}.pdf')
+            doc.sections.create(tag='mvmt-1', start=1, end=3)
+            doc.sections.create(tag='mvmt-2', start=4, end=8)
+            doc.sections.create(tag='mvmt-3', start=9, end=12)
+            doc.sections.create(tag=g)
+
+        # no tags - get nothing (should it be everything?)
+        self.assertEqual(work.extract(), [])
+
+        # single tag - should get just that range
+        self.assertEqual(work.extract('vl-1'), [('sel/beethoven/some_quartet/some_quartet_vl-1.pdf', None, None)])
+
+        # single tag - returns all documents with that range
+        result = work.extract('mvmt-2')
+        self.assertEqual(len(result), 4)
+
+        # multiple tags - returns the overlapping portion of all documents that have all tags
+        self.assertEqual(work.extract('vl-1', 'mvmt-2'), [('sel/beethoven/some_quartet/some_quartet_vl-1.pdf', 4, 8)])
+        self.assertEqual(work.extract('vl-1', 'vl-2'), [])

app/library/urls.py

@@ -0,0 +1,42 @@
+from django.urls import path, include
+from django.contrib.auth import views as auth_views
+from rest_framework import routers
+
+from . import views
+
+from library.views import api
+
+#router = routers.DefaultRouter()
+#router.register(r'collection', external.CollectionViewSet, basename="collection")
+#router.register(r'work', external.WorkViewSet, basename="work")
+
+urlpatterns = [
+    
+    path('projects/<int:project>/items', views.ProjectItemListView.as_view(), name="item_list"),
+    path('projects/<int:project>/items/manage', views.ProjectItemManageView.as_view(), name="item_list_manage"),
+    path('projects/<int:project>/items/append', views.ProjectItemAddView.as_view(), name="item_list_append"),
+    
+    path('library', views.WorkListView.as_view(), name="work_list"),
+
+    path('collections', views.CollectionListView.as_view(), name="collection_list"),
+    path('collections/<int:collection>', views.CollectionWorkListView.as_view(), name="collection_work_list"),
+    path('collections/<int:collection>/add', views.WorkAddView.as_view(), name="work_add"),
+    
+    path('collections/<int:collection>/works/<int:pk>', views.WorkDetailView.as_view(), name="work_detail"),
+    path('collections/<int:collection>/works/<int:pk>/edit', views.WorkUpdateView.as_view(), name="work_edit"),
+    path('collections/<int:collection>/works/<int:pk>/partset', views.WorkPartSetView.as_view(), name="work_partset"),
+    path('collections/<int:collection>/works/<int:pk>/add_to_project', views.WorkAddToProject.as_view(), name="work_add_to_project"),
+    path('collections/<int:collection>/works/<int:pk>/upload', views.WorkAddDocumentView.as_view(), name="document_add"),
+
+    path('collections/<int:collection>/docs/<int:pk>/delete', views.DocumentDeleteView.as_view(), name="document_delete"),
+    path('collections/<int:collection>/docs/<int:pk>/download', views.DocumentDownloadView.as_view(), name="document_download"),
+    path('collections/<int:collection>/docs/<int:pk>/annotate', views.DocumentAnnotateView.as_view(), name="document_annotate"),
+
+    path('collections/<int:collection>/download/<int:section>/<str:filename>', views.PartDownloadView.as_view(), name="part_download"),
+
+    #path('api/', include(router.urls))
+    path('api/library/collections/<int:pk>/export', api.CollectionExportView.as_view(), name="collection_export"),
+    path('api/library/works/<int:pk>/export', api.WorkExportView.as_view(), name="work_export"),
+    path('api/library/collections/<int:pk>/import', api.WorkImportView.as_view(), name="work_import"),
+    path('api/library/collections/<int:pk>/bulk_import', api.CollectionImportView.as_view(), name="collection_import"),
+]

app/library/views/__init__.py

@@ -0,0 +1,439 @@
+from django.shortcuts import get_object_or_404, redirect, resolve_url
+from django.views.generic.detail import DetailView, SingleObjectMixin, View
+from django.views.generic.list import ListView, MultipleObjectMixin
+from django.views.generic.edit import CreateView, FormView, UpdateView, DeleteView
+from django.http import FileResponse, HttpResponse, JsonResponse
+from django.db import IntegrityError
+from django.db.models import Q, Count, Sum
+from django.db import transaction
+from django.utils.timezone import now
+from django.urls import reverse
+from django.template.loader import render_to_string
+from django.core.exceptions import SuspiciousOperation
+from django.http import Http404, HttpResponseRedirect
+
+import json
+import os.path
+import re
+
+from interface.views import EnsembleMixin, ProjectMixin, AuthorizedResourceMixin
+from interface.models import Project
+from library.models import Collection, Work, Document, Section
+from library.music_tags import MUSIC_TAGS
+from library import forms, models
+from library.pdf_utils import extract_pages, extract_and_concat
+
+
+class ProjectItemListView(ProjectMixin, ListView):
+    template_name = "library/item_list.html"
+    model = models.ProjectItem
+
+    def post(self, request, **kwargs):
+
+        project = self.get_project()
+
+        project_works = project.works.all()
+
+        instruments = request.POST.getlist('instruments')
+        works = request.POST.getlist('works')
+
+        self.request.session['part'] = request.POST.get('part', '')
+        self.request.session['instrument'] = request.POST.get('instrument')
+
+        valid_pks = [ x.pk for x in project_works ]
+
+        sections = []
+
+        for i, pk in enumerate(works):
+
+            if int(pk) not in valid_pks:
+                raise Exception(f"Not a valid work pk: {pk}")
+
+            tag = instruments[i]
+            if tag == '-':
+                continue
+
+            part = Section.objects.filter(tag=tag, doc__work=pk).select_related('doc').get()
+            sections.append((part.doc.upload.path, part.doc.work.name, part.start, part.end, 1))
+
+        result = extract_and_concat(sections)
+
+        download_name = f'{project.name}.pdf'
+
+        response = FileResponse(result, content_type="application/pdf")
+        response['Content-Disposition'] = f'inline; filename="{download_name}"'
+        return response
+
+
+    def get_queryset(self):
+        return super(ProjectItemListView, self).get_queryset().select_related('project', 'work')
+
+    def get_context_data(self, **kwargs):
+        data = super(ProjectItemListView, self).get_context_data(**kwargs)
+        data['instruments'] = MUSIC_TAGS
+        data['instrument'] = self.request.session.get('instrument', 'Score')
+        data['part'] = self.request.session.get('part', '0')
+        data['running_time'] = self.get_queryset().aggregate(Sum('work__running_time'))['work__running_time__sum']
+        #if running_time:
+        #    data['running_time'] = "{0:d}:{1:02d}".format(int(running_time / 60), running_time % 60)
+        #else:
+        #    data['running_time'] = "-:--"
+        return data
+
+
+class ProjectItemManageView(ProjectMixin, ListView):
+    template_name = "library/item_list_manage.html"
+    model = models.ProjectItem
+
+    def post(self, request, **kwargs):
+        self.request = request
+        self.kwargs = kwargs
+
+        data = json.loads(request.body)
+
+        q = self.get_queryset()
+        for pk, order in data.items():
+            order = int(order)
+            if order == -1:
+                q.filter(pk=pk).delete()
+            else:
+                i = q.filter(pk=pk).update(order=order)
+
+        return HttpResponse(status=204)
+
+    def get_queryset(self):
+        return super(ProjectItemManageView, self).get_queryset().select_related('project', 'work')
+
+class ProjectItemAddView(ProjectMixin, UpdateView):
+    form_class = forms.PlaylistAddForm
+    template_name = "interface/default_form.html"
+
+    def get_success_url(self):
+        return resolve_url('item_list_manage', project=self.kwargs['project'])
+
+    def get_object(self):
+        return self.get_project()
+
+""" COLLECTION VIEWS """
+
+class CollectionMixin(AuthorizedResourceMixin):
+    def is_authorized(self):
+        collection_id = self.kwargs['collection']
+        self.collection = get_object_or_404(models.Collection, pk=collection_id)
+
+        if super().is_authorized():
+            return True
+        
+        if self.collection.has_administrator(self.request.user):
+            self.request.is_admin = True
+            return True
+
+        if self.is_authorized_key('collection', collection_id, self.collection.nonce):
+            return True
+
+        return False
+
+    def get_context_data(self, **kwargs):
+        data = super().get_context_data(**kwargs)
+        if self.collection:
+            data['collection'] = self.collection
+        return data
+
+    def get_queryset(self):
+        return super().get_queryset().filter(collection=self.collection)
+
+    
+class CollectionListView(ListView):
+    paginate_by = 20
+
+    def get_queryset(self):
+        collections = models.Collection.objects.all()
+
+        if self.request.user.is_anonymous:
+            return models.Collection.objects.none()
+
+        if self.request.user.is_staff:
+            return collections
+        
+        return collections.filter(Q(administrators=self.request.user) | Q(allowed_ensembles__ensemble__admins=self.request.user))
+
+class WorkListView(CollectionMixin, ListView):
+    paginate_by = 20
+
+    def request_denied(self):
+        if 'auth' in self.request.GET:
+            if self.request.GET['auth'] != self.collection.auth():
+                raise SuspiciousOperation("Bad collection link")
+            self.add_authorized_key('collection', self.collection.pk, self.collection.nonce)
+            return HttpResponseRedirect(self.request.path)
+        return super().request_denied()
+
+    def get_works(self):
+        collections = CollectionMixin.get_queryset(self)
+        return  Work.objects.filter(collection__in=collections).select_related('collection')
+        
+    def get_context_data(self, *args, **kwargs):
+        data = super(WorkListView, self).get_context_data(*args, **kwargs)
+        #data['title'] = f'Music available to {self.ensemble.name}' 
+        data['title'] = "My Library"
+        return data
+
+    def get_queryset(self):
+        works = self.get_works()
+
+        q = self.request.GET.get('filter')
+        if q:
+            if ":" in q:
+                name, _, value = q.partition(":")
+                works = works.filter(meta_info__name=name, meta_info__value__contains=value)
+            else:
+                works = works.filter(Q(name__contains=q) | Q(composer__contains=q) | Q(meta_info__value__contains=q))
+        
+        return works.order_by('name', 'composer', 'edition', 'pk')
+
+class CollectionWorkListView(WorkListView):
+
+    def get_works(self):
+        works = Work.objects.filter(collection=self.kwargs['collection'])
+
+        if self.request.is_admin:
+            loan_count = Count('project_items', Q(project_items__checkout__lte=now(), project_items__returned=None))
+            works = works.annotate(loan_count=loan_count)
+        return works
+
+    def get_context_data(self, *args, **kwargs):
+        data = super(CollectionWorkListView, self).get_context_data(*args, **kwargs)
+        data['title'] = self.collection.name 
+        return data
+
+class WorkAddView(CollectionMixin, FormView):
+    template_name = "interface/default_form.html"
+    form_class = forms.WorkCreateForm
+
+    title = "Add a new work"
+
+    def get_form(self, form_class=None):
+        form = super().get_form(form_class)
+        qs = models.Orchestration.objects.filter(Q(collection=None) | Q(collection=self.collection))
+        form.fields['orchestration'].queryset = qs.order_by('-collection_id', 'pk')
+        return form
+
+    def form_valid(self, form):
+        work = form.save(commit=False)
+        #work.ensemble_id = self.request.ensemble_id
+        work.collection_id = self.collection.pk
+        work.save()
+        
+        # handle the files
+        uploads = self.request.FILES.getlist('uploads')
+        docs = []
+        for f in uploads:
+            docs.append(work.docs.create(upload=f).pk)
+
+        if len(docs) == 1:
+            return redirect('document_annotate', docs[0])
+        else:
+            return redirect('work_detail', collection=self.collection.pk, pk=work.pk)
+
+class WorkDetailView(CollectionMixin, DetailView):
+    model = models.Work 
+
+class WorkUpdateView(CollectionMixin, UpdateView):
+    model = models.Work
+    form_class = forms.WorkCreateForm
+    template_name = 'interface/default_form.html'
+
+    def get_success_url(self):
+        return resolve_url('work_detail', self.kwargs['pk'])
+
+
+
+class WorkAddToProject(ProjectMixin, FormView):
+    admin_required = True
+    form_class = forms.ProjectSelectForm
+    template_name = "interface/default_form.html"
+    title = "Select project to add work to"
+    
+    def get_object(self):
+        return Work.objects.get(pk=self.kwargs['pk'])
+
+    def get_form(self):
+        f = super(WorkAddToProject, self).get_form()
+        qs = f.fields['project'].queryset 
+
+        work = self.get_object()
+        qs = qs.filter(ensemble_id=self.request.ensemble_id).exclude(pk__in=work.projects.all())
+
+        f.fields['project'].queryset = qs
+        return f
+
+    def form_valid(self, form):
+        work = self.get_object()
+        project = form.cleaned_data['project']
+        work.project_items.create(project=project, approved_by=self.request.user, checkout=now())
+        return redirect('item_list', project=project.pk)
+
+    
+
+class WorkPartSetView(CollectionMixin, DetailView):
+    template_name = "library/work_partset.html"
+
+    def post(self, request, *args, **kwargs):
+
+        work = self.get_object()
+
+        parts = request.POST.getlist('parts')
+        copies = request.POST.getlist('copies')
+
+        sections = []
+
+        for i, tag in enumerate(parts):
+            c = int(copies[i])
+            if c > 0:
+                part = models.Section.objects.select_related('doc').get(tag=tag, doc__work=work)
+                sections.append((part.doc.upload.path, part.name, part.start, part.end, c))
+
+        result = extract_and_concat(sections)
+
+        download_name = f'{work.name}.pdf'
+
+        response = FileResponse(result, content_type="application/pdf")
+        response['Content-Disposition'] = f'inline; filename="{download_name}"'
+        return response
+
+    def get_queryset(self):
+        works = Work.objects.all()
+
+        if not self.request.is_admin:
+            works = works.filter(collection__allowed_ensembles__ensemble=self.request.ensemble_id)
+        return works
+
+class WorkAddDocumentView(CollectionMixin, CreateView):
+    template_name = "interface/default_form.html"
+    model = Document
+    fields = ['upload']
+    
+    def title(self):
+        work = Work.objects.get(pk=self.kwargs['pk'])
+        return f"Add a document to {work.name}"
+
+    def form_invalid(self, form):
+        if self.request.headers['Accept'] == 'application/json':
+            return HttpResponse(status=400)
+        return super().form_invalid(form)
+
+    def form_valid(self, form):
+        doc = form.save(commit=False)
+        doc.work_id = self.kwargs['pk']
+        doc.save()
+
+        # auto tag the document
+
+        name, _ = os.path.splitext(os.path.basename(doc.upload.name))
+        parts = re.split(r'[^A-Za-z]+', name)
+        parts.reverse()
+        for word in parts:
+            try:
+                tag = INSTRUMENT_TAGS[word.lower()] 
+                doc.sections.create(tag=tag)
+                break
+            except KeyError:
+                pass
+
+
+        if self.request.headers['Accept'] == 'application/json':
+            filename = os.path.basename(doc.upload.name)
+            return JsonResponse({
+                "message": "created",
+                "id": doc.pk,
+                "entry": render_to_string('library/document_entry.html',
+                    {'collection': self.collection, 'doc': doc, 'request': self.request}
+                )
+            }, status=201)
+
+        return redirect('document_annotate', self.collection.pk, doc.pk)
+
+class DocumentMixin(CollectionMixin):
+    model = models.Document
+
+    def get_queryset(self):
+        qs = models.Document.objects.select_related('work')
+        if self.request.is_admin:
+            return qs
+        return qs.filter(work__collection=self.collection)
+
+class DocumentDetailView(DocumentMixin, DetailView):
+    pass
+
+class DocumentDownloadView(DocumentMixin, SingleObjectMixin, View):
+
+    def get(self, request, **args):
+        self.request = request
+        self.args = args
+        self.object = self.get_object()
+
+        #response = FileResponse(self.object.upload, content_type="application/pdf")
+        #return response
+        return redirect(self.object.upload.url)
+
+class DocumentAnnotateView(DocumentMixin, DetailView):
+    template_name = 'library/document_annotate.html'
+
+    def post(self, request, **args):
+        self.request = request
+        self.args = args
+        self.object = self.get_object()
+
+        data = json.loads(request.body)
+
+        with transaction.atomic():
+            self.object.sections.all().delete()
+            for tag, start, end in data:
+                #pages.sort()
+                #end = pages[-1] if len(pages) > 1 else None
+                o = self.object.sections.create(tag=tag, type=models.Section.TYPE_INSTRUMENT, start=start, end=end)
+
+        return HttpResponse(status=204)
+
+    def get_context_data(self, **kwargs):
+        data = super(DocumentAnnotateView, self).get_context_data(**kwargs)
+
+        pages = []
+        for part in data['document'].sections.all():
+            pages.append((part.tag, part.start, part.end))
+
+        data['json_data'] = {'pageTags': pages, 'instruments': dict(MUSIC_TAGS)}
+        return data
+
+class DocumentDeleteView(DocumentMixin, DeleteView):
+
+    #def get_template_names(self):
+    #   return ["interface/default_form.html"]
+
+    def get_success_url(self):
+        return resolve_url('work_detail', self.collection.pk, self.object.work_id)
+
+class PartDownloadView(CollectionMixin, SingleObjectMixin, View):
+
+    pk_url_kwarg = 'section'
+
+    def get(self, request, **args):
+        self.request = request
+        self.args = args
+        self.object = self.get_object()
+
+        result = extract_pages(self.object.doc.upload.path, self.object.doc.work.name, self.object.start, self.object.end)
+
+        #download_name = f'{self.object.doc.work.name}_{self.object.instrument}.pdf'
+
+        response = FileResponse(result, content_type="application/pdf")
+        response['Content-Disposition'] = f'inline; filename="{self.args["filename"]}"'
+        return response
+
+    def get_queryset(self):
+
+        if self.request.is_admin:
+            parts = Section.objects.all()
+        else:
+            parts = Section.objects.filter(doc__work__collection__allowed_ensembles__ensemble=self.request.ensemble_id)
+        return parts.select_related('doc', 'doc__work')

app/library/views/api.py

@@ -0,0 +1,192 @@
+"""
+Views relating to importing and exporting collection items
+"""
+"""
+from interface.views import EnsembleMixin
+from library.views import WorkMixin
+from django.views.generic import View
+from django.http import JsonResponse
+
+from djantic import ModelSchema
+from library.models import Work, Document, Section
+
+class DocumentSchema(ModelSchema):
+    class Config:
+        model = Document
+
+
+class WorkSchema(ModelSchema):
+
+    docs: DocumentSchema
+
+    class Config:
+        model = Work
+        exclude = ['licence']
+
+class WorkExportView(EnsembleMixin, WorkMixin, View):
+    
+    def get(self, request, *args, **kwargs):
+        obj = self.get_queryset().get(pk=kwargs['pk'])
+        schema = WorkSchema.from_orm(obj)
+        return JsonResponse(schema.dict())
+
+"""
+
+from interface.views import AuthorizedResourceMixin
+
+from rest_framework import routers, serializers, viewsets
+
+from library.models import Collection, Work, Document, Section, WorkMeta
+
+
+import requests
+from io import BytesIO
+import tempfile
+import shutil
+
+from django.db import transaction
+from django.core.files.uploadedfile import TemporaryUploadedFile
+
+class WorkMetaSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = WorkMeta
+        exclude = ['id', 'work']
+
+    def to_representation(self, instance):
+        return f"{instance.name}:{instance.value}"
+    
+    def to_internal_value(self, data):
+        name, _, value = data.partition(':')
+        return super().to_internal_value({'name': name, 'value': value})
+
+class SectionSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Section
+        exclude = ['id', 'doc']
+
+    def to_representation(self, instance):
+        start = instance.start or 0
+        end = instance.end or 0
+        return f"{instance.tag}:{instance.type}:{start}:{end}"
+
+    def to_internal_value(self, data):
+        tag, section_type, start, end = data.split(":")
+        try:
+            start = int(start)
+        except:
+            start = 0
+        try:
+            end = int(end)
+        except:
+            end = 0
+        return super().to_internal_value({'tag': tag, 'type': int(section_type), 'start': start, 'end': end})
+
+class DocumentSerializer(serializers.ModelSerializer):
+
+    upload = serializers.URLField()
+    sections = SectionSerializer(many=True)
+    #doctype = serializers.CharField(source='get_doctype_display')
+
+    #def to_internal_value(self, data):
+    #    r = requests.get(data['upload'], stream=True)
+    #    with tempfile.NamedTemporaryFile('wb') as f:
+    #        shutil.copyfileobj(r.raw, f)
+    #        data['upload'] = f.name
+    #        print(repr(data))
+    #        return super().to_internal_value(data)
+
+    def to_representation(self, instance):
+        data = super().to_representation(instance)
+        if data['upload'][0] == '/':
+            data['upload'] = 'http://localhost:8000' + (data['upload'])
+        return data
+
+    def create(self, validated_data):
+        print("CREATE", validated_data)
+        return super().create(validated_data)
+
+    def validate(self, data):
+        print("VALIDATE", data)
+        return super().validate(data)
+
+    def validate_upload(self, value):
+        print("VALIDATE", value)
+        return value
+
+    class Meta:
+        model = Document
+        exclude = ["id", "work", "version", "created"]
+
+# Serializers define the API representation.
+class WorkSerializer(serializers.ModelSerializer):
+
+    docs = DocumentSerializer(many=True)
+    meta_info = WorkMetaSerializer(many=True)
+    
+    class Meta:
+        model = Work
+        exclude = ['id', 'collection', 'projects', 'parent']
+
+    def create(self, validated):
+        with transaction.atomic():
+            docs = validated.pop('docs', [])
+            meta = validated.pop('meta_info', [])
+            work = Work.objects.create(**validated)
+
+            for d in docs:
+                sections = d.pop('sections', [])
+
+                r = requests.get(d['upload'], stream=True)
+                f = TemporaryUploadedFile(d['upload'], r.headers['content-type'], r.headers['content-length'], r.encoding)
+                shutil.copyfileobj(r.raw, f.file)
+                r.close()
+                d['upload'] = f
+                doc = Document.objects.create(work_id=work.pk, **d)
+
+                for s in sections:
+                    Section.objects.create(doc_id=doc.pk, **s)
+
+            for m in meta:
+                WorkMeta.objects.create(work_id=work.pk, **m)
+
+            return work
+
+class CollectionSerializer(serializers.Serializer):
+    works = WorkSerializer(many=True)
+
+    def create(self, validated):
+        s = WorkSerializer()
+        print(validated)
+        collection = validated['collection_id']
+        with transaction.atomic():
+            for work in validated['works']:
+                work['collection_id'] = collection
+                s.create(work)
+        return Collection.objects.get(pk=collection)
+        
+
+from rest_framework import generics
+
+class CollectionExportView(AuthorizedResourceMixin, generics.RetrieveAPIView):
+    serializer_class = CollectionSerializer
+
+    def get_queryset(self):
+        return Collection.objects.filter(administrators=self.request.user)
+
+class WorkExportView(AuthorizedResourceMixin, generics.RetrieveAPIView):
+    serializer_class = WorkSerializer
+
+    def get_queryset(self):
+        return Work.objects.filter(collection__administrators=self.request.user)
+
+class WorkImportView(AuthorizedResourceMixin, generics.CreateAPIView):
+    serializer_class = WorkSerializer
+
+    def perform_create(self, serializer):
+        serializer.save(collection_id=self.kwargs['pk'])
+
+class CollectionImportView(AuthorizedResourceMixin, generics.CreateAPIView):
+    serializer_class = CollectionSerializer
+
+    def perform_create(self, serializer):
+        serializer.save(collection_id=self.kwargs['pk'])

app/manage.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Django's command-line utility for administrative tasks."""
 import os
 import sys

app/polyphonic/default_settings.py

@@ -11,25 +11,28 @@ https://docs.djangoproject.com/en/3.1/ref/settings/
 """
 
 from pathlib import Path
+from os import environ
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
 
+SECRET_KEY=environ.get('SECRET_KEY')
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/3.1/howto/deployment/checklist/
 
-# SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = None
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+DEBUG = False
 
 ALLOWED_HOSTS = ['localhost']
 
-
 # Application definition
 
+POLYPHONIC_MODULES = [
+    'library'
+]
+
 INSTALLED_APPS = [
     'django.contrib.admin',
     'django.contrib.auth',
@@ -38,9 +41,16 @@ INSTALLED_APPS = [
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'django_markdown2',
+    'rest_framework',
+    'crispy_forms',
+    'crispy_bulma',
+    'byostorage',
     'interface',
 ]
 
+CRISPY_ALLOWED_TEMPLATE_PACKS = ("bulma",)
+CRISPY_TEMPLATE_PACK = "bulma"
+
 MIDDLEWARE = [
     'django.middleware.security.SecurityMiddleware',
     'django.contrib.sessions.middleware.SessionMiddleware',
@@ -82,6 +92,7 @@ DATABASES = {
     }
 }
 
+DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
 
 # Password validation
 # https://docs.djangoproject.com/en/3.1/ref/settings/#auth-password-validators
@@ -120,6 +131,8 @@ USE_TZ = True
 # https://docs.djangoproject.com/en/3.1/howto/static-files/
 
 STATIC_URL = '/static/'
+STATIC_ROOT = 'static'
 
 # Need to set this
 AWS_BUCKET = ''
+

app/polyphonic/settings.py

@@ -0,0 +1,7 @@
+try:
+    from .local_settings import *
+except ImportError:
+    from .default_settings import *
+
+
+INSTALLED_APPS += POLYPHONIC_MODULES

app/polyphonic/urls.py

@@ -14,9 +14,17 @@ Including another URLconf
     2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
 """
 from django.contrib import admin
-from django.urls import path, include
+from django.urls import path, re_path, include
 
 urlpatterns = [
     path('admin/', admin.site.urls),
     path('', include('interface.urls')),
+    #path('', include('submissions.urls')),
+    path('', include('library.urls')),
 ]
+
+try:
+    import debug_toolbar
+    urlpatterns.append(path('__debug__', include(debug_toolbar.urls)))
+except ImportError:
+    pass

app/requirements.txt

@@ -0,0 +1,29 @@
+asgiref==3.4.1
+boto3==1.18.34
+botocore==1.21.34
+certifi==2022.12.7
+charset-normalizer==2.1.1
+crispy-bulma==0.8.0
+Django==3.2.7
+#-e git+ssh://git@gitea.tfconsulting.com.au/tris/django-byostorage.git@227ce5fccb5864657f080c25528263b655c2b6b7#egg=django_byostorage
+git+https://gitea.tfconsulting.com.au/tris/django-byostorage.git
+django-crispy-forms==1.14.0
+django-markdown2==0.3.1
+django-rest-framework==0.1.0
+django-storages==1.13.1
+django_debug_toolbar==3.8.1
+djangorestframework==3.14.0
+djantic==0.7.0
+idna==3.4
+jmespath==0.10.0
+markdown2==2.4.1
+pydantic==1.10.2
+pydantic-django==0.1.1
+python-dateutil==2.8.2
+pytz==2021.1
+requests==2.28.1
+s3transfer==0.5.2
+six==1.16.0
+sqlparse==0.4.1
+typing_extensions==4.4.0
+urllib3==1.26.6

dev-requirements.txt

@@ -1 +0,0 @@
-pylint==2.6.0

docker_settings.py

@@ -0,0 +1,8 @@
+from .default_settings import *
+
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': '/var/polyphonic/db.sqlite3',
+    }
+}

interface/forms.py

@@ -1,17 +0,0 @@
-from django import forms
-from .models import Submission
-
-class CodeForm(forms.Form):
-    code = forms.CharField(max_length=14,
-        widget=forms.TextInput(attrs={'placeholder': 'xxx-xxx-xxx', 'inputmode': 'numeric'}))
-    passphrase = forms.CharField(max_length=32)
-
-class SubmissionForm(forms.ModelForm):
-    method = forms.ChoiceField(choices=(
-        ('upload', 'I need to upload a file'), 
-        ('link', 'I have a link from my own cloud storage provider')
-    ), initial='upload')
-
-    class Meta:
-        model = Submission
-        fields = ['name', 'instrument', 'method', 'notes']

interface/migrations/0001_initial.py

@@ -1,40 +0,0 @@
-# Generated by Django 3.1.1 on 2020-09-04 09:59
-
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    initial = True
-
-    dependencies = [
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Project',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=100)),
-            ],
-        ),
-        migrations.CreateModel(
-            name='WikiPage',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('markdown', models.TextField()),
-                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='wiki_pages', to='interface.project')),
-            ],
-        ),
-        migrations.CreateModel(
-            name='Submission',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=255)),
-                ('instrument', models.CharField(max_length=100)),
-                ('notes', models.TextField()),
-                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='submissions', to='interface.project')),
-            ],
-        ),
-    ]