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

Implemented root API v2 routes

Browse source
This commit is contained in:
jtc42 2019-11-14 16:33:00 +00:00
parent 5aa783c269
commit 6581612312
27 changed files with 1205 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

6
openflexure_microscope/config.py
View file

@ -85,16 +85,16 @@ class OpenflexureSettingsFile:
# If the loaded config was in contracted format
if self.expand:
# Contract self._config into self.raw_config
save_config = self.contract_config(config)
save_settings = self.contract_config(config)
else:
save_config = config
save_settings = config
if backup:
if os.path.isfile(self.config_path):
shutil.copyfile(self.config_path, self.config_path + ".bk")
logging.debug("Saving settings dictionary to disk")
save_json_file(self.config_path, save_config)
save_json_file(self.config_path, save_settings)
def merge(self, config: dict, backup: bool = True):
logging.debug("Merging settings with file on disk")