ruby-pass-qt 2.0.7 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe16368263f57aeb0a5f0c094bc01d051bf5130c1b14b21f8bc461f7f2f47102
-  data.tar.gz: 9a1b4b86470606106e13230bcd143d974c3dfec5ee27960a78785b5bbb0915ca
+  metadata.gz: 0fb6805f75336a47b0d05fefce05aef65337a02726c03cae84d85587dc2ffe2c
+  data.tar.gz: dd7c0cad047c733a073bc301a8b57512da731888a62960d207015e8b1c2f0eab
 SHA512:
-  metadata.gz: c0ec8c9abb5390441a8ea5888c7c7ef30f8699506cad1bfccf6d3662a236fb336c5f8ddb40730d273573ec4027254821dae89deb94abe3da69ddaf8bbdfb1ee4
-  data.tar.gz: 8b3360194e28a221283a42b6d1d87dca2265cbfdbf3dce76dfc9c5f6b49ce929b945f4b8c184351fe0d1ad5022684e09319ccd0189966120787632a9c5a3b8e1
+  metadata.gz: b6a0044d9db31fb3cdd5c76ab9ac3c22266e371d6c2c9f18a58ed4de480740849c3cfcd4713cbd2344ac815b670a4d43c84db7e20f9ff8fb826488232c182ca4
+  data.tar.gz: '069c63341c0129c3c5b113572055d579873fe58f9e95b16e74f80d1deabf01ee7e4503f0404f58682187fb0f03d52ce9bab176826947c3678bd8f9e6e0614a88'

data/.rubocop.yml

@@ -8,3 +8,7 @@ AllCops:
   Exclude:
     - "bin/**/*"
     - "tmp/**/*"
+
+Style/GlobalVars:
+  AllowedVariables:
+    - '$qApp'

data/lib/pass-qt/app/views/browsestoresdialog/ui.rb

@@ -0,0 +1,77 @@
+class BrowseStoresDialog < RubyQt6::Bando::QDialog
+  private
+
+  def initialize_ui
+    initialize_toolbar
+    initialize_tablewidget
+    initialize_layout
+
+    set_attribute(Qt::WA_DeleteOnClose)
+    set_modal(true)
+  end
+
+  def initialize_toolbar
+    @toolbar = QWidget.new
+
+    btn = QPushButton.new(QIcon.from_theme(QIcon::ThemeIcon::ListAdd), "Add")
+    btn.clicked.connect(self, :_on_list_add_button_clicked)
+
+    qhboxlayout = QHBoxLayout.new(@toolbar)
+    qhboxlayout.add_widget(QLabel.new("Password Stores"))
+    qhboxlayout.add_stretch
+    qhboxlayout.add_widget(btn)
+  end
+
+  def initialize_tablewidget
+    @tablewidget = QWidget.new
+    @tablewidget.set_object_name("browsestoresdialog_tablewidget")
+    @tablewidget.set_style_sheet("
+      #browsestoresdialog_tablewidget {
+        min-width: 600px;
+        background: white;
+      }
+    ")
+
+    QVBoxLayout.new(@tablewidget)
+    PassQt.settings.GET_stores.each do |store|
+      update_tablewidget_addtableitem(store["fullpath"])
+    end
+  end
+
+  def initialize_layout
+    mainlayout = QVBoxLayout.new(self)
+    mainlayout.add_stretch
+    mainlayout.add_widget(@toolbar)
+    mainlayout.add_widget(@tablewidget)
+    mainlayout.add_stretch
+  end
+
+  def update_tablewidget_addtableitem(fullpath)
+    tableitem = QWidget.new
+    tableitemlayout = QHBoxLayout.new(tableitem)
+
+    label = QLabel.new(fullpath)
+    tableitemlayout.add_widget(label)
+    tableitemlayout.add_stretch
+
+    btn = QPushButton.new(QIcon.from_theme(QIcon::ThemeIcon::ListRemove), "Remove")
+    btn.clicked.connect(self, :_on_list_remove_button_clicked)
+    tableitemlayout.add_widget(btn)
+
+    @dataitems[fullpath] = DataItem.new(tableitem)
+    @tablewidget.layout.add_widget(tableitem)
+    update_settings_stores
+  end
+
+  def update_tablewidget_removetableitem(tableitem)
+    @dataitems.delete_if { |_, item| item.tablewidgetitem == tableitem }
+    tableitem.delete_now
+    update_settings_stores
+  end
+
+  def update_settings_stores
+    stores = @dataitems.map { |fullpath, _| {"fullpath" => fullpath} }
+    PassQt.settings.PUT_stores(stores)
+    stores_changed.emit
+  end
+end

data/lib/pass-qt/app/views/browsestoresdialog.rb

@@ -1,3 +1,5 @@
+require_relative "browsestoresdialog/ui"
+
 class BrowseStoresDialog < RubyQt6::Bando::QDialog
   DataItem = Struct.new(:tablewidgetitem)
 
@@ -11,77 +13,11 @@ class BrowseStoresDialog < RubyQt6::Bando::QDialog
     super
 
     @dataitems = {}
-
-    initialize_toolbar
-    initialize_tablewidget
-
-    mainlayout = QVBoxLayout.new(self)
-    mainlayout.add_stretch
-    mainlayout.add_widget(@toolbar)
-    mainlayout.add_widget(@tablewidget)
-    mainlayout.add_stretch
-
-    set_attribute(Qt::WA_DeleteOnClose)
-    set_modal(true)
+    initialize_ui
   end
 
   private
 
-  def initialize_toolbar
-    @toolbar = QWidget.new
-
-    btn = QPushButton.new(QIcon.from_theme(QIcon::ThemeIcon::ListAdd), "Add")
-    btn.clicked.connect(self, :_on_list_add_button_clicked)
-
-    qhboxlayout = QHBoxLayout.new(@toolbar)
-    qhboxlayout.add_widget(QLabel.new("Password Stores"))
-    qhboxlayout.add_stretch
-    qhboxlayout.add_widget(btn)
-  end
-
-  def initialize_tablewidget
-    @tablewidget = QWidget.new
-    @tablewidget.set_object_name("browsestoresdialog_tablewidget")
-    @tablewidget.set_style_sheet("
-      #browsestoresdialog_tablewidget {
-        min-width: 600px;
-        background: white;
-      }
-    ")
-
-    QVBoxLayout.new(@tablewidget)
-    PassQt.settings.GET_stores.each do |store|
-      update_tablewidget_addtableitem(store["fullpath"])
-    end
-  end
-
-  def update_tablewidget_addtableitem(fullpath)
-    tableitem = QWidget.new
-    tableitemlayout = QHBoxLayout.new(tableitem)
-
-    label = QLabel.new(fullpath)
-    tableitemlayout.add_widget(label)
-    tableitemlayout.add_stretch
-
-    btn = QPushButton.new(QIcon.from_theme(QIcon::ThemeIcon::ListRemove), "Remove")
-    btn.clicked.connect(self, :_on_list_remove_button_clicked)
-    tableitemlayout.add_widget(btn)
-
-    @dataitems[fullpath] = DataItem.new(tableitem)
-    @tablewidget.layout.add_widget(tableitem)
-  end
-
-  def update_tablewidget_removetableitem(tableitem)
-    @dataitems.delete_if { |_, item| item.tablewidgetitem == tableitem }
-    tableitem.delete_now
-  end
-
-  def update_settings_stores
-    stores = @dataitems.map { |fullpath, _| {"fullpath" => fullpath} }
-    PassQt.settings.PUT_stores(stores)
-    stores_changed.emit
-  end
-
   def _on_list_add_button_clicked
     dir = QFileDialog.get_existing_directory(self, "", QDir.home_path)
     return if dir.empty?
@@ -99,11 +35,9 @@ class BrowseStoresDialog < RubyQt6::Bando::QDialog
     end
 
     update_tablewidget_addtableitem(dir)
-    update_settings_stores
   end
 
   def _on_list_remove_button_clicked
     update_tablewidget_removetableitem(sender.parent)
-    update_settings_stores
   end
 end

data/lib/pass-qt/app/{components → views/mainwindow/components}/passinfowidget/helpers.rb

@@ -1,4 +1,4 @@
-class PassInfoWidget < RubyQt6::Bando::QWidget
+class MainWindowPassInfoWidget < RubyQt6::Bando::QWidget
   module Helpers
     def self.parse_passfile(data)
       lines = data["stdout"].lines

data/lib/pass-qt/app/{components/passinfowidget.rb → views/mainwindow/components/passinfowidget/ui.rb}

@@ -1,69 +1,14 @@
-require_relative "passinfowidget/helpers"
-
-class PassInfoWidget < RubyQt6::Bando::QWidget
-  q_object do
-    slot "_on_copy_action_triggered()"
-    slot "_on_copy_action_triggered_otpcode()"
-    slot "_on_view_action_triggered()"
-  end
-
-  def initialize
-    super
-
-    @store = QString.new
-    @passname = QString.new
+class MainWindowPassInfoWidget < RubyQt6::Bando::QWidget
+  private
 
+  def initialize_ui
     initialize_form
     initialize_otpform
     initialize_folderform
     initialize_infoframe
-
-    @stackedlayout = QStackedLayout.new
-    @stackedlayout.add_widget(@form)
-    @stackedlayout.add_widget(@otpform)
-    @stackedlayout.add_widget(@folderform)
-    @stackedlayout.add_widget(@infoframe)
-
-    mainlayout = QVBoxLayout.new(self)
-    mainlayout.add_spacing(76)
-    mainlayout.add_layout(@stackedlayout)
-
-    use_infoframe
-  end
-
-  def use_passfilecard(store, passname)
-    @store = store
-    @passname = passname
-    use_infoframe
-
-    Pass.show(@store, @passname, on_success: ->(data) {
-      formdata = Helpers.parse_passfile(data)
-      if formdata["password"].start_with?("otpauth:")
-        use_otpform(formdata)
-      else
-        use_form(formdata)
-      end
-    }, on_failure: ->(data) {
-      errinfo = data["stderr"]
-      use_infoframe_err(errinfo)
-    })
+    initialize_layout
   end
 
-  def use_passfoldercard(store, passname)
-    @store = store
-    @passname = passname
-    use_infoframe
-    use_folderform
-  end
-
-  def use_infocard
-    @store = QString.new
-    @passname = QString.new
-    use_infoframe
-  end
-
-  private
-
   def initialize_form
     @passnameinput = initialize_form_inputfield
     initialize_form_inputfield_copyaction(@passnameinput)
@@ -150,7 +95,19 @@ class PassInfoWidget < RubyQt6::Bando::QWidget
     infoframelayout.add_stretch
   end
 
-  def use_form(formdata)
+  def initialize_layout
+    @stackedlayout = QStackedLayout.new
+    @stackedlayout.add_widget(@form)
+    @stackedlayout.add_widget(@otpform)
+    @stackedlayout.add_widget(@folderform)
+    @stackedlayout.add_widget(@infoframe)
+
+    mainlayout = QVBoxLayout.new(self)
+    mainlayout.add_spacing(76)
+    mainlayout.add_layout(@stackedlayout)
+  end
+
+  def activate_form(formdata)
     @passnameinput.set_text(@passname)
     @passwordinput.set_text(formdata["password"])
     @passwordinput.set_echo_mode(QLineEdit::Password)
@@ -160,7 +117,7 @@ class PassInfoWidget < RubyQt6::Bando::QWidget
     @stackedlayout.set_current_widget(@form)
   end
 
-  def use_otpform(formdata)
+  def activate_otpform(formdata)
     @otppassnameinput.set_text(@passname)
     @otppasswordinput.set_text(formdata["password"])
     @otppasswordinput.set_cursor_position(0)
@@ -179,42 +136,20 @@ class PassInfoWidget < RubyQt6::Bando::QWidget
     }, on_failure: ->(_) {})
   end
 
-  def use_folderform
+  def activate_folderform
     @folderpassnameinput.set_text(@passname)
     @stackedlayout.set_current_widget(@folderform)
   end
 
-  def use_infoframe(info = "")
+  def activate_infoframe(info = "")
     @infolabel.set_style_sheet("color: black;")
     @infolabel.set_text(info)
     @stackedlayout.set_current_widget(@infoframe)
   end
 
-  def use_infoframe_err(info)
+  def activate_infoframe_err(info)
     @infolabel.set_style_sheet("color: red;")
     @infolabel.set_text(info)
     @stackedlayout.set_current_widget(@infoframe)
   end
-
-  def _on_copy_action_triggered
-    input = sender.parent
-    QApplication.clipboard.set_text(input.text)
-  end
-
-  def _on_copy_action_triggered_otpcode
-    Pass.otp(@store, @passname, on_success: ->(data) {
-      otpcode = data["stdout"].rstrip
-      @otpcodeinput.set_text(otpcode)
-      QApplication.clipboard.set_text(otpcode)
-    }, on_failure: ->(_) {})
-  end
-
-  def _on_view_action_triggered
-    input = sender.parent
-    case input.echo_mode
-    when QLineEdit::Normal then input.set_echo_mode(QLineEdit::Password)
-    when QLineEdit::Password then input.set_echo_mode(QLineEdit::Normal)
-    else raise "unreachable!"
-    end
-  end
 end

data/lib/pass-qt/app/views/mainwindow/components/passinfowidget.rb

@@ -0,0 +1,75 @@
+require_relative "passinfowidget/helpers"
+require_relative "passinfowidget/ui"
+
+class MainWindowPassInfoWidget < RubyQt6::Bando::QWidget
+  q_object do
+    slot "activate_passfilecard(QString,QString)"
+    slot "activate_passfoldercard(QString,QString)"
+    slot "activate_infocard()"
+    slot "_on_copy_action_triggered()"
+    slot "_on_copy_action_triggered_otpcode()"
+    slot "_on_view_action_triggered()"
+  end
+
+  def initialize
+    super
+
+    initialize_ui
+    activate_infocard
+  end
+
+  private
+
+  def activate_passfilecard(store, passname)
+    @store = store
+    @passname = passname
+    activate_infoframe
+
+    Pass.show(@store, @passname, on_success: ->(data) {
+      formdata = Helpers.parse_passfile(data)
+      if formdata["password"].start_with?("otpauth:")
+        activate_otpform(formdata)
+      else
+        activate_form(formdata)
+      end
+    }, on_failure: ->(data) {
+      errinfo = data["stderr"]
+      activate_infoframe_err(errinfo)
+    })
+  end
+
+  def activate_passfoldercard(store, passname)
+    @store = store
+    @passname = passname
+    activate_infoframe
+    activate_folderform
+  end
+
+  def activate_infocard
+    @store = QString.new
+    @passname = QString.new
+    activate_infoframe
+  end
+
+  def _on_copy_action_triggered
+    input = sender.parent
+    QApplication.clipboard.set_text(input.text)
+  end
+
+  def _on_copy_action_triggered_otpcode
+    Pass.otp(@store, @passname, on_success: ->(data) {
+      otpcode = data["stdout"].rstrip
+      @otpcodeinput.set_text(otpcode)
+      QApplication.clipboard.set_text(otpcode)
+    }, on_failure: ->(_) {})
+  end
+
+  def _on_view_action_triggered
+    input = sender.parent
+    case input.echo_mode
+    when QLineEdit::Normal then input.set_echo_mode(QLineEdit::Password)
+    when QLineEdit::Password then input.set_echo_mode(QLineEdit::Normal)
+    else raise "unreachable!"
+    end
+  end
+end

data/lib/pass-qt/app/{components → views/mainwindow/components}/passlistwidget/treewidget/helpers.rb

@@ -1,4 +1,4 @@
-class PassListWidget < RubyQt6::Bando::QWidget
+class MainWindowPassListWidget < RubyQt6::Bando::QWidget
   class TreeWidget < RubyQt6::Bando::QTreeWidget
     module Helpers
       def self.passfile?(fileinfo)

data/lib/pass-qt/app/{components → views/mainwindow/components}/passlistwidget/treewidget/treebuilder.rb

@@ -1,4 +1,4 @@
-class PassListWidget < RubyQt6::Bando::QWidget
+class MainWindowPassListWidget < RubyQt6::Bando::QWidget
   class TreeWidget < RubyQt6::Bando::QTreeWidget
     DataItem = Struct.new(:passname, :treewidgetitem)
 

data/lib/pass-qt/app/{components → views/mainwindow/components}/passlistwidget/treewidget/treefilter.rb

@@ -1,4 +1,4 @@
-class PassListWidget < RubyQt6::Bando::QWidget
+class MainWindowPassListWidget < RubyQt6::Bando::QWidget
   class TreeWidget < RubyQt6::Bando::QTreeWidget
     class TreeFilter
       def perform(treewidget, dataitems, text)

data/lib/pass-qt/app/views/mainwindow/components/passlistwidget/treewidget/ui.rb

@@ -0,0 +1,36 @@
+class MainWindowPassListWidget < RubyQt6::Bando::QWidget
+  class TreeWidget < RubyQt6::Bando::QTreeWidget
+    private
+
+    def initialize_actions
+      @new_password_action = initialize_actions_act(QIcon::ThemeIcon::DocumentNew, "New Password", :_on_new_password_action_triggered)
+      @new_otp_action = initialize_actions_act(QIcon::ThemeIcon::DocumentNew, "New OTP", :_on_new_otp_action_triggered)
+      @delete_action = initialize_actions_act(QIcon::ThemeIcon::EditDelete, "Delete", :_on_delete_action_triggered)
+      @refresh_action = initialize_actions_act(QIcon::ThemeIcon::ViewRefresh, "Refresh", :_on_refresh_action_triggered)
+      @open_action = initialize_actions_act(QIcon::ThemeIcon::FolderVisiting, "Open Store With File Explorer", :_on_open_action_triggered)
+    end
+
+    def initialize_actions_act(icon, text, slot)
+      action = QAction.new(QIcon.from_theme(icon), text, self)
+      action.triggered.connect(self, slot)
+      action
+    end
+
+    def initialize_context_menu
+      menu = QMenu.new("", self)
+      menu.set_attribute(Qt::WA_DeleteOnClose)
+
+      menu.add_action(@new_password_action)
+      menu.add_action(@new_otp_action)
+      menu.add_action(@delete_action)
+      menu.add_separator
+      menu.add_action(@refresh_action)
+      menu.add_action(@open_action)
+
+      enabled = !selected_items.empty?
+      @delete_action.set_enabled(enabled)
+
+      menu
+    end
+  end
+end

data/lib/pass-qt/app/{components → views/mainwindow/components}/passlistwidget/treewidget.rb

@@ -1,8 +1,9 @@
 require_relative "treewidget/helpers"
 require_relative "treewidget/treebuilder"
 require_relative "treewidget/treefilter"
+require_relative "treewidget/ui"
 
-class PassListWidget < RubyQt6::Bando::QWidget
+class MainWindowPassListWidget < RubyQt6::Bando::QWidget
   class TreeWidget < RubyQt6::Bando::QTreeWidget
     q_object do
       signal "nil_selected(QString)"
@@ -23,25 +24,11 @@ class PassListWidget < RubyQt6::Bando::QWidget
       @dataitems = {}
 
       initialize_actions
-
       current_item_changed.connect(self, :_on_current_item_changed)
     end
 
     def context_menu_event(evt)
-      menu = QMenu.new("", self)
-      menu.set_attribute(Qt::WA_DeleteOnClose)
-
-      menu.add_action(@new_password_action)
-      menu.add_action(@new_otp_action)
-      menu.add_action(@delete_action)
-
-      menu.add_separator
-      menu.add_action(@refresh_action)
-      menu.add_action(@open_action)
-
-      enabled = !selected_items.empty?
-      @delete_action.set_enabled(enabled)
-
+      menu = initialize_context_menu
       menu.exec(evt.global_pos)
     end
 
@@ -71,20 +58,6 @@ class PassListWidget < RubyQt6::Bando::QWidget
 
     private
 
-    def initialize_actions
-      @new_password_action = initialize_actions_act(QIcon::ThemeIcon::DocumentNew, "New Password", :_on_new_password_action_triggered)
-      @new_otp_action = initialize_actions_act(QIcon::ThemeIcon::DocumentNew, "New OTP", :_on_new_otp_action_triggered)
-      @delete_action = initialize_actions_act(QIcon::ThemeIcon::EditDelete, "Delete", :_on_delete_action_triggered)
-      @refresh_action = initialize_actions_act(QIcon::ThemeIcon::ViewRefresh, "Refresh", :_on_refresh_action_triggered)
-      @open_action = initialize_actions_act(QIcon::ThemeIcon::FolderVisiting, "Open Store With File Explorer", :_on_open_action_triggered)
-    end
-
-    def initialize_actions_act(icon, text, slot)
-      action = QAction.new(QIcon.from_theme(icon), text, self)
-      action.triggered.connect(self, slot)
-      action
-    end
-
     def _on_current_item_changed(curr, _prev)
       if curr.nil?
         nil_selected.emit(@store)

data/lib/pass-qt/app/{components/passlistwidget.rb → views/mainwindow/components/passlistwidget/ui.rb}

@@ -1,42 +1,15 @@
-require_relative "passlistwidget/treewidget"
-
-class PassListWidget < RubyQt6::Bando::QWidget
-  q_object do
-    signal "store_changed(QString)"
-    signal "nil_selected(QString)"
-    signal "passfile_selected(QString,QString)"
-    signal "passfolder_selected(QString,QString)"
-    slot "_on_combobox_current_text_changed(QString)"
-    slot "_on_searchbar_text_changed(QString)"
-  end
-
-  def initialize
-    super
+class MainWindowPassListWidget < RubyQt6::Bando::QWidget
+  private
 
+  def initialize_ui
     initialize_combobox
     initialize_searchbar
     initialize_treewidget
+    initialize_layout
 
-    mainlayout = QVBoxLayout.new(self)
-    mainlayout.add_layout(@comboboxlayout)
-    mainlayout.add_widget(@searchbar)
-    mainlayout.add_widget(@treewidget)
-
-    update_combobox
+    update_combobox_using_settings_stores
   end
 
-  def refresh
-    @combobox.block_signals(true).tap do |blocked|
-      @combobox.clear
-    ensure
-      @combobox.block_signals(blocked)
-    end
-
-    update_combobox
-  end
-
-  private
-
   def initialize_combobox
     @combobox = QComboBox.new
     @combobox.current_text_changed.connect(self, :_on_combobox_current_text_changed)
@@ -63,24 +36,17 @@ class PassListWidget < RubyQt6::Bando::QWidget
     @treewidget.passfolder_selected.connect(self, :passfolder_selected)
   end
 
-  def update_combobox
+  def initialize_layout
+    mainlayout = QVBoxLayout.new(self)
+    mainlayout.add_layout(@comboboxlayout)
+    mainlayout.add_widget(@searchbar)
+    mainlayout.add_widget(@treewidget)
+  end
+
+  def update_combobox_using_settings_stores
     PassQt.settings.GET_stores.each do |store|
       fileinfo = QFileInfo.new(store["fullpath"])
       @combobox.add_item(fileinfo.file_name, QVariant.new(fileinfo.absolute_file_path))
     end
   end
-
-  def _on_combobox_current_text_changed(_text)
-    store = @combobox.current_data.value
-    store_changed.emit(store)
-
-    @searchbar.clear
-    QTimer.single_shot(0, @searchbar, :set_focus)
-
-    @treewidget.refresh(store)
-  end
-
-  def _on_searchbar_text_changed(text)
-    @treewidget.update_passname_filter(text)
-  end
 end

data/lib/pass-qt/app/views/mainwindow/components/passlistwidget.rb

@@ -0,0 +1,45 @@
+require_relative "passlistwidget/treewidget"
+require_relative "passlistwidget/ui"
+
+class MainWindowPassListWidget < RubyQt6::Bando::QWidget
+  q_object do
+    signal "store_changed(QString)"
+    signal "nil_selected(QString)"
+    signal "passfile_selected(QString,QString)"
+    signal "passfolder_selected(QString,QString)"
+    slot "refresh()"
+    slot "_on_combobox_current_text_changed(QString)"
+    slot "_on_searchbar_text_changed(QString)"
+  end
+
+  def initialize
+    super
+
+    initialize_ui
+  end
+
+  private
+
+  def refresh
+    @combobox.block_signals(true).tap do |blocked|
+      @combobox.clear
+    ensure
+      @combobox.block_signals(blocked)
+    end
+    update_combobox_using_settings_stores
+  end
+
+  def _on_combobox_current_text_changed(_text)
+    store = @combobox.current_data.value
+    store_changed.emit(store)
+
+    @searchbar.clear
+    QTimer.single_shot(0, @searchbar, :set_focus)
+
+    @treewidget.refresh(store)
+  end
+
+  def _on_searchbar_text_changed(text)
+    @treewidget.update_passname_filter(text)
+  end
+end