Bugfix

Reviewed-on: #18

.gitignore

@@ -5,7 +5,10 @@ __pycache__
 credentials.json
 credentials
 local_settings.py
+local.mk
 .coverage
+.lint
+.deploy
 Session.vim
 poetry.lock
 /env

Dockerfile

@@ -1,7 +1,10 @@
 FROM alpine:latest
 
+ARG VERSION=0.8.4
+
 ENV TARGET=/opt/polyphonic
-ENV RELEASE=polyphonic-0.8.3-py3-none-any.whl 
+#ENV RELEASE=polyphonic-${VERSION}-py3-none-any.whl
+ENV RELEASE=git+https://gitea.tfconsulting.com.au/projects/polyphonic.git@${VERSION}
 
 RUN apk add --no-cache python3 py3-pip git ghostscript sqlite
 
@@ -10,15 +13,15 @@ WORKDIR /root
 RUN python3 -m venv ${TARGET}
 ENV PATH="${TARGET}/bin:$PATH"
 
-COPY dist/${RELEASE} .
+#COPY dist/${RELEASE} .
 RUN pip3 install ${RELEASE} --no-cache-dir
+RUN pip3 install gunicorn whitenoise
 
 WORKDIR ${TARGET}
 
 RUN SECRET_KEY=_ poly-tool collectstatic --noinput
 
 VOLUME ["/var/polyphonic"]
+EXPOSE 8000/tcp
 
-RUN pip3 install gunicorn whitenoise
-
-CMD ["gunicorn", "-b", "0.0.0.0", "polyphonic.wsgi"]
+CMD ["gunicorn", "-b", "0.0.0.0", "polyphonic.config.wsgi"]

Makefile

@@ -1,16 +1,36 @@
 PYTHON=env/bin/python
-DROPZONE=5.7.0
 
-test: check
-	poetry run coverage run --include "app/*" --omit "*/migrations/*" app/manage.py test app
+LIBRARY=polyphonic/interface/static
+DROPZONE=5.7.0
+BULMA=1.0.4
+ALPINE=3.15.12
+
+VERSION=0.8.4
+
+export DJANGO_SETTINGS_MODULE=polyphonic.config.settings.dev
+
+-include local.mk
+
+test: .coverage
+
+check: .lint
+
+pre-commit: check test
+
+.coverage: polyphonic
+	poetry run coverage run --include "polyphonic/*" --omit "*/migrations/*" polyphonic/manage.py test polyphonic
 	poetry run coverage html
 	poetry run coverage report
 
-check:
-	poetry run ruff check app
-	poetry run ruff format --check app || true
+.lint: polyphonic
+	poetry run ruff check polyphonic
+	poetry run ruff format --check polyphonic
+	touch $@
 
-build:
+
+build: dist/polyphonic-${VERSION}-py3-none-any.whl
+
+dist/polyphonic-${VERSION}-py3-none-any.whl: polyphonic 
 	poetry build
 
 dev-setup:
@@ -23,7 +43,18 @@ upgrade:
 	poetry run manage collectstatic
 	${MAKE} libraries
 
-libraries: static/dropzone static/fonts/Quicksand_Book.otf
+#libraries: static/dropzone static/fonts/Quicksand_Book.otf
+libraries: ${LIBRARY}/css/bulma.min.css ${LIBRARY}/js/alpine.js ${LIBRARY}/css/material.css
+
+${LIBRARY}/css/bulma.min.css:
+	curl -o $@ "https://cdn.jsdelivr.net/npm/bulma@${BULMA}/css/bulma.min.css"
+
+${LIBRARY}/js/alpine.js:
+	curl -o $@ "https://cdn.jsdelivr.net/npm/alpinejs@${ALPINE}/dist/cdn.min.js"
+
+${LIBRARY}/css/material.css:
+	curl -o $@ "https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined"
+
 
 static/dropzone: 
 	wget -O dropzone-${DROPZONE}.zip https://github.com/enyo/dropzone/archive/v${DROPZONE}.zip

app/interface/templatetags/polyphonic.py

@@ -1,18 +0,0 @@
-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/library/gdrive/storage.py

@@ -1,120 +0,0 @@
-from django.core.files.storage import Storage
-from collections import namedtuple
-import requests
-import re
-from gzip import GzipFile
-
-import logging
-
-logger = logging.getLogger(__name__)
-
-SHARED_FOLDER = re.compile(r"https://drive.google.com/drive/folders/(\w+)")
-SHARED_FILE = re.compile(r"https://drive.google.com/file/d/([\w\-]+)")
-
-FILES_API = "https://www.googleapis.com/drive/v3/files"
-
-
-class DriveObject(namedtuple("DriveObject", ("id", "name"))):
-    @classmethod
-    def from_string(cls, s):
-        return cls(*s.split("/", 1))
-
-    def __str__(self):
-        return f"{self.id}/{self.name}"
-
-
-class GDriveLinkStorage(Storage):
-    is_writable = False
-
-    def __init__(self, api_key):
-        self.api_key = api_key
-        super().__init__()
-
-    def parse_id(self, name):
-        parts = name.split("/")
-        return parts[0]
-
-    def extract_id(self, url, *patterns):
-        logger.debug("EXTRACT_ID: %r", url)
-        for pattern in patterns:
-            match = pattern.match(url)
-            if match:
-                return match.groups()[0]
-        raise FileNotFoundError(f"Not a valid url: {url}")
-
-    def get_json(self, url):
-        logger.debug("GET_JSON: %s", url)
-        response = requests.get(url)
-        data = response.json()
-        logger.debug("Data: %r", data)
-        return data
-
-    def listdir(self, path) -> tuple[list[str], list[str]]:
-
-        # used to test for valid connection parameters - should do something to validate API key here
-        if path == "":
-            return [], []
-
-        logger.debug("LISTDIR: %s", path)
-        folder_id = self.parse_id(path)
-        url = f"{FILES_API}?q='{folder_id}'+in+parents&key={self.api_key}"
-        data = self.get_json(url)
-        files = []
-        folders = []
-        for x in data["files"]:
-            if x["mimeType"] == "application/vnd.google-apps.folder":
-                # folders.append(f"{x['id']}/{x['name']}")
-                folders.append(DriveObject(x["id"], x["name"]))
-            else:
-                # files.append(f"{x['id']}/{x['name']}")
-                files.append(DriveObject(x["id"], x["name"]))
-
-        return folders, files
-
-    def get_meta(self, name):
-        file_id = self.parse_id(name)
-        url = f"{FILES_API}/{file_id}?key={self.api_key}"
-        return self.get_json(url)
-
-    def open(self, name, mode="rb"):
-        file_id = self.parse_id(name)
-        url = f"{FILES_API}/{file_id}?alt=media&key={self.api_key}"
-        logger.info("URL: %s", url)
-        response = requests.get(url, stream=True)
-        return GzipFile(name, "rb", 9, response.raw)
-
-    def size(self, name):
-        raise NotImplementedError()
-
-    def delete(self, name):
-        pass
-
-    def url(self, name):
-        logger.debug("URL: %r", name)
-        file_id = self.parse_id(name)
-        return f"https://drive.usercontent.google.com/download?export=download&id={file_id}&confirm=yes"
-
-    def get_folder_id(self, url):
-        try:
-            return self.extract_id(url, SHARED_FOLDER)
-        except FileNotFoundError:
-            return None
-
-    def get_file_id(self, url):
-        try:
-            return self.extract_id(url, SHARED_FILE)
-        except FileNotFoundError:
-            return None
-
-
-"""
-    def import_link(self, url) -> str:
-        file_id = self.extract_id(url, SHARED_FILE)
-        meta = self.get_meta(file_id)
-        return f"{file_id}/{meta['name']}"
-
-    def folder_import(self, url) -> list[str]:
-        folder_id = self.extract_id(url, SHARED_FOLDER)
-        _, files = self.listdir(folder_id)
-        return files
-"""

app/library/templates/library/document_annotate.html

@@ -1,450 +0,0 @@
-{% 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.music_tags %}
-    <li class="is-clickable" onclick="assignInstrument('{{tag}}', this)")>{{ inst }}</li>
-  {% endfor %}
-  </ul>
-  <a onclick="document.getElementById('add-modal').classList.add('is-active')">Add Tag</a>
-  </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 = "{% url 'document_download' collection.pk document.pk %}";
-
-  // 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 = '';
-
-    let li = document.createElement('li');
-    li.classList.add("is-clickable");
-    li.addEventListener('click', () => assignInstrument(tag, li));
-    li.innerHTML = get_instrument(tag);
-    document.getElementById('unassigned-area').appendChild(li);
-    
-    addTag(tag, pageNum, pageNum);
-    closeAddModal();
-  }
-
-  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', () => {
-      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/item_list_manage.html

@@ -1,109 +0,0 @@
-{% 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/work_parts_fragment.html

@@ -1,27 +0,0 @@
-<h3 class="subtitle">{{ work.name }}</h3>
-<div class="block tags">
-{% for tag, name in work.digital_parts %}
-<a class="tag is-info" href="{% url 'work_download' work.collection_id work.pk %}?tag={{ tag }}" target="polyphonic_parts">{{ name }}</a>
-{% endfor %}
-</div>
-
-<!--
-<h3 class="subtitle">Files</h3>
-<table class="table is-narrow is-fullwidth">
-<tbody>
-    {% for doc in work.pdfs %}
-    <tr>
-        <td><a href="{{ doc.upload.url }}">{{ doc.filename }}</a></td>
-    </tr>
-    {% empty %}
-    <tr>
-        <td>There are no files available for this work</td>
-    </tr>
-    {% endfor %}
-</tbody>
-</table>
--->
-
-<p>
-<a href="{% url 'work_detail' work.collection_id work.pk %}">More details...</a>
-</p>

app/polyphonic/settings/dev.py

@@ -1,10 +0,0 @@
-from .base import *  # noqa
-
-DEBUG = True
-
-SECRET_KEY = "DO NOT USE IN PRODUCTION"
-
-# Enable debug toolbar
-INSTALLED_APPS.append("debug_toolbar")  # noqa
-MIDDLEWARE.insert(1, "debug_toolbar.middleware.DebugToolbarMiddleware")  # noqa
-INTERNAL_IPS = ["127.0.0.1"]

docker-compose.yml

@@ -1,11 +1,15 @@
 services:
   polyphonic:
-    image: "polyphonic:latest"
-    build: "."
+    image: "polyphonic:0.8.4"
+    build: .
     ports:
-      - "8000:8000"
+      - "8001:8000"
     volumes:
       - "./data:/var/polyphonic"
+      - "./local_settings.py:/opt/polyphonic/local_settings.py"
     env_file: "compose.env"
     environment:
-      DJANGO_SETTINGS_MODULE: polyphonic.settings.docker
+      DJANGO_SETTINGS_MODULE: local_settings
+      PYTHONPATH: /opt/polyphonic
+      WORK_DIR: /var/polyphonic
+      VERSION: 0.8.4

polyphonic/config/asgi.py

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

polyphonic/config/settings/base.py

@@ -29,11 +29,11 @@ SECRET_KEY = os.environ.get("SECRET_KEY")
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = False
 
-ALLOWED_HOSTS = ["localhost"]
+ALLOWED_HOSTS = ["localhost", "127.0.0.1"]
 
 # Application definition
 
-POLYPHONIC_MODULES = ["library"]
+POLYPHONIC_MODULES = ["polyphonic.library"]
 
 INSTALLED_APPS = [
     "django.contrib.admin",
@@ -47,7 +47,7 @@ INSTALLED_APPS = [
     "crispy_forms",
     "crispy_bulma",
     "byostorage",
-    "interface",
+    "polyphonic.interface",
 ]
 
 INSTALLED_APPS += POLYPHONIC_MODULES
@@ -65,7 +65,7 @@ MIDDLEWARE = [
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
 ]
 
-ROOT_URLCONF = "polyphonic.urls"
+ROOT_URLCONF = "polyphonic.config.urls"
 
 TEMPLATES = [
     {
@@ -83,7 +83,7 @@ TEMPLATES = [
     },
 ]
 
-WSGI_APPLICATION = "polyphonic.wsgi.application"
+WSGI_APPLICATION = "polyphonic.config.wsgi.application"
 
 
 # Database
@@ -139,4 +139,4 @@ STATIC_ROOT = "static"
 CACHED_STORAGE_REMOTE = "byostorage.user.BYOStorage"
 CACHED_STORAGE_DIR = os.path.join(WORK_DIR, "cache")
 WHOOSH_INDEX = os.path.join(WORK_DIR, "index")
-STORAGE_CLASSES = ["library.gdrive.storage.GDriveLinkStorage"]
+STORAGE_CLASSES = ["polyphonic.library.gdrive.storage.GDriveLinkStorage"]

polyphonic/config/settings/dev.py

@@ -0,0 +1,28 @@
+from .base import *  # noqa
+from os import environ
+
+DEBUG = True
+
+SECRET_KEY = "DO NOT USE IN PRODUCTION"
+
+# Enable debug toolbar
+INSTALLED_APPS.append("debug_toolbar")  # noqa
+MIDDLEWARE.insert(1, "debug_toolbar.middleware.DebugToolbarMiddleware")  # noqa
+INTERNAL_IPS = ["127.0.0.1"]
+
+LOGGING = {
+    "version": 1,
+    "disable_existing_loggers": False,
+    "handlers": {
+        "console": {
+            "class": "logging.StreamHandler",
+            "level": environ.get("DEBUG_LEVEL", "WARNING"),
+        },
+    },
+    "loggers": {
+        "polyphonic": {
+            "handlers": ["console"],
+            "level": environ.get("DEBUG_LEVEL", "WARNING"),
+        }
+    },
+}

polyphonic/config/urls.py

@@ -19,9 +19,9 @@ from django.urls import path, include
 
 urlpatterns = [
     path("admin/", admin.site.urls),
-    path("", include("interface.urls")),
+    path("", include("polyphonic.interface.urls")),
     # path('', include('submissions.urls')),
-    path("", include("library.urls")),
+    path("", include("polyphonic.library.urls")),
 ]
 
 try:

polyphonic/config/wsgi.py

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

polyphonic/interface/apps.py

@@ -2,4 +2,4 @@ from django.apps import AppConfig
 
 
 class InterfaceConfig(AppConfig):
-    name = "interface"
+    name = "polyphonic.interface"

polyphonic/interface/forms.py

@@ -31,12 +31,12 @@ class ProjectForm(forms.ModelForm, BaseForm):
     class Meta:
         model = models.Project
         fields = ["name", "description", "modules", "event_date"]
-        # widgets = {
-        #    'event_date': forms.DateTimeInput(attrs={'type': 'date'})
-        # }
+        widgets = {"event_date": forms.DateTimeInput()}
 
     modules = forms.MultipleChoiceField(
-        choices=[(x, x.title()) for x in models.settings.POLYPHONIC_MODULES],
+        choices=[
+            (x, x.replace(".", " ").title()) for x in models.settings.POLYPHONIC_MODULES
+        ],
         widget=forms.CheckboxSelectMultiple,
         required=False,
     )

polyphonic/interface/migrations/0001_initial.py

@@ -4,7 +4,7 @@ import byostorage.user
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
-import interface.models
+import polyphonic.interface.models
 
 
 class Migration(migrations.Migration):
@@ -23,7 +23,7 @@ class Migration(migrations.Migration):
                 ('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)),
+                ('code', models.CharField(default=polyphonic.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)),
@@ -60,7 +60,7 @@ class Migration(migrations.Migration):
                 ('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)),
+                ('file', models.FileField(storage=byostorage.user.BYOStorage(), upload_to=polyphonic.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')),

polyphonic/interface/models.py

@@ -192,8 +192,9 @@ class Project(models.Model):
 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]
+    name = models.CharField(
+        max_length=100,
+        choices=[(x, x.replace(".", " ").title()) for x in settings.POLYPHONIC_MODULES],
     )
     project = models.ForeignKey(
         Project, related_name="modules", on_delete=models.CASCADE

polyphonic/interface/static/css/polyphonic.css

@@ -32,10 +32,11 @@
 .menu-label {
     color: var(--primary);
 }
-
+/*
 .button.is-primary, .button.is-primary:hover {
     background-color: var(--primary);
 }
+*/
 
 A.admin-link:after {
     content: "*";
@@ -60,4 +61,4 @@ TEXTAREA.input {
     padding: 10px 10px;
     margin-top: 30px;
     border-top-left-radius: 6px;
-}
+}

polyphonic/interface/templates/base.html

@@ -1,17 +1,15 @@
 {% load static %}
 <!DOCTYPE html>
-<html lang="en">
+<html lang="en" data-theme="light">
   <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>
-    <script src="//unpkg.com/alpinejs" defer></script>
-    <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.5.1/jquery.min.js" defer></script>
-    <script src="//kit.fontawesome.com/c837098e5b.js" crossorigin="anonymous" defer></script>
+    <link rel="icon" type="image/png" href="{% static 'images/icon.png' %}" />
+    <link rel="stylesheet" href="{% static 'css/bulma.min.css' %}" />
+    <link rel="stylesheet" href="{% static 'css/polyphonic.css' %}" />
+    <link rel="stylesheet" href="{% static 'css/material.css' %}" />
+    <script src="{% static 'js/interface.js' %}"></script>
     <title>{% block title %}Polyphonic{% endblock %}</title>
     {% block media %}{% endblock %}
     <style>{% block style %}{% endblock %}</style>
@@ -23,7 +21,7 @@
   <nav class="navbar" role="navigation">
     <div class="navbar-brand has-text-primary">
       <a class="navbar-item" href="/">
-        <span class="icon fancy is-size-2 is-size-4-mobile mx-4"><i class="fas fa-random"></i></span>
+        <span class="icon fancy mx-4"><span class="material-symbols-outlined is-size-1 is-size-3-mobile">groups</span></span>
         <span class="fancy is-size-2 is-size-4-mobile">Polyphonic</span>
       </a>
       <span class="navbar-item is-hidden-mobile fancy is-size-5">Musical Ensemble Manager</span>

polyphonic/interface/templates/bulma/file_upload.html

@@ -6,7 +6,7 @@
         {% crispy_field field 'class' 'file-input'%}
         <span class="file-cta">
             <span class="file-icon">
-            <i class="fas fa-upload"></i>
+              <span class="material-symbols-outlined">file_upload</span>
             </span>
             <span class="file-label">
             Choose a file…
@@ -25,4 +25,4 @@
         fileName.textContent = fileInput.files[0].name;
       }
     }
-  </script>
+  </script>

polyphonic/interface/templates/interface/ensemble_detail.html

@@ -1,19 +1,20 @@
 {% extends "interface/project_base.html" %}
 {% load md2 %}
+{% load polyphonic %}
 
 {% block admin %}
 <a href="{% url 'project_create' object.slug %}" class="button is-link">
-    <span class="icon"><i class="fas fa-plus-circle"></i></span>
+    {{ "add_notes"|icon }}
     <span>Add project</span>
 </a>
 {% if inactive %}
 <a href="?" class="button is-link">
-    <span class="icon"><i class="fas fa-archive"></i></span>
+    {{ "preview_off"|icon }}
     <span>Hide old</span>
 </a>
 {% else %}
 <a href="?inactive" class="button is-link">
-    <span class="icon"><i class="fas fa-archive"></i></span>
+    {{ "preview"|icon }}
     <span>Show all</span>
 </a>
 {% endif %}
@@ -35,23 +36,17 @@ Contacts:
 {% 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">
-            <ul>
-                <li><a href="{{ ensemble_link }}">Ensemble Sharing Link</a></li>
-                <li><a href="{% url 'project_create' ensemble.pk %}">Add a new project</a></li>
-            </ul>
-        </div>
-    </div>
+<div class="box">
+  <h3 class="subtitle">Admin Details</h3>
+  <ul>
+      <li><a href="{{ ensemble_link }}">Ensemble Sharing Link</a></li>
+      <li><a href="{% url 'project_create' ensemble.pk %}">Add a new project</a></li>
+  </ul>
 </div>
 {% endif %}
 
-<div>
+<div class="has-text-right is-size-6">
 <a href="{% url 'forget_resource' 'ensemble' ensemble.slug %}">Forget this ensemble</a>
 </div>
 
-{% endblock %}
+{% endblock %}

polyphonic/interface/templates/interface/ensemble_list.html

@@ -5,7 +5,7 @@
 {% 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>
+    {% icon "add_file" %}
     <span>Register another</span>
 </a>
 </div>
@@ -25,10 +25,13 @@
                         <img src="https://www.gravatar.com/avatar/{{ ensemble.email }}?d=mp" alt="Placeholder image">
                         </figure>
                     </div>
-                    <div class="media-content" style="min-height: 60px">
+                    <div class="media-content" style="min-height: 100px">
                         <a href="{% url 'ensemble_detail' ensemble.slug %}">
                             <p class="title is-4">{{ ensemble.name }}</p>
                         </a>
+                        <div class="mt-3">
+                          {{ ensemble.details|markdown }}
+                        </div>
                     </div>
                 </div>
             </div>
@@ -40,9 +43,12 @@
         </div>
     </div>
 {% empty %}
-    <div class="hero">
-        You don't currently have access to any ensembles - ask your administrator for a link.
+    <div class="hero mx-auto my-4">
+        <div class="hero-body has-text-centered">
+            <p class="title">You don't currently have access to any ensembles</p>
+            <p class="subtitle">Ask your administrator for a link.</p>
+        </div>
     </div>
 {% endfor %}
 </div>
-{% endblock %}
+{% endblock %}

polyphonic/interface/templates/interface/project_base.html

@@ -21,7 +21,7 @@
                 <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 %}
+                        {% if 'polyphonic.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 %}

polyphonic/interface/templates/interface/project_detail.html

@@ -4,11 +4,11 @@
 
 {% 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>
+  {{ "add_notes"|icon }}
+  <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>
+    {{ "edit"|icon }}
     <span>Edit</span>
 </a>
 {% endblock %}
@@ -29,7 +29,7 @@
             </h3>
         {% endif %}
 
-        <div class="block">
+        <div class="block content">
             {% if project.description %}
                 <p class="content">{{ project.description|markdown }}</p>
             {% else %}
@@ -40,40 +40,36 @@
         {% if project.owner %}
             <div class="block">
             {% if project.owner.email %}
-                The project owner is <a href="mailto:{{ project.owner.email }}">{{ project.owner }}</a>
+                The project owner is <strong><a href="mailto:{{ project.owner.email }}">{{ project.owner }}</a></strong>.
             {% else %}
-                The project owner is {{ project.owner }}.
+                The project owner is <strong>{{ project.owner }}</strong>.
             {% endif %}
             </div>
         {% endif %}
         </div>
+      {% if request.is_admin %}
+      <div class="box">
+          <h3 class="subtitle">Admin Actions</h3>
+          <ul>
+              <li><a href="{{ project_link }}">Project Link</a></li>
+          </ul>
+      </div>
+      {% endif %}
+
     </div>
 
-    {% if 'library' in modules %}
     <div class="column is-one-third">
+    {% if 'polyphonic.library' in modules %}
         {% include 'library/project_detail.html' %}
-    </div>
     {% endif %}
 
-    {% if 'submission' in modules %}
-    <div class="column">
+    {% if 'polyphonic.submission' in modules %}
         {% include 'submissions/project_detail.html' %}
-    </div>
     {% endif %}
+    </div>
 
 </div>
 
-{% if request.is_admin %}
-<div class="box">
-    <h3 class="subtitle">Admin Actions</h3>
-    <ul>
-        <li><a href="{{ project_link }}">Project Link</a></li>
-        {% if 'library' in modules %}
-        <li><a href="{% url 'item_list_manage' project=project.pk %}">Manage items</a></li>
-        {% endif %}
-    </ul>
-</div>
-{% endif %}
 
 <!--
 <div>

polyphonic/interface/templates/interface/project_items.html

@@ -12,7 +12,8 @@
                     <p class="card-header-icon" style="color: black;">{{ project.rough_date }}</p>
             </header>
             </a>
-            <div class="card-content" style="height: 100px; overflow: hidden">
+            <div class="card-content" style="height: 150px; overflow: hidden">
+                <div><b>{{ project.event_date|date:"l jS F Y, g:i A" }}</b></div>
                 <div class="content">
                     {{ project.description | markdown }}
                 </div>
@@ -26,11 +27,11 @@
         </div>
     </div>
 {% empty %}
-    <div class="hero">
-        <div class="hero-body">
+    <div class="hero mx-auto my-4">
+        <div class="hero-body has-text-centered">
             <p class="title">No projects currently planned</p>
             <p class="subtitle">Go put your feet up!</p>
         </div>
     </div>
 {% endfor %}
-</div>
+</div>

polyphonic/interface/templates/interface/resource_list.html

@@ -1,9 +1,10 @@
 {% extends "interface/project_base.html" %}
 {% load md2 %}
+{% load polyphonic %}
 
 {% 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>
+    {% icon "add_notes" %}
     <span>Add new</span>
 </a>
 {% endblock %}
@@ -27,11 +28,11 @@
 
                 <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 href="{% url 'resource_upload' project=project.pk pk=resource.pk %}" title="Upload">
+                        {% icon "upload_file" %}
                     </a>
-                    <a href="{% url 'resource_edit' project=project.pk pk=resource.pk %}" class="icon" title="Edit">
-                        <i class="fas fa-edit"></i>
+                    <a href="{% url 'resource_edit' project=project.pk pk=resource.pk %}" title="Edit">
+                        {% icon "edit" %}
                     </a>
                     {% endif %}
                 </div>

polyphonic/interface/templates/interface/wiki.html

@@ -1,9 +1,10 @@
 {% extends "interface/project_base.html" %}
+{% load polyphonic %}
 
 {% 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>
+  {{ "edit"|icon }}
+  <span>Edit</span>
 </a>
 {% endblock %}
 
@@ -12,4 +13,4 @@
 <div class="box content wiki-page">
 {{ wiki_html|safe }}
 </div>
-{% endblock %}
+{% endblock %}

polyphonic/interface/templatetags/path_filters.py

@@ -5,7 +5,7 @@ register = template.Library()
 
 
 def basename(value):
-    return os.path.basename(value)
+    return os.path.basename(str(value))
 
 
 register.filter("basename", basename)

polyphonic/interface/templatetags/polyphonic.py

@@ -0,0 +1,36 @@
+from django import template
+from django.utils import timesince
+from django.utils.html import format_html
+
+register = template.Library()
+
+
+@register.filter("icon", is_safe=True)
+def material_icon(value):
+    return f'<span class="icon"><span class="material-symbols-outlined">{value}</span></span>'
+
+
+@register.simple_tag
+def icon(name, element="span", classes=[]):
+    classes = ["icon"] + classes
+    return format_html(
+        '<{} class="{}"><span class="material-symbols-outlined">{}</span></{}>',
+        element,
+        " ".join(classes),
+        name,
+        element,
+    )
+
+
+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)

polyphonic/interface/tests/__init__.py

@@ -1,5 +1,5 @@
 from django.test import TestCase
-from interface import models
+from polyphonic.interface import models
 from django.contrib.auth.models import User
 from django.utils import timezone
 from datetime import timedelta

polyphonic/interface/tests/test_access.py

@@ -1,5 +1,4 @@
-
-from interface import models
+from polyphonic.interface import models
 
 from . import AccessTestCase
 

polyphonic/interface/views.py

@@ -15,7 +15,7 @@ from django.contrib.auth import logout
 from markdown2 import markdown
 
 from . import models, forms
-from interface.utils import check_signed_url
+from .utils import check_signed_url
 
 import logging
 

polyphonic/library/apps.py

@@ -2,4 +2,4 @@ from django.apps import AppConfig
 
 
 class LibraryConfig(AppConfig):
-    name = "library"
+    name = "polyphonic.library"

polyphonic/library/forms.py

@@ -1,7 +1,7 @@
 from django import forms
 from .models import Work
-from interface.models import Project
-from interface.forms import BaseForm
+from polyphonic.interface.models import Project
+from polyphonic.interface.forms import BaseForm
 
 
 class WorkCreateForm(forms.ModelForm, BaseForm):

polyphonic/library/gdrive/__init__.py

@@ -1,4 +1,5 @@
-from library.models import Collection, Work, WorkMeta, Document
+from polyphonic.library.models import Collection, Work, WorkMeta, Document
+from byostorage.models import UserStorage
 
 import logging
 
@@ -6,21 +7,26 @@ logger = logging.getLogger(__name__)
 
 
 def sync_work(work: Work):
-    logger.info("Syncing '%s'", work.name)
-    folder_id = work.meta_info.get(name="folderid").value
+    try:
+        folder_id = work.meta_info.get(name="folderid").value
+    except WorkMeta.DoesNotExist as err:
+        raise IndexError("Work not currently linked to a gdrive folder") from err
 
-    storage = work.collection.storage.instance()
-    prefix = work.collection.storage.name
-    _, files = storage.listdir(folder_id)
+    logger.info("Syncing '%s' from %r", work.name, folder_id)
+
+    storage = UserStorage.objects.get(name="gdrive").instance()
 
     existing = set(
         [
-            storage.parse_id(x.partition(":")[2])
+            storage.parse_resource(x.partition(":")[2]).id
             for x in work.docs.values_list("upload", flat=True)
         ]
     )
     logger.debug("%d existing documents", len(existing))
 
+    _, files = storage.listdir(folder_id)
+    logger.debug("Remote files: %r", files)
+
     for file in files:
         if file.id in existing:
             logger.debug("%30s: Skipping existing (%s)", file.name, file.id)
@@ -32,21 +38,26 @@ def sync_work(work: Work):
             continue
 
         logger.info("%40s: Adding", file.name)
-        doc = work.docs.create(upload=f"{prefix}:{file}", doctype=Document.DOCTYPE_PDF)
+        doc = work.docs.create(upload=f"gdrive:{file}", doctype=Document.DOCTYPE_PDF)
         doc.auto_tag()
 
     for uri in existing:
         logger.warning("Local entry not in folder: %s", uri)
 
 
+def sync_partial_collection(collection: Collection, sync_existing: bool = True):
+
+    works = Work.objects.filter(collection=collection, meta_info__name="folderid")
+
+    for work in works:
+        sync_work(work)
+
+
 def sync_collection(collection: Collection, sync_existing: bool = False):
     logger.info("Syncing '%s'", collection)
 
     if not collection.storage.storage.endswith("GDriveLinkStorage"):
-        raise RuntimeError("Not a gdrive storage")
-
-    if not collection.prefix:
-        raise KeyError("Prefix must store folder id")
+        return sync_partial_collection(collection, sync_existing)
 
     existing = dict(
         WorkMeta.objects.filter(
@@ -54,10 +65,14 @@ def sync_collection(collection: Collection, sync_existing: bool = False):
         ).values_list("value", "work_id")
     )
 
+    folder = collection.prefix
     storage = collection.storage.instance()
-    folders, _ = storage.listdir(collection.prefix)
+    folders, _ = storage.listdir(folder)
 
     for folder in folders:
+        if folder[0] == "_":
+            continue
+
         if folder.id in existing:
             if sync_existing:
                 logger.info("%40s: Syncing (%s)", folder.name, folder.id[:12])

polyphonic/library/gdrive/storage.py

@@ -0,0 +1,141 @@
+from django.core.files.storage import Storage
+from collections import namedtuple
+import requests
+import re
+from gzip import GzipFile
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+SHARED_FOLDER = re.compile(
+    r"https://drive.google.com/drive[u0-9\/]+folders/([\w\-]+)(\?resourcekey=([\w\-]+))?"
+)
+SHARED_FILE = re.compile(
+    r"https://drive.google.com/file/d/([\w\-]+)(\?resourcekey=([\w\-]+))?"
+)
+
+FILES_API = "https://www.googleapis.com/drive/v3/files"
+
+
+class DriveObject(namedtuple("DriveObject", ("id", "key", "name"))):
+    @classmethod
+    def from_string(cls, s: str):
+        resource, _, name = s.partition("/")
+        id, _, key = resource.partition("#")
+        return cls(id, key, name)
+
+    def __str__(self):
+        resource = f"{self.id}#{self.key}" if self.key else self.id
+        return f"{resource}/{self.name}"
+
+
+class GDriveLinkStorage(Storage):
+    is_writable = False
+
+    def __init__(self, api_key):
+        self.api_key = api_key
+        super().__init__()
+
+    def parse_resource(self, name) -> DriveObject:
+        return DriveObject.from_string(name)
+
+    def extract_resource(self, url, *patterns) -> DriveObject:
+        logger.debug("EXTRACT_RESOURCE: %r", url)
+        for pattern in patterns:
+            match = pattern.match(url)
+            if match:
+                groups = match.groups()
+                logger.debug(groups)
+                if len(groups) == 3:
+                    return DriveObject(groups[0], groups[2], "")
+                return DriveObject(groups[0], None, "")
+        raise FileNotFoundError(f"Not a valid url: {url}")
+
+    def get_json(self, url, resource: DriveObject):
+        headers = {}
+        if resource.key:
+            headers["X-Goog-Drive-Resource-Keys"] = f"{resource.id}/{resource.key}"
+
+        logger.debug("GET_JSON: %s %r", url, headers)
+        response = requests.get(url, headers=headers)
+        data = response.json()
+        logger.debug("Data: %r", data)
+        return data
+
+    def listdir(self, path) -> tuple[list[str], list[str]]:
+        # used to test for valid connection parameters - should do something to validate API key here
+        logger.debug("listdir: %s", path)
+        if path == "":
+            return [], []
+
+        folder = self.parse_resource(path)
+        url = f"{FILES_API}?q='{folder.id}'+in+parents&key={self.api_key}"
+        data = self.get_json(url, folder)
+        files = []
+        folders = []
+        for x in data["files"]:
+            if x["mimeType"] == "application/vnd.google-apps.folder":
+                # folders.append(f"{x['id']}/{x['name']}")
+                folders.append(DriveObject(x["id"], x.get("resourceKey"), x["name"]))
+            else:
+                # files.append(f"{x['id']}/{x['name']}")
+                files.append(DriveObject(x["id"], x.get("resourceKey"), x["name"]))
+
+        return folders, files
+
+    def get_meta(self, name):
+        file_resource = self.parse_resource(name)
+        url = f"{FILES_API}/{file_resource.id}?key={self.api_key}"
+        return self.get_json(url, file_resource)
+
+    def open(self, name, mode="rb"):
+        resource = self.parse_resource(name)
+        url = f"{FILES_API}/{resource.id}?alt=media&key={self.api_key}"
+
+        headers = {}
+        if resource.key:
+            headers["X-Goog-Drive-Resource-Keys"] = f"{resource.id}/{resource.key}"
+        logger.info("URL: %s [%r]", url, headers)
+
+        response = requests.get(url, headers=headers, stream=True)
+        return GzipFile(name, "rb", 9, response.raw)
+
+    def size(self, name):
+        raise NotImplementedError()
+
+    def delete(self, name):
+        pass
+
+    def url(self, name):
+        logger.debug("URL: %r", name)
+        resource = self.parse_resource(name)
+        uri = f"https://drive.usercontent.google.com/download?export=download&id={resource.id}&confirm=yes"
+        if resource.key:
+            uri += f"&resourcekey=${resource.key}"
+        return uri
+
+    def get_folder_id(self, url):
+        try:
+            return self.extract_resource(url, SHARED_FOLDER)
+        except FileNotFoundError:
+            return None
+
+    def get_file_id(self, url):
+        try:
+            return self.extract_resource(url, SHARED_FILE)
+        except FileNotFoundError:
+            return None
+
+    def import_link(self, url) -> str:
+        file_resource = self.extract_resource(url, SHARED_FILE)
+        meta = self.get_meta(file_resource)
+        return f"{file_resource}/{meta['name']}"
+
+
+"""
+    def folder_import(self, url) -> list[str]:
+        folder_id = self.extract_id(url, SHARED_FOLDER)
+        _, files = self.listdir(folder_id)
+        return files
+"""

polyphonic/library/gdrive/views.py

@@ -1,9 +1,12 @@
 from django.shortcuts import resolve_url, redirect
 from django.views.generic import FormView
 from django.views.generic.detail import SingleObjectMixin
-from library.views import CollectionMixin
-from library.models import Work, Document
-from library import forms
+from polyphonic.library.views import CollectionMixin
+from polyphonic.library.models import Work, Document
+from polyphonic.library import forms
+from byostorage.models import UserStorage
+
+from . import sync_work
 
 
 class WorkGDriveView(CollectionMixin, SingleObjectMixin, FormView):
@@ -27,31 +30,30 @@ class WorkGDriveView(CollectionMixin, SingleObjectMixin, FormView):
     def form_valid(self, form):
         link = form.cleaned_data["link"]
 
-        storage = self.collection.storage.instance()
+        # storage = self.collection.storage.instance()
+        storage = UserStorage.objects.get(name="gdrive").instance()
         self.object = self.get_object()
 
-        try:
-            folderid = storage.get_folder_id(link)
+        folderid = storage.get_folder_id(link)
+        if folderid:
             self.object.meta_info.update_or_create(
                 name="folderid", defaults={"value": folderid}
             )
-            return redirect("work_detail", self.collection.pk, self.kwargs["pk"])
-        except FileNotFoundError:
-            pass  # not a folder id
+            sync_work(self.object)
 
-        try:
-            link = self.collection.storage.instance().import_link(link)
-        except AttributeError:
-            pass
-        except FileNotFoundError as e:
-            form.add_error("link", str(e))
+            return redirect("work_detail", self.collection.pk, self.kwargs["pk"])
+
+        link = storage.import_link(link)
+        if link is None:
+            form.add_error("link", "Not a valid link")
             return self.form_invalid(form)
 
         work = self.collection.works.get(pk=self.kwargs["pk"])
 
         doc = Document(
             work=work,
-            upload=f"{self.collection.storage.name}:{link}",
+            upload=f"gdrive:{link}",
+            # upload=f"{self.collection.storage.name}:{link}",
             doctype=Document.DOCTYPE_PDF,
         )
         doc.save()

polyphonic/library/indexer/__init__.py

@@ -3,9 +3,9 @@ from django.conf import settings
 from django.utils.module_loading import import_module
 from django.db.models import QuerySet
 
-from library.models import Work, Collection
+from polyphonic.library.models import Work, Collection
 
-instance = getattr(settings, "INDEXER", "library.indexer.whoosh")
+instance = getattr(settings, "INDEXER", "polyphonic.library.indexer.whoosh")
 
 
 class Indexer(Protocol):

polyphonic/library/indexer/whoosh.py

@@ -3,7 +3,7 @@ from whoosh.analysis import StemmingAnalyzer, CharsetFilter
 from whoosh.support.charset import accent_map
 from whoosh.fields import Schema, TEXT, KEYWORD, NUMERIC
 from whoosh.qparser import QueryParser
-from whoosh.query import Term, NullQuery, Prefix
+from whoosh.query import Term, NullQuery, FuzzyTerm
 
 
 from typing import Any
@@ -69,7 +69,6 @@ def search(
     limit = NullQuery
     for c in collections:
         limit |= Term("collection", c)
-    print(limit)
 
     hits = []
     ix = get_index()
@@ -78,7 +77,7 @@ def search(
 
         # if no results, do a prefix search
         if results.results.is_empty():
-            qp.termclass = Prefix
+            qp.termclass = FuzzyTerm
             q = qp.parse(query)
             results = searcher.search_page(q & limit, page, pagesize)
 

polyphonic/library/management/commands/index.py

@@ -1,7 +1,7 @@
 from django.core.management.base import BaseCommand
 
-from library import models
-from library.indexer import model_search, index_works, indexer
+from polyphonic.library import models
+from polyphonic.library.indexer import model_search, index_works, indexer
 
 FORMATTER = "{w.name:50s} {w.edition:15s} {w.collection.name:15s}"
 

polyphonic/library/management/commands/sync.py

@@ -1,6 +1,6 @@
 from django.core.management.base import BaseCommand, CommandError
-from library.models import Work, Collection
-from library.gdrive import sync_work, sync_collection
+from polyphonic.library.models import Work, Collection
+from polyphonic.library.gdrive import sync_work, sync_collection
 
 
 class Command(BaseCommand):

polyphonic/library/migrations/0001_initial.py

@@ -4,7 +4,7 @@ import byostorage.user
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
-import library.models
+import polyphonic.library.models
 
 
 class Migration(migrations.Migration):
@@ -35,7 +35,7 @@ class Migration(migrations.Migration):
             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)),
+                ('upload', models.FileField(storage=byostorage.user.BYOStorage(), upload_to=polyphonic.library.models.doc_upload_filename)),
                 ('created', models.DateTimeField(auto_now_add=True)),
                 ('version', models.CharField(blank=True, max_length=30)),
             ],

polyphonic/library/migrations/0004_auto_20230101_1535.py

@@ -3,7 +3,7 @@
 import byostorage.cached
 import byostorage.user
 from django.db import migrations, models
-import library.models
+import polyphonic.library.models
 
 
 class Migration(migrations.Migration):
@@ -26,7 +26,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='document',
             name='upload',
-            field=models.FileField(storage=byostorage.cached.CachedStorage(byostorage.user.BYOStorage()), upload_to=library.models.doc_upload_filename),
+            field=models.FileField(storage=byostorage.cached.CachedStorage(byostorage.user.BYOStorage()), upload_to=polyphonic.library.models.doc_upload_filename),
         ),
         migrations.AlterField(
             model_name='work',

polyphonic/library/models.py

@@ -11,8 +11,8 @@ import os.path
 from byostorage.user import BYOStorage
 from byostorage.cached import CachedStorage
 
-from library.music_tags import MusicTag, auto_tag
-from interface.utils import sign_data
+from polyphonic.library.music_tags import MusicTag, auto_tag
+from polyphonic.interface.utils import sign_data
 
 import logging
 
@@ -292,7 +292,11 @@ class Work(models.Model):
 
     @property
     def digital_parts(self):
-        sections = [(s.tag, s.name) for s in Section.objects.filter(doc__work=self.pk)]
+        sections = [
+            (s.tag, s.name)
+            for s in Section.objects.filter(doc__work=self.pk)
+            if ":" not in s.tag
+        ]
         sections.sort(key=self.orchestration.sorter())
         # return [ s[1] for s in sections ]
         sections = list(dict(sections).items())  # primitive unique()
@@ -366,8 +370,8 @@ class Work(models.Model):
 
     def music_tags(self):
         tags = dict(self.orchestration.as_list())
-        for section in Section.objects.filter(doc__work_id=self.pk):
-            tags.setdefault(section.tag, section.name)
+        # for section in Section.objects.filter(doc__work_id=self.pk):
+        #    tags.setdefault(section.tag, section.name)
 
         return tags.items()
 
@@ -434,7 +438,7 @@ class Document(models.Model):
         filename = os.path.basename(str(self.upload))
         inst = auto_tag(filename)
         if inst:
-            self.sections.get_or_create(tag=inst.abbreviate())
+            self.sections.get_or_create(tag=inst.tag)
 
     def delete(self, *args, **kwargs):
         self.upload.delete(save=False)

polyphonic/library/music_tags.py

@@ -1,13 +1,15 @@
-from collections import namedtuple
+from dataclasses import dataclass
 import re
 
-GENERAL = """
-mvmt    Movement
-ex      Excerpt
-sec     Section
-pce     Piece
-no      Number
-"""
+
+TAG_PREFIXES = {
+    "mvmt": "Movement",
+    "ex": "Excerpt",
+    "sect": "Section",
+    "name": "Name",
+    "no": "Number",
+    "page": "Page",
+}
 
 # taken from https://imslp.org/wiki/IMSLP:Abbreviations_for_MusicTags
 # Include any aliases at the top
@@ -19,6 +21,10 @@ cb      Double Bass
 mall    Mallet Percussion
 vln     Violin
 vla     Viola
+kit     Drumkit
+asax    Alto Sax
+tsax    Tenor Sax
+bsax    Bari Sax
 
 acc 	Accordion 
 afl 	Alto flute 
@@ -155,71 +161,110 @@ 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_TAG = re.compile(r"((?P<prefix>\w+):)?(?P<name>.*?)(\-(?P<number>[0-9]+))?")
 
+MUSIC_TAGS = []
+TAG_ALIASES = {}
+# GENERAL_TAGS = set()
+for line in INSTRUMENTS.split("\n"):
+    parts = line.strip().split(maxsplit=1)
+    if len(parts) < 2:
+        continue
+    name, _, _ = parts[1].partition("(")
+    MUSIC_TAGS.append((parts[0], name.strip()))
+    # if i == 0:
+    #    GENERAL_TAGS.add(parts[0])
+    TAG_ALIASES.setdefault(name, []).append(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])):
+def slug(s):
+    """
+    >>> slug("This is a test")
+    'This_is_a_test'
+    """
+    return str(s).replace(" ", "_")
+
+
+def deslug(s):
+    return s.replace("_", " ")
+
+
+@dataclass
+class MusicTag:
+    name: str
+    number: int | None = None
+    prefix: str = ""
+
     @classmethod
     def from_tag(cls, tag):
         """
         >>> MusicTag.from_tag('vn-1')
-        MusicTag(name='Violin', variant='1')
+        MusicTag(name='Violin', number=1, prefix='')
         >>> MusicTag.from_tag('db')
-        MusicTag(name='Double Bass', variant=None)
+        MusicTag(name='Double Bass', number=None, prefix='')
         >>> 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')
+        MusicTag(name='Jaws Harp', number=None, prefix='')
+        >>> MusicTag.from_tag('mvmt:Largo-2')
+        MusicTag(name='Largo', number=2, prefix='mvmt')
+        >>> MusicTag.from_tag('name:A2')
+        MusicTag(name='A2', number=None, prefix='name')
+        >>> MusicTag.from_tag('name:Ode_to_Joy')
+        MusicTag(name='Ode to Joy', number=None, prefix='name')
+        >>> MusicTag.from_tag('no:-2')
+        MusicTag(name='', number=2, prefix='no')
         """
-        abbr, _, variant = tag.partition("-")
-        name = MUSIC_NAME_BY_TAG.get(abbr.lower(), abbr)
 
-        if variant:
-            return cls(name, variant)
-        return cls(name, None)
+        match = MUSIC_TAG.fullmatch(tag)
 
-    @property
-    def tag(self):
-        lc = self.name.lower()
-        return MUSIC_TAG_BY_NAME.get(lc, lc)
+        if match is None:
+            raise ValueError("Not a valid tag")
+
+        result = match.groupdict()
+
+        if result["prefix"] is None:
+            result["name"] = MUSIC_NAME_BY_TAG.get(
+                result["name"].lower(), deslug(result["name"])
+            )
+            result["prefix"] = ""
+        else:
+            result["name"] = deslug(result["name"])
+
+        result["number"] = int(result["number"]) if result["number"] else None
+
+        return cls(**result)
 
     @property
     def is_general(self):
         """
-        >>> MusicTag('Piece', 'A3').is_general
+        >>> MusicTag('A3', prefix="name").is_general
         True
         >>> MusicTag('Violin', 2).is_general
         False
         """
-        return self.tag in GENERAL_TAGS
+        return self.prefix in TAG_PREFIXES
 
-    def abbreviate(self):
+    @property
+    def tag(self):
         """
-        >>> MusicTag('Violin', 1).abbreviate()
+        >>> MusicTag('Violin', 1).tag
         'vn-1'
-        >>> MusicTag('Double Bass').abbreviate()
+        >>> MusicTag('Double Bass').tag
         'db'
+        >>> MusicTag('left', prefix="page:").tag
+        'page:left'
+        >>> MusicTag("Ode to Joy", prefix="name:").tag
+        'name:Ode_to_Joy'
+        >>> MusicTag('Unknown Instrument').tag
+        'Unknown_Instrument'
         """
-        tag = MUSIC_TAG_BY_NAME.get(self.name.lower())
-        if self.variant:
-            tag = f"{tag}-{self.variant}"
-        return tag
+        parts = [self.prefix]
+        parts.append(MUSIC_TAG_BY_NAME.get(self.name.lower(), slug(self.name)))
+        if self.number:
+            parts.extend(["-", str(self.number)])
+        return "".join(parts)
 
     def __str__(self):
         """
@@ -227,15 +272,17 @@ class MusicTag(namedtuple("MusicTag", ("name", "variant"), defaults=[None])):
         'Violin 1'
         >>> str(MusicTag('Double Bass'))
         'Double Bass'
+        >>> str(MusicTag('Unknown Instrument'))
+        'Unknown Instrument'
         """
-        if self.variant:
-            return f"{self.name} {self.variant}"
+        if self.number:
+            return f"{self.name} {self.number}"
         return self.name
 
 
 PATTERNS = [
-    re.compile(r"(?P<inst>[A-Za-z]+)[_\- ]*(?P<ord>\d+)"),
-    re.compile(r"(?P<ord>\d+)(st|nd|rd|th)[_\- ]*(?P<inst>[A-Za-z]+)"),
+    re.compile(r"(?P<inst>[A-Za-z]+)[_\- ]*(?P<number>\d+)"),
+    re.compile(r"(?P<number>\d+)(st|nd|rd|th)[_\- ]*(?P<inst>[A-Za-z]+)"),
     re.compile(r"(?P<inst>[A-Za-z]+)()"),
 ]
 
@@ -243,34 +290,33 @@ PATTERNS = [
 def auto_tag(filename):
     """
 
-    >>> auto_tag('Ode to Joy - Violin 1.pdf')
-    MusicTag(name='Violin', variant=1)
-    >>> auto_tag('Ode to Joy_Cello.pdf')
-    MusicTag(name='Cello', variant=None)
-    >>> auto_tag('Ode to Joy violin - 1.pdf')
-    MusicTag(name='Violin', variant=1)
-    >>> auto_tag('Ode to Joy - vla.pdf')
-    MusicTag(name='Viola', variant=None)
-    >>> auto_tag('Ode to Joy - fl-2 (piccolo).pdf')
-    MusicTag(name='Flute', variant=2)
-    >>> auto_tag('1st Violin - Ode to Joy.pdf')
-    MusicTag(name='Violin', variant=1)
-    >>> auto_tag('Ode to Joy - 2nd Violin.pdf')
-    MusicTag(name='Violin', variant=2)
-
+    >>> auto_tag('Ode to Joy - Violin 1.pdf').tag
+    'vn-1'
+    >>> auto_tag('Ode to Joy_Cello.pdf').tag
+    'vc'
+    >>> auto_tag('Ode to Joy violin - 1.pdf').tag
+    'vn-1'
+    >>> auto_tag('Ode to Joy - vla.pdf').tag
+    'va'
+    >>> auto_tag('Ode to Joy - fl-2 (piccolo).pdf').tag
+    'fl-2'
+    >>> auto_tag('1st Violin - Ode to Joy.pdf').tag
+    'vn-1'
+    >>> auto_tag('Ode to Joy - 2nd Violin.pdf').tag
+    'vn-2'
     """
 
     for pattern in PATTERNS:
         for m in pattern.finditer(filename):
             inst = m["inst"].lower()
             try:
-                ordinal = int(m["ord"])
+                number = int(m["number"])
             except IndexError:
-                ordinal = None
+                number = None
             if inst in MUSIC_TAG_BY_NAME:
-                return MusicTag(inst.title(), ordinal)
+                return MusicTag(inst.title(), number)
             if inst in MUSIC_NAME_BY_TAG:
-                return MusicTag(MUSIC_NAME_BY_TAG[inst], ordinal)
+                return MusicTag(MUSIC_NAME_BY_TAG[inst], number)
 
 
 if __name__ == "__main__":

polyphonic/library/templates/library/collection_list.html

@@ -1,4 +1,5 @@
 {% extends "interface/project_base.html" %}
+{% load polyphonic %}
 
 {% block page %}
 <h3 class="title">Library collections for {% firstof request.user.first_name request.user.username %}</h3>
@@ -10,7 +11,9 @@
             <input class="input" name="q" type="text" placeholder="Find a work" value="{{ request.GET.filter }}"/>
         </div>
         <div class="control">
-            <a class="button" href="?"><i class="fas fa-times"></i></a>
+            <a class="button" href="?">
+              {% icon "close" %}
+            </a>
         </div>
     </div>
 </form>
@@ -47,4 +50,5 @@
 <div>
     <small>{{ ensemble.ensemble_code }}</small>
 </div>
+
 {% endblock %}

polyphonic/library/templates/library/document_annotate.html

@@ -0,0 +1,784 @@
+{% extends "interface/project_base.html" %}
+{% load polyphonic %}
+
+{% block admin %}
+<a href="#" onclick="saveTags()" class="button is-link">
+  {% icon "save" %}
+  <span>Save</span>
+</a>
+<a href="{% url 'work_detail' collection=collection.pk pk=object.work_id %}" class="button is-link is-light">
+  {% icon "backspace" %}
+  <span>Cancel</span>
+</a>
+{% endblock %}
+
+{% block media %}
+<style>
+  #unassigned-area {
+    max-width: 200px;
+  }
+  #unassigned-area .tag {
+    cursor: pointer;
+  }
+  #area-left h3 {
+    margin-top: 10px;
+    text-align: center;
+  }
+  .tag-grid {
+    display: flex;
+    margin-bottom: 5px;
+    overflow-y: auto;
+  }
+  .grid-column {
+    margin-left: 0;
+    margin-right: 0;
+  }
+  .grid-page {
+    height: 25px;
+    border: none;
+    border-top: 1px solid #DDD;
+    text-align: center;
+    width: 50px;
+    cursor: pointer;
+  }
+  .grid-page:last-child {
+    border-bottom: 1px solid #DDD;
+    height: 26px;
+  }
+  .grid-page.is-active {
+    /*background-color: var(--bulma-link-light);*/
+    color: var(--bulma-link);
+    background-color: #EEE;
+    border-radius: 0px 6px 6px 0px;
+  }
+  .grid-tag {
+    background: #fff;
+    border: 1px solid #DDD;
+    border-radius: 0px 4px 4px 0px;
+    border-left: none;
+    padding-left: 0.5em;
+    min-width: 100px;
+    position: absolute;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: top;
+    z-index: 1;
+    margin: 0;
+    box-shadow: 4px 0 6px -4px rgba(0,0,0,0.12);
+  }
+  .grid-tag:hover {
+    z-index: 100 !important;
+  }
+  .tag-handle {
+    position: relative;
+    width: 20px;
+    background-color: var(--bulma-warning-light);
+    margin-left: 10px;
+    cursor: move;
+  }
+  .tag-name {
+    flex: 1;
+    text-align: right;
+    cursor: pointer;
+  }
+  .tag-handle-resize {
+    position: absolute;
+    height: 10px;
+    width: 10px;
+    bottom: 0px;
+    right: 0px;
+    border-radius: 3px 0px 0px 0px;
+    background-color: var(--bulma-warning);
+    cursor: ns-resize;
+  }
+
+  {% for tag, colour in tag_colours %}
+  .tag-type-{{ tag }} .tag-handle {
+    background-color: var(--bulma-{{ colour }}-light);
+  }
+  .tag-type-{{ tag }} .tag-handle-resize {
+    background-color: var(--bulma-{{ colour }});
+  }
+  {% endfor %}
+
+  #tag-area {
+    min-width: 220px;
+    position: relative;
+    font-size: 9pt;
+  }
+  .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" id="area-left">
+    <h3>Page control</h3>
+    <div class="columns">
+      <div class="column is-narrow">
+        <button class="button is-small is-primary" id="prev">&lt;</button>
+      </div>
+      <div class="column has-text-centered">
+        <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>
+    <h3>Quick Tags</h3>
+    <ul id="unassigned-area">
+    {% for tag, inst in document.work.music_tags %}
+      <li class="tag is-warning" onclick="assignTag('{{tag}}', this)">{{ inst }}</li>
+    {% endfor %}
+    </ul>
+    <h3>Actions</h3>
+    <div>
+      <a class="button is-small is-primary" onclick="showTagModal(createNewTag)">New Tag</a>
+      <button class="button is-small is-primary" onclick="expandEntries()">Expand Tags</button>
+    </div>
+  </div>
+  <div class="column is-narrow">
+    <div class="has-text-centered">
+      <div class="box" style="display: inline-block; padding: 0px;">
+        <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>
+
+  </div>
+</div>
+
+<div class="modal" id="tag-modal">
+  <div class="modal-background" onclick="closeTagModal()"></div>
+  <div class="modal-card">
+    <header class="modal-card-head">
+      <p class="modal-card-title">Tag Editor</p>
+      <button class="delete" aria-label="close" onclick="closeTagModal()"></button>
+    </header>
+    <section class="modal-card-body">
+      <form>
+      <div class="field has-addons is-justify-content-center">
+        <span class="control">
+          <span class="select">
+            <select onChange="onChangeTagType()" id="tag-prefix">
+              <option value="inst">Instrument</option>
+              <option value="mvmt">Movement</option>
+              <option value="sect">Section</option>
+              <option value="no">Number</option>
+              <option value="page">Page</option>
+            </select>
+          </span>
+        </span>
+        <span class="control tag-option enable-page">
+          <span class="select tag-name">
+            <select id="tag-name-page">
+              <option value="left">Left</option>
+              <option value="right">Right</option>
+              <option value="blank">Add Blank</option>
+            </select>
+          </span>
+        </span>
+        <span class="control tag-option enable-sect enable-mvmt">
+          <input type="text" class="input tag-name" id="tag-name" />
+        </span>
+        <span class="control tag-option enable-inst">
+          <input type="text" class="input tag-name" list="instrument-list" id="tag-name-inst"/>
+          <datalist id="instrument-list">
+            {% for inst in json_data.instrumentNames %}
+            <option value="{{inst}}"/>
+            {% endfor %}
+          </datalist>
+        </span>
+        <span class="control tag-option enable-inst enable-mvmt enable-no">
+          <input type="number" class="input tag-number" min="1" size="3" id="tag-number"/>
+        </span>
+        <span class="control">
+          <button type="submit" class="button is-primary" onclick="event.preventDefault(); confirmTagModal(); ">Save</button>
+        </span>
+      </div>
+      </form>
+    </section>
+  </div>
+</div>
+
+<p>{{ document.upload.name }}</p>
+
+<template id="blank-tag">
+    <div class="grid-tag">
+      <span class="tag-name"></span>
+      <div class="tag-handle">
+        <div class="tag-handle-resize"></div>
+      </div>
+    </div>
+</template>
+
+{% 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 = "{% url 'document_download' collection.pk document.pk %}";
+
+  // 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;
+  var tagModalCallback = null;
+
+  //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'),
+    draggedTag = null,
+    dragMode = null,
+    dragOrigStart = null,
+    dragOrigEnd = null;
+
+  /**
+   * 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');
+    const tagGrid = document.querySelector('.tag-grid');
+    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);
+    }
+
+    tagGrid.addEventListener('dragover', (e) => {
+      e.preventDefault();
+      e.dataTransfer.dropEffect = 'move';
+      if (draggedTag) {
+        const rect = pageList.getBoundingClientRect();
+        const y = e.clientY - rect.top;
+        const page = Math.min(Math.max(Math.floor(y / 25) + 1, 1), pdfDoc.numPages);
+        if (dragMode === 'resize') {
+          if (page >= parseInt(draggedTag.dataset.start) && page !== parseInt(draggedTag.dataset.end)) {
+            draggedTag.dataset.end = page;
+            updateTag(draggedTag);
+            resolveOverlaps();
+          }
+        } else {
+          const length = dragOrigEnd - dragOrigStart;
+          if (page !== parseInt(draggedTag.dataset.start)) {
+            draggedTag.dataset.start = page;
+            draggedTag.dataset.end = Math.min(page + length, pdfDoc.numPages);
+            updateTag(draggedTag);
+            resolveOverlaps();
+          }
+        }
+      }
+    });
+    tagGrid.addEventListener('drop', (e) => {
+      e.preventDefault();
+      if (draggedTag) {
+        draggedTag = null;
+        dragMode = null;
+      }
+      resolveOverlaps();
+    });
+
+    document.getElementById('page-count').textContent = pdfDoc.numPages;
+
+    // Initial/first page rendering
+    renderPage(pageNum);
+    setTimeout(() => {
+      const previewBox = document.querySelector('.box');
+      tagGrid.style.maxHeight = previewBox.offsetHeight + 'px';
+    }, 100);
+
+    tagArea.innerHTML = '';
+    for (let pageTag of data.pageTags) {
+      addTag(pageTag[0], pageTag[1], pageTag[2]);
+    }
+    dirty = false;
+  });
+
+  function showTagModal(callback, tag) {
+    document.getElementById("tag-modal").classList.add("is-active");
+
+    tagModalCallback = callback;
+
+    if(tag) {
+      const parts = parseTag(tag);
+      console.log(parts);
+      document.querySelector("#tag-prefix").value = parts.prefix;
+      onChangeTagType();
+      document.querySelectorAll(".tag-name").forEach(el => el.value = parts.name);
+      document.querySelector(".tag-number").value = parts.number;
+    } else {
+      onChangeTagType();
+    }
+  }
+
+  function closeTagModal() {
+    document.getElementById('tag-modal').classList.remove('is-active');
+  }
+
+  function addNumberedInstrument(tag, e) {
+    let modal = document.getElementById('add-modal');
+
+    document.getElementById("add-instrument-name").value = data.instruments[tag];
+    document.getElementById("add-instrument-variant").value = 1;
+    document.getElementById("add-instrument-variant").focus();
+
+    modal.classList.add('is-active');
+  }
+
+  function onChangeTagType() {
+    const tag_prefix = document.querySelector("#tag-prefix");
+    const selected = tag_prefix.value;
+    document.querySelectorAll(".tag-option").forEach((x) => {x.classList.add("is-hidden")});
+    document.querySelectorAll(".tag-option input").forEach((x) => {x.value=""});
+    document.querySelectorAll(".enable-" + selected).forEach((x) => {x.classList.remove("is-hidden")});
+    tag_prefix.focus();
+    
+  }
+
+  function confirmTagModal() {
+    const selected = document.querySelector("#tag-prefix").value;
+    let name = document.querySelector("#tag-name").value;
+    const n = document.querySelector("#tag-number").value;
+    switch (selected) {
+      case "no":
+        if (!n) throw new Error("Missing number");
+      case "page":
+        name = document.querySelector("#tag-name-page").value;
+      case "inst":
+        name = document.querySelector("#tag-name-inst").value;
+        for (let key in data.instruments) {
+          if (data.instruments[key] == name) {
+            name = key;
+            break;
+          }
+        }
+    }
+    name = name.replace(" ", "_");
+
+    const prefix = (selected == "inst") ? "" : selected + ":";
+
+    const tag = (n) ? prefix + name + "-" + n : prefix + name;
+
+    closeTagModal();
+    tagModalCallback(tag);
+  }
+
+
+  function createNewTag(tag) {
+    addTag(tag, pageNum, pageNum);
+    dirty = true;
+  }
+
+  function assignTag(tag, el) {
+    addTag(tag, pageNum, pageNum);
+    //el.remove();
+  }
+
+  function editTag(e) {
+    console.log("EDIT", e.target);
+    showTagModal((tag) => {
+      console.log("Updating to " + tag);
+      e.target.innerHTML = get_tag_name(tag);
+      e.target.parentNode.dataset["tag"] = tag;
+      dirty = true;
+    }, e.target.parentNode.dataset["tag"]);
+  }
+
+  function addTag(tag, start, end) {
+
+
+    //console.log("addTag", tag, start, end);
+    const fragment = document.importNode(document.querySelector("#blank-tag").content, true);
+    const el = fragment.querySelector("div");
+    const tagName = el.querySelector(".tag-name");
+    tagName.innerHTML=get_tag_name(tag);
+
+    tagName.addEventListener('dblclick', editTag);
+
+    //el.className = 'grid-tag';
+    el.dataset.start = start;
+    el.dataset.end = end;
+    el.dataset.tag = tag;
+
+    const parts = parseTag(tag)
+    el.classList.add("tag-type-" + parts.prefix);
+
+
+    const handle = el.querySelector('.tag-handle');
+    handle.draggable = true;
+    handle.addEventListener('dragstart', (e) => {
+      draggedTag = el;
+      dragMode = 'move';
+      dragOrigStart = parseInt(el.dataset.start);
+      dragOrigEnd = parseInt(el.dataset.end);
+      el.style.zIndex = 1000;
+      e.dataTransfer.effectAllowed = 'move';
+      const blankImg = new Image();
+      blankImg.src = 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7';
+      e.dataTransfer.setDragImage(blankImg, 0, 0);
+    });
+    handle.addEventListener('dragend', () => {
+      if (draggedTag === el && dragMode === 'move') {
+        el.dataset.start = dragOrigStart;
+        el.dataset.end = dragOrigEnd;
+        updateTag(el);
+        el.remove();
+        dirty = true;
+      } else if (draggedTag === el) {
+        el.dataset.start = dragOrigStart;
+        el.dataset.end = dragOrigEnd;
+        updateTag(el);
+        el.style.zIndex = '';
+      }
+      resolveOverlaps();
+      draggedTag = null;
+      dragMode = null;
+    });
+
+    const resize = el.querySelector('.tag-handle-resize');
+    resize.draggable = true;
+    resize.addEventListener('dragstart', (e) => {
+      draggedTag = el;
+      dragMode = 'resize';
+      dragOrigEnd = parseInt(el.dataset.end);
+      el.style.zIndex = 1000;
+      e.dataTransfer.effectAllowed = 'move';
+      const blankImg2 = new Image();
+      blankImg2.src = 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7';
+      e.dataTransfer.setDragImage(blankImg2, 0, 0);
+      e.stopPropagation();
+    });
+    resize.addEventListener('dragend', () => {
+      if (draggedTag === el) {
+        el.dataset.end = dragOrigEnd;
+        updateTag(el);
+        el.style.zIndex = '';
+      }
+      resolveOverlaps();
+      draggedTag = null;
+      dragMode = null;
+    });
+    
+    updateTag(el);
+    tagArea.appendChild(el);
+    resolveOverlaps();
+  }
+
+  function updateTag(tag) {
+    let start = tag.dataset.start;
+    let end = tag.dataset.end;
+    let span = end-start+1;
+    let height = span * 25 + 1;
+    let top = (start-1) * 25;
+    
+    tag.style.height = height + 'px';
+    tag.style.marginTop = top + 'px';
+    dirty = true;
+
+    const name = tag.querySelector('.tag-name');
+    const handle = tag.querySelector('.tag-handle');
+    if (name) {
+      if (span >= 3) {
+        name.style.position = 'absolute';
+        name.style.top = '4px';
+        name.style.right = '20px';
+        name.style.writingMode = 'vertical-rl';
+        tag.style.justifyContent = 'flex-end';
+        if (handle) handle.style.marginLeft = 'auto';
+      } else {
+        name.style.position = '';
+        name.style.top = '';
+        name.style.right = '';
+        name.style.writingMode = '';
+        tag.style.justifyContent = '';
+        if (handle) handle.style.marginLeft = '';
+      }
+    }
+  }
+
+  function resolveOverlaps() {
+    const tags = Array.from(tagArea.children);
+    tags.sort((a, b) => parseInt(a.dataset.start) - parseInt(b.dataset.start));
+
+    const groups = [];
+    let current = [tags[0]];
+    for (let i = 1; i < tags.length; i++) {
+      const prevEnd = parseInt(tags[i-1].dataset.end);
+      const currStart = parseInt(tags[i].dataset.start);
+      if (currStart <= prevEnd) {
+        current.push(tags[i]);
+      } else {
+        groups.push(current);
+        current = [tags[i]];
+      }
+    }
+    if (current.length) groups.push(current);
+
+    for (let group of groups) {
+      group.sort((a, b) => {
+        const spanA = parseInt(a.dataset.end) - parseInt(a.dataset.start);
+        const spanB = parseInt(b.dataset.end) - parseInt(b.dataset.start);
+        return spanB - spanA;
+      });
+      const n = group.length;
+      group.forEach((tag, i) => {
+        tag.style.minWidth = (120 + (n - 1 - i) * 70) + 'px';
+        tag.style.zIndex = i;
+      });
+    }
+  }
+
+  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 answer = confirm("This will expand all tags to fill up available pages");
+    if (!answer) return;
+
+
+    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]);
+  }
+
+  const body = document.querySelector("body");
+  function keymap(e) {
+    if (e.target != body) return;
+    switch(e.key) {
+      case "ArrowRight":
+      case "l":
+      case "ArrowDown":
+      case "j":
+        onNextPage();
+        break;
+      case "ArrowLeft":
+      case "h":
+      case "ArrowUp":
+      case "k":
+        onPrevPage();
+        break;
+      case "n":
+        showTagModal(createNewTag);
+        break;
+      default:
+        return;
+    }
+    e.preventDefault();
+
+  }
+  body.addEventListener("keydown", keymap)
+
+  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 parseTag(tag) {
+    const result = {
+      prefix: "inst",
+      name: "",
+      number: "",
+    };
+
+    let parts = tag.split(":");
+    if(parts.length == 2) {
+      result.prefix = parts[0];
+      tag = parts[1];
+    }
+
+    parts = tag.split('-');
+    if(parts.length == 2) {
+      result.number = parts[1];
+    }
+    result.name = parts[0];
+
+    if(result.prefix == "inst") {
+      result.name = data.instruments[result.name] || result.name;
+    }
+    
+    result.name = result.name.replace("_", " ");
+
+    return result;
+
+  }
+
+  function get_tag_name(s) {
+
+    tag = parseTag(s);
+    console.log(tag);
+    
+    let prefix = (tag.prefix == "inst") ? "" : data.prefixes[tag.prefix] + " ";
+
+    return (tag.number) ? prefix + tag.name + " " + tag.number : prefix + tag.name;
+  }
+
+  function checkSaved(e) {
+    if (dirty) {
+      e.preventDefault();
+    }
+  }
+  window.addEventListener('beforeunload', checkSaved);
+
+</script>
+{% endblock %}

polyphonic/library/templates/library/document_entry.html

@@ -1,7 +1,10 @@
 {% load path_filters %}
+{% load polyphonic %}
 <tr>
-    <td><a href="{{ doc.upload.url }}" target="_blank">
-            {{ doc.upload.name|basename }}</a></td>
+    <td style="white-space: nowrap">
+      <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>
@@ -10,10 +13,13 @@
     <td class="has-text-right" style="white-space: nowrap;">
     {% if request.is_admin %}
         {% if doc.doctype == 1 %}
-        <a href="{% url 'document_annotate' collection.pk doc.pk %}"><i class="fas fa-tags"
-                title="Manage Tags"></i></a>
+        <a href="{% url 'document_annotate' collection.pk doc.pk %}" title="Annotate">
+          {% icon "toc" %}
+        </a>
         {% endif %}
-        <a href="{% url 'document_delete' collection.pk doc.pk %}"><i class="fas fa-trash-alt" title="Delete Document"></i></a>
+        <a href="{% url 'document_delete' collection.pk doc.pk %}" title="Delete">
+          {% icon "delete" %}
+        </a>
     {% endif %}
     </td>
-</tr>
+</tr>