polyphonic/interface/static/interface/js/interface.js

@@ -27,30 +27,3 @@ document.addEventListener('DOMContentLoaded', () => {
   }
 
 });
-
-  async function background_api(el) {
-    console.log(el.dataset["api"]);
-    let text = el.innerHTML;
-    el.disabled = true;
-    el.innerHTML = "Running..."
-    const response = await fetch(el.dataset.api);
-
-    console.log(response);
-      
-    el.innerHTML = text;
-
-    if(!response.ok) {
-      el.disabled = false;
-      throw new Error(`Response: ${response.status}`);
-    }
-
-    if (el.dataset.success) {
-      text = el.dataset.success;
-    }
-
-    el.innerHTML = text;
-    const data = await response.json();
-    
-    console.log(data);
-
-  }

polyphonic/library/gdrive/__init__.py

@@ -14,13 +14,6 @@ def sync_work(work: Work):
 
     logger.info("Syncing '%s' from %r", work.name, folder_id)
 
-    results = {
-        "folder_id": folder_id,
-        "added": [],
-        "skipped": [],
-        "missing": [],
-    }
-
     storage = UserStorage.objects.get(name="gdrive").instance()
 
     existing = set(
@@ -34,8 +27,6 @@ def sync_work(work: Work):
     _, files = storage.listdir(folder_id)
     logger.debug("Remote files: %r", files)
 
-    results["files"] = len(files)
-
     for file in files:
         if file.id in existing:
             logger.debug("%30s: Skipping existing (%s)", file.name, file.id)
@@ -44,29 +35,22 @@ def sync_work(work: Work):
 
         if not file.name.lower().endswith(".pdf"):
             logger.debug("%40s: Not a PDF", file.name)
-            results["skipped"].append({"file": file.name, "file_id": file.id})
             continue
 
-        results["added"].append({"file": file.name, "file_id": file.id})
+        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:
-        results["missing"].append({"uri": uri})
         logger.warning("Local entry not in folder: %s", uri)
 
-    return results
-
 
 def sync_partial_collection(collection: Collection, sync_existing: bool = True):
+
     works = Work.objects.filter(collection=collection, meta_info__name="folderid")
 
-    result = []
-
     for work in works:
-        result.append(sync_work(work))
+        sync_work(work)
-
-    return result
 
 
 def sync_collection(collection: Collection, sync_existing: bool = False):
@@ -85,12 +69,6 @@ def sync_collection(collection: Collection, sync_existing: bool = False):
     storage = collection.storage.instance()
     folders, _ = storage.listdir(folder)
 
-    results = {
-        "folders": len(folders),
-        "added": [],
-        "missing": [],
-    }
-
     for folder in folders:
         if folder[0] == "_":
             continue
@@ -106,11 +84,7 @@ def sync_collection(collection: Collection, sync_existing: bool = False):
         work = Work(name=folder.name, collection=collection)
         work.save()
         work.meta_info.create(name="folderid", value=folder.id)
-        results["added"].append({"work": work.pk, "folder_id": folder.id})
         sync_work(work)
 
-    for folderid, work in existing.items():
+    for folderid, work in existing:
-        results["missing"].append({"work": work, "folder_id": folderid})
         logger.warning("Folder for work %d no longer in drive (%s)", work, folderid)
-
-    return results

polyphonic/library/gdrive/storage.py

@@ -69,26 +69,20 @@ class GDriveLinkStorage(Storage):
         if path == "":
             return [], []
 
-        files = []
-        folders = []
-
         folder = self.parse_resource(path)
         url = f"{FILES_API}?q='{folder.id}'+in+parents&key={self.api_key}"
-
         data = self.get_json(url, folder)
-        while True:
+        files = []
-            for x in data["files"]:
+        folders = []
-                if x["mimeType"] == "application/vnd.google-apps.folder":
+        for x in data["files"]:
-                    folders.append(
+            if x["mimeType"] == "application/vnd.google-apps.folder":
-                        DriveObject(x["id"], x.get("resourceKey"), x["name"])
+                # folders.append(f"{x['id']}/{x['name']}")
-                    )
+                folders.append(DriveObject(x["id"], x.get("resourceKey"), x["name"]))
-                else:
+            else:
-                    files.append(DriveObject(x["id"], x.get("resourceKey"), x["name"]))
+                # files.append(f"{x['id']}/{x['name']}")
+                files.append(DriveObject(x["id"], x.get("resourceKey"), x["name"]))
 
-            token = data.get("nextPageToken")
+        return folders, files
-            if token is None:
-                return folders, files
-            data = self.get_json(f"{url}&pageToken={token}", folder)
 
     def get_meta(self, name):
         file_resource = self.parse_resource(name)

polyphonic/library/templates/library/gdrive.html

@@ -2,20 +2,10 @@
 {% load polyphonic %}
 
 {% block admin %}
-
-{% if meta.folderid %}
-<button class="button is-link" data-api="{% url 'work_sync' work=object.pk %}" data-success="Synced" onclick="background_api(this)">
-
-  {% icon "sync" %}
-  <span>Sync with Drive</span>
-</button>
-{% endif %}
-
 <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 %}
@@ -30,8 +20,8 @@
 <div class="m-3">
 <p>
     {% if meta.folderid %}
-This work is currently linked to folder <span class="tag is-success">{{ meta.folderid }}</span><br/>
+This work is currently linked to <b>{{ meta.folderid }}</b>.<br/>
-<em>Pasting a new folder link will overwrite this.</em>
+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 %}
@@ -52,6 +42,4 @@ There is currently no shared drive folder linked to this work - paste one here t
   {% csrf_token %}
 </form>
 </div>
-
 {% endblock %}
-

polyphonic/library/templates/library/work_list.html

@@ -3,21 +3,12 @@
 {% load polyphonic %}
 
 {% block admin %}
-
 {% if collection %}
-
-
-<button class="button is-link" data-api="{% url 'collection_sync' collection=collection.pk %}" data-success="Synced" onclick="background_api(this)">
-  {% icon "sync" %}
-  <span>Sync Collection</span>
-</button>
-
 <a href="{% url 'work_add' collection.pk %}" class="button is-link">
     {% icon "add_notes" %}
     <span>Add a work</span>
 </a>
 {% endif %}
-
 {% endblock %}
 
 {% block page %}

polyphonic/library/urls.py

@@ -126,14 +126,4 @@ urlpatterns = [
         api.CollectionImportView.as_view(),
         name="collection_import",
     ),
-    path(
-        "api/collections/<int:collection>/sync",
-        api.CollectionSyncView.as_view(),
-        name="collection_sync",
-    ),
-    path(
-        "api/works/<int:work>/sync",
-        api.WorkSyncView.as_view(),
-        name="work_sync",
-    ),
 ]

polyphonic/library/views/api.py

@@ -3,12 +3,9 @@ from polyphonic.interface.views import AuthorizedResourceMixin
 from rest_framework import serializers
 from rest_framework.exceptions import APIException
 from rest_framework import generics
-from rest_framework.views import APIView
-from rest_framework.response import Response
 
 from polyphonic.library.models import Collection, Work, Document, Section, WorkMeta
 
-from polyphonic.library.gdrive import sync_collection, sync_work
 
 import requests
 import urllib
@@ -211,25 +208,3 @@ class CollectionImportView(AuthorizedResourceMixin, generics.CreateAPIView):
 
     def perform_create(self, serializer):
         serializer.save(collection_id=self.kwargs["pk"])
-
-
-class WorkSyncView(AuthorizedResourceMixin, APIView):
-    admin_required = True
-
-    def get(self, request, work, format=None):
-        obj = Work.objects.get(pk=work)
-
-        result = sync_work(obj)
-
-        return Response(result)
-
-
-class CollectionSyncView(AuthorizedResourceMixin, APIView):
-    admin_required = True
-
-    def get(self, request, collection, format=None):
-        obj = Collection.objects.get(pk=collection)
-
-        result = sync_collection(obj)
-
-        return Response(result)