v1.1.2 Reverted to earlier style of putting files into uploads

Author: OutsourcedGuru

octoprint_gitfiles/__init__.py

@@ -41,11 +41,11 @@ def on_api_command(self, command, data):
 
 			self._logger.info("`git {arg1}`".format(**data))
 			uploads = self._settings.global_get_basefolder("uploads")
-			gitfilesFolder = os.path.expanduser("~") + "/gitfiles"
+			gitfilesFolder = uploads + "/github"
 			self._logger.info(gitfilesFolder)
 			if not self._settings.get(["initialized"]):
 				self._logger.info("Not initialized")
-				# These run if it's not been initialized before this 
+				# These run if it's not been initialized before this
 				try:
 					self._logger.info("Creating the gitfiles folder...")
 					os.mkdir(gitfilesFolder, 0755)
@@ -57,8 +57,9 @@ def on_api_command(self, command, data):
 					self._logger.info("Initializing the uploads folder...")
 					output =  call(["git", "init"], cwd=gitfilesFolder)
 					self._logger.info(output)
-					self._settings.setBoolean(["plugins", "gitfiles", "initialized"], True)
-					self._settings.save()
+					s = settings()
+					s.setBoolean(["plugins", "gitfiles", "initialized"], True)
+					s.save()
 				except OSError as e:
 					self._logger.info("git init failed")
 					return
@@ -69,13 +70,6 @@ def on_api_command(self, command, data):
 				except OSError as e:
 					self._logger.info("git add remote origin failed")
 					return
-				try:
-					self._logger.info("Creating the symlink...")
-					os.symlink(gitfilesFolder, uploads + "/github")
-					self._logger.info("Created symlink")
-				except OSError as e:
-					self._logger.info("Creation of symlink failed")
-					return
 			# This one runs regardless of whether or not it's been previously initialized
 			try:
 				self._logger.info("-- git pull origin master ---------------------------------------------------")

setup.py

@@ -14,7 +14,7 @@
 plugin_name = "GitFiles"
 
 # The plugin's version. Can be overwritten within OctoPrint's internal data via __plugin_version__ in the plugin module
-plugin_version = "1.1.1"
+plugin_version = "1.1.2"
 
 # The plugin's description. Can be overwritten within OctoPrint's internal data via __plugin_description__ in the plugin
 # module