add delay to wait fpr multiple lamps #2

stroebjo · May 26, 2014 · 6d094ac · 6d094ac
1 parent 9ae1e68
commit 6d094ac
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 2 deletions.
diff --git a/workflow/lifx.rb b/workflow/lifx.rb
@@ -17,6 +17,9 @@
 
   begin
     client.discover!
+
+    sleep 1
+
   rescue LIFX::Client::DiscoveryTimeout => e
     $stderr.puts("Could not find any LIFX bulbs.")
 

diff --git a/workflow/lifx_run.rb b/workflow/lifx_run.rb
@@ -12,7 +12,28 @@
 Alfred.with_friendly_error do |alfred|
 
   client = LIFX::Client.lan
-  client.discover! { |c| c.lights.count >= 1 }
+  #client.discover! { |c| c.lights.count >= 1 }
+
+  begin
+    client.discover!
+
+    sleep 1
+
+  rescue LIFX::Client::DiscoveryTimeout => e
+    $stderr.puts("Could not find any LIFX bulbs.")
+
+    # no bulbs found
+    fb.add_item({
+      :uid      => "no-lifx",
+      :title    => "Could not find any LIFX bulbs.",
+      :subtitle => e,
+      :valid    => "no",
+    })
+
+    puts fb.to_xml(ARGV)
+
+    exit 1
+  end
 
 
   case ARGV[0]

diff --git a/workflow/lifxc.rb b/workflow/lifxc.rb
@@ -38,6 +38,7 @@ def is_valid_color(color)
 
     begin
       client.discover!
+      sleep 1
     rescue LIFX::Client::DiscoveryTimeout => e
       $stderr.puts("Could not find any LIFX bulbs.")
 

diff --git a/workflow/lifxc_run.rb b/workflow/lifxc_run.rb
@@ -12,7 +12,7 @@
 Alfred.with_friendly_error do |alfred|
 
   client = LIFX::Client.lan
-  client.discover! { |c| c.lights.count >= 1 }
+  #client.discover! { |c| c.lights.count >= 1 }
 
 
   arguments  = ARGV[0].split # if a split pattern is omitted, whitespaces are the default
@@ -23,11 +23,36 @@
 
   case bulb
   when "all"
+
+    begin
+      client.discover!
+      sleep 1
+    rescue LIFX::Client::DiscoveryTimeout => e
+      $stderr.puts("Could not find any LIFX bulbs.")
+
+      # no bulbs found
+      fb.add_item({
+        :uid      => "no-lifx",
+        :title    => "Could not find any LIFX bulbs.",
+        :subtitle => e,
+        :valid    => "no",
+      })
+
+      puts fb.to_xml(ARGV)
+
+      exit 1
+    end
+
     client.lights.each do |c|
       color = LIFX::Color.random_color
       c.set_color(color)
     end
   else
+
+    client.discover! do |c|                    # Discover lights. Blocks until a light with the label 'Office' is found
+      c.lights.with_label(bulb)
+    end
+
     if c = client.lights.with_label(bulb)
 
       if c.off?
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,6 +17,9 @@ @@
       begin
         client.discover!
+        sleep 1
       rescue LIFX::Client::DiscoveryTimeout => e
         $stderr.puts("Could not find any LIFX bulbs.")
@@ Expand Down @@