savant-echo 1.0.5 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa49c5c4a0083affe39ca9c6379fb2a2cefd9006
-  data.tar.gz: 63505440aceff03b3e612d6280b944e4a37c1031
+  metadata.gz: 1d697f91ad2086bedf9e01c21539cede24ef4cf6
+  data.tar.gz: f751654b48d18c21fd2a9a9a96fb4523fe324c2e
 SHA512:
-  metadata.gz: c70c6e2a7dbecf7e66aed4fecd9bb63b45c755305da03a23f8a78dc8c4095adbb121cbef74caa85a10d6e6026d989ea0037cbf993e4d1f755451345f36b542e6
-  data.tar.gz: 2b7f8c257b4456c87d0ee3f02a50eac9c3bef48c6702870640eac4f3a21baba6a3d64696df152fad54d321b1df38a2857fc3e3af612c03f9c7bc459c2fde805a
+  metadata.gz: 8e48ac117ce8fba65784726791673c24d34989f347f4b17a4aaf0922c7c18ce5bccc1056ec4381b845929339fd1246ad99f640fd98417987df32e60fa28fed34
+  data.tar.gz: 2b625506c37558dad6409404d5b5201b31713444d4b20dabc1c7e1c5031101100897071b4309205527f16ed49918918637027ba528cff4562c047fe84ca7a90e

data/bin/habridge/SCLI_HTTP.rb

@@ -58,7 +58,7 @@ def connThread(rti)
       break
     end
     #puts data.inspect
-    if /(readstate|writestate|servicerequestcommand|servicerequest|userzones|statenames|settrigger)/.match(data)
+    if /(readstate|writestate|servicerequestcommand|servicerequest|userzones|statenames|settrigger|getSceneNames|activateScene)/.match(data)
       #puts $1.inspect
       if $1 == "servicerequestcommand" && $savConn == true
         r = writeToRequest(data)

data/bin/habridge/com.habridgescenesync.plist

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+  <key>Label</key>
+  <string>com.habridgescenesync</string>
+  <key>ProgramArguments</key>
+  <array>
+    <string>ruby</string>
+    <string>/Users/RPM/habridge/habridgescenesync.rb</string>
+  </array>
+  <key>RunAtLoad</key>
+  <true/> 
+  <key>KeepAlive</key>
+  <true/> 
+  <key>WorkingDirectory</key>
+  <string>/Users/RPM/habridge/</string>
+</dict>
+</plist>

data/bin/habridge/habridgescenesync.rb

@@ -0,0 +1,198 @@
+require 'net/http'
+require 'json'
+require 'ostruct'
+
+#-----------------NOTES-----------------------
+# This script can be installed as a launchagent on a Savant Pro Host running the habridge for Alexa interation.
+# It scans for new scenes on the host every 5 seconds and automaticalyl adds them to the harbdige
+# or removes them from the habridge if they are no longer a scene.
+# Devices would still need to be deleted from the Alexa app.
+
+#-------------INITIALIZATION------------------
+$read = "readstate "
+$write = "writestate "
+$request = "servicerequest "
+
+@savantURL = "127.0.0.1"
+@haURLstr = "http://127.0.0.1:8888/api/devices"
+@savantURLstr = "http://127.0.0.1:12000"
+
+deviceNameArray = []
+deviceIDArray = []
+deviceOnUrlArray = []
+sceneNameArray = []
+sceneIDArray = []
+sceneUserArray = []
+
+if RUBY_PLATFORM.include? "linux"
+	$bridge = "/usr/local/bin/sclibridge "
+else
+	$bridge = "~/Applications/RacePointMedia/sclibridge "
+end
+
+#----------------SCRIPT-----------------------
+
+def EscapeString(s)
+ s.gsub!(' ','\ ')
+ return s
+end
+
+def readState(strState)
+	strState = EscapeString(strState)
+	s = $bridge + $read + strState
+	s = `#{s}`
+	return s
+end
+ 
+def writeState(strState,strVal)
+	strState = EscapeString(strState)
+	strVal = EscapeString(strVal)
+	s = $bridge + $write + strState + " " + strVal
+	`#{s}`
+end
+
+def serviceRequest(strZone, strcomponent, strlogical, strvariant, strtype, strCommand)
+	strZone = " " + EscapeString(strZone)
+	strcomponent = " " + EscapeString(strcomponent)
+	strCommand = " " + EscapeString(strCommand)
+	strlogical = " " + strlogical
+	strvariant = " " + strvariant
+	strtype = " " + strtype
+	s = $bridge + $request + strZone + strcomponent + strlogical + strvariant + strtype + strCommand
+	puts "Service request sent = " + s
+	`#{s}`
+end
+
+def queryScenes()
+	s = $bridge + "getSceneNames"
+	`#{s}`
+end
+
+def activateScene(sceneName, sceneID, sceneUser)
+	s = $bridge + "activateScene \"" + sceneName.to_s + "\" \"" + sceneID.to_s + "\" \"" + sceneUser.to_s + "\""
+	puts "Scene activated = " + sceneName.to_s
+	`#{s}`
+end
+
+loop do
+	#------Query current devices on habridge
+	uri = URI(@haURLstr)
+	response = Net::HTTP.get(uri)
+	habridgeArray = JSON.parse(response, object_class: OpenStruct)
+
+	#------build arrays of habridge devices
+	habridgeArray.each { |device| deviceNameArray.push(device.name)}
+	habridgeArray.each { |device| deviceIDArray.push(device.id)}
+	habridgeArray.each { |device|
+		if device.to_s.include? "onUrl"
+			deviceOnUrlArray.push(device.onUrl)
+		else
+			deviceOnUrlArray.push("none")
+		end
+	}
+	
+	#------convert names to all lowercase for duplicates and missing comparisons
+	deviceNameArray.map! {|str| str.downcase.chomp}
+
+	#print device names on habridge
+	puts "Devices on HA Bridge = "
+	puts deviceNameArray
+	
+	#------Query savant scenes from host
+	scenesString = queryScenes()
+	sceneArray = scenesString.split(/\n|,/)
+
+	#------Separate out the elements of the scene into their own arrays
+	until sceneArray.empty?
+		sceneNameArray << sceneArray.shift
+		sceneIDArray << sceneArray.shift
+		sceneUserArray << sceneArray.shift
+	end
+	
+	#------Print scene names
+	puts "\nScenes on host = "
+	puts sceneNameArray
+	
+	#------Compare habridge device list to Savant scene list
+	sceneNameArrayLowercase = sceneNameArray.map {|str| str.downcase.chomp}
+	duplicateScenes = deviceNameArray & sceneNameArrayLowercase
+	missingScenes = deviceNameArray - sceneNameArrayLowercase
+
+	#------Print duplicates
+	puts "\nDuplicates = "
+	puts duplicateScenes
+	
+	#------Print bridge devices that are not scenes on Savant
+	puts "\nMissing = "
+	puts missingScenes
+
+	#------Loop through each habridge device and see if it should be deleted 
+	#------because it is a scene that is no longer on the savant host
+	until deviceNameArray.empty?
+		if missingScenes.include? deviceNameArray[0].downcase
+			puts deviceNameArray[0] + " will be scanned for scene."
+			#------Check to see if the habridge device is a savant scene
+			if deviceOnUrlArray[0].include? "activateScene"
+				puts "\n" + deviceNameArray[0] + " is marked for deletion!\n"
+				#------Delete the device from habridge if it is no longer a savant scene
+				uri = "http://127.0.0.1:8888/api/devices/" 
+				uri += deviceIDArray[0].chomp				
+				uri = URI(uri)
+				begin
+					http = Net::HTTP.new(uri.host, uri.port)
+					request = Net::HTTP::Delete.new(uri.request_uri)
+					response = http.request(request)
+					puts response.code
+					puts response
+					if response.code == "201" || "200"
+						puts 'Command deleted from HA Bridge.'
+					elsif response.code.include?("4" || "5")
+						puts 'Command failed to be deleted from HA Bridge.'
+					end
+				rescue Timeout::Error, SocketError, Errno::EHOSTUNREACH, Errno::ECONNREFUSED
+					puts "Unable to reach host."
+				end
+			end
+		else
+			puts deviceNameArray[0] + " will NOT be scanned for scene."
+		end
+		deviceNameArray.delete_at(0)
+		deviceIDArray.delete_at(0)
+		deviceOnUrlArray.delete_at(0)	
+	end
+
+	#------Loop through each Savant scene and add to habridge if not already there
+	until sceneNameArray.empty?
+		@haScene = %q{\{'name' : '} + sceneNameArray[0] + %q{','deviceType' : 'custom','onUrl' : '} + @savantURLstr + %q{/activateScene%20\'} + sceneNameArray[0].gsub(" ", "%20") + %q{\'%20\'} + sceneIDArray[0] + %q{\'%20\'} + sceneUserArray[0] + %q{\''\}}
+		if !(duplicateScenes.include? sceneNameArray[0].downcase)
+			uri = URI.parse(@haURLstr)
+			begin
+				http = Net::HTTP.start(uri.host, uri.port, {open_timeout: 3, read_timeout: 3})
+				begin
+					request = Net::HTTP::Post.new(
+						uri.request_uri,
+						'Content-Type' => 'application/json'
+					)
+					request.body = @haScene
+					response = http.request(request)
+					puts response.code
+					if response.code == "201" || "200"
+						puts "Scene added = " + sceneNameArray[0] + ' ' + sceneIDArray[0] + ' ' + sceneUserArray[0]
+					elsif response.code.include?("4" || "5")
+						puts 'Failed to add to HA Bridge.'
+					end
+				rescue Timeout::Error, SocketError, Errno::EHOSTUNREACH, Errno::ECONNREFUSED
+					puts "Unable to reach host."
+				end
+			rescue Timeout::Error, SocketError, Errno::EHOSTUNREACH, Errno::ECONNREFUSED
+					puts "Unable to reach host."
+			end
+		else
+			puts "Scene already exists = " + sceneNameArray[0]
+		end
+		sceneNameArray.delete_at(0)
+		sceneIDArray.delete_at(0)
+		sceneUserArray.delete_at(0)
+	end
+	sleep 5
+end

data/bin/src/Savant.rb

@@ -1,3 +1,10 @@
+#to do
+#habridge updater?
+#check for sclibridge version and popup updater on scene entry
+#sort scenes and devices
+#browse commands?
+#delete scenes?
+
 require 'rubygems'
 require 'net/http'
 require 'net/scp'
@@ -5,44 +12,140 @@ require 'uri'
 require 'socket'
 require 'timeout'
 require 'ipaddress'
-class Savant 
+require 'json'
+require 'ostruct'
+
+class Savant #< VR::ListView
+  
+  	attr_accessor :ftv
+
   	include GladeGUI
 
+	def initialize
+		@listviewSavantScenes = VR::ListView.new(:add => TrueClass, :scene => String, :id => String, :user => String)
+		@listviewhabridgeDevices = VR::ListView.new(:device => String)
+	end
+
 	#####Method to check to see if HA Bridge is running on host#####
-	def up?(server, port)
-		http = Net::HTTP.start(server, port, {open_timeout: 1, read_timeout: 1})
-		response = http.head("/")
-		if response.code == "200"
-			@builder["buttonHabridgeStatus"].label = "HA Bridge is Online\nClick to open in browser."
-			@habridgeStatus = "Online"
+	def up?(ip, port)
+		if IPAddress.valid? ip
+			begin
+				http = Net::HTTP.start(ip, port, {open_timeout: 1, read_timeout: 1})
+				response = http.head("/")
+				if response.code == "200"
+					@builder["buttonHabridgeStatus"].label = "HA Bridge is Online\nClick to open in browser."
+					@builder["buttonBackupRestore"].show
+					if savantVersion?(@savantURL)
+						@builder["buttonSceneSync"].label = "Savant Scene Sync"
+					@builder["buttonSceneSync"].show
+					
+					end
+					@habridgeStatus = "Online"
+				end
+			rescue StandardError
+				false
+				@builder["buttonHabridgeStatus"].label = "HA Bridge is Offline\nClick for help."
+				@builder["buttonSceneSync"].hide
+				@builder["buttonBackupRestore"].hide
+				@habridgeStatus = "Offline"
+			end
 		end
-	rescue Timeout::Error, SocketError, Errno::EHOSTUNREACH, Errno::ECONNREFUSED
-		false
-		@builder["buttonHabridgeStatus"].label = "HA Bridge is Offline\nClick for help."
-			@habridgeStatus = "Offline"
 	end
 	
-	#####Method to check to see if Racepoint and SCLI bridge ports are open on host#####
+	#####Check to see if Racepoint and SCLI bridge ports are open on host#####
 	def is_port_open?(ip, port)
-  		begin
-			Timeout::timeout(1) do
-				begin
-					s = TCPSocket.new(ip, port)
-					s.close
-					return true
-				rescue Errno::ECONNREFUSED, Errno::EHOSTUNREACH
-					return false
+		if IPAddress.valid? ip
+			begin
+				Timeout::timeout(1) do
+					begin
+						s = TCPSocket.new(ip, port)
+						s.close
+						return true
+					rescue StandardError
+						return false
+					end
 				end
+			rescue Timeout::Error
 			end
-		rescue Timeout::Error
 		end
+	end
+	
+	#####Checks to see if Savant version is greater than 8.3 to support scene features.
+	def savantVersion?(ip)
+		login = 'RPM'
+		@password = 'RPM'
+		begin
+			Net::SSH.start(ip, login, :password => @password, :paranoid => false, :timeout => 3) do |ssh|
+				#Check host type and update sclibridge location for reference, though only Pro Host is supported
+				ssh.open_channel do |ch, success|
+					ch.exec("uname")
+					ch.on_data do |ch, data|
+						if data.to_s.include? 'Darwin'
+							@scliBridge = "~/Applications/RacePointMedia/sclibridge "
+						else
+							@scliBridge = "/usr/local/bin/sclibridge "
+						end
+					end
+				end
+				ssh.loop
+				#parse the rpmSystemInfo.plist form the pro host to get host name
+				if @scliBridge == "~/Applications/RacePointMedia/sclibridge "
+					ssh.open_channel do |ch, success|
+						
+						ch.exec("plutil -p 'library/application support/racepointmedia/userconfig.rpmconfig/rpmSystemInfo.plist'")
+						ch.on_data do |ch, data|
+							if data.to_s.include? 'module'
+								x = data.split("\"RPMSystemName\" => ")
+								x = x[1].split("\n")
+								@str = @scliBridge + "readstate \"" + x[0][1..-2] + ".SoftwareVersion\""
+							end
+						end
+					end
+					ssh.loop
+				#parse the rpmSystemInfo.plist from the smart host to get host name
+				elsif @scliBridge == "/usr/local/bin/sclibridge "
+					ssh.open_channel do |ch, success|
+						ch.exec("strings 'GNUstep/Library/ApplicationSupport/RacePointMedia/userConfig.rpmConfig/rpmSystemInfo.plist'")
+						ch.on_data do |ch, data|
+							if data.to_s.include? 'DOCTYPE'
+								x = data.split("RPMUserDefinedName</key><string>")
+								y = x[1].split("</string>")
+								x = x[1].split("VERSION</key><integer>")
+								x = x[1].split("</integer>")
+							elsif data.to_s.include? 'module'
+								x = data.split('module')
+								x = x[1].split("\n")
+								@str = @scliBridge + "readstate \"" + x[0][1..-1] + ".SoftwareVersion\""
+							end
+						end
+					end
+					ssh.loop
+				end
+				#Use host name to query SoftwareVersion state from host
+				ssh.open_channel do |ch, success|
+					ch.exec(@str)
+					ch.on_data do |ch, data|
+						@version = data
+					end
+				end
+				ssh.loop
+			end
+			#return true if version is 8.3 or later
+			if @version.to_r > 8.2 && !@version.empty?
+				return true
+			else
+				return false
+			end
+		rescue Net::SSH::ConnectionTimeout, SocketError, Errno::EHOSTUNREACH, Errno::ECONNREFUSED, Errno::EHOSTDOWN
 		
-	  	return false
+		end
 	end
 
 	#####Set variables before windows load#####
 	def before_show()
+
 		@savantURL = "192.168.77.40"
+		
 		@haName = ""
 		@habridgeStatus = "Offline"
 		@installStatus = ""
@@ -85,18 +188,102 @@ class Savant
 		@requestDimValue8 = "percent"
 		@requestDimValue9 = "percent"
 		
-		up?(@savantURL,"8888")		
+		up?(@savantURL,"8888")
+		
+  		@ftv = VR::FileTreeView.new(Dir.home, File.join(File.dirname(__FILE__), "/../img"), glob = "*", validate_block = nil)
+		@builder["scrolledwindow_BackupRestore"].add(@ftv)
+		@ftv.set_show_expanders(true)
+
 	end  
 	
-	#####Check HA bridge server status for feedback when textbox is edited#####
-	def savantURL__focus_out_event(*argv)
+
+	
+	#FileTreeView expand and collapse for file backup and restore
+  	def ftv__row_activated(_self, path, col)
+     	@ftv.expand_or_collapse_folder() 
+  	end
+  	
+  	#Restore files from local filesystem to remote host
+  	def buttonRestore__clicked(*a)
+    	return unless row = @ftv.selected_rows.first
+    	login = 'RPM'
+		@password = 'RPM'
+		backupDir = row[:path]
+		#Get folder name if a file is selected.
+		if File.file?(backupDir)
+			backupDir = File.dirname(backupDir)
+		end
+		#Check that folder contains correct files
+		if File.file?(backupDir + "/device.db") && File.file?(backupDir + "/habridge.config")
+			begin
+				Net::SSH.start(@savantURL, login, :password => @password, :paranoid => false, :timeout => 3) do |ssh|
+					# test to see if remote folder exists, if so, transfer files and restart harbridge
+					dirExists = ssh.exec!("[ -d ~/habridge/data ] && echo 'true' || echo 'false'")
+					if dirExists == 'true'
+						ssh.scp.upload!(backupDir + "/device.db", '/Users/RPM/habridge/data/')
+						ssh.scp.upload!(backupDir + "/habridge.config",'/Users/RPM/habridge/data/')
+						ssh.exec!("launchctl unload /Users/RPM/Library/LaunchAgents/com.habridge.plist")
+						ssh.exec!("launchctl load /Users/RPM/Library/LaunchAgents/com.habridge.plist")
+						alert "Files have been restored from " + row[:path] + " and habridge has been re-initialized."
+					else
+						alert "Users/RPM/habridge/data folder not found on remote host."
+					end
+				end
+			end
+		else
+			alert "Selected directory does not contain device.db and habridge.config."
+    	end
+  	end
+
+  	#Backup files from remote host to local filesystem
+  	def buttonBackup__clicked(*a)
+    	return unless row = @ftv.selected_rows.first
+    	login = 'RPM'
+		@password = 'RPM'
+		backupDir = row[:path]
+		#Get folder name if a file is selected.
+		if File.file?(backupDir)
+			backupDir = File.dirname(backupDir)
+		end
+		begin
+			Net::SSH.start(@savantURL, login, :password => @password, :paranoid => false, :timeout => 3) do |ssh|
+				# test to see if remote files exist and transfer them if they do
+				fileExists = ssh.exec!("[ -f ~/habridge/data/device.db ] && echo 'true' || echo 'false'")
+				if fileExists == 'true'
+					ssh.scp.download!('/Users/RPM/habridge/data/device.db', backupDir)
+				else
+					alert "Users/RPM/habridge/data/device.db not found on remote host."
+				end
+				fileExists = ssh.exec!("[ -f ~/habridge/data/habridge.config ] && echo 'true' || echo 'false'")
+				if fileExists == 'true'
+					ssh.scp.download!('/Users/RPM/habridge/data/habridge.config', backupDir)
+				else
+					alert "Users/RPM/habridge/data/habridge.config not found on remote host."
+				end
+			end
+		end
+    	alert "Files backed up to " + row[:path]
+  	end
+
+  	def buttonBackupRestore__clicked(*argv)
+		@builder["windowBackupRestore"].show
+	end
+
+  	def buttonBackupRestoreCancel__clicked(*argv)
+		@builder["windowBackupRestore"].hide
+	end
+	
+	#Test to see if habridge is running when IP address is changed
+	def savantURL__changed(*argv)
 		@savantURL = @builder["savantURL"].text 
 		up?(@savantURL,"8888")
 	end
-		
-	def savantHelpURL__focus_out_event(*argv)
+
+	#Test to see if habridge is running when IP address is changed
+	def savantHelpURL__changed(*argv)
 		@savantURL = @builder["savantHelpURL"].text 
 		up?(@savantURL,"8888")
+		 
 	end	
 	
 	#####Launch HA Bridge if online or help window if offline#####
@@ -132,7 +319,7 @@ class Savant
 			if is_port_open?(@savantURL,"12000")
 				system("open http://" + @savantURL + ":12000/userzones")
 			else
-				alert "SCLI_HTTP bridge is not online at specified IP address.\nPlease change IP address or install SCLI_HTTP bridge and set to port 12000."
+				alert "SCLI_HTTP bridge is not online at specified IP address.\nPlease change IP address or install SCLI_HTTP bridge and set to port 120000."
 			end
 		else
 			alert "Invalid IP Address."
@@ -296,7 +483,7 @@ class Savant
 	##### Repeat install process in reverse for uninstall. BUG: Java uninstall can be flaky and might fail. #####
 	def buttonHelpUninstall__clicked(*argv)
 		if IPAddress.valid? @savantURL
-			if is_port_open?(@savantURL,"11263")
+			if is_port_open?(@savantURL,"11263") || is_port_open?(@savantURL,"48664")
 				@builder["dialogInstall"].show
 				login = 'RPM'
 				@password = 'RPM'
@@ -406,6 +593,216 @@ class Savant
 	##### Close window #####	
 	def buttonHelpCancel__clicked(*argv)
 		@builder["dialogHelp"].hide
+		@builder["savantURL"].text = @builder["savantHelpURL"].text
+	end
+	
+	
+	##### Refresh scenesync listview window #####
+	def refresh()			
+		#find scenes
+		habridgeArray = []
+		@deviceNameArray = []
+		@deviceIDArray = []
+		@deviceOnUrlArray = []
+		@sceneNameArray = []
+		@sceneIDArray = []
+		@sceneUserArray = []
+		@scenesURLstr = "http://" + @savantURL + ":12000/getSceneNames"
+	
+		#Query current devices on habridge
+		uri = URI(@haURLstr)
+		response = Net::HTTP.get(uri)
+		habridgeArray = JSON.parse(response, object_class: OpenStruct)
+
+		#build array of habridge device names
+		unless habridgeArray.to_s.empty?
+			habridgeArray.each { |device| @deviceNameArray.push(device.name)}
+			@deviceNameArray.each do |device|
+				row = @listviewhabridgeDevices.add_row
+				row[:device] = device
+			end
+			#convert names to all lowercase for duplicates comparison
+			@deviceNameArray.map! {|str| str.downcase.chomp}
+		end 
+		
+		#------Query savant scenes from host
+		uri = URI(@scenesURLstr)
+		begin
+			http = Net::HTTP.start(uri.host, uri.port, {open_timeout: 1, read_timeout: 1})
+			request = Net::HTTP::Get.new(uri.request_uri)
+			response = http.request(request)
+			if response.code == "201" || response.code == "200"
+				unless response.body.to_s.empty?
+					scenesString = response.body
+				end
+			elsif response.code.include?("4" || "5")
+				scenesString = ""
+			end
+		rescue Timeout::Error, SocketError, Errno::EHOSTUNREACH, Errno::ECONNREFUSED
+			alert "Unable to get scene information from host. If you had echo 
+integration installed on this host previous to Savant version 8.3, 
+you need to update the SCLI bridge on the next screen."
+			scenesString = ""
+		end
+			unless scenesString.to_s.empty?
+			@sceneArray = scenesString.split(/\n|,/)
+			until @sceneArray.empty?
+				@sceneNameArray << @sceneArray.shift
+				@sceneIDArray << @sceneArray.shift
+				@sceneUserArray << @sceneArray.shift
+			end
+		
+			#add scene names to UI
+			count = 0
+			@sceneNameArray.each do |scene|
+				row = @listviewSavantScenes.add_row
+				row[:scene] = scene
+				row[:id] = @sceneIDArray[count]
+				row[:user] = @sceneUserArray[count]
+				row[:add] = false
+				count += 1
+			end
+		end
+		@listviewhabridgeDevices.col_sortable(true)
+		@listviewSavantScenes.col_sortable(true)
+		@listviewhabridgeDevices.col_sort_column_id(:device => @listviewhabridgeDevices.id(:device))
+		@listviewSavantScenes.col_sort_column_id(:scene => @listviewSavantScenes.id(:scene), :user => @listviewSavantScenes.id(:user))
+	end
+
+	##### Add selected scenes to habridge #####
+  	def buttonAddScenes__clicked(*argv)
+  		#See which scenes were checked to be added
+  		get_glade_variables()
+		@sceneNameArray = []
+		@sceneNameArray = []
+		@sceneNameArray = []
+		count = 0
+  		@listviewSavantScenes.each_row { |row|
+  			if row[:add]
+  				@sceneArray << row[:scene]
+  				@sceneArray << row[:id]
+  				@sceneArray  << row[:user] 	
+  				count += 1	
+  			end		
+  		}
+  		#Put scenes into habridge
+		unless count == 0
+			until @sceneArray.empty?
+				@sceneNameArray << @sceneArray.shift
+				@sceneIDArray << @sceneArray.shift
+				@sceneUserArray << @sceneArray.shift
+			end
+			sceneNameArrayLowercase = @sceneNameArray.map {|str| str.downcase.chomp}
+			@duplicateScenes = @deviceNameArray & sceneNameArrayLowercase
+		
+			addScenes()
+		else
+			alert "No scenes selected."
+		end
+  		
+	end
+	
+	def buttonCancelScenes__clicked(*argv)
+		@listviewSavantScenes.model.clear
+		@builder["dialogScenes"].hide
+		@listviewSavantScenes.model.clear
+	end
+	
+	##### Add scenes to habridge #####
+	def addScenes()
+		message = ""
+		until @sceneNameArray.empty?
+			#Skip scenes that are already on the habridge
+			if !(@duplicateScenes.include? @sceneNameArray[0].downcase)
+				#build json string
+				@haScene = %q{\{'name' : '} + @sceneNameArray[0] + %q{','deviceType' : 'custom','onUrl' : '} + @savantURLstr + %q{/activateScene%20\'} + @sceneNameArray[0].gsub(" ", "%20") + %q{\'%20\'} + @sceneIDArray[0] + %q{\'%20\'} + @sceneUserArray[0] + %q{\''\}}
+				#post device to habridge
+				uri = URI.parse(@haURLstr)
+				begin
+					http = Net::HTTP.start(uri.host, uri.port, {open_timeout: 3, read_timeout: 3})
+					begin
+						request = Net::HTTP::Post.new(
+							uri.request_uri,
+							'Content-Type' => 'application/json'
+						)
+						request.body = @haScene
+						response = http.request(request)
+						if response.code == "201" || response.code == "200"
+							message += "\nScene added = " + @sceneNameArray[0]
+						elsif response.code.include?("4" || "5")
+							message += "\nFailed to add scene = " + @sceneNameArray[0]
+						end
+					rescue Timeout::Error, SocketError, Errno::EHOSTUNREACH, Errno::ECONNREFUSED
+						message "Unable to reach host."
+					end
+				rescue Timeout::Error, SocketError, Errno::EHOSTUNREACH, Errno::ECONNREFUSED
+						message "Unable to reach host."
+				end
+			else
+				message += "\nScene already exists = " + @sceneNameArray[0]
+			end
+			@sceneNameArray.delete_at(0)
+			@sceneIDArray.delete_at(0)
+			@sceneUserArray.delete_at(0)
+			
+		end
+		alert message + "\n\nPlease tell Alexa to find devices."
+	end
+	
+	##### Update SCLI bridge to add scene support in case SCLI bridge was added before 8.3 #####
+	def buttonUpdateSCLI__clicked(*argv)
+		login = 'RPM'
+		@password = 'RPM'
+		Net::SSH.start(@savantURL, login, :password => @password, :paranoid => false) do |ssh|
+			path = File.expand_path("..",__dir__)
+			ssh.exec!("launchctl unload /Users/RPM/Library/LaunchAgents/com.SCLI_HTTP.plist")
+			ssh.scp.upload!(path + "/habridge/SCLI_HTTP.rb", '/Users/RPM/habridge')
+			ssh.exec!("launchctl load /Users/RPM/Library/LaunchAgents/com.SCLI_HTTP.plist")
+		end
+		alert "SCLI Bridge Updated."
+		refresh()
+	end
+	
+	##### Install scenesync script on host and start service to auto update scenes to habridge
+	def buttonInstallSceneSync__clicked(*argv)
+		login = 'RPM'
+		@password = 'RPM'
+		Net::SSH.start(@savantURL, login, :password => @password, :paranoid => false) do |ssh|
+			path = File.expand_path("..",__dir__)
+			ssh.exec!("launchctl unload /Users/RPM/Library/LaunchAgents/com.SCLI_HTTP.plist")
+ssh.exec!("launchctl unload /Users/RPM/Library/LaunchAgents/com.habridgescenesync.plist")
+			ssh.scp.upload!(path + "/habridge/com.habridgescenesync.plist", '/Users/RPM/habridge')
+			ssh.scp.upload!(path + "/habridge/habridgescenesync.rb", '/Users/RPM/habridge')
+			ssh.scp.upload!(path + "/habridge/SCLI_HTTP.rb", '/Users/RPM/habridge')
+			ssh.exec!("mv /Users/RPM/habridge/com.habridgescenesync.plist /Users/RPM/Library/LaunchAgents/")
+			ssh.exec!("launchctl load /Users/RPM/Library/LaunchAgents/com.habridgescenesync.plist")
+			ssh.exec!("launchctl load /Users/RPM/Library/LaunchAgents/com.SCLI_HTTP.plist")
+		end
+		alert "HA Bridge Scene Sync installed."
+	end
+	
+	##### Uninstall scene sync service on host and delete script
+	def buttonUninstallSceneSync__clicked(*argv)
+		login = 'RPM'
+		@password = 'RPM'
+		Net::SSH.start(@savantURL, login, :password => @password, :paranoid => false) do |ssh|
+			ssh.exec!("launchctl unload /Users/RPM/Library/LaunchAgents/com.habridgescenesync.plist")
+			ssh.exec!("rm -f ~/Library/LaunchAgents/com.habridgescenesync.plist")
+			ssh.exec!("rm –f ~/habridge/habridgescenesync.rb")
+		end
+		alert "HA Bridge Scene Sync uninstalled."
+	end
+	
+	
+	def buttonSceneSync__clicked(*argv)
+		if @habridgeStatus == "Offline"
+			@builder["dialogHelp"].show
+		elsif @habridgeStatus == "Online"
+			@haURLstr = "http://" + @savantURL + ":8888/api/devices"
+			@savantURLstr = "http://" + @savantURL + ":12000"
+			refresh()
+			@builder["dialogScenes"].show_all
+		end
 	end
 	
 	##### Launch HABridge and SCLIbridge in browser and close installation status window #####
@@ -475,6 +872,7 @@ class Savant
 			
 	end
 	
+	
 	#####  								   #####
 	##### 			IP FIltering		   #####
 	##### 		(not yet implemented)	   #####

data/bin/src/glade/Savant.glade

@@ -111,11 +111,36 @@
                 <property name="hexpand">True</property>
                 <property name="left_padding">12</property>
                 <child>
-                  <object class="GtkEntry" id="haName">
+                  <object class="GtkGrid">
                     <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="halign">start</property>
-                    <property name="width_chars">50</property>
+                    <property name="can_focus">False</property>
+                    <child>
+                      <object class="GtkEntry" id="haName">
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="halign">start</property>
+                        <property name="width_chars">50</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="buttonSceneSync">
+                        <property name="label" translatable="yes">button</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="halign">end</property>
+                        <property name="hexpand">True</property>
+                        <property name="image_position">right</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                      </packing>
+                    </child>
                   </object>
                 </child>
               </object>
@@ -326,37 +351,74 @@
           </packing>
         </child>
         <child>
-          <object class="GtkButtonBox">
+          <object class="GtkGrid">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="margin_top">12</property>
-            <property name="margin_bottom">12</property>
-            <property name="spacing">7</property>
-            <property name="layout_style">end</property>
+            <property name="margin_left">12</property>
+            <property name="margin_right">12</property>
+            <property name="column_homogeneous">True</property>
             <child>
-              <object class="GtkButton" id="buttonAdd">
-                <property name="label" translatable="yes">Add</property>
+              <object class="GtkButtonBox">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_top">12</property>
+                <property name="margin_bottom">12</property>
+                <property name="spacing">7</property>
+                <property name="layout_style">end</property>
+                <child>
+                  <object class="GtkButton" id="buttonAdd">
+                    <property name="label" translatable="yes">Add</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="buttonExit">
+                    <property name="label" translatable="yes">Exit</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkButton" id="buttonExit">
-                <property name="label" translatable="yes">Exit</property>
+              <object class="GtkButtonBox">
                 <property name="visible">True</property>
-                <property name="can_focus">True</property>
-                <property name="receives_default">True</property>
+                <property name="can_focus">False</property>
+                <property name="layout_style">start</property>
+                <child>
+                  <object class="GtkButton" id="buttonBackupRestore">
+                    <property name="label" translatable="yes">Backup/Restore</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
               </object>
               <packing>
-                <property name="expand">True</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
           </object>
@@ -1819,4 +1881,368 @@ Enter "percent" to derive 0-100 value from voice command.</property>
       </object>
     </child>
   </object>
+  <object class="GtkDialog" id="dialogScenes">
+    <property name="width_request">800</property>
+    <property name="can_focus">False</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="default_width">320</property>
+    <property name="default_height">260</property>
+    <property name="destroy_with_parent">True</property>
+    <property name="type_hint">dialog</property>
+    <property name="urgency_hint">True</property>
+    <property name="transient_for">window1</property>
+    <child internal-child="vbox">
+      <object class="GtkBox">
+        <property name="can_focus">False</property>
+        <property name="margin_top">12</property>
+        <property name="margin_bottom">12</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="buttonCancelScenes">
+                <property name="label" translatable="yes">Done</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="margin_right">12</property>
+                <property name="margin_top">6</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkGrid">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <child>
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_bottom">5</property>
+                <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;Savant Scenes&lt;/b&gt;&lt;/big&gt;
+
+Check the box next to a scene and select "add" to create an Alexa device with name of the scene. 
+
+The following scenes have been found on this host:</property>
+                <property name="use_markup">True</property>
+                <property name="justify">center</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow" id="listviewSavantScenes">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="margin_left">12</property>
+                <property name="margin_right">12</property>
+                <property name="margin_bottom">12</property>
+                <property name="hexpand">True</property>
+                <property name="shadow_type">in</property>
+                <property name="min_content_height">200</property>
+                <property name="max_content_height">400</property>
+                <property name="propagate_natural_height">True</property>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkScrolledWindow" id="listviewhabridgeDevices">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="margin_left">12</property>
+                <property name="margin_right">12</property>
+                <property name="margin_top">12</property>
+                <property name="margin_bottom">12</property>
+                <property name="hexpand">True</property>
+                <property name="shadow_type">in</property>
+                <property name="min_content_height">200</property>
+                <property name="max_content_height">400</property>
+                <property name="propagate_natural_height">True</property>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">4</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;Automatic Scenes Sync&lt;/b&gt;&lt;/big&gt;
+
+Scene sync is a background service that runs on the pro host to automatically sync Savant user scenes to the ha bridge. 
+When a scene is created in Savant, it will be added to the habridge.
+When a scene is deleted in Savant, it will be deleted from the habridge.
+The user will simply need to ask Alexa to find devices after creating a scene.
+To call the scene, use the syntax: Alexa, Turn On (Scene Name).</property>
+                <property name="use_markup">True</property>
+                <property name="justify">center</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">5</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkGrid">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">center</property>
+                <property name="margin_top">12</property>
+                <property name="column_homogeneous">True</property>
+                <child>
+                  <object class="GtkButton" id="buttonInstallSceneSync">
+                    <property name="label" translatable="yes">Install</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="margin_right">12</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="buttonUninstallSceneSync">
+                    <property name="label" translatable="yes">Uninstall</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="margin_left">12</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">6</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;HA Bridge Devices&lt;/b&gt;&lt;/big&gt;
+
+The following devices have been found on this habridge:</property>
+                <property name="use_markup">True</property>
+                <property name="justify">center</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">3</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkGrid">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="margin_left">12</property>
+                <property name="margin_right">12</property>
+                <property name="column_homogeneous">True</property>
+                <child>
+                  <object class="GtkButton" id="buttonAddScenes">
+                    <property name="label" translatable="yes">Add Scenes</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="halign">end</property>
+                    <property name="margin_top">6</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="buttonUpdateSCLI">
+                    <property name="label" translatable="yes">Update SCLI</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="halign">start</property>
+                    <property name="margin_left">12</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+  <object class="GtkWindow" id="windowBackupRestore">
+    <property name="width_request">300</property>
+    <property name="height_request">300</property>
+    <property name="can_focus">False</property>
+    <property name="modal">True</property>
+    <property name="window_position">center-on-parent</property>
+    <property name="gravity">center</property>
+    <property name="transient_for">window1</property>
+    <property name="has_resize_grip">True</property>
+    <child>
+      <object class="GtkBox">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_top">20</property>
+            <property name="margin_bottom">20</property>
+            <property name="label" translatable="yes">&lt;big&gt;&lt;b&gt;Backup and Restore&lt;/b&gt;&lt;/big&gt;</property>
+            <property name="use_markup">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkLabel">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_left">20</property>
+            <property name="margin_right">20</property>
+            <property name="margin_bottom">12</property>
+            <property name="label" translatable="yes">	There are two files to be backed up and restored. 
+	The first is device.db that contains all the virtual devices in the habridge. 
+	The second is the habridge.config file that contains information about the habridge itself.
+
+	To backup the files, select a destination folder.
+
+	To restore the backed up files to the habridge, select the folder that contains both files. </property>
+            <property name="wrap">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkScrolledWindow" id="scrolledwindow_BackupRestore">
+            <property name="width_request">300</property>
+            <property name="height_request">300</property>
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="margin_left">20</property>
+            <property name="margin_right">20</property>
+            <property name="shadow_type">in</property>
+            <property name="min_content_width">300</property>
+            <property name="min_content_height">300</property>
+            <property name="max_content_width">300</property>
+            <property name="max_content_height">300</property>
+            <child>
+              <placeholder/>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButtonBox">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_top">20</property>
+            <property name="margin_bottom">12</property>
+            <property name="layout_style">spread</property>
+            <child>
+              <object class="GtkButton" id="buttonBackup">
+                <property name="label" translatable="yes">Backup</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="buttonRestore">
+                <property name="label" translatable="yes">Restore</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="buttonBackupRestoreCancel">
+                <property name="label" translatable="yes">Cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
 </interface>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: savant-echo
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors:
 - Corey Miller
@@ -9,7 +9,7 @@ autorequire:
 bindir:
 - bin
 cert_chain: []
-date: 2017-03-08 00:00:00.000000000 Z
+date: 2017-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -92,7 +92,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.2.0
 description: Savant Integration with Amazon Echo
-email: cmiller@premieresystems.com.com
+email: cmiller@premieresystems.com
 executables:
 - alexa
 extensions: []
@@ -102,8 +102,10 @@ files:
 - bin/habridge/SCLI_HTTP.rb
 - bin/habridge/com.SCLI_HTTP.plist
 - bin/habridge/com.habridge.plist
+- bin/habridge/com.habridgescenesync.plist
 - bin/habridge/data/habridge.config
 - bin/habridge/ha-bridge.jar
+- bin/habridge/habridgescenesync.rb
 - bin/src/Savant.rb
 - bin/src/glade/Savant.glade
 homepage: http://www.yoursite.org/