ruby-pass-qt 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a101e18a3f8a4c03a9996efadf2cbe3a09d393605e57d49a86fe401726d6c7b8
-  data.tar.gz: 99390447b2bde56c07063127b4fa899490fe22197ab37f0b08153d3ce581b938
+  metadata.gz: 1816007968467bc6ee9d3fcd9a69bb648a10cde931ebc809a09e76b82bd15109
+  data.tar.gz: 752af79c37a068739aa9751a8015da3c7e08901f8b39442441e502cdb3495149
 SHA512:
-  metadata.gz: 79213aedb87e6432955fffd25377e21f108e35bbb1a9c5914939620f76fdd9041dad166f78a4c10fa82987404bbd15eabbc178d3084867494a56441a899e31cd
-  data.tar.gz: b3297f156132a566b6cd40454f543ce0c42a0d9b15eca7196d69628c465e6e64b2fc3d8d63d41a0204ffa876c9c2503088decb618cd15bc47c8df551cb41903b
+  metadata.gz: 727ccfc09d7df169abdf1b6512d27fe82f0931a0c2f6e43deadcf6eb9c2ec829c8e36cd5a09acfc46d5ac568866710ae386963685b0dbab0c676431bb0a946ca
+  data.tar.gz: 6400d7a320dfb687a6e1ba0a8b1cdf819e3bb42b966f3161073e081202f2bae428f4c3cc28883e24a37c93a3b760e0605c01708adeefc1d739b9e52f858a5cea

data/README.md

@@ -12,22 +12,22 @@ A simple GUI for pass on Linux.
 
 ## Installation
 
-```console
-$ gem install ruby-pass-qt
+```sh
+gem install ruby-pass-qt
 ```
 
 ## Usage
 
 To initialize the password store:
 
-```console
-$ pass init new_gpg-id_or_email
+```sh
+pass init new_gpg-id_or_email
 ```
 
 To launch the GUI:
 
-```console
-$ pass-qt
+```sh
+pass-qt
 ```
 
 ## Screenshot

data/lib/pass-qt/app/components/passinfowidget/helpers.rb

@@ -0,0 +1,26 @@
+class PassInfoWidget < RubyQt6::Bando::QWidget
+  module Helpers
+    def self.parse_passfile(data)
+      lines = data["stdout"].lines
+      password = lines[0][..-2]
+
+      username = ""
+      website = ""
+      lines.each do |line|
+        matched = line.match(/\A(\w+:\s*)?(.*)\n/)
+        next if matched.nil?
+
+        case matched[1]&.rstrip&.downcase
+        when "username:" then username = matched[2]
+        when "website:" then website = matched[2]
+        end
+      end
+
+      {
+        "password" => password,
+        "username" => username,
+        "website" => website
+      }
+    end
+  end
+end

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

@@ -1,3 +1,5 @@
+require_relative "passinfowidget/helpers"
+
 class PassInfoWidget < RubyQt6::Bando::QWidget
   q_object do
     slot "_on_copy_action_triggered()"
@@ -29,13 +31,13 @@ class PassInfoWidget < RubyQt6::Bando::QWidget
     use_infoframe
   end
 
-  def reinitialize_passfile(store, passname)
+  def use_passfilecard(store, passname)
     @store = store
     @passname = passname
     use_infoframe
 
     Pass.show(@store, @passname, on_success: ->(data) {
-      formdata = h_parse_passfile(data)
+      formdata = Helpers.parse_passfile(data)
       if formdata["password"].start_with?("otpauth:")
         use_otpform(formdata)
       else
@@ -47,14 +49,14 @@ class PassInfoWidget < RubyQt6::Bando::QWidget
     })
   end
 
-  def reinitialize_passfolder(store, passname)
+  def use_passfoldercard(store, passname)
     @store = store
     @passname = passname
     use_infoframe
     use_folderform
   end
 
-  def reinitialize_infoframe
+  def use_infocard
     @store = QString.new
     @passname = QString.new
     use_infoframe
@@ -186,29 +188,6 @@ class PassInfoWidget < RubyQt6::Bando::QWidget
     @stackedlayout.set_current_widget(@infoframe)
   end
 
-  def h_parse_passfile(data)
-    lines = data["stdout"].lines
-    password = lines[0][..-2]
-
-    username = ""
-    website = ""
-    lines.each do |line|
-      matched = line.match(/\A(\w+:\s*)?(.*)\n/)
-      next if matched.nil?
-
-      case matched[1]&.rstrip&.downcase
-      when "username:" then username = matched[2]
-      when "website:" then website = matched[2]
-      end
-    end
-
-    {
-      "password" => password,
-      "username" => username,
-      "website" => website
-    }
-  end
-
   def _on_copy_action_triggered
     input = sender.parent
     QApplication.clipboard.set_text(input.text)

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

@@ -0,0 +1,18 @@
+class PassListWidget < RubyQt6::Bando::QWidget
+  class TreeWidget < RubyQt6::Bando::QTreeWidget
+    module Helpers
+      def self.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 self.folderpath(store, fileinfo)
+        folder = fileinfo.dir? ? fileinfo.absolute_file_path : fileinfo.absolute_path
+        QDir.new(store).relative_file_path(folder)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,46 @@
+class PassListWidget < RubyQt6::Bando::QWidget
+  class TreeWidget < RubyQt6::Bando::QTreeWidget
+    DataItem = Struct.new(:passname, :treewidgetitem)
+
+    class TreeBuilder
+      def initialize
+        @fileiconprovider = QFileIconProvider.new
+      end
+
+      def perform(treewidget, store, dataitems)
+        treewidget.clear
+
+        store_root_path = QDir.new(store)
+        dirs = [store]
+        until dirs.empty?
+          dir = dirs.shift
+          diritem = dataitems[dir]&.treewidgetitem || treewidget.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 Helpers.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)
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,43 @@
+class PassListWidget < RubyQt6::Bando::QWidget
+  class TreeWidget < RubyQt6::Bando::QTreeWidget
+    class TreeFilter
+      def perform(_treewidget, dataitems, 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)
+
+        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 Helpers.passfile?(filepath)
+          end
+
+          loop do
+            filepath_matched << filepath
+            filepath = QFileInfo.new(filepath).absolute_path
+            break unless dataitems.key?(filepath)
+          end
+        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)
+        end
+      end
+    end
+  end
+end

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

@@ -1,9 +1,10 @@
+require_relative "treewidget/helpers"
+require_relative "treewidget/treebuilder"
+require_relative "treewidget/treefilter"
+
 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)"
@@ -21,7 +22,6 @@ class PassListWidget < RubyQt6::Bando::QWidget
       @dataitems = {}
 
       initialize_actions
-      initialize_fileiconprovider
 
       item_clicked.connect(self, :_on_item_clicked)
     end
@@ -44,83 +44,25 @@ class PassListWidget < RubyQt6::Bando::QWidget
       menu.exec(evt.global_pos)
     end
 
-    def reinitialize_store(store)
-      clear
-
+    def refresh(store, selected_passname: nil)
       @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)
-        end
-      end
+      builder = TreeBuilder.new
+      builder.perform(self, @store, @dataitems)
 
       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)
-
-      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)
+      @dataitems.each do |_, item|
+        if item.passname == selected_passname
+          item.treewidgetitem.set_selected(true)
+          break
         end
       end
+    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)
-      end
+    def update_passname_filter(text)
+      filter = TreeFilter.new
+      filter.perform(self, @dataitems, text)
     end
 
     private
@@ -139,38 +81,10 @@ class PassListWidget < RubyQt6::Bando::QWidget
       action
     end
 
-    def initialize_fileiconprovider
-      @fileiconprovider = QFileIconProvider.new
-    end
-
-    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_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 h_folderpath(fileinfo)
-      folder = fileinfo.dir? ? fileinfo.absolute_file_path : fileinfo.absolute_path
-      QDir.new(@store).relative_file_path(folder)
-    end
-
     def _on_item_clicked(item, _column)
       filepath = item.data(1, Qt::DisplayRole).value
       dataitem = @dataitems[filepath]
-      h_passfile?(filepath) ?
+      Helpers.passfile?(filepath) ?
         passfile_selected.emit(@store, dataitem.passname) :
         passfolder_selected.emit(@store, dataitem.passname)
     end
@@ -179,14 +93,14 @@ class PassListWidget < RubyQt6::Bando::QWidget
       item = selected_items[0]
       if item
         filepath = item.data(1, Qt::DisplayRole).value
-        folder = h_folderpath(QFileInfo.new(filepath))
+        folder = Helpers.folderpath(@store, QFileInfo.new(filepath))
         folder = "" if folder == "."
       else
         folder = ""
       end
 
       dialog = NewPasswordDialog.new(@store, folder, on_success: ->(passname) {
-        reinitialize(selected_passname: passname)
+        refresh(@store, selected_passname: passname)
       })
       dialog.show
     end
@@ -195,14 +109,14 @@ class PassListWidget < RubyQt6::Bando::QWidget
       item = selected_items[0]
       if item
         filepath = item.data(1, Qt::DisplayRole).value
-        folder = h_folderpath(QFileInfo.new(filepath))
+        folder = Helpers.folderpath(@store, QFileInfo.new(filepath))
         folder = "" if folder == "."
       else
         folder = ""
       end
 
       dialog = NewOneTimePasswordDialog.new(@store, folder, on_success: ->(passname) {
-        reinitialize(selected_passname: passname)
+        refresh(@store, selected_passname: passname)
       })
       dialog.show
     end
@@ -218,7 +132,7 @@ class PassListWidget < RubyQt6::Bando::QWidget
 
       file = QFile.new(filepath)
       file.move_to_trash
-      reinitialize
+      refresh(@store)
     end
 
     def _on_refresh_action_triggered
@@ -231,7 +145,7 @@ class PassListWidget < RubyQt6::Bando::QWidget
         passname = ""
       end
 
-      reinitialize(selected_passname: passname)
+      refresh(@store, selected_passname: passname)
     end
 
     def _on_open_action_triggered

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

@@ -7,7 +7,6 @@ class PassListWidget < RubyQt6::Bando::QWidget
     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
@@ -25,7 +24,7 @@ class PassListWidget < RubyQt6::Bando::QWidget
     update_combobox
   end
 
-  def reinitialize_stores
+  def refresh
     @combobox.block_signals(true).tap do |blocked|
       @combobox.clear
     ensure
@@ -58,7 +57,6 @@ class PassListWidget < RubyQt6::Bando::QWidget
   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
@@ -72,18 +70,15 @@ class PassListWidget < RubyQt6::Bando::QWidget
 
   def _on_combobox_current_text_changed(_text)
     store = @combobox.current_data.value
-    @treewidget.reinitialize_store(store)
+    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
-
-  def _on_treewidget_store_changed(store)
-    @searchbar.clear
-    store_changed.emit(store)
-  end
 end

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

@@ -76,7 +76,7 @@ class BrowseStoresDialog < RubyQt6::Bando::QDialog
     tableitem.delete_now
   end
 
-  def h_put_stores
+  def update_settings_stores
     stores = @dataitems.map { |fullpath, _| {"fullpath" => fullpath} }
     PassQt.settings.PUT_stores(stores)
     stores_changed.emit
@@ -99,11 +99,11 @@ class BrowseStoresDialog < RubyQt6::Bando::QDialog
     end
 
     update_tablewidget_addtableitem(dir)
-    h_put_stores
+    update_settings_stores
   end
 
   def _on_list_remove_button_clicked
     update_tablewidget_removetableitem(sender.parent)
-    h_put_stores
+    update_settings_stores
   end
 end

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

@@ -61,18 +61,18 @@ class MainWindow < RubyQt6::Bando::QMainWindow
   end
 
   def _on_browsestoresdialog_stores_changed
-    @passlistwidget.reinitialize_stores
+    @passlistwidget.refresh
   end
 
   def _on_passlistwidget_store_changed(store)
-    @passinfowidget.reinitialize_infoframe
+    @passinfowidget.use_infocard
   end
 
   def _on_passlistwidget_passfile_selected(store, passname)
-    @passinfowidget.reinitialize_passfile(store, passname)
+    @passinfowidget.use_passfilecard(store, passname)
   end
 
   def _on_passlistwidget_passfolder_selected(store, passname)
-    @passinfowidget.reinitialize_passfolder(store, passname)
+    @passinfowidget.use_passfoldercard(store, passname)
   end
 end

data/lib/pass-qt/version.rb

@@ -1,3 +1,3 @@
 module PassQt
-  VERSION = "2.0.3"
+  VERSION = "2.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-pass-qt
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - John Doe
@@ -43,8 +43,12 @@ files:
 - lib/pass-qt/app/assets/app.svg
 - lib/pass-qt/app/components.rb
 - lib/pass-qt/app/components/passinfowidget.rb
+- lib/pass-qt/app/components/passinfowidget/helpers.rb
 - lib/pass-qt/app/components/passlistwidget.rb
 - lib/pass-qt/app/components/passlistwidget/treewidget.rb
+- lib/pass-qt/app/components/passlistwidget/treewidget/helpers.rb
+- lib/pass-qt/app/components/passlistwidget/treewidget/treebuilder.rb
+- lib/pass-qt/app/components/passlistwidget/treewidget/treefilter.rb
 - lib/pass-qt/app/views.rb
 - lib/pass-qt/app/views/browsestoresdialog.rb
 - lib/pass-qt/app/views/mainwindow.rb