rtfm-filemanager 2.1 → 2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1513671bf2225ce310f4da9d6456c24f9268b6adbbb295574f2251358bb1bc7d
-  data.tar.gz: 8018bd4e856182ae60a7957e9381c4109c28423710ed224276633b9763b4d075
+  metadata.gz: 0d7099e1d453f30470918460a94ed63c4fe27f9aeabaf048d5d49f28c5f5f492
+  data.tar.gz: 316001942094dc0323d27959341fcfd0b4abf380ac7e709235dfec33561931d3
 SHA512:
-  metadata.gz: 84902969b49951e25999896cfb64e7712bb21032b6b5c1d43f239b3a926077faa7e5d7fb02c834587a004d5830b75517451c90ad84a82e230007802777703439
-  data.tar.gz: 23f9324a0382237e030d9e172495ec22329c679d98c16c1f3e6c3943b68bd5b5930072939e8798f72e8862ceba4396447c31b632a22fc47e70fc455c8af9d7d2
+  metadata.gz: fba204a6f59db705c929a3efd21043013a405db024f3ad415c80aeca4f2d8961e14f114409d766620a189a4fc8b1d0492b554d40f3c085e3594a599f5bfe0cf1
+  data.tar.gz: 4adbff6448f6c3bbd1dde25260d32d9dd4ec032892e7f82fa73c1db6d5733e38e9fefc580f0968ce65e1b252c33dbb57788a63c9f048a4c935961097da6b6665

data/README.md

@@ -147,7 +147,7 @@ M      | Show marked items in right pane
 n      | Jump to the next item matched by '/'
 N      | Jump to the previous item matched by '/'
 ~      | Jump to Home directory
-f      | Follow symlink to the directory where the target resides
+\>      | Follow symlink to the directory where the target resides
 L      | Start 'locate' search for files, then use '#' to jump to desired line/directory
 
 ### Tagging
@@ -180,7 +180,6 @@ i      | Invert/reverse the sorting
 O      | Show the Ordering in the bottom window (the full ls command)
 G      | Show git status for current directory
 H      | Do a cryptographic hash of the current directory with subdirs. If a previous hash was made, compare and report if there has been any change
-S      | Show comprehensive system info (system, CPU, filesystem, latest dmesg messages)
 I      | Show OpenAI's description of the selected item and its content (if available). You must have installed the ruby-openai gem and added your openai secret key in the .rtfm.conf (add `@ai = "your-secret-openai-key") for this to work. If RTFM is installed as a gem, the ruby-openai gem is included in the installation
 
 ### Right pane
@@ -198,12 +197,14 @@ _      | Toggle preview of images in right pane
 
 Key    | Description
 -------|------------------------------------------------------------------
-F      | Show only files in the left pane matching extension(s) (e.g. "txt" or "pdf,png,jpg")
+f      | Show only files in the left pane matching extension(s) (e.g. "txt" or "pdf,png,jpg")
+F      | Show only files matching a pattern (Ruby Regex) (e.g. "abc" or "ab.+12(\w3)*")
 g      | Run 'grep' to show files that contains the MATCH in current directory
 :      | Enter "command mode" in bottom window (press ENTER to execute, press Ctrl-G to escape)
 ;      | Show command history in right pane
 y      | Copy path of selected item to primary selection (for pasting with middle mouse button)
 Y      | Copy path of selected item to clipboard
+S      | Show comprehensive system info (system, CPU, filesystem, latest dmesg messages)
 
 
 ## A convenient shell function

data/bin/rtfm

@@ -48,11 +48,11 @@ JUMPING AND MARKS
  '       = Jump to mark (next letter is the name of the mark [a-zA-Z'])
            The 5 latest directories visited are stored in marks 1-5 (1 being the very latest)
  /       = Enter search string in bottom window to highlight matching items and jump to the first match
- \\       = Remove search pattern
+ \       = Remove search pattern
  n       = Jump to the next item matched by '/'
  N       = Jump to the previous item matched by '/'
  ~       = Jump to Home directory
- f       = Follow symlink to the directory where the target resides
+ >       = Follow symlink to the directory where the target resides
  L       = Start 'locate' search for files, then use '#' to jump to desired line/directory
 
 TAGGING
@@ -77,7 +77,6 @@ DIRECTORY VIEWS
  G       = Show git status for current directory
  H       = Do a cryptographic hash of the current directory with subdirs
            If a previous hash was made, compare and report if there has been any change
- S       = Show comprehensive system info (system, CPU, filesystem, latest dmesg messages)
  I       = Show OpenAI's description of the selected item and its content (if available)
            You must have installed the ruby-openai gem and added your openai secret key
            in the .rtfm.conf (add `@ai = "your-secret-openai-key") for this to work.
@@ -87,16 +86,18 @@ RIGHT PANE
  TAB     = Next page of the preview (if doc long and ∇ in the bottom right)
  S-TAB   = Previous page (if you have moved down the document first - ∆ in the top right)
  w       = Change the width of the left/right panes (left pane ⇒ ⅓ ⇒ ¼ ⇒ ⅕ ⇒ ⅙ ⇒ ½ ⇒ ⅓)
- -       = Toggle preview in right pane (turn it off for faster traversing of directories)
- _       = Toggle preview of images in right pane
+ -       = (Minus sign) Toggle preview in right pane (turn it off for faster traversing of directories)
+ _       = (Underscore) Toggle preview of images in right pane
 
 ADDITINAL COMMANDS
- F       = Show only files in the left pane matching extension(s) (e.g. "txt" or "pdf,png,jpg")
+ f       = Show only files in the left pane matching extension(s) (e.g. "txt" or "pdf,png,jpg")
+ F       = Show only files matching a pattern (Ruby Regex) (e.g. "abc" or "ab.+12(\w3)*")
  g       = Run 'grep' to show files that contains the MATCH in current directory
  :       = Enter "command mode" in bottom window (press ENTER to execute, press Ctrl-G to escape)
  ;       = Show command history in right pane
  y       = Copy path of selected item to primary selection (for pasting with middle mouse button)
  Y       = Copy path of selected item to clipboard
+ S       = Show comprehensive System info (system, CPU, filesystem, latest dmesg messages)
 
 COPYRIGHT: Geir Isene, 2020-3. No rights reserved. See http://isene.com for more.
 HELPTEXT
@@ -179,7 +180,8 @@ begin # BASIC SETUP
   ## These should not be set by user in .rtfm.conf
   @directory  = {}    # Initialize the directory hash for remembering directories visited
   @searched   = ""    # Initialize the active searched for items
-  @lsfiles    = ""    # File types to show (initially set to all file types"
+  @lsfiles    = ""    # File types to show (initially set to all file types) - not saved on exit
+  @lsmatch    = ""    # Files to match (initially set to matching all files) - not saved on exit
   @index      = 0     # Set chosen item to first on startup
   @marks["'"] = Dir.pwd
   ## File type recognizers
@@ -430,7 +432,7 @@ def main_getkey # GET KEY FROM USER
     Dir.chdir
     @w_r.update = true
     @w_b.update = true
-  when 'f' # Follow symlink
+  when '>' # Follow symlink
     @directory[Dir.pwd] = @selected # Store this directory before leaving
     mark_latest
     if File.symlink?(@selected) 
@@ -682,11 +684,15 @@ def main_getkey # GET KEY FROM USER
     getch
     @break = true
   # ADDITIONAL COMMANDS
-  when 'F' # Filter out filetypes not matching @lsfiles
+  when 'f' # Filter out filetypes not matching @lsfiles
     loop do
       @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("/ ", "")
@@ -823,6 +829,31 @@ def mark_latest
   @marks["1"] = @marks["'"]
   @marks["'"] = Dir.pwd
 end
+def get_files(win) # The core of the directory listings
+  ls_cmd  = "ls #{@lsbase} #{@lsall} #{@lsorder} #{@lsinvert} #{@lsuser}" # Get files in current directory 
+  ls_cmd += @selected_safe if win == "right"
+  @files  = `#{ls_cmd} 2>/dev/null`.split("\n")
+  ls_cmd += " -H " if win == "right"
+  ls_cmd += %q[ -lhgG --time-style="long-iso" 2>/dev/null | awk '{printf "%s%12s%6s%6s%5s", $1,$4,$5,$3,$2 "\n"}']
+  @fspes  = `#{ls_cmd} 2>/dev/null`.split("\n").drop(1)
+  if @lsfiles != "" or @lsmatch != ""
+    lsf      = @lsfiles.split(",").map! {|e| e.strip}
+    dir_cmd  = "ls -d "
+    dir_cmd += @selected_safe + "/" if win == "right"
+    dir_cmd += "*/"
+    dirs     = `#{dir_cmd} 2>/dev/null`.split("/\n")
+    dirs.map!{|d| d.sub!(/.*\//, '')} if win == "right"
+    @files   = @files - dirs
+    @fspes   = @fspes - dirs
+    @files.select! {|f| lsf.any? {|l| File.extname(f) == ".#{l}"}} if @lsfiles != ""
+    @fspes.select! {|f| lsf.any? {|l| File.extname(f) == ".#{l}"}} if @lsfiles != ""
+    @files.select! {|f| f =~ /#{@lsmatch}/} if @lsmatch != ""
+    @fspes.select! {|f| f =~ /#{@lsmatch}/} if @lsmatch != ""
+    @files   = dirs + @files
+    @fspes   = dirs + @fspes
+    @w_r.update = true
+  end
+end
 # TOP WINDOW FUNCTIONS 
 def w_t_info # SHOW INFO IN @w_t
   text  = " " + ENV['USER'].to_s + "@" + `hostname 2>/dev/null`.to_s.chop + ": " + Dir.pwd + "/"
@@ -1002,10 +1033,7 @@ def w_r_show # SHOW CONTENTS IN THE RIGHT WINDOW
     if @w_r.pager > 0
       pager_show 
     elsif File.directory?(@selected)
-      ls_cmd  = "ls #{@selected_safe} #{@lsbase} #{@lsall} #{@lsorder} #{@lsinvert} #{@lsuser}"
-      @files  = `#{ls_cmd} 2>/dev/null`.split("\n")
-      ls_cmd += %q[ -lhgGH --time-style="long-iso" 2>/dev/null | awk '{printf "%s%12s%6s%6s%5s", $1,$4,$5,$3,$2 "\n"}']
-      @fspes  = `#{ls_cmd} 2>/dev/null`.split("\n").drop(1)
+      get_files("right")
       list_dir(false)
     # TEXT 
     elsif File.read(@selected).force_encoding("UTF-8").valid_encoding? and @w_r.pager == 0
@@ -1222,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
@@ -1416,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
@@ -1429,25 +1464,13 @@ 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
       rescue
         Dir.chdir
       end
-      lsf     = @lsfiles.split(",").map! {|e| "*." + e.strip }
-      lsf     = lsf.join(" ")
-      ls_cmd  = "ls #{@lsbase} #{@lsall} #{@lsorder} #{@lsinvert} #{@lsuser} #{lsf}" # Get files in current directory 
-      @files  = `#{ls_cmd} 2>/dev/null`.split("\n")
-      ls_cmd += %q[ -lhgG --time-style="long-iso" 2>/dev/null | awk '{printf "%s%12s%6s%6s%5s", $1,$4,$5,$3,$2 "\n"}']
-      @fspes  = `#{ls_cmd} 2>/dev/null`.split("\n").drop(1)
-      if @lsfiles != ""
-        dirs    = `ls -d */`.split("/\n")
-        @files  = dirs + @files
-        @fspes  = dirs + @fspes
-      end
+      get_files("left")
       if Dir.pwd != dir_old
         if @directory.key?(Dir.pwd)
           @selected = @directory[Dir.pwd]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rtfm-filemanager
 version: !ruby/object:Gem::Version
-  version: '2.1'
+  version: '2.3'
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-21 00:00:00.000000000 Z
+date: 2023-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -47,7 +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 filter-by-extension via the key ''F'''
+  other features. New in 2.2: Better notification when files are filtered with ''f''
+  or ''F'''
 email: g@isene.com
 executables:
 - rtfm