ruby-pass-qt 2.0.0 → 2.0.1

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

@@ -1,243 +1,241 @@
-module PassQt
-  class PassListWidget < RubyQt6::Bando::QWidget
-    class TreeWidget < RubyQt6::Bando::QTreeWidget
-      DataItem = Struct.new(:passname, :treewidgetitem)
-
-      q_object do
-        signal "store_changed(QString)"
-        signal "passfile_selected(QString,QString)"
-        signal "passfolder_selected(QString,QString)"
-        slot "_on_item_clicked(QTreeWidgetItem*,int)"
-        slot "_on_new_password_action_triggered()"
-        slot "_on_new_otp_action_triggered()"
-        slot "_on_delete_action_triggered()"
-        slot "_on_refresh_action_triggered()"
-        slot "_on_open_action_triggered()"
-      end
+class PassListWidget < RubyQt6::Bando::QWidget
+  class TreeWidget < RubyQt6::Bando::QTreeWidget
+    DataItem = Struct.new(:passname, :treewidgetitem)
+
+    q_object do
+      signal "store_changed(QString)"
+      signal "passfile_selected(QString,QString)"
+      signal "passfolder_selected(QString,QString)"
+      slot "_on_item_clicked(QTreeWidgetItem*,int)"
+      slot "_on_new_password_action_triggered()"
+      slot "_on_new_otp_action_triggered()"
+      slot "_on_delete_action_triggered()"
+      slot "_on_refresh_action_triggered()"
+      slot "_on_open_action_triggered()"
+    end
 
-      def initialize
-        super
+    def initialize
+      super
 
-        @store = QString.new
-        @dataitems = {}
+      @store = QString.new
+      @dataitems = {}
 
-        initialize_actions
-        initialize_fileiconprovider
+      initialize_actions
+      initialize_fileiconprovider
 
-        item_clicked.connect(self, :_on_item_clicked)
-      end
+      item_clicked.connect(self, :_on_item_clicked)
+    end
 
-      def context_menu_event(evt)
-        menu = QMenu.new("", self)
+    def context_menu_event(evt)
+      menu = QMenu.new("", self)
 
-        menu.add_action(@new_password_action)
-        menu.add_action(@new_otp_action)
-        menu.add_action(@delete_action)
+      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)
+      menu.add_separator
+      menu.add_action(@refresh_action)
+      menu.add_action(@open_action)
 
-        enabled = !selected_items.empty?
-        @delete_action.set_enabled(enabled)
+      enabled = !selected_items.empty?
+      @delete_action.set_enabled(enabled)
 
-        menu.exec(evt.global_pos)
-      end
+      menu.exec(evt.global_pos)
+    end
 
-      def reinitialize_store(store)
-        clear
-
-        @store = store
-        @dataitems = {}
-
-        store_root_path = QDir.new(@store)
-        dirs = [store]
-        until dirs.empty?
-          dir = dirs.shift
-          diritem = @dataitems[dir]&.treewidgetitem || invisible_root_item
-
-          entry_list = QDir.new(dir).entry_info_list(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot)
-          entry_list.each do |entry|
-            next if entry.hidden?
-            next if entry.file_name.starts_with(".")
-
-            filepath = entry.absolute_file_path
-            next if @dataitems.key?(filepath)
-
-            if entry.dir?
-              dirs << filepath
-              passname = store_root_path.relative_file_path(filepath)
-            elsif entry.file?
-              next unless h_passfile?(entry)
-              passname = store_root_path.relative_file_path(filepath)
-              passname = passname[0, passname.size - entry.suffix.size - 1]
-            else
-              next
-            end
-
-            item = QTreeWidgetItem.new(diritem, QStringList.new << entry.complete_base_name << filepath)
-            item.set_icon(0, @fileiconprovider.icon(entry))
-            @dataitems[filepath] = DataItem.new(passname, item)
+    def reinitialize_store(store)
+      clear
+
+      @store = store
+      @dataitems = {}
+
+      store_root_path = QDir.new(@store)
+      dirs = [store]
+      until dirs.empty?
+        dir = dirs.shift
+        diritem = @dataitems[dir]&.treewidgetitem || invisible_root_item
+
+        entry_list = QDir.new(dir).entry_info_list(QDir::Dirs | QDir::Files | QDir::NoDotAndDotDot)
+        entry_list.each do |entry|
+          next if entry.hidden?
+          next if entry.file_name.starts_with(".")
+
+          filepath = entry.absolute_file_path
+          next if @dataitems.key?(filepath)
+
+          if entry.dir?
+            dirs << filepath
+            passname = store_root_path.relative_file_path(filepath)
+          elsif entry.file?
+            next unless h_passfile?(entry)
+            passname = store_root_path.relative_file_path(filepath)
+            passname = passname[0, passname.size - entry.suffix.size - 1]
+          else
+            next
           end
-        end
 
-        expand_all
-        store_changed.emit(@store)
+          item = QTreeWidgetItem.new(diritem, QStringList.new << entry.complete_base_name << filepath)
+          item.set_icon(0, @fileiconprovider.icon(entry))
+          @dataitems[filepath] = DataItem.new(passname, item)
+        end
       end
 
-      def update_passname_filter(text)
-        if text.empty?
-          @dataitems.each do |_, item|
-            item.treewidgetitem.set_hidden(false)
-            item.treewidgetitem.set_selected(false)
-          end
-          return
+      expand_all
+      store_changed.emit(@store)
+    end
+
+    def update_passname_filter(text)
+      if text.empty?
+        @dataitems.each do |_, item|
+          item.treewidgetitem.set_hidden(false)
+          item.treewidgetitem.set_selected(false)
         end
+        return
+      end
 
-        re_options = QRegularExpression::UnanchoredWildcardConversion | QRegularExpression::NonPathWildcardConversion
-        re = QRegularExpression.from_wildcard(text, nil, re_options)
+      re_options = QRegularExpression::UnanchoredWildcardConversion | QRegularExpression::NonPathWildcardConversion
+      re = QRegularExpression.from_wildcard(text, nil, re_options)
 
-        filepath_matched = Set.new
-        filepath_matched_1st = nil
-        @dataitems.each do |filepath, item|
-          has_match = re.match(item.passname).has_match
-          next unless has_match
+      filepath_matched = Set.new
+      filepath_matched_1st = nil
+      @dataitems.each do |filepath, item|
+        has_match = re.match(item.passname).has_match
+        next unless has_match
 
-          if filepath_matched_1st.nil?
-            filepath_matched_1st = filepath if h_passfile?(filepath)
-          end
-
-          loop do
-            filepath_matched << filepath
-            filepath = QFileInfo.new(filepath).absolute_path
-            break unless @dataitems.key?(filepath)
-          end
+        if filepath_matched_1st.nil?
+          filepath_matched_1st = filepath if h_passfile?(filepath)
         end
 
-        @dataitems.each do |filepath, item|
-          visible = filepath_matched.include?(filepath)
-          item.treewidgetitem.set_hidden(!visible)
-
-          selected = filepath_matched_1st == filepath
-          item.treewidgetitem.set_selected(selected)
+        loop do
+          filepath_matched << filepath
+          filepath = QFileInfo.new(filepath).absolute_path
+          break unless @dataitems.key?(filepath)
         end
       end
 
-      private
+      @dataitems.each do |filepath, item|
+        visible = filepath_matched.include?(filepath)
+        item.treewidgetitem.set_hidden(!visible)
 
-      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)
+        selected = filepath_matched_1st == filepath
+        item.treewidgetitem.set_selected(selected)
       end
+    end
 
-      def initialize_actions_act(icon, text, slot)
-        action = QAction.new(QIcon.from_theme(icon), text, self)
-        action.triggered.connect(self, slot)
-        action
-      end
+    private
 
-      def initialize_fileiconprovider
-        @fileiconprovider = QFileIconProvider.new
-      end
+    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 reinitialize(selected_passname: "")
-        reinitialize_store(@store)
+    def initialize_actions_act(icon, text, slot)
+      action = QAction.new(QIcon.from_theme(icon), text, self)
+      action.triggered.connect(self, slot)
+      action
+    end
 
-        @dataitems.each do |_, item|
-          if item.passname == selected_passname
-            item.treewidgetitem.set_selected(true)
-            break
-          end
-        end
-      end
+    def initialize_fileiconprovider
+      @fileiconprovider = QFileIconProvider.new
+    end
 
-      def h_passfile?(fileinfo)
-        case fileinfo
-        when QFileInfo then fileinfo.suffix.downcase == "gpg"
-        when QString then fileinfo.ends_with(".gpg", Qt::CaseInsensitive)
-        else raise "unreachable!"
+    def reinitialize(selected_passname: "")
+      reinitialize_store(@store)
+
+      @dataitems.each do |_, item|
+        if item.passname == selected_passname
+          item.treewidgetitem.set_selected(true)
+          break
         end
       end
+    end
 
-      def h_folderpath(fileinfo)
-        folder = fileinfo.dir? ? fileinfo.absolute_file_path : fileinfo.absolute_path
-        QDir.new(@store).relative_file_path(folder)
+    def h_passfile?(fileinfo)
+      case fileinfo
+      when QFileInfo then fileinfo.suffix.downcase == "gpg"
+      when QString then fileinfo.ends_with(".gpg", Qt::CaseInsensitive)
+      else raise "unreachable!"
       end
+    end
 
-      def _on_item_clicked(item, _column)
-        filepath = item.data(1, Qt::DisplayRole).value
-        dataitem = @dataitems[filepath]
-        h_passfile?(filepath) ?
-          passfile_selected.emit(@store, dataitem.passname) :
-          passfolder_selected.emit(@store, dataitem.passname)
-      end
+    def h_folderpath(fileinfo)
+      folder = fileinfo.dir? ? fileinfo.absolute_file_path : fileinfo.absolute_path
+      QDir.new(@store).relative_file_path(folder)
+    end
 
-      def _on_new_password_action_triggered
-        item = selected_items[0]
-        if item
-          filepath = item.data(1, Qt::DisplayRole).value
-          folder = h_folderpath(QFileInfo.new(filepath))
-          folder = "" if folder == "."
-        else
-          folder = ""
-        end
+    def _on_item_clicked(item, _column)
+      filepath = item.data(1, Qt::DisplayRole).value
+      dataitem = @dataitems[filepath]
+      h_passfile?(filepath) ?
+        passfile_selected.emit(@store, dataitem.passname) :
+        passfolder_selected.emit(@store, dataitem.passname)
+    end
 
-        dialog = NewPasswordDialog.new(@store, folder, on_success: ->(passname) {
-          reinitialize(selected_passname: passname)
-        })
-        dialog.show
+    def _on_new_password_action_triggered
+      item = selected_items[0]
+      if item
+        filepath = item.data(1, Qt::DisplayRole).value
+        folder = h_folderpath(QFileInfo.new(filepath))
+        folder = "" if folder == "."
+      else
+        folder = ""
       end
 
-      def _on_new_otp_action_triggered
-        item = selected_items[0]
-        if item
-          filepath = item.data(1, Qt::DisplayRole).value
-          folder = h_folderpath(QFileInfo.new(filepath))
-          folder = "" if folder == "."
-        else
-          folder = ""
-        end
+      dialog = NewPasswordDialog.new(@store, folder, on_success: ->(passname) {
+        reinitialize(selected_passname: passname)
+      })
+      dialog.show
+    end
 
-        dialog = NewOneTimePasswordDialog.new(@store, folder, on_success: ->(passname) {
-          reinitialize(selected_passname: passname)
-        })
-        dialog.show
+    def _on_new_otp_action_triggered
+      item = selected_items[0]
+      if item
+        filepath = item.data(1, Qt::DisplayRole).value
+        folder = h_folderpath(QFileInfo.new(filepath))
+        folder = "" if folder == "."
+      else
+        folder = ""
       end
 
-      def _on_delete_action_triggered
-        item = selected_items[0]
-        filepath = item.data(1, Qt::DisplayRole).value
-        dataitem = @dataitems[filepath]
+      dialog = NewOneTimePasswordDialog.new(@store, folder, on_success: ->(passname) {
+        reinitialize(selected_passname: passname)
+      })
+      dialog.show
+    end
 
-        message = "<p>Do you really want to delete this item?</p>#{dataitem.passname}"
-        reply = QMessageBox.question(self, "", message)
-        return if reply == QMessageBox::No
+    def _on_delete_action_triggered
+      item = selected_items[0]
+      filepath = item.data(1, Qt::DisplayRole).value
+      dataitem = @dataitems[filepath]
 
-        file = QFile.new(filepath)
-        file.move_to_trash
-        reinitialize
-      end
+      message = "<p>Do you really want to delete this item?</p>#{dataitem.passname}"
+      reply = QMessageBox.question(self, "", message)
+      return if reply == QMessageBox::No
 
-      def _on_refresh_action_triggered
-        item = selected_items[0]
-        if item
-          filepath = item.data(1, Qt::DisplayRole).value
-          dataitem = @dataitems[filepath]
-          passname = dataitem.passname
-        else
-          passname = ""
-        end
+      file = QFile.new(filepath)
+      file.move_to_trash
+      reinitialize
+    end
 
-        reinitialize(selected_passname: passname)
+    def _on_refresh_action_triggered
+      item = selected_items[0]
+      if item
+        filepath = item.data(1, Qt::DisplayRole).value
+        dataitem = @dataitems[filepath]
+        passname = dataitem.passname
+      else
+        passname = ""
       end
 
-      def _on_open_action_triggered
-        url = QUrl.from_local_file(@store)
-        QDesktopServices.open_url(url)
-      end
+      reinitialize(selected_passname: passname)
+    end
+
+    def _on_open_action_triggered
+      url = QUrl.from_local_file(@store)
+      QDesktopServices.open_url(url)
     end
   end
 end

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

@@ -1,91 +1,89 @@
 require_relative "passlistwidget/treewidget"
 
-module PassQt
-  class PassListWidget < RubyQt6::Bando::QWidget
-    q_object do
-      signal "store_changed(QString)"
-      signal "passfile_selected(QString,QString)"
-      signal "passfolder_selected(QString,QString)"
-      slot "_on_combobox_current_text_changed(QString)"
-      slot "_on_searchbar_text_changed(QString)"
-      slot "_on_treewidget_store_changed(QString)"
-    end
+class PassListWidget < RubyQt6::Bando::QWidget
+  q_object do
+    signal "store_changed(QString)"
+    signal "passfile_selected(QString,QString)"
+    signal "passfolder_selected(QString,QString)"
+    slot "_on_combobox_current_text_changed(QString)"
+    slot "_on_searchbar_text_changed(QString)"
+    slot "_on_treewidget_store_changed(QString)"
+  end
 
-    def initialize
-      super
+  def initialize
+    super
 
-      initialize_combobox
-      initialize_searchbar
-      initialize_treewidget
+    initialize_combobox
+    initialize_searchbar
+    initialize_treewidget
 
-      mainlayout = QVBoxLayout.new(self)
-      mainlayout.add_layout(@comboboxlayout)
-      mainlayout.add_widget(@searchbar)
-      mainlayout.add_widget(@treewidget)
+    mainlayout = QVBoxLayout.new(self)
+    mainlayout.add_layout(@comboboxlayout)
+    mainlayout.add_widget(@searchbar)
+    mainlayout.add_widget(@treewidget)
 
-      update_combobox
-    end
-
-    def reinitialize_stores
-      @combobox.block_signals(true).tap do |blocked|
-        @combobox.clear
-      ensure
-        @combobox.block_signals(blocked)
-      end
+    update_combobox
+  end
 
-      update_combobox
+  def reinitialize_stores
+    @combobox.block_signals(true).tap do |blocked|
+      @combobox.clear
+    ensure
+      @combobox.block_signals(blocked)
     end
 
-    private
+    update_combobox
+  end
 
-    def initialize_combobox
-      @combobox = QComboBox.new
-      @combobox.current_text_changed.connect(self, :_on_combobox_current_text_changed)
+  private
 
-      @comboboxlayout = QHBoxLayout.new
-      @comboboxlayout.add_widget(QLabel.new("Current Store"))
-      @comboboxlayout.add_widget(@combobox)
-      @comboboxlayout.set_stretch(0, 2)
-      @comboboxlayout.set_stretch(1, 3)
-    end
+  def initialize_combobox
+    @combobox = QComboBox.new
+    @combobox.current_text_changed.connect(self, :_on_combobox_current_text_changed)
 
-    def initialize_searchbar
-      @searchbar = QLineEdit.new
-      @searchbar.set_clear_button_enabled(true)
-      @searchbar.set_placeholder_text("List passwords that match passname...")
-      @searchbar.text_changed.connect(self, :_on_searchbar_text_changed)
-    end
+    @comboboxlayout = QHBoxLayout.new
+    @comboboxlayout.add_widget(QLabel.new("Current Store"))
+    @comboboxlayout.add_widget(@combobox)
+    @comboboxlayout.set_stretch(0, 2)
+    @comboboxlayout.set_stretch(1, 3)
+  end
 
-    def initialize_treewidget
-      @treewidget = TreeWidget.new
-      @treewidget.set_header_hidden(true)
-      @treewidget.store_changed.connect(self, :_on_treewidget_store_changed)
-      @treewidget.passfile_selected.connect(self, :passfile_selected)
-      @treewidget.passfolder_selected.connect(self, :passfolder_selected)
-    end
+  def initialize_searchbar
+    @searchbar = QLineEdit.new
+    @searchbar.set_clear_button_enabled(true)
+    @searchbar.set_placeholder_text("List passwords that match passname...")
+    @searchbar.text_changed.connect(self, :_on_searchbar_text_changed)
+  end
+
+  def initialize_treewidget
+    @treewidget = TreeWidget.new
+    @treewidget.set_header_hidden(true)
+    @treewidget.store_changed.connect(self, :_on_treewidget_store_changed)
+    @treewidget.passfile_selected.connect(self, :passfile_selected)
+    @treewidget.passfolder_selected.connect(self, :passfolder_selected)
+  end
 
-    def update_combobox
-      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
+  def update_combobox
+    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
-      @treewidget.reinitialize_store(store)
+  def _on_combobox_current_text_changed(_text)
+    store = @combobox.current_data.value
+    @treewidget.reinitialize_store(store)
 
-      @searchbar.clear
-      QTimer.single_shot(0, @searchbar, :set_focus)
-    end
+    @searchbar.clear
+    QTimer.single_shot(0, @searchbar, :set_focus)
+  end
 
-    def _on_searchbar_text_changed(text)
-      @treewidget.update_passname_filter(text)
-    end
+  def _on_searchbar_text_changed(text)
+    @treewidget.update_passname_filter(text)
+  end
 
-    def _on_treewidget_store_changed(store)
-      @searchbar.clear
-      store_changed.emit(store)
-    end
+  def _on_treewidget_store_changed(store)
+    @searchbar.clear
+    store_changed.emit(store)
   end
 end