discourse-systray 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 342570ecbf8771500b6be8dd6deba05ceb429b4465746c3fa2fc822dedbff311
-  data.tar.gz: c6a5dbc3ab88a256c2d9f5a9bda9def61ce26ec46a32280e4a81c144335f1017
+  metadata.gz: 95ff2cc576c4d66442c61d9834a3acec72c3e4580dafbee456207554b16af844
+  data.tar.gz: efab7206a8bdecf9bccdbd1dc0712954291e559cba789247be93b9b157d2e5d9
 SHA512:
-  metadata.gz: 183b3a72d39b1f6525d7a2ce533829349709192f8da6ede5d53ae231441a3064e37e04eaa94050ed3e63327784184c9b004049521c7a79fc6f2db688618aec96
-  data.tar.gz: 5c803012c9fdcaeea04465e8803e66f3531cec3c3487616256e24ede3b28d4e2a0e3a3e59c583fdb9a1a1618d411de98297b43b77ed7abd2c664e2a4a2e648de
+  metadata.gz: 034dc4dbe05f8a2d7f4a4fa8a82ea0e1baae3c200eceb7650a9ef8a37c2de9e8bd950d69d001838ac62c298dc59a9f820fc07b3a1d1baaf5c6e52c844d7e609e
+  data.tar.gz: 7c2c636e716c62ebc0412d2551c7913f4ecb31a1341ae9d1ae6d5d0eefc1b364868dc162d2217d331e513132be78a6f317ee15e7e3148a214a31906b0d5bfbfa

data/lib/discourse_systray/systray.rb

@@ -5,22 +5,19 @@ require "timeout"
 require "fileutils"
 require "json"
 
-# Parse command line options
-OPTIONS = { debug: false, path: nil }
-
-OptionParser
-  .new do |opts|
-    opts.banner = "Usage: systray.rb [options]"
-    opts.on("--debug", "Enable debug mode") { OPTIONS[:debug] = true }
-    opts.on("--path PATH", "Set Discourse path") { |p| OPTIONS[:path] = p }
-  end
-  .parse!
-
 class DiscourseSystemTray
   CONFIG_DIR = File.expand_path("~/.config/discourse-systray")
   CONFIG_FILE = File.join(CONFIG_DIR, "config.json")
+  OPTIONS = { debug: false, path: nil }
 
   def self.load_or_prompt_config
+    OptionParser
+      .new do |opts|
+        opts.banner = "Usage: systray.rb [options]"
+        opts.on("--debug", "Enable debug mode") { OPTIONS[:debug] = true }
+        opts.on("--path PATH", "Set Discourse path") { |p| OPTIONS[:path] = p }
+      end
+      .parse!
     FileUtils.mkdir_p(CONFIG_DIR) unless Dir.exist?(CONFIG_DIR)
 
     if OPTIONS[:path]
@@ -73,7 +70,10 @@ class DiscourseSystemTray
   def initialize
     @discourse_path = self.class.load_or_prompt_config
     @indicator = Gtk::StatusIcon.new
-    @indicator.pixbuf = GdkPixbuf::Pixbuf.new(file: File.join(File.dirname(__FILE__), "../../assets/discourse.png"))
+    @indicator.pixbuf =
+      GdkPixbuf::Pixbuf.new(
+        file: File.join(File.dirname(__FILE__), "../../assets/discourse.png")
+      )
     @indicator.tooltip_text = "Discourse Manager"
     @running = false
     @ember_output = []
@@ -160,6 +160,17 @@ class DiscourseSystemTray
   def cleanup
     return if @processes.empty?
 
+    # First disable updates to prevent race conditions
+    @view_timeouts&.values&.each do |id|
+      begin
+        GLib::Source.remove(id)
+      rescue StandardError => e
+        puts "Error removing timeout: #{e}" if OPTIONS[:debug]
+      end
+    end
+    @view_timeouts&.clear
+
+    # Then stop processes
     @processes.each do |name, process|
       begin
         Process.kill("TERM", process[:pid])
@@ -172,21 +183,11 @@ class DiscourseSystemTray
     @processes.clear
     @ember_running = false
     @unicorn_running = false
-    update_tab_labels if @notebook
 
-    # Clean up window and timeouts on exit
-    if @status_window
-      # Clean up any existing timeouts
-      if @view_timeouts
-        @view_timeouts.values.each do |id|
-          begin
-            GLib::Source.remove(id)
-          rescue StandardError
-            nil
-          end
-        end
-        @view_timeouts.clear
-      end
+    # Finally clean up UI elements
+    update_tab_labels if @notebook && !@notebook.destroyed?
+
+    if @status_window && !@status_window.destroyed?
       @status_window.destroy
       @status_window = nil
     end
@@ -315,10 +316,22 @@ class DiscourseSystemTray
   end
 
   def update_all_views
+    return unless @status_window && !@status_window.destroyed?
     return unless @ember_view && @unicorn_view
+    return unless @ember_view.child && @unicorn_view.child
+    return if @ember_view.destroyed? || @unicorn_view.destroyed?
+    return if @ember_view.child.destroyed? || @unicorn_view.child.destroyed?
 
-    update_log_view(@ember_view.child, @ember_output)
-    update_log_view(@unicorn_view.child, @unicorn_output)
+    begin
+      if @ember_view.visible? && @ember_view.child.visible?
+        update_log_view(@ember_view.child, @ember_output)
+      end
+      if @unicorn_view.visible? && @unicorn_view.child.visible?
+        update_log_view(@unicorn_view.child, @unicorn_output)
+      end
+    rescue StandardError => e
+      puts "Error updating views: #{e}" if OPTIONS[:debug]
+    end
   end
 
   def create_log_view(buffer)
@@ -393,8 +406,9 @@ class DiscourseSystemTray
   end
 
   def update_log_view(text_view, buffer)
-    return if buffer.empty? || text_view.nil? || !text_view.visible?
-    return unless text_view.parent&.visible?
+    return if buffer.empty? || text_view.nil? || text_view.destroyed?
+    return unless text_view.visible? && text_view.parent&.visible?
+    return if text_view.buffer.nil? || text_view.buffer.destroyed?
 
     text_view.buffer.text = ""
     iter = text_view.buffer.get_iter_at(offset: 0)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: discourse-systray
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Sam Saffron