Code formatting

This commit is contained in:
Joel Collins 2020-10-13 15:02:19 +01:00
parent 0234b20ce3
commit 2bfb988460
60 changed files with 392 additions and 396 deletions

View file

@ -1,3 +1,3 @@
from .capture_manager import CaptureManager
from . import capture, capture_manager
from .capture import CaptureObject
from . import capture_manager, capture
from .capture_manager import CaptureManager

View file

@ -1,17 +1,17 @@
import uuid
import io
import os
import shutil
import glob
import atexit
import datetime
import glob
import io
import json
import logging
from PIL import Image
import dateutil.parser
import atexit
import os
import shutil
import uuid
from collections import OrderedDict
import dateutil.parser
from PIL import Image
from openflexure_microscope.camera import piexif
from openflexure_microscope.camera.piexif._exceptions import InvalidImageDataError
from openflexure_microscope.config import JSONEncoder
@ -156,7 +156,7 @@ class CaptureObject(object):
def flush(self):
logging.info(f"Writing to disk {self.file}")
with open(self.file, "wb") as outfile:
with open(self.file, "wb") as outfile:
outfile.write(self.stream.getbuffer())
self.stream.close()
logging.info(f"Finished writing to disk {self.file}")
@ -233,7 +233,9 @@ class CaptureObject(object):
self._metadata.update(data)
self.save_metadata()
def put_and_save(self, tags: list = None, annotations: dict = None, metadata: dict = None):
def put_and_save(
self, tags: list = None, annotations: dict = None, metadata: dict = None
):
"""
Batch-write tags, metadata, and annotations in a single disk operation
"""
@ -243,7 +245,7 @@ class CaptureObject(object):
annotations = {}
if not metadata:
metadata = {}
# Tags
for tag in tags:
if tag not in self.tags:

View file

@ -1,13 +1,13 @@
import os
import datetime
import shutil
import logging
import os
import shutil
from collections import OrderedDict
from labthings import StrictLock
from openflexure_microscope.utilities import entry_by_uuid
from openflexure_microscope.paths import data_file_path
from openflexure_microscope.utilities import entry_by_uuid
from .capture import CaptureObject, build_captures_from_exif