savant-scenes 0.2.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 987323baa5624ba5887e615bbd19ff6a9740814d
-  data.tar.gz: d61c474930a4a5922eb01bd844e742629a73cec6
+  metadata.gz: f9e5402055742f0f70932825792310aa90141712
+  data.tar.gz: f5fc4f1f20d3420f0e8df55b11c85ffb711f33e2
 SHA512:
-  metadata.gz: 3be051879d402a93ad320e55be83b129fa7ac1582bddfaa79d50893d5aceaa1c2e46c533b08d3dbf691e5019eccae024b3243719bf48b7a2896480226fedef79
-  data.tar.gz: 69b56038c9a6ce04920f3f48f22fc11092be50ca309e1c1152ba94f961e454fd5e51b5df628dea7e89a7d2b89dbf992dddd72b52e08165abc0aefa8e00f7c6f1
+  metadata.gz: ee0003002a456eaa16107db29af9e58a525e1336426d90f0e326df4b9d83e54e2d82926af4782c6f9e522eb2be1f79ea7e72ea3c6971e3fe849060038bca59b2
+  data.tar.gz: 28fc520229783fce34564cff5764c7ce5658b955b9924ae7a11f0699e59c279794c00bd9d03042d140b7227ef9bfe17034fb6d41c6f8fa2185e1b16c4a51785f

data/bin/src/SceneManager.rb

@@ -21,7 +21,7 @@ class SceneManager
 		@listviewSavantScenes.col_title(:modify => "", :scene => "Scene Name", :tags => "Zones Affected", :isGlobal => "Global", :isActive => "Active", :isScheduled => "Scheduled", :hasCustomImage => "Custom Image", :userSceneOrder => "User Order")
 		@listviewSavantScenes.col_xalign(:isGlobal => 0.5, :isActive => 0.5, :isScheduled => 0.5, :hasCustomImage => 0.5, :userSceneOrder => 0.5)
 		@listviewSavantScenes.col_width(:tags => 100, :image => 100)
-		@listviewSavantScenes.ren_editable(:scene => true, :user => true, :id => true)
+		@listviewSavantScenes.ren_editable(:scene => true, :user => true, :id => true, :isGlobal => String)
 		
 		row = @listviewSavantScenes.add_row
 		row[:scene] = ""
@@ -45,10 +45,10 @@ class SceneManager
 			text == "this is never going to validate"
 		}
 		
-		#Validate Actively Scheduled to only be a 0 or 1
-# 		@listviewSavantScenes.renderer(:isScheduled).validate_block = Proc.new { |text, model_sym, row, view|
-# 			text == "0" || text == "1"
-# 		}
+		#Validate isGlobal to only be a 0 or 1
+		@listviewSavantScenes.renderer(:isGlobal).validate_block = Proc.new { |text, model_sym, row, view|
+			text == "0" || text == "1"
+		}
 		
 # 		Capture user name change, save to SQL, and transfer SQL to host
 # 		@listviewSavantScenes.renderer(:user).edited_callback = Proc.new { |model_sym, row, view | 
@@ -109,6 +109,7 @@ class SceneManager
 						else
 							@scliBridge = "/usr/local/bin/sclibridge "
 							@dis = "GNUstep/Library/ApplicationSupport/RacePointMedia/statusfiles/dis/dashboard.sqlite"
+							alert "smart host"
 						end
 					end
 				end
@@ -146,6 +147,7 @@ class SceneManager
 								x = x[1].split("\n")
 								@savantHostName = x[0][1..-1]
 								@str = @scliBridge + "readstate \"" + @savantHostName + ".SoftwareVersion\""
+								alert @str
 							end
 						end
 					end
@@ -160,6 +162,8 @@ class SceneManager
 				end
 				ssh.loop
 			end
+			alert @savantHostName
+			alert @savantHostVersion
 			@builder["labelHostInfo"].text = @savantHostName + "   Version : " + @savantHostVersion
 
 			#return true if version is 8.3 or later
@@ -283,6 +287,7 @@ class SceneManager
 		editScenes = []
 		editIDs = []
 		editUsers = []
+		editGlobal = []
 		count = 0
 		@listviewSavantScenes.each_row do |row|
 			if row[:modify]
@@ -290,6 +295,7 @@ class SceneManager
 				editScenes << row[:scene]
 				editIDs << row[:id]
 				editUsers << row[:user]
+				editGlobal << row[:isGlobal]
 			end
 		end
 		#make sure a scene was selected, else alert the user
@@ -305,9 +311,10 @@ class SceneManager
 					stm.bind_param 2, id
 					stm.execute
 					stm.close
-					stm = @db.prepare( "update scenes set name=? where identifier=?" )
+					stm = @db.prepare( "update scenes set name=?, isGlobal=? where identifier=?" )
 					stm.bind_param 1, editScenes[count]
-					stm.bind_param 2, id
+					stm.bind_param 2, editGlobal[count]
+					stm.bind_param 3, id
 					stm.execute
 					stm.close
 
@@ -362,7 +369,7 @@ class SceneManager
 		end
 	end
 	
-# 	Delete the selected scenes
+# 	Duplicate the selected scenes
 # 	def buttonDuplicateScene__clicked(*argv)
 # 		get_glade_variables()
 # 		

data/bin/src/glade/SceneManager.glade

@@ -280,7 +280,7 @@
             <property name="margin_top">12</property>
             <property name="margin_bottom">12</property>
             <property name="label" translatable="yes">	Savant scene manager copies the dashboard.sqlite file from the host to a temporary folder and lists all scenes from all users on that host. 
-	You can backup and restore this database, as well as delete scenes or edit certain properties: Scene Name and user email.
+	You can backup and restore this database, as well as delete scenes or edit certain properties: Scene Name, user email, and if the scene is Global.
 
 If the host is running at least 8.3, you can also activate scenes.</property>
             <property name="justify">center</property>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: savant-scenes
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Corey Miller
@@ -9,7 +9,7 @@ autorequire:
 bindir:
 - bin
 cert_chain: []
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2017-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -132,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="