Switched to material icons

Reviewed-on: #15

.gitignore

@@ -17,3 +17,4 @@ poetry.lock
 /local_storage
 /media
 /index
+/dist

Dockerfile

@@ -1,21 +1,25 @@
-FROM alpine:3.14
+FROM alpine:latest
 
-RUN apk add --no-cache python3 git ghostscript sqlite
+ENV TARGET=/opt/polyphonic
+#ENV RELEASE=polyphonic-0.8.4-py3-none-any.whl
+ENV RELEASE=git+https://gitea.tfconsulting.com.au/projects/polyphonic.git
+
+RUN apk add --no-cache python3 py3-pip git ghostscript sqlite
 
 WORKDIR /root
-RUN python3 -m ensurepip
-RUN pip3 install -U pip --no-cache-dir
 
-COPY app/requirements.txt .
+RUN python3 -m venv ${TARGET}
-RUN pip3 install -r requirements.txt --no-cache-dir
+ENV PATH="${TARGET}/bin:$PATH"
 
-COPY app /opt/polyphonic
+#COPY dist/${RELEASE} .
-WORKDIR /opt/polyphonic
+RUN pip3 install ${RELEASE} --no-cache-dir
+RUN pip3 install gunicorn whitenoise
 
-COPY docker_settings.py polyphonic/local_settings.py
+WORKDIR ${TARGET}
-RUN SECRET_KEY=_ python3 manage.py collectstatic --noinput
+
+RUN SECRET_KEY=_ poly-tool collectstatic --noinput
 
 VOLUME ["/var/polyphonic"]
+EXPOSE 8000/tcp
 
-ENTRYPOINT ["python3", "manage.py"]
+CMD ["gunicorn", "-b", "0.0.0.0", "polyphonic.config.wsgi"]
-CMD ["runserver", "0.0.0.0:8000", "--insecure"]

Makefile

@@ -2,19 +2,27 @@ PYTHON=env/bin/python
 DROPZONE=5.7.0
 
 test:
-	coverage run --include "app/*" --omit "*/migrations/*" app/manage.py test app
+	poetry run coverage run --include "polyphonic/*" --omit "*/migrations/*" polyphonic/manage.py test polyphonic
-	coverage html
+	poetry run coverage html
-	coverage report
+	poetry run coverage report
+
+check:
+	poetry run ruff check polyphonic
+	poetry run ruff format --check polyphonic
+
+pre-commit: check test
+
+build:
+	poetry build
 
 dev-setup:
-	env/bin/pip install -r requirements.txt
+	poetry install --with=dev
-	env/bin/pip install -r dev-requirements.txt
+	poetry run manage migrate
-	${PYTHON} manage.py migrate
+	poetry run manage createsuperuser --username admin --email admin@localhost
-	${PYTHON} manage.py createsuperuser --username admin --email admin@localhost
 
 upgrade:
-	${PYTHON} manage.py migrate
+	poetry run manage migrate
-	${PYTHON} manage.py collectstatic
+	poetry run manage collectstatic
 	${MAKE} libraries
 
 libraries: static/dropzone static/fonts/Quicksand_Book.otf

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/polyphonic/settings.py

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

docker-compose.yml

@@ -0,0 +1,14 @@
+services:
+  polyphonic:
+    image: "polyphonic:0.8.4"
+    build: "."
+    ports:
+      - "8001:8000"
+    volumes:
+      - "./data:/var/polyphonic"
+      - "./local_settings.py:/opt/polyphonic/local_settings.py"
+    env_file: "compose.env"
+    environment:
+      DJANGO_SETTINGS_MODULE: local_settings
+      PYTHONPATH: /opt/polyphonic
+      WORK_DIR: /var/polyphonic

docker_settings.py

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

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

@@ -11,26 +11,29 @@ https://docs.djangoproject.com/en/3.1/ref/settings/
 """
 
 from pathlib import Path
-from os import environ
+import os
+
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
-BASE_DIR = Path(__file__).resolve().parent.parent
+BASE_DIR = Path(__file__).resolve().parent.parent.parent.parent
 
-SECRET_KEY = environ.get("SECRET_KEY")
+# A place to put things
+WORK_DIR = os.environ.get("WORK_DIR") or os.path.join(BASE_DIR, "data")
+
+# Will fail to start if not defined
+SECRET_KEY = os.environ.get("SECRET_KEY")
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/3.1/howto/deployment/checklist/
 
-
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = False
 
-ALLOWED_HOSTS = ["localhost"]
+ALLOWED_HOSTS = ["localhost", "127.0.0.1"]
-INTERNAL_IPS = ["127.0.0.1"]
 
 # Application definition
 
-POLYPHONIC_MODULES = ["library"]
+POLYPHONIC_MODULES = ["polyphonic.library"]
 
 INSTALLED_APPS = [
     "django.contrib.admin",
@@ -44,9 +47,11 @@ INSTALLED_APPS = [
     "crispy_forms",
     "crispy_bulma",
     "byostorage",
-    "interface",
+    "polyphonic.interface",
 ]
 
+INSTALLED_APPS += POLYPHONIC_MODULES
+
 CRISPY_ALLOWED_TEMPLATE_PACKS = ("bulma",)
 CRISPY_TEMPLATE_PACK = "bulma"
 
@@ -60,7 +65,7 @@ MIDDLEWARE = [
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
 ]
 
-ROOT_URLCONF = "polyphonic.urls"
+ROOT_URLCONF = "polyphonic.config.urls"
 
 TEMPLATES = [
     {
@@ -78,7 +83,7 @@ TEMPLATES = [
     },
 ]
 
-WSGI_APPLICATION = "polyphonic.wsgi.application"
+WSGI_APPLICATION = "polyphonic.config.wsgi.application"
 
 
 # Database
@@ -87,7 +92,7 @@ WSGI_APPLICATION = "polyphonic.wsgi.application"
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.sqlite3",
-        "NAME": BASE_DIR / "db.sqlite3",
+        "NAME": os.path.join(WORK_DIR, "db.sqlite3"),
     }
 }
 
@@ -120,17 +125,18 @@ LANGUAGE_CODE = "en-us"
 TIME_ZONE = "Australia/Melbourne"
 
 USE_I18N = True
-
 USE_L10N = True
-
 USE_TZ = True
 
-
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/3.1/howto/static-files/
 
 STATIC_URL = "/static/"
 STATIC_ROOT = "static"
 
-# Need to set this
+# Library settings
-AWS_BUCKET = ""
+
+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 = ["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/settings/docker.py

@@ -0,0 +1,4 @@
+from .base import *  # noqa
+
+# Enable WhiteNoise for static files
+MIDDLEWARE.insert(1, "whitenoise.middleware.WhiteNoiseMiddleware")  # noqa

polyphonic/config/urls.py

@@ -15,13 +15,13 @@ Including another URLconf
 """
 
 from django.contrib import admin
-from django.urls import path, re_path, include
+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

@@ -1,6 +1,6 @@
 from django import forms
 from crispy_forms.helper import FormHelper
-from crispy_forms.layout import Submit, HTML, Div
+from crispy_forms.layout import Submit, HTML
 from crispy_bulma.layout import FormGroup
 
 from . import models, fields

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

@@ -8,9 +8,7 @@ from byostorage.user import BYOStorage
 
 import random
 
-from urllib.parse import urlparse
 
-import os.path
 from .utils import sign_data
 
 MEDIA_TYPES = [

polyphonic/interface/templates/base.html

@@ -11,7 +11,8 @@
     <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>
+    <!-- script src="//kit.fontawesome.com/c837098e5b.js" crossorigin="anonymous" defer></script -->
+    <link href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined" rel="stylesheet" />
     <title>{% block title %}Polyphonic{% endblock %}</title>
     {% block media %}{% endblock %}
     <style>{% block style %}{% endblock %}</style>
@@ -23,7 +24,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…

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 %}

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>

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>
+  {{ "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 %}

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">
+                    <a href="{% url 'resource_upload' project=project.pk pk=resource.pk %}" title="Upload">
-                        <i class="fas fa-upload"></i>
+                        {% icon "upload_file" %}
                     </a>
-                    <a href="{% url 'resource_edit' project=project.pk pk=resource.pk %}" class="icon" title="Edit">
+                    <a href="{% url 'resource_edit' project=project.pk pk=resource.pk %}" title="Edit">
-                        <i class="fas fa-edit"></i>
+                        {% icon "edit" %}
                     </a>
                     {% endif %}
                 </div>

polyphonic/interface/templates/interface/wiki.html

@@ -1,8 +1,9 @@
 {% 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>
+  {{ "edit"|icon }}
   <span>Edit</span>
 </a>
 {% endblock %}

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, utils
+from polyphonic.interface import models
 from django.contrib.auth.models import User
 from django.utils import timezone
 from datetime import timedelta
@@ -16,7 +16,6 @@ class AccessTestCase(TestCase):
 
     @classmethod
     def setUpTestData(cls):
-
         cls.users = {}
         for details in cls.USERS:
             cls.users[details["username"]] = User.objects.create_user(**details)
@@ -42,7 +41,6 @@ class AccessTestCase(TestCase):
         return
 
     def test_protected_views(self):
-
         self.assertAccess({x: False for x in self.PROTECTED_URLS})
 
         if "admin" in self.users:

polyphonic/interface/tests/test_access.py

@@ -1,7 +1,4 @@
-from django.test import TestCase, Client
+from polyphonic.interface import models
-
-from interface import models, utils
-from django.contrib.auth.models import User
 
 from . import AccessTestCase
 

polyphonic/interface/urls.py

@@ -1,6 +1,7 @@
 from django.urls import path
 from django.contrib.auth import views as auth_views
 from django.views.generic.base import RedirectView
+from django.conf import settings
 
 from . import views
 
@@ -69,7 +70,6 @@ urlpatterns = [
     ),
 ]
 
-from django.conf import settings
 
 if settings.DEBUG:
     from django.views.static import serve

polyphonic/interface/utils.py

@@ -1,20 +1,19 @@
 from django.shortcuts import resolve_url
 from django.core.signing import Signer
 from django.core.exceptions import SuspiciousOperation
+import logging
 
 signer = Signer()
 
-import logging
-
 logger = logging.getLogger(__name__)
 
 
-def sign_data(data, l=None):
+def sign_data(data, length=None):
     sig = signer.sign(data)
-    p = len(data) + 1
+    pos = len(data) + 1
-    if l:
+    if length:
-        l += p
+        length += pos
-    return sig[p:l]
+    return sig[pos:length]
 
 
 def signed_url(name, **kwargs):

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 polyphonic.interface.models import Project
-from interface.forms import BaseForm
+from polyphonic.interface.forms import BaseForm
 
 
 class WorkCreateForm(forms.ModelForm, BaseForm):
@@ -44,3 +44,11 @@ class ProjectEnsembleChoiceField(forms.ModelChoiceField):
 
 class ProjectSelectForm(BaseForm):
     project = ProjectEnsembleChoiceField(queryset=Project.objects.all())
+
+
+class DocumentLinkForm(BaseForm):
+    link = forms.URLField(help_text="Paste the direct link relevant to this storage")
+
+
+class DocumentBulkForm(BaseForm):
+    folder_link = forms.URLField(help_text="Paste the folder link for this storage")

polyphonic/library/gdrive/__init__.py

@@ -0,0 +1,90 @@
+from polyphonic.library.models import Collection, Work, WorkMeta, Document
+from byostorage.models import UserStorage
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+def sync_work(work: Work):
+    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
+
+    logger.info("Syncing '%s' from %r", work.name, folder_id)
+
+    storage = UserStorage.objects.get(name="gdrive").instance()
+
+    existing = set(
+        [
+            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)
+            existing.discard(file.id)
+            continue
+
+        if not file.name.lower().endswith(".pdf"):
+            logger.debug("%40s: Not a PDF", file.name)
+            continue
+
+        logger.info("%40s: Adding", file.name)
+        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"):
+        return sync_partial_collection(collection, sync_existing)
+
+    existing = dict(
+        WorkMeta.objects.filter(
+            work__collection=collection, name="folderid"
+        ).values_list("value", "work_id")
+    )
+
+    folder = collection.prefix
+    storage = collection.storage.instance()
+    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])
+                sync_work(Work.objects.get(pk=existing[folder.id]))
+            del existing[folder.id]
+            continue
+
+        logger.info("%40s: Adding", folder.name)
+        work = Work(name=folder.name, collection=collection)
+        work.save()
+        work.meta_info.create(name="folderid", value=folder.id)
+        sync_work(work)
+
+    for folderid, work in existing:
+        logger.warning("Folder for work %d no longer in drive (%s)", work, folderid)

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

@@ -0,0 +1,62 @@
+from django.shortcuts import resolve_url, redirect
+from django.views.generic import FormView
+from django.views.generic.detail import SingleObjectMixin
+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):
+    model = Work
+    template_name = "library/gdrive.html"
+    form_class = forms.DocumentLinkForm
+
+    @property
+    def cancel_url(self):
+        return resolve_url("work_detail", self.collection.pk, self.kwargs["pk"])
+
+    def get_context_data(self, *args, **kwargs):
+        self.object = self.get_object()
+        data = super().get_context_data(*args, **kwargs)
+
+        data["meta"] = dict(self.object.meta_info.values_list("name", "value"))
+        print(data["meta"])
+
+        return data
+
+    def form_valid(self, form):
+        link = form.cleaned_data["link"]
+
+        # storage = self.collection.storage.instance()
+        storage = UserStorage.objects.get(name="gdrive").instance()
+        self.object = self.get_object()
+
+        folderid = storage.get_folder_id(link)
+        if folderid:
+            self.object.meta_info.update_or_create(
+                name="folderid", defaults={"value": folderid}
+            )
+            sync_work(self.object)
+
+            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"gdrive:{link}",
+            # upload=f"{self.collection.storage.name}:{link}",
+            doctype=Document.DOCTYPE_PDF,
+        )
+        doc.save()
+        doc.auto_tag()
+
+        return redirect("work_detail", self.collection.pk, self.kwargs["pk"])

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

@@ -1,15 +1,13 @@
 from whoosh.index import create_in, open_dir, EmptyIndexError, Index
 from whoosh.analysis import StemmingAnalyzer, CharsetFilter
 from whoosh.support.charset import accent_map
-from whoosh.fields import Schema, ID, TEXT, KEYWORD, STORED, NUMERIC
+from whoosh.fields import Schema, TEXT, KEYWORD, NUMERIC
 from whoosh.qparser import QueryParser
-from whoosh.query import Term, NullQuery
+from whoosh.query import Term, NullQuery, FuzzyTerm
 
-from library.models import Work
 
 from typing import Any
 from django.conf import settings
-from django.db.models import QuerySet
 import os.path
 import shutil
 
@@ -26,7 +24,7 @@ schema = Schema(
 )
 
 
-index_path = os.path.join(os.path.dirname(settings.BASE_DIR), "index")
+index_path = settings.WHOOSH_INDEX
 
 
 def create_index() -> Index:
@@ -63,20 +61,26 @@ def search(
     pagesize: int = 20,
 ) -> tuple[list[dict], dict[str, Any]]:
     meta = {}
+    query = query.lower()
 
     qp = QueryParser("text", schema=schema)
-    q = qp.parse(query.lower())
+    q = qp.parse(query)
-    meta["query"] = str(q)
 
-    terms = NullQuery
+    limit = NullQuery
     for c in collections:
-        terms = terms | Term("collection", c)
+        limit |= Term("collection", c)
-    q = q & terms
 
     hits = []
     ix = get_index()
     with ix.searcher() as searcher:
-        results = searcher.search_page(q, page, pagesize)
+        results = searcher.search_page(q & limit, page, pagesize)
+
+        # if no results, do a prefix search
+        if results.results.is_empty():
+            qp.termclass = FuzzyTerm
+            q = qp.parse(query)
+            results = searcher.search_page(q & limit, page, pagesize)
+
         for result in results:
             hits.append(
                 dict(
@@ -87,7 +91,7 @@ def search(
                     collection_id=int(result["collection"]),
                 )
             )
-
+    meta["query"] = str(q & limit)
     meta["total"] = len(results)
 
     return hits, meta

polyphonic/library/management/commands/import_works.py

@@ -1,4 +1,4 @@
-from django.core.management.base import BaseCommand, CommandError
+from django.core.management.base import BaseCommand
 import argparse
 import csv
 

polyphonic/library/management/commands/index.py

@@ -1,7 +1,7 @@
-from django.core.management.base import BaseCommand, CommandError
+from django.core.management.base import BaseCommand
 
-from library import models
+from polyphonic.library import models
-from library.indexer import model_search, index_works, indexer
+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

@@ -0,0 +1,25 @@
+from django.core.management.base import BaseCommand, CommandError
+from polyphonic.library.models import Work, Collection
+from polyphonic.library.gdrive import sync_work, sync_collection
+
+
+class Command(BaseCommand):
+    help = "Synchronizes folders and works"
+
+    def add_arguments(self, parser):
+        parser.add_argument("type", type=str, choices=["work", "collection"])
+        parser.add_argument("pk", nargs="?", type=int)
+
+    def handle(self, *args, **options):
+
+        if options["type"] == "work":
+            work = Work.objects.get(pk=options["pk"])
+            sync_work(work)
+            return
+
+        if options["type"] == "collection":
+            collection = Collection.objects.get(pk=options["pk"])
+            sync_collection(collection)
+            return
+
+        raise CommandError("Unknown object type")

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

@@ -1,11 +1,9 @@
-from os import SCHED_OTHER
-from django.conf import settings
 from django.shortcuts import resolve_url
 from django.db import models
 from django.utils.text import slugify
 from django.utils.timezone import now
 from django.utils.functional import cached_property
-from django.db.models import Q, Count, Min, Max
+from django.db.models import Count, Min, Max
 
 import re
 import os.path
@@ -13,8 +11,8 @@ import os.path
 from byostorage.user import BYOStorage
 from byostorage.cached import CachedStorage
 
-from library.music_tags import MusicTag
+from polyphonic.library.music_tags import MusicTag, auto_tag
-from interface.utils import sign_data
+from polyphonic.interface.utils import sign_data
 
 import logging
 
@@ -347,12 +345,11 @@ class Work(models.Model):
 
     @property
     def identifier(self):
-
         if self.code:
             return self.code
 
         composer = self.composer or "Anon"
-        composer = re.sub("[^\w]", "", composer)
+        composer = re.sub(r"[^\w]", "", composer)
         words = self.name.split()
         work = words[0][:3]
 
@@ -365,7 +362,7 @@ class Work(models.Model):
 
     def unassigned_instruments(self):
         assigned = set(self.assigned_instruments())
-        return [x for x in self.orchestration.as_list() if not x[0] in assigned]
+        return [x for x in self.orchestration.as_list() if x[0] not in assigned]
 
     def music_tags(self):
         tags = dict(self.orchestration.as_list())
@@ -386,6 +383,7 @@ class WorkMeta(models.Model):
         ("genre", "Genre"),
         ("style", "Style"),
         ("orchestration", "Orchestration"),
+        ("folderid", "GDrive"),
     )
 
     work = models.ForeignKey(Work, on_delete=models.CASCADE, related_name="meta_info")
@@ -430,6 +428,14 @@ class Document(models.Model):
     created = models.DateTimeField(auto_now_add=True)
     version = models.CharField(max_length=30, blank=True)
 
+    def auto_tag(self):
+        if self.doctype != self.DOCTYPE_PDF:
+            return
+        filename = os.path.basename(str(self.upload))
+        inst = auto_tag(filename)
+        if inst:
+            self.sections.get_or_create(tag=inst.abbreviate())
+
     def delete(self, *args, **kwargs):
         self.upload.delete(save=False)
         return super().delete(*args, **kwargs)

polyphonic/library/music_tags.py

@@ -1,4 +1,5 @@
 from collections import namedtuple
+import re
 
 GENERAL = """
 mvmt    Movement
@@ -18,6 +19,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 
@@ -195,8 +200,8 @@ class MusicTag(namedtuple("MusicTag", ("name", "variant"), defaults=[None])):
 
     @property
     def tag(self):
-        l = self.name.lower()
+        lc = self.name.lower()
-        return MUSIC_TAG_BY_NAME.get(l, l)
+        return MUSIC_TAG_BY_NAME.get(lc, lc)
 
     @property
     def is_general(self):
@@ -232,9 +237,11 @@ class MusicTag(namedtuple("MusicTag", ("name", "variant"), defaults=[None])):
         return self.name
 
 
-import re
+PATTERNS = [
-
+    re.compile(r"(?P<inst>[A-Za-z]+)[_\- ]*(?P<ord>\d+)"),
-PATTERNS = [re.compile("([A-Za-z]+)[_\- ]*(\d+)"), re.compile("([A-Za-z]+)()")]
+    re.compile(r"(?P<ord>\d+)(st|nd|rd|th)[_\- ]*(?P<inst>[A-Za-z]+)"),
+    re.compile(r"(?P<inst>[A-Za-z]+)()"),
+]
 
 
 def auto_tag(filename):
@@ -250,12 +257,20 @@ def auto_tag(filename):
     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)
+
     """
 
     for pattern in PATTERNS:
-        for inst, ordinal in pattern.findall(filename):
+        for m in pattern.finditer(filename):
-            inst = inst.lower()
+            inst = m["inst"].lower()
-            ordinal = int(ordinal) if ordinal else None
+            try:
+                ordinal = int(m["ord"])
+            except IndexError:
+                ordinal = None
             if inst in MUSIC_TAG_BY_NAME:
                 return MusicTag(inst.title(), ordinal)
             if inst in MUSIC_NAME_BY_TAG:

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

@@ -1,11 +1,13 @@
 {% extends "interface/project_base.html" %}
+{% load polyphonic %}
 
 {% block admin %}
 <a href="#" onclick="saveTags()" class="button is-link">
-  <span class="icon"><i class="fas fa-save"></i></span>
+  {% 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 %}
@@ -76,7 +78,11 @@
   </div>
   <ul id="unassigned-area">
   {% for tag, inst in document.work.music_tags %}
-    <li class="is-clickable" onclick="assignInstrument('{{tag}}', this)")>{{ inst }}</li>
+    <li>
+      <span class="is-clickable" onclick="assignInstrument('{{tag}}', this)")>{{ inst }}</span>
+      &nbsp;
+      <span class="is-clickable" onclick="addNumberedInstrument('{{tag}}', this)">...</span>
+    </li>
   {% endfor %}
   </ul>
   <a onclick="document.getElementById('add-modal').classList.add('is-active')">Add Tag</a>
@@ -276,6 +282,16 @@
     document.getElementById('add-instrument-variant').value = "";
   }
   
+  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 addInstrument() {
     let name = document.getElementById('add-instrument-name');
     let variant = document.getElementById('add-instrument-variant');
@@ -326,7 +342,7 @@
 
     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.innerHTML = '<span class="material-symbols-outlined" title="Set start page">vertical_align_top</span>';
     setStart.addEventListener('click', () => setTagStart(el));
     el.appendChild(setStart);
     
@@ -336,22 +352,20 @@
     let name = document.createElement('b');
     name.innerHTML = get_instrument(tag);
     label.appendChild(name);
+    el.appendChild(label);
     
     let del = document.createElement('span');
     del.className = "icon is-action";
-    del.innerHTML = '<i class="fas fa-trash-alt" title="Remove this tag"></i>';
+    del.innerHTML = '<span class="material-symbols-outlined" title="Remove this tag">delete</span>';
     del.addEventListener('click', () => {
       el.remove();
       dirty=true;
     });
-    label.appendChild(del)
+    el.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.innerHTML = '<span class="material-symbols-outlined" title="Set end page">vertical_align_bottom</span>';
     setEnd.addEventListener('click', () => setTagEnd(el));
     el.appendChild(setEnd);
 

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">
+    <td style="white-space: nowrap">
-            {{ doc.upload.name|basename }}</a></td>
+      <a href="{{ doc.upload.url }}" target="_blank">
+            {{ doc.upload.name|basename }}</a>
+    </td>
     <td>
         {% for section in doc.sections.all %}
             <a class="tag is-{{ section.bulma_class }}" target="_blank" href="{% url 'part_download' collection.pk section.pk section.filename %}">{{ section.name }}</a>
@@ -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"
+        <a href="{% url 'document_annotate' collection.pk doc.pk %}" title="Annotate">
-                title="Manage Tags"></i></a>
+          {% 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>

polyphonic/library/templates/library/gdrive.html

@@ -0,0 +1,45 @@
+{% extends "interface/project_base.html" %}
+{% load polyphonic %}
+
+{% block admin %}
+<a href="{% url 'work_detail' collection=collection.pk pk=object.pk %}" class="button is-link is-light">
+  {% icon "backspace" %}
+  <span>Back to work</span>
+</a>
+{% endblock %}
+
+{% block page %}
+<h2 class="title">
+  {% icon "add_to_drive" %}
+  <span>Google Drive - Shared Links
+</h2>
+<h3 class="subtitle"><a href="{% url 'work_detail' collection.pk object.pk %}">{{ object.name }}</a></h3>
+<div class="m-3">
+<p>This page lets you link a work to a google drive folder.  You can either paste a public link to a folder to enable syncing or a file to add individually</p>
+</div>
+<div class="m-3">
+<p>
+    {% if meta.folderid %}
+This work is currently linked to <b>{{ meta.folderid }}</b>.<br/>
+Pasting a new folder link will overwrite this.
+    {% else %}
+There is currently no shared drive folder linked to this work - paste one here to enable syncing.
+    {% endif %}
+</p>
+</div>
+<div class="mt-5">
+<form method="post">
+  <div class="field has-addons mx-6">
+      <div class="control is-expanded">
+          <input class="input" name="link" type="text" placeholder="Paste shared link">
+      </div>
+      <div class="control">
+          <button class="button" type="submit">
+            Add
+          </button>
+      </div>
+  </div>
+  {% csrf_token %}
+</form>
+</div>
+{% endblock %}

polyphonic/library/templates/library/item_list.html

@@ -1,4 +1,5 @@
 {% extends "interface/project_base.html" %}
+{% load polyphonic %}
 
 {% block page %}
 <form action="" method="post" target="_blank">
@@ -31,12 +32,6 @@
                 </span>
             </span>
         </div>
-        <span class="control">
-            <button type="submit" class="button is-primary">
-                <span class="icon"><i class="fas fa-copy"></i></span>
-                <span>Get My Parts!</span>
-            </button>
-        </span>
     </div>
 </div>
 
@@ -45,6 +40,7 @@
         <tr>
             <th/>
             <th>Piece</th>
+            <th>Composer</th>
             <th class="is-hidden-mobile">Running time</th>
             <th>Part</th>
             <th/>
@@ -61,11 +57,12 @@
                     {{ item.work.name }}
                     {% endif %}
                 </td>
+                <td class="is-hidden-mobile">{{ item.work.composer }}</td>
                 <td class="is-hidden-mobile">{% firstof item.work.running_time "------" %}</td>
                 <td class="select-cell">
                     <input type="hidden" name="works" value="{{ item.work.pk }}"/>
                     <span class="select is-small" style="width: 100%">
-                    <select name="instruments" id="part-{{ item.work.pk }}" style="width: 100%">
+                    <select name="instrument-selection" id="part-{{ item.work.pk }}" style="width: 100%">
                         <option value='-'>None</option>
                         {% for tag, name in item.work.digital_parts %}
                         <option value='{{ tag }}'>{{ name }}</option>
@@ -74,8 +71,9 @@
                     </span>
                 </td>
                 <td>
-                    <span class="is-action" onclick="downloadPart({{ item.work.collection_id }}, {{ item.work.pk }})">
+                    <span class="button is-link is-small" onclick="downloadPart({{ item.work.collection_id }}, {{ item.work.pk }})">
-                        <i class="fas fa-download" title="Download Part"></i>
+                        {% icon "download" %}
+                        <span>Get</span>
                     </span>
                 </td>
             </tr>
@@ -85,13 +83,17 @@
         <tr>
             <td/>
             <td/>
-            <td>{% firstof running_time "------" %}</td>
             <td/>
-            <td>
+            <td>{% firstof running_time "------" %}</td>
-            <!--
+            <td colspan="2">
-                <button class="button is-link is-small" type="submit"><span class="icon"><i class="fas fa-copy"></i></span><span>Single combined PDF</span></button>
+                <button class="button is-link is-small" type="submit" name="action" value="pdf">
-                <a class="button is-link is-small"><span class="icon"><i class="fas fa-archive"></i></span><span>Individual files (zipped)</span></a>
+                  {% icon "two_pager" %}
-            -->
+                  <span>&nbsp;Single combined PDF</span>
+                </button>
+                <button class="button is-link is-small" type="submit" name="action" value="zip">
+                  {% icon "folder_zip" %}
+                  <span>&nbsp;Individual files (zipped)</span>
+                </button>
             </td>
         </tr>
     </tfoot>
@@ -112,16 +114,23 @@
 const INSTRUMENTS = JSON.parse(document.getElementById('instruments').innerText);
 
 function updateParts() {
-    var inst = document.getElementById("instrument-name").value;
+    var inst = document.getElementById("instrument-name").value.toLowerCase();
     window.localStorage.setItem('instrument-name', inst);
+    console.log("Changing to", inst);
 
     for (let i of INSTRUMENTS) {
-        if (i[1] === inst) inst = i[0];
+      if (i[1].toLowerCase() === inst) {
+        inst = i[0];
+
+        break;
       }
+    }
+    console.log("Instrument code:", inst);
 
 
     let part = document.getElementById("part-preference").value;
     window.localStorage.setItem('part-preference', part);
+    console.log("Part preference:", part);
 
 
     selectParts(inst, part);
@@ -132,10 +141,11 @@ function selectParts(inst, part) {
 
     let prefix = inst + "-" + part;
 
-    let instruments = document.getElementsByName("instruments");
+    let selections = document.getElementsByName("instrument-selection");
-    for(let i=0; i<instruments.length; i++) {
+    console.log("Updating selections:", prefix, selections);
+    for(let i=0; i<selections.length; i++) {
         var result = "-"
-        let options = instruments[i].children;
+        let options = selections[i].children;
         for(let j=0; j<options.length; j++) {
             let value = options[j].value;
             if (value.startsWith(prefix)) {
@@ -146,7 +156,8 @@ function selectParts(inst, part) {
                 result = value;
             }
         }
-        instruments[i].value = result;
+        console.log("Selected:", result);
+        selections[i].value = result;
     }
 
 }