ruby-pass-qt 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fb6805f75336a47b0d05fefce05aef65337a02726c03cae84d85587dc2ffe2c
-  data.tar.gz: dd7c0cad047c733a073bc301a8b57512da731888a62960d207015e8b1c2f0eab
+  metadata.gz: c91b2943a3a656afdaa617f3bc534c2beab4dfeebb86c38f177054a2291cc202
+  data.tar.gz: 7d911ca4c201296c9259d755d643e500c15bc95fc2a7f723cef21e68882ed6d1
 SHA512:
-  metadata.gz: b6a0044d9db31fb3cdd5c76ab9ac3c22266e371d6c2c9f18a58ed4de480740849c3cfcd4713cbd2344ac815b670a4d43c84db7e20f9ff8fb826488232c182ca4
-  data.tar.gz: '069c63341c0129c3c5b113572055d579873fe58f9e95b16e74f80d1deabf01ee7e4503f0404f58682187fb0f03d52ce9bab176826947c3678bd8f9e6e0614a88'
+  metadata.gz: 35cb967283aa998c40e766d78e53d909e5f1034005130238608d20f5c2d072839d3dac7a5ac3547da7c6293205768928a0a4d7c750286ed4b2d95777d0101f0c
+  data.tar.gz: 7346a3732c5fad0a5c820340a462e2e150f525a15cfb2ab6f2da7d92f0472a8c1a544e16fcec6c84e154d097bc2081f8b7ffc76d667bab97ace3528576007616

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

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

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

@@ -26,7 +26,7 @@ class MainWindowPassInfoWidget < RubyQt6::Bando::QWidget
     activate_infoframe
 
     Pass.show(@store, @passname, on_success: ->(data) {
-      formdata = Helpers.parse_passfile(data)
+      formdata = hlpr_parse_passfile(data)
       if formdata["password"].start_with?("otpauth:")
         activate_otpform(formdata)
       else

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

@@ -0,0 +1,45 @@
+class MainWindowPassListWidget < RubyQt6::Bando::QWidget
+  class TreeWidget < RubyQt6::Bando::QTreeWidget
+    private
+
+    def filter_imp(text)
+      set_current_item(nil)
+
+      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 hlpr_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

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

@@ -0,0 +1,58 @@
+class MainWindowPassListWidget < RubyQt6::Bando::QWidget
+  class TreeWidget < RubyQt6::Bando::QTreeWidget
+    private
+
+    def refresh_imp(store, selected_passname:)
+      @store = store
+      @dataitems = {}
+
+      clear
+      refresh_imp_rebuild_tree
+      expand_all
+
+      if selected_passname.nil?
+        set_current_item(nil)
+      else
+        @dataitems.each do |_, item|
+          next if item.passname != selected_passname
+          set_current_item(item.treewidgetitem)
+          break
+        end
+      end
+    end
+
+    def refresh_imp_rebuild_tree
+      file_icon_provider = QFileIconProvider.new
+      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 hlpr_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, file_icon_provider.icon(entry))
+          @dataitems[filepath] = DataItem.new(passname, item)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,2 @@
+require_relative "funcs/filter"
+require_relative "funcs/refresh"

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

@@ -1,18 +1,18 @@
 class MainWindowPassListWidget < 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
+    private
 
-      def self.folderpath(store, fileinfo)
-        folder = fileinfo.dir? ? fileinfo.absolute_file_path : fileinfo.absolute_path
-        QDir.new(store).relative_file_path(folder)
+    def hlpr_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 hlpr_folderpath(store, fileinfo)
+      folder = fileinfo.dir? ? fileinfo.absolute_file_path : fileinfo.absolute_path
+      QDir.new(store).relative_file_path(folder)
+    end
   end
 end

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

@@ -1,10 +1,11 @@
+require_relative "treewidget/funcs"
 require_relative "treewidget/helpers"
-require_relative "treewidget/treebuilder"
-require_relative "treewidget/treefilter"
 require_relative "treewidget/ui"
 
 class MainWindowPassListWidget < RubyQt6::Bando::QWidget
   class TreeWidget < RubyQt6::Bando::QTreeWidget
+    DataItem = Struct.new(:passname, :treewidgetitem)
+
     q_object do
       signal "nil_selected(QString)"
       signal "passfile_selected(QString,QString)"
@@ -33,27 +34,11 @@ class MainWindowPassListWidget < RubyQt6::Bando::QWidget
     end
 
     def refresh(store, selected_passname: nil)
-      @store = store
-      @dataitems = {}
-
-      builder = TreeBuilder.new
-      builder.perform(self, @store, @dataitems)
-
-      expand_all
-      if selected_passname.nil?
-        set_current_item(nil)
-      else
-        @dataitems.each do |_, item|
-          next if item.passname != selected_passname
-          set_current_item(item.treewidgetitem)
-          break
-        end
-      end
+      refresh_imp(store, selected_passname:)
     end
 
-    def update_passname_filter(text)
-      filter = TreeFilter.new
-      filter.perform(self, @dataitems, text)
+    def filter(text)
+      filter_imp(text)
     end
 
     private
@@ -66,7 +51,7 @@ class MainWindowPassListWidget < RubyQt6::Bando::QWidget
 
       filepath = curr.data(1, Qt::DisplayRole).value
       dataitem = @dataitems[filepath]
-      Helpers.passfile?(filepath) ?
+      hlpr_passfile?(filepath) ?
         passfile_selected.emit(@store, dataitem.passname) :
         passfolder_selected.emit(@store, dataitem.passname)
     end
@@ -75,7 +60,7 @@ class MainWindowPassListWidget < RubyQt6::Bando::QWidget
       item = selected_items[0]
       if item
         filepath = item.data(1, Qt::DisplayRole).value
-        folder = Helpers.folderpath(@store, QFileInfo.new(filepath))
+        folder = hlpr_folderpath(@store, QFileInfo.new(filepath))
         folder = "" if folder == "."
       else
         folder = ""
@@ -91,7 +76,7 @@ class MainWindowPassListWidget < RubyQt6::Bando::QWidget
       item = selected_items[0]
       if item
         filepath = item.data(1, Qt::DisplayRole).value
-        folder = Helpers.folderpath(@store, QFileInfo.new(filepath))
+        folder = hlpr_folderpath(@store, QFileInfo.new(filepath))
         folder = "" if folder == "."
       else
         folder = ""

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

@@ -40,6 +40,6 @@ class MainWindowPassListWidget < RubyQt6::Bando::QWidget
   end
 
   def _on_searchbar_text_changed(text)
-    @treewidget.update_passname_filter(text)
+    @treewidget.filter(text)
   end
 end

data/lib/pass-qt/version.rb

@@ -1,3 +1,3 @@
 module PassQt
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-pass-qt
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - John Doe
@@ -48,9 +48,10 @@ files:
 - lib/pass-qt/app/views/mainwindow/components/passinfowidget/ui.rb
 - lib/pass-qt/app/views/mainwindow/components/passlistwidget.rb
 - lib/pass-qt/app/views/mainwindow/components/passlistwidget/treewidget.rb
+- lib/pass-qt/app/views/mainwindow/components/passlistwidget/treewidget/funcs.rb
+- lib/pass-qt/app/views/mainwindow/components/passlistwidget/treewidget/funcs/filter.rb
+- lib/pass-qt/app/views/mainwindow/components/passlistwidget/treewidget/funcs/refresh.rb
 - lib/pass-qt/app/views/mainwindow/components/passlistwidget/treewidget/helpers.rb
-- lib/pass-qt/app/views/mainwindow/components/passlistwidget/treewidget/treebuilder.rb
-- lib/pass-qt/app/views/mainwindow/components/passlistwidget/treewidget/treefilter.rb
 - lib/pass-qt/app/views/mainwindow/components/passlistwidget/treewidget/ui.rb
 - lib/pass-qt/app/views/mainwindow/components/passlistwidget/ui.rb
 - lib/pass-qt/app/views/mainwindow/ui.rb

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

@@ -1,46 +0,0 @@
-class MainWindowPassListWidget < 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/views/mainwindow/components/passlistwidget/treewidget/treefilter.rb

@@ -1,45 +0,0 @@
-class MainWindowPassListWidget < RubyQt6::Bando::QWidget
-  class TreeWidget < RubyQt6::Bando::QTreeWidget
-    class TreeFilter
-      def perform(treewidget, dataitems, text)
-        treewidget.set_current_item(nil)
-
-        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