From f83d5aa89f23d64927ced85756f44d52bb0d16a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gina=20H=C3=A4u=C3=9Fge?= <osd@foosel.net>
Date: Mon, 5 Oct 2015 18:07:43 +0200
Subject: [PATCH] Fix: Use atomic writes for all save processes

That includes uploaded files, profiles, caching files, settings and user
directories.
---
 src/octoprint/filemanager/util.py               | 4 +++-
 src/octoprint/plugins/cura/__init__.py          | 2 +-
 src/octoprint/plugins/pluginmanager/__init__.py | 2 +-
 src/octoprint/settings.py                       | 4 +++-
 src/octoprint/users.py                          | 4 +++-
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/octoprint/filemanager/util.py b/src/octoprint/filemanager/util.py
index 105987f3..f3fe20fb 100644
--- a/src/octoprint/filemanager/util.py
+++ b/src/octoprint/filemanager/util.py
@@ -7,6 +7,8 @@ __copyright__ = "Copyright (C) 2015 The OctoPrint Project - Released under terms
 
 import io
 
+from octoprint.util import atomic_write
+
 class AbstractFileWrapper(object):
 	"""
 	Wrapper for file representations to save to storages.
@@ -85,7 +87,7 @@ class StreamWrapper(AbstractFileWrapper):
 		"""
 		import shutil
 
-		with open(path, "wb") as dest:
+		with atomic_write(path, "wb") as dest:
 			with self.stream() as source:
 				shutil.copyfileobj(source, dest)
 
diff --git a/src/octoprint/plugins/cura/__init__.py b/src/octoprint/plugins/cura/__init__.py
index 30de8874..fd326a10 100644
--- a/src/octoprint/plugins/cura/__init__.py
+++ b/src/octoprint/plugins/cura/__init__.py
@@ -393,7 +393,7 @@ class CuraPlugin(octoprint.plugin.SlicerPlugin,
 
 	def _save_profile(self, path, profile, allow_overwrite=True):
 		import yaml
-		with open(path, "wb") as f:
+		with octoprint.util.atomic_write(path, "wb") as f:
 			yaml.safe_dump(profile, f, default_flow_style=False, indent="  ", allow_unicode=True)
 
 	def _convert_to_engine(self, profile_path, printer_profile, posX, posY):
diff --git a/src/octoprint/plugins/pluginmanager/__init__.py b/src/octoprint/plugins/pluginmanager/__init__.py
index a93b6cc2..0c40562a 100644
--- a/src/octoprint/plugins/pluginmanager/__init__.py
+++ b/src/octoprint/plugins/pluginmanager/__init__.py
@@ -536,7 +536,7 @@ class PluginManagerPlugin(octoprint.plugin.SimpleApiPlugin,
 
 		try:
 			import json
-			with open(self._repository_cache_path, "w+b") as f:
+			with octoprint.util.atomic_write(self._repository_cache_path, "wb") as f:
 				json.dump(repo_data, f)
 		except Exception as e:
 			self._logger.exception("Error while saving repository data to {}: {}".format(self._repository_cache_path, str(e)))
diff --git a/src/octoprint/settings.py b/src/octoprint/settings.py
index fa3f0e5f..733d24b8 100644
--- a/src/octoprint/settings.py
+++ b/src/octoprint/settings.py
@@ -30,6 +30,8 @@ import logging
 import re
 import uuid
 
+from octoprint.util import atomic_write
+
 _APPNAME = "OctoPrint"
 
 _instance = None
@@ -1057,7 +1059,7 @@ class Settings(object):
 		path, _ = os.path.split(filename)
 		if not os.path.exists(path):
 			os.makedirs(path)
-		with open(filename, "w+") as f:
+		with atomic_write(filename, "wb") as f:
 			f.write(script)
 
 def _default_basedir(applicationName):
diff --git a/src/octoprint/users.py b/src/octoprint/users.py
index 76bf23bd..d4890a64 100644
--- a/src/octoprint/users.py
+++ b/src/octoprint/users.py
@@ -17,6 +17,8 @@ import logging
 
 from octoprint.settings import settings
 
+from octoprint.util import atomic_write
+
 class UserManager(object):
 	valid_roles = ["user", "admin"]
 
@@ -217,7 +219,7 @@ class FilebasedUserManager(UserManager):
 				"settings": user._settings
 			}
 
-		with open(self._userfile, "wb") as f:
+		with atomic_write(self._userfile, "wb") as f:
 			yaml.safe_dump(data, f, default_flow_style=False, indent="    ", allow_unicode=True)
 			self._dirty = False
 		self._load()