ruby-netmon-qt 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef00043ddd797d7eb54541887a7fc555b4cf364776c4816fd1c0595846b1bfa5
-  data.tar.gz: ae2776b9ba39d934ca00e2429e025b45b7dc2465a45ff63c3632051c4cadcbbc
+  metadata.gz: 1b5ae43229614572636751dc0765e94da577124b603fdfe034464b9ed7b4aac7
+  data.tar.gz: 810e536eb5b67bf68c419eae154567c006deb70ef59cdeeb403ec6eaf6c3ac9d
 SHA512:
-  metadata.gz: 97834105620607927518ef39a38e3430cd22debf3c1e56637c850ab7ee1f63e774307764bf938e45512efd607d0b6d4fbc84bb016437d252281e5d6c12f0f371
-  data.tar.gz: c43afc8ec1c5d1fac3e97a8cce5fc90f8844d11727172ccdb57a31e54442e86a90228678003d47dd3eca41b1749c000ef9a4913c1430c66ab9bf61d32a31e430
+  metadata.gz: 3b530cefa1913b5253f33dc071f220dc7c88742e6150a9f0c3664b6a4e96f8a6a9137bf6dd30cc9559beeb1ddb7ee875c19ffc271823557ef759a7b18babff99
+  data.tar.gz: d96e4ed33ca77f5eb5e163d6ca618c2963ff309d4f7829fa0b33b1029a85a934f179a53fb1775c122a9873c5f954b8300af06a58789313f42fe7270742f41a08

data/lib/netmon-qt/app/components/connstableview.rb

@@ -24,9 +24,6 @@ class ConnsTableView < RubyQt6::Bando::QWidget
     slot "_on_autorefreshbtn_toggled(bool)"
     slot "_on_autorefresh_timer_timeout()"
     slot "_on_tableview_custom_context_menu_requested(QPoint)"
-    slot "_on_endprocess_action_triggered()"
-    slot "_on_whois_action_triggered()"
-    slot "_on_copy_action_triggered()"
   end
 
   attr_reader :processfilter, :protocolfilter, :statefilter, :userfilter
@@ -59,15 +56,13 @@ class ConnsTableView < RubyQt6::Bando::QWidget
   end
 
   def initialize_actions
-    @endprocess_action = initialize_actions_act(QIcon::ThemeIcon::ApplicationExit, "End Process", :_on_endprocess_action_triggered)
-    @whois_action = initialize_actions_act(QIcon::ThemeIcon::EditFind, "", :_on_whois_action_triggered)
-    @copy_action = initialize_actions_act(QIcon::ThemeIcon::EditCopy, "", :_on_copy_action_triggered)
+    @endprocess_action = initialize_actions_act(QIcon::ThemeIcon::ApplicationExit, "End Process")
+    @whois_action = initialize_actions_act(QIcon::ThemeIcon::EditFind, "")
+    @copy_action = initialize_actions_act(QIcon::ThemeIcon::EditCopy, "")
   end
 
-  def initialize_actions_act(icon, text, slot)
-    action = QAction.new(QIcon.from_theme(icon), text, self)
-    action.triggered.connect(self, slot)
-    action
+  def initialize_actions_act(icon, text)
+    QAction.new(QIcon.from_theme(icon), text, self)
   end
 
   def initialize_toolbar
@@ -201,40 +196,36 @@ class ConnsTableView < RubyQt6::Bando::QWidget
     menu.set_attribute(Qt::WA_DeleteOnClose)
 
     pid = @lastindex.sibling_at_column(COLUMN_PROCESS_ID).data.value.to_s
-    remote_address = @lastindex.sibling_at_column(COLUMN_REMOTE_ADDRESS).data.value
-    remote_address = remote_address.contains(".") ? remote_address : "#{remote_address[0, 12]}..."
+    remote_address = @lastindex.sibling_at_column(COLUMN_REMOTE_ADDRESS).data.value.to_s
+    remote_address = remote_address.include?(".") ? remote_address : "#{remote_address[0, 12]}..."
+    text = @lastindex.data.value.to_s
 
     @endprocess_action.set_enabled(pid.to_i.nonzero?)
     @whois_action.set_text("Whois #{remote_address} - via IPinfo")
-    @copy_action.set_text("Copy \"#{@lastindex.data.value}\"")
+    @copy_action.set_text("Copy \"#{text}\"")
 
     menu.add_action(@endprocess_action)
     menu.add_separator
     menu.add_action(@whois_action)
     menu.add_action(@copy_action)
 
-    menu.exec(@tableview.viewport.map_to_global(position))
+    case menu.exec(@tableview.viewport.map_to_global(position))
+    when @endprocess_action then _on_endprocess_action_triggered(pid)
+    when @whois_action then _on_whois_action_triggered(remote_address)
+    when @copy_action then _on_copy_action_triggered(text)
+    end
   end
 
-  def _on_endprocess_action_triggered
-    return unless @lastindex.valid?
-
-    pid = @lastindex.sibling_at_column(COLUMN_PROCESS_ID).data.value
+  def _on_endprocess_action_triggered(pid)
     QProcess.execute("kill", QStringList.new << "-9" << pid)
   end
 
-  def _on_whois_action_triggered
-    return unless @lastindex.valid?
-
-    remote_address = @lastindex.sibling_at_column(COLUMN_REMOTE_ADDRESS).data.value
+  def _on_whois_action_triggered(remote_address)
     url = QUrl.new("https://ipinfo.io/#{remote_address}")
     QDesktopServices.open_url(url)
   end
 
-  def _on_copy_action_triggered
-    return unless @lastindex.valid?
-
-    text = @lastindex.data.value
+  def _on_copy_action_triggered(text)
     QApplication.clipboard.set_text(text)
   end
 end

data/lib/netmon-qt/version.rb

@@ -1,3 +1,3 @@
 module NetmonQt
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-netmon-qt
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - John Doe