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

Restructured how temporary paths are calculated

Browse source
This commit is contained in:
Joel Collins 2019-04-09 14:52:08 +01:00
parent 24ded8de32
commit 61f15d610f
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
openflexure_microscope/camera/capture.py
View file

@ -215,6 +215,12 @@ class CaptureObject(object):
""" """
global TEMP_CAPTURE_PATH global TEMP_CAPTURE_PATH
if self.temporary:
# Store original file path
self.file_notmp = os.path.join(folder, filename)
# Move user-specified folder to TEMP
self.folder = os.path.join(TEMP_CAPTURE_PATH, self.folder)
self.file = os.path.join(folder, filename) # Full file name by joining given folder to given name self.file = os.path.join(folder, filename) # Full file name by joining given folder to given name
self.split_file_path(self.file) # Split file path into folder, filename, and basename self.split_file_path(self.file) # Split file path into folder, filename, and basename
@ -223,12 +229,6 @@ class CaptureObject(object):
if not os.path.commonprefix([self.file, BASE_CAPTURE_PATH]) == BASE_CAPTURE_PATH: if not os.path.commonprefix([self.file, BASE_CAPTURE_PATH]) == BASE_CAPTURE_PATH:
raise Exception("Captures cannot be stored in a lower-level directory than {}.".format(BASE_CAPTURE_PATH)) raise Exception("Captures cannot be stored in a lower-level directory than {}.".format(BASE_CAPTURE_PATH))
# Move to tmp directory if not being kept
if self.temporary:
self.file_notmp = self.file # Store originally defined folder
self.filefolder = TEMP_CAPTURE_PATH
self.file = os.path.join(self.filefolder, self.filename)
# Create folder and file # Create folder and file
if not os.path.exists(self.filefolder): if not os.path.exists(self.filefolder):
os.makedirs(self.filefolder) os.makedirs(self.filefolder)