rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated tasks nomenclature

Browse source
This commit is contained in:
Joel Collins 2020-07-21 12:54:42 +01:00
parent 56051f8863
commit 24398ba7dc
27 changed files with 100 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

14
openflexure_microscope/api/default_extensions/zip_builder.py
View file

@ -1,7 +1,6 @@
from openflexure_microscope.devel import (
JsonResponse,
request,
update_task_progress,
)
from flask import send_file, abort, url_for
@ -12,12 +11,11 @@ import zipfile
import tempfile
import logging
from labthings.server.find import find_component
from labthings.server.view import View, ActionView, PropertyView
from labthings.server.schema import Schema, pre_dump
from labthings.server import fields
from labthings.server.extensions import BaseExtension
from labthings.server.utilities import description_from_view
from labthings import fields, find_component, update_action_progress
from labthings.views import View, ActionView, PropertyView
from labthings.schema import Schema, pre_dump
from labthings.extensions import BaseExtension
from labthings.utilities import description_from_view
class ZipObjectSchema(Schema):
@ -107,7 +105,7 @@ class ZipManager:
)
zipObj.write(file_path, arcname=rel_path)
# Update task progress
update_task_progress(int((index / n_files) * 100))
update_action_progress(int((index / n_files) * 100))
session_id = str(uuid.uuid4())
session_description = ZipObjectDescription(