rtfm-filemanager 2.2 → 2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c410aa1b0b696236f9954263caa3d7e670d7ca45da0d45d2e8cb94fc52d895d1
-  data.tar.gz: 6832505f97d8b81010c50905782af9eb2a36709386ee616d06c8f1024d798a54
+  metadata.gz: 0d7099e1d453f30470918460a94ed63c4fe27f9aeabaf048d5d49f28c5f5f492
+  data.tar.gz: 316001942094dc0323d27959341fcfd0b4abf380ac7e709235dfec33561931d3
 SHA512:
-  metadata.gz: 7901006b50b618083589b017b66cb747d41c42d7bb170c95b00b19ddbdc0aa1d4921ddfe90ed2eebef10e040f0c15b7a1fa4b2557416d0d0d9b6201d34f8267f
-  data.tar.gz: d8666f8f471d72bc19fd27235e191604d09ef2dd7df58a51339fd9ec7c2cfa5ba7714d28a7aa5c8a2217dd5916cd31c3a473f2b31a397f336ba69ef15fce23a6
+  metadata.gz: fba204a6f59db705c929a3efd21043013a405db024f3ad415c80aeca4f2d8961e14f114409d766620a189a4fc8b1d0492b554d40f3c085e3594a599f5bfe0cf1
+  data.tar.gz: 4adbff6448f6c3bbd1dde25260d32d9dd4ec032892e7f82fa73c1db6d5733e38e9fefc580f0968ce65e1b252c33dbb57788a63c9f048a4c935961097da6b6665

data/bin/rtfm

@@ -689,8 +689,10 @@ def main_getkey # GET KEY FROM USER
       @lsfiles = w_b_getstr("Filetype(s) to show: ", @lsfiles)
       break if @lsfiles.match(/^$|\w+(,\w+)*$/)
     end
+    w_b_info(nil)
   when 'F' # Filter out files not matching @lsmatch
     @lsmatch = w_b_getstr("Files will match RegEx: ", @lsmatch)
+    w_b_info(nil)
   when '/' # Get search string to mark items that match the input 
     @w_b.nohistory = true
     @searched = w_b_getstr("/ ", "")
@@ -1248,10 +1250,16 @@ end
 # BOTTOM WINDOW FUNCTIONS 
 def w_b_info(info) # SHOW INFO IN @W_B
   @w_b.clr
+  @w_b.fg, @w_b.bg = 250, 238
   if info == nil
     info      = ": for command (use @s for selected item, @t for tagged items) - press ? for help" 
-    info      = "Showing only file type #{@lsfiles}" if @lsfiles != ""
-    info      = "Showing only file types #{@lsfiles}" if @lsfiles =~ /,/
+    info      = "Showing only files matching '#{@lsmatch}'" if @lsmatch != ""
+    info      = "Showing only file type '#{@lsfiles}'" if @lsfiles != ""
+    info      = "Showing only file types '#{@lsfiles}'" if @lsfiles =~ /,/
+    info     += " and only files matching '#{@lsmatch}'" if @lsfiles != "" and @lsmatch != ""
+    @w_b.fg, @w_b.bg = 250, 88  if @lsfiles != ""
+    @w_b.fg, @w_b.bg = 250, 21  if @lsmatch != ""
+    @w_b.fg, @w_b.bg = 250, 55  if @lsfiles != "" and @lsmatch != ""
   end
   info      = info[1..(@w_b.maxx - 3)] + "…" if info.length + 3 > @w_b.maxx 
   info     += " " * (@w_b.maxx - info.length) if info.length < @w_b.maxx
@@ -1442,6 +1450,7 @@ loop do # OUTER LOOP - CATCHING REFRESHES VIA 'r'
     @w_p.refresh
     @w_t.fg, @w_t.bg = 232, 249
     @w_t.attr        = Curses::A_BOLD
+    @w_b.fg, @w_b.bg = 250, 238
     @w_b.update = true
     @w_r.update = true
     @w_r.pager  = 0
@@ -1455,8 +1464,6 @@ loop do # OUTER LOOP - CATCHING REFRESHES VIA 'r'
     @change     = true
     @change_tag = true # For future need to force @change
     loop do # INNER, CORE LOOP 
-      @w_b.fg, @w_b.bg = 250, 238
-      @w_b.fg, @w_b.bg = 250, 88  if @lsfiles != ""
       @w_r.text = ""
       begin # Jump to home dir if current dir is externally removed
         Dir.pwd

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rtfm-filemanager
 version: !ruby/object:Gem::Version
-  version: '2.2'
+  version: '2.3'
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-22 00:00:00.000000000 Z
+date: 2023-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -47,8 +47,8 @@ dependencies:
 description: 'A full featured terminal browser with syntax highlighted files, images
   shown in the terminal, videos thumbnailed, etc. You can bookmark and jump around
   easily, delete, rename, copy, symlink and move files. RTFM has a a wide range of
-  other features. New in 2.1: Added keys ''f'' (show only file types) and ''F'' (show
-  only files matching a RegEx) and moved follow-symlink from ''f'' to ''>''.'
+  other features. New in 2.2: Better notification when files are filtered with ''f''
+  or ''F'''
 email: g@isene.com
 executables:
 - rtfm