projects/polyphonic
1
0
Fork 0
Code Issues 8 Pull Requests Releases 1 Wiki Activity

Got api work import working

Browse Source
This commit is contained in:
Tris Forster 2023-03-02 07:09:38 +11:00
parent f1757be96e
commit a892b0bc41
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/library/tests.py
View File

@ -1,10 +1,12 @@
from interface.tests import AccessTestCase from interface.tests import AccessTestCase
from django.contrib.auth.models import User from byostorage.user import UserStorage
from interface.models import Ensemble, Project
from . import models from . import models
from .views.api import WorkSerializer from .views.api import WorkSerializer
import tempfile
import json
class LibraryTestCase(AccessTestCase): class LibraryTestCase(AccessTestCase):
USERS = ( USERS = (
@ -32,6 +34,7 @@ class LibraryTestCase(AccessTestCase):
WORKS = ( WORKS = (
{'name': 'Baby on Board', 'collection': 'ned', 'docs': [{'upload': 'local:baby_on_board.pdf'}]}, {'name': 'Baby on Board', 'collection': 'ned', 'docs': [{'upload': 'local:baby_on_board.pdf'}]},
{'name': 'Star Spangled Banner', 'collection': 'sel'},
) )
PROTECTED_URLS = ( PROTECTED_URLS = (
@ -45,8 +48,8 @@ class LibraryTestCase(AccessTestCase):
'/collections/2/docs/1/annotate', '/collections/2/docs/1/annotate',
# Need to add storage before we can test these # Need to add storage before we can test these
#'/api/collections/2', '/api/collections/2',
#'/api/collections/2/works/1', '/api/collections/2/works/1',
'/admin/library/collection/', '/admin/library/collection/',
'/admin/library/document/', '/admin/library/document/',
@ -60,10 +63,13 @@ class LibraryTestCase(AccessTestCase):
def setUpTestData(cls): def setUpTestData(cls):
super().setUpTestData() super().setUpTestData()
cls.temp_dir = tempfile.TemporaryDirectory()
cls.storage = UserStorage.objects.create(name='local', storage='django.core.files.storage.FileSystemStorage',
settings_data=json.dumps({'location': cls.temp_dir.name, 'base_url': 'file://' + cls.temp_dir.name}))
cls.collections = {} cls.collections = {}
for details in cls.COLLECTIONS: for details in cls.COLLECTIONS:
admins = details.pop('admins', []) admins = details.pop('admins', [])
obj = models.Collection.objects.create(**details) obj = models.Collection.objects.create(storage=cls.storage, **details)
for admin in admins: for admin in admins:
obj.administrators.add(cls.users[admin]) obj.administrators.add(cls.users[admin])
cls.collections[details['prefix']] = obj cls.collections[details['prefix']] = obj
@ -83,6 +89,12 @@ class LibraryTestCase(AccessTestCase):
cls.works[details['name']] = obj cls.works[details['name']] = obj
def setUp(self):
pass
@classmethod
def tearDownClass(cls):
cls.temp_dir.cleanup()
def test_integration(self): def test_integration(self):
@ -128,7 +140,12 @@ class LibraryTestCase(AccessTestCase):
'/collections/2': False, '/collections/2': False,
'/collections/2/works/1': False, '/collections/2/works/1': False,
}) })
def test_export_and_import(self):
self.login('admin', 'secret')
data = self.client.get('/api/collections/1/works/2', HTTP_ACCEPT="application/json").json()
response = self.client.post('/api/collections/2/import', data, "application/json")
self.assertEqual(response.status_code, 201)
def test_movement_from_large_work(self): def test_movement_from_large_work(self):
''' '''

12
app/library/views/api.py
View File

@ -41,8 +41,9 @@ from library.models import Collection, Work, Document, Section, WorkMeta
import requests import requests
from io import BytesIO from io import BytesIO
import tempfile import urllib
import shutil import shutil
import os.path
from django.db import transaction from django.db import transaction
from django.core.files.uploadedfile import TemporaryUploadedFile from django.core.files.uploadedfile import TemporaryUploadedFile
@ -70,7 +71,7 @@ class SectionSerializer(serializers.ModelSerializer):
return f"{instance.tag}:{start}:{end}" return f"{instance.tag}:{start}:{end}"
def to_internal_value(self, data): def to_internal_value(self, data):
tag, section_type, start, end = data.split(":") tag, start, end = data.split(":")
try: try:
start = int(start) start = int(start)
except: except:
@ -134,8 +135,11 @@ class WorkSerializer(serializers.ModelSerializer):
for d in docs: for d in docs:
sections = d.pop('sections', []) sections = d.pop('sections', [])
url = urllib.parse.urlparse(d['upload'])
filename = os.path.basename(url.path)
r = requests.get(d['upload'], stream=True) r = requests.get(d['upload'], stream=True)
f = TemporaryUploadedFile(d['upload'], r.headers['content-type'], r.headers['content-length'], r.encoding) f = TemporaryUploadedFile(filename, r.headers['content-type'], r.headers['content-length'], r.encoding)
shutil.copyfileobj(r.raw, f.file) shutil.copyfileobj(r.raw, f.file)
r.close() r.close()
d['upload'] = f d['upload'] = f
@ -186,7 +190,7 @@ class WorkImportView(AuthorizedResourceMixin, generics.CreateAPIView):
serializer_class = WorkSerializer serializer_class = WorkSerializer
def perform_create(self, serializer): def perform_create(self, serializer):
serializer.save(collection_id=self.kwargs['pk']) serializer.save(collection_id=self.kwargs['collection'])
class CollectionImportView(AuthorizedResourceMixin, generics.CreateAPIView): class CollectionImportView(AuthorizedResourceMixin, generics.CreateAPIView):
serializer_class = CollectionSerializer serializer_class = CollectionSerializer