Merge pull request #93 from donovan6000/devel

Version 0.27.1

Changelog

@@ -1,5 +1,9 @@
 Changelog:
 
+V0.27.1 February 22, 2016
+
+	* Fixed issue where webcam URL's couldn't be changed
+
 V0.27 February 20, 2016
 
 	* Builtin webcam server

installers/OS X/installer.sh

@@ -40,18 +40,18 @@ else
 		version="$(perl -nle'print $1 if m/pyobjc-core-([0-9\.]*)\.tar\.gz/' index.html | head -1)"
 		rm index.html
 		curl -o pyobjc-core.tar.gz https://pypi.python.org/packages/source/p/pyobjc-core/pyobjc-core-${version}.tar.gz
-		tar zxvf pyobjc-core.tar.gz
+		sudo -u $SUDO_USER tar zxvf pyobjc-core.tar.gz
 		rm pyobjc-core.tar.gz
 		cd pyobjc-core-${version}
 
 		# Patch installer
-		sed -i '' -e 's/\(self\.sdk_root = subprocess.*\)/try:\
+		sudo -u $SUDO_USER sed -i '' -e 's/\(self\.sdk_root = subprocess.*\)/try:\
                     \1/g' setup.py
-		sed -i '' -e 's/\(universal_newlines=True.*\)/\1\
+		sudo -u $SUDO_USER sed -i '' -e 's/\(universal_newlines=True.*\)/\1\
                 except subprocess.CalledProcessError as e:\
                     self.sdk_root = \'"'"'\/\'"'"'/g' setup.py
 
-		/Library/Frameworks/Python.framework/Versions/${pythonVersion}/bin/python setup.py install
+		sudo -u $SUDO_USER /Library/Frameworks/Python.framework/Versions/${pythonVersion}/bin/python setup.py install --user
 		cd ..
 		rm -rf pyobjc-core-${version}
 
@@ -60,10 +60,10 @@ else
 		version="$(perl -nle'print $1 if m/pyobjc-framework-Cocoa-([0-9\.]*)\.tar\.gz/' index.html | head -1)"
 		rm index.html
 		curl -o pyobjc-framework-Cocoa.tar.gz https://pypi.python.org/packages/source/p/pyobjc-framework-Cocoa/pyobjc-framework-Cocoa-${version}.tar.gz
-		tar zxvf pyobjc-framework-Cocoa.tar.gz
+		sudo -u $SUDO_USER tar zxvf pyobjc-framework-Cocoa.tar.gz
 		rm pyobjc-framework-Cocoa.tar.gz
 		cd pyobjc-framework-Cocoa-${version}
-		/Library/Frameworks/Python.framework/Versions/${pythonVersion}/bin/python setup.py install
+		sudo -u $SUDO_USER /Library/Frameworks/Python.framework/Versions/${pythonVersion}/bin/python setup.py install --user
 		cd ..
 		rm -rf pyobjc-framework-Cocoa-${version}
 
@@ -72,10 +72,10 @@ else
 		version="$(perl -nle'print $1 if m/pyobjc-framework-Quartz-([0-9\.]*)\.tar\.gz/' index.html | head -1)"
 		rm index.html
 		curl -o pyobjc-framework-Quartz.tar.gz https://pypi.python.org/packages/source/p/pyobjc-framework-Quartz/pyobjc-framework-Quartz-${version}.tar.gz
-		tar zxvf pyobjc-framework-Quartz.tar.gz
+		sudo -u $SUDO_USER tar zxvf pyobjc-framework-Quartz.tar.gz
 		rm pyobjc-framework-Quartz.tar.gz
 		cd pyobjc-framework-Quartz-${version}
-		/Library/Frameworks/Python.framework/Versions/${pythonVersion}/bin/python setup.py install
+		sudo -u $SUDO_USER /Library/Frameworks/Python.framework/Versions/${pythonVersion}/bin/python setup.py install --user
 		cd ..
 		rm -rf pyobjc-framework-Quartz-${version}
 
@@ -84,27 +84,27 @@ else
 		version="$(perl -nle'print $1 if m/pyobjc-framework-QTKit-([0-9\.]*)\.tar\.gz/' index.html | head -1)"
 		rm index.html
 		curl -o pyobjc-framework-QTKit.tar.gz https://pypi.python.org/packages/source/p/pyobjc-framework-QTKit/pyobjc-framework-QTKit-${version}.tar.gz
-		tar zxvf pyobjc-framework-QTKit.tar.gz
+		sudo -u $SUDO_USER tar zxvf pyobjc-framework-QTKit.tar.gz
 		rm pyobjc-framework-QTKit.tar.gz
 		cd pyobjc-framework-QTKit-${version}
-		/Library/Frameworks/Python.framework/Versions/${pythonVersion}/bin/python setup.py install
+		sudo -u $SUDO_USER /Library/Frameworks/Python.framework/Versions/${pythonVersion}/bin/python setup.py install --user
 		cd ..
 		rm -rf pyobjc-framework-QTKit-${version}
 
 		# Install OctoPrint
-		su $SUDO_USER -c 'launchctl unload /Library/LaunchAgents/com.octoprint.app.plist'
+		sudo -u $SUDO_USER launchctl unload /Library/LaunchAgents/com.octoprint.app.plist
 		curl -LOk https://github.com/foosel/OctoPrint/archive/master.zip
-		unzip master.zip
+		sudo -u $SUDO_USER unzip master.zip
 		cd OctoPrint-master
-		/Library/Frameworks/Python.framework/Versions/${pythonVersion}/bin/python setup.py install
+		sudo -u $SUDO_USER /Library/Frameworks/Python.framework/Versions/${pythonVersion}/bin/python setup.py install --user
 		cd ..
 		rm -rf OctoPrint-master
 		rm master.zip
 
 		# Install M3D Fio
-		echo 'y' | /Library/Frameworks/Python.framework/Versions/${pythonVersion}/bin/pip uninstall OctoPrint-M3DFio
+		echo 'y' | sudo -u $SUDO_USER /Library/Frameworks/Python.framework/Versions/${pythonVersion}/bin/pip uninstall OctoPrint-M3DFio
 		curl -LOk https://github.com/donovan6000/M3D-Fio/archive/master.zip
-		while ! /Library/Frameworks/Python.framework/Versions/${pythonVersion}/bin/pip install master.zip
+		while ! sudo -u $SUDO_USER /Library/Frameworks/Python.framework/Versions/${pythonVersion}/bin/pip install master.zip
 		do
 			:
 		done
@@ -116,7 +116,7 @@ else
 		rm CH34x_Install.pkg
 
 		# Get OctoPrint parameter
-		octoPrintVersion="$(/Library/Frameworks/Python.framework/Versions/${pythonVersion}/bin/octoprint --version | cut -d' ' -f3)"
+		octoPrintVersion="$(/Users/$SUDO_USER/Library/Python/${pythonVersion}/bin/octoprint --version | cut -d' ' -f3)"
 		if [ $octoPrintVersion = "1.2.8" ] || [ $octoPrintVersion = "1.2.9" ]; then
 			octoPrintParameter=""
 		else
@@ -125,16 +125,16 @@ else
 
 		# Add OctoPrint to startup programs
 		curl -O 'https://raw.githubusercontent.com/donovan6000/M3D-Fio/master/installers/OS%20X/com.octoprint.app.plist'
-		sed -i '' -e 's/path to octoprint/\/Library\/Frameworks\/Python.framework\/Versions\/'"${pythonVersion}"'\/bin\/octoprint/g' com.octoprint.app.plist
+		sed -i '' -e 's/path to octoprint/\/Users\/'"$SUDO_USER"'\/Library\/Python\/'"${pythonVersion}"'\/bin\/octoprint/g' com.octoprint.app.plist
 		sed -i '' -e 's/<string>octoprint parameter<\/string>/'"$octoPrintParameter"'/g' com.octoprint.app.plist
 		mv com.octoprint.app.plist '/Library/LaunchAgents'
 
 		# Create URL link on desktop
 		curl -O 'https://raw.githubusercontent.com/donovan6000/M3D-Fio/master/installers/OS%20X/shortcut.zip'
-		ditto -x -k --sequesterRsrc --rsrc shortcut.zip '/Users/'"$SUDO_USER"'/Desktop'
+		sudo -u $SUDO_USER ditto -x -k --sequesterRsrc --rsrc shortcut.zip '/Users/'"$SUDO_USER"'/Desktop'
 
 		# Start OctoPrint
-		su $SUDO_USER -c 'launchctl load /Library/LaunchAgents/com.octoprint.app.plist'
+		sudo -u $SUDO_USER launchctl load /Library/LaunchAgents/com.octoprint.app.plist
 
 		# Display message
 		echo

octoprint_m3dfio/__init__.py

@@ -1165,6 +1165,38 @@ def get_settings_defaults(self) :
 			CameraFramesPerSecond = 20
 		)
 
+	# On settings save
+	def on_settings_save(self, data) :
+
+		# Get old host camera settings
+		oldHostCamera = self._settings.get_boolean(["HostCamera"])
+
+		# Save settings
+		octoprint.plugin.SettingsPlugin.on_settings_save(self, data)
+
+		# Get new host camera settings
+		newHostCamera = self._settings.get_boolean(["HostCamera"])
+
+		# Check if host camera setting changed
+		if oldHostCamera != newHostCamera :
+
+			# Check if now hosting camera
+			if newHostCamera :
+
+				# Set camera URLs
+				octoprint.settings.settings().set(["webcam", "stream"], "http://" + socket.gethostbyname(socket.gethostname()) + ":4999/stream.mjpg")
+				octoprint.settings.settings().set(["webcam", "snapshot"], "http://" + socket.gethostbyname(socket.gethostname()) + ":4999/snapshot.jpg")
+
+			# Otherwise assume now not hosting camera
+			else :
+
+				# Clear camera URLs
+				octoprint.settings.settings().set(["webcam", "stream"], None)
+				octoprint.settings.settings().set(["webcam", "snapshot"], None)
+
+			# Save settings
+			octoprint.settings.settings().save()
+
 	# Template manager
 	def get_template_configs(self) :
 
@@ -1651,16 +1683,8 @@ def on_api_command(self, command, data) :
 			# Otherwise check if parameter is to saved settings
 			elif data["value"] == "Saved Settings" :
 
-				# Check if hosting camera
-				if self._settings.get_boolean(["HostCamera"]) :
-
-					# Set OctoPrint camera URLs
-					octoprint.settings.settings().set(["webcam", "stream"], "http://localhost:4999/stream.mjpg")
-					octoprint.settings.settings().set(["webcam", "snapshot"], "http://localhost:4999/snapshot.jpg")
-					octoprint.settings.settings().save()
-
-				# Check if a micro 3D is connected
-				if not self.invalidPrinter :
+				# Check if a micro 3D is connected and not printing or paused
+				if not self.invalidPrinter and not self._printer.is_printing() and not self._printer.is_paused() :
 
 					# Save settings to the printer
 					self.sendCommands(self.getSaveCommands())
@@ -3153,6 +3177,18 @@ def on_event(self, event, payload) :
 			# Send provided firmware versions
 			self._plugin_manager.send_plugin_message(self._identifier, dict(value = "Provided Firmwares", firmwares = self.providedFirmwares))
 
+			# Check if shared library exists
+			if self.sharedLibrary :
+
+				# Show shared library options
+				self._plugin_manager.send_plugin_message(self._identifier, dict(value = "Using Shared Library"))
+
+			# Otherwise
+			else :
+
+				# Hide shared library options
+				self._plugin_manager.send_plugin_message(self._identifier, dict(value = "Not Using Shared Library"))
+
 			# Check if EEPROM was read
 			if self.eeprom :
 

octoprint_m3dfio/static/css/m3dfio.css

@@ -11,11 +11,6 @@
 	top: -1px;
 }
 
-#settings_plugin_m3dfio label.disabled {
-	opacity: 0.5;
-	cursor: not-allowed;
-}
-
 #settings_plugin_m3dfio label.checkbox {
 	margin-top: -15px;
 	width: calc(100% - 24px);
@@ -512,6 +507,17 @@ body > div.page-container > div.message > div > div > span.show {
 	left: -5px;
 }
 
+#slicing_configuration_dialog .modal-footer p.warning {
+	position: absolute;
+	left: 50%;
+	bottom: 17px;
+	transform: translateX(-50%);
+	margin: 0;
+	font-size: 9px;
+	color: #999;
+	cursor: default;
+}
+
 #slicing_configuration_dialog .modal-footer a.link, #slicing_configuration_dialog:not(.model):not(.profile) .modal-footer a.save {
 	display: none;
 }