rtfm-filemanager 1.5.6 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f0131adea235fd4c83591da8e250a7eeca1cc35b0941e23c5372fd35a33caa8
-  data.tar.gz: 52b1b04410ec57b95517e26d50c03cec83ca22c9aa21c87cb496a7b26ac689a3
+  metadata.gz: 4c3a3d9a904767a6ef5decf4f4924b624cea2c35c4928000084d48b318b58424
+  data.tar.gz: c9f94ffc2fbdac8a6be651cb90314d9042a0e54fff5031f60b8b266605fb748c
 SHA512:
-  metadata.gz: 813931572663d1e25ab22fd1ddcc6d4de1db96fe3167f53d5fbdc199d2f2668efbc71cc54a26ce0c1592947fab7f0f76ef673748ce2b14ff3c0a2e4f8d598db8
-  data.tar.gz: 0f04762f7209ed0dd90e4aae3820915312e924a043ab12b14496d4c2b78136795ec05d0b98a4b74276b6a8ac4bfc82be0b04af051215f2ce98275a461194f09e
+  metadata.gz: ddc76de2b511bb3306857e3f97c10cd2ac0c02903ff9b16d3c4d3ac33ce2035831f48ed93f7821b6b6977a9ba8207019a434f840bd7c55a9948e40f4a5a6a178
+  data.tar.gz: 0110652cfbd0f59040e1b606dfd653fb8c62207fbc6351d3cf7114d5a196233e13388b97376d4e8ad4878ab8fed3efd5a1343b5ef971034777f6c49b3323fb74

data/bin/rtfm

@@ -242,7 +242,7 @@ def getchr # PROCESS KEY PRESSES
   # Note: Curses.getch blanks out @w_t
   # @w_l.getch makes Curses::KEY_DOWN etc not work
   # Therefore resorting to the generic method
-  c = STDIN.getch(min: 0, time: 5)
+  c = STDIN.getch(min: 0, time: 1)
   case c
   when "\e"    # ANSI escape sequences
     case $stdin.getc
@@ -324,6 +324,7 @@ def main_getkey # GET KEY FROM USER
     @directory[Dir.pwd] = @selected # Store this directory before leaving
     @marks["'"] = Dir.pwd
     open_selected()
+    @change_tag = true
     @w_r.update = true
     @w_b.update = true
   when 'x'   # Force open with file opener (used to open HTML files in browser)
@@ -331,6 +332,7 @@ def main_getkey # GET KEY FROM USER
     @directory[Dir.pwd] = @selected # Store this directory before leaving
     @marks["'"] = Dir.pwd
     open_selected(true)
+    @change_tag = true
     @w_r.update = true
     @w_b.update = true
   when 'PgDOWN'
@@ -401,7 +403,10 @@ def main_getkey # GET KEY FROM USER
     @directory[Dir.pwd] = @selected # Store this directory before leaving
     @marks["'"] = Dir.pwd
     if File.symlink?(@selected) 
-      Dir.chdir(File.dirname(File.readlink(@selected)))
+      begin
+        Dir.chdir(File.dirname(File.readlink(@selected)))
+      rescue
+      end
     end
     @w_b.update = true
   when 'g' # Run 'grep' in the current directory
@@ -458,10 +463,12 @@ def main_getkey # GET KEY FROM USER
     copy_move_link("copy")
     @w_r.update = true
     @w_b.update = true
+    @change_tag = true
   when 'P' # Move tagged items here 
     copy_move_link("move")
     @w_r.update = true
     @w_b.update = true
+    @change_tag = true
   when 's' # Create symlink to tagged items here 
     copy_move_link("link")
     @w_r.update = true
@@ -564,11 +571,22 @@ def main_getkey # GET KEY FROM USER
   when 'S' # Show comprehensive system info
     begin
       @w_r.pager_cmd = ""
-      uname    = `uname -o`.chop + "  "
-      uname   += `uname -r`.chop + "  "
-      uname   += `uname -v`.chop + "  "
-      uname   += `uname -p` + "\n"
+      uname    = `uname -o`.chomp + "  "
+      uname   += `uname -r`.chomp + "  "
+      uname   += `uname -v`.chomp + "  "
+      uname   += `uname -p`.chomp + "  "
+      uname   += `awk -F '"' '/PRETTY/ {print $2}' /etc/os-release` + "\n"
       text     = [[253, 1, uname]]
+      system   = "Shell & Terminal: " + `echo $SHELL`.sub(/.*\//, '').chomp + ", " + `echo $TERM`.chomp + "   "
+      packages = `pacman -Q | wc -l`.chomp
+      packages = `dpkg-query -l | grep -c '^.i'`.chomp if packages == "0"
+      packages = "Unrecognized" if packages == "0"
+      system  += "Packages: " + packages + "\n"
+      system  += "Desktop: " + `awk '/^DesktopNames/' /usr/share/xsessions/* | sed 's/DesktopNames=//g' | \\
+                  sed 's/\\;/\\n/g' | sed '/^$/d' | sort -u | sed ':a;N;$!ba;s/\\n/, /g'`.chomp + "/"
+      system  += `grep 'gtk-theme-name' ~/.config/gtk-3.0/* | sed 's/gtk-theme-name=//g' | \\
+                  sed 's/-/ /g'`.sub(/.*:/, '') + "\n"
+      text    += [[251, 0, system]]
       cpu      = "CPUs = " + `nproc`.chop + "  "
       cpuinfo  = `lscpu`
       cpu     += cpuinfo[/^.*Model name:\s*(.*)/, 1] + "  "
@@ -594,7 +612,7 @@ def main_getkey # GET KEY FROM USER
     image_show("clear") if @image; @image = false
     @w_r.update = true
     @w_b.update = true
-  when 'TAB' # Start paging
+  when 'TAB' # Start paging/Down one page
     if @w_r.pager == 1 and @w_r.pager_cmd != ""
       @w_r.text = `#{@w_r.pager_cmd} 2>/dev/null` 
     end
@@ -624,12 +642,10 @@ def main_getkey # GET KEY FROM USER
     @searched = w_b_getstr("/ ", "")
     l = `ls #{@lsbase} #{@lsall} #{@lsorder} #{@lsinvert} #{@lsuser}`.split
     m = l.each_index.select{|n| l[n] =~ /#{@searched}/}
-    @index = 0 unless m == []
-    i = m.find { |n| n > @index }
-    @index = i if i > @index unless i == nil
+    @index = m[0] unless m == []
     @index = 0 if @searched == ""
     @w_r.update = true
-  when 'n'
+  when 'n' # Jump to next occurence of search (after '/')
     l = `ls #{@lsbase} #{@lsall} #{@lsorder} #{@lsinvert} #{@lsuser}`.split
     m = l.each_index.select{|n| l[n] =~ /#{@searched}/}
     i = m.find { |n| n > @index }
@@ -639,7 +655,7 @@ def main_getkey # GET KEY FROM USER
       @index = i
     end
     @w_r.update = true
-  when 'N'
+  when 'N' # Jump to previous occurence of search (after '/')
     l = `ls #{@lsbase} #{@lsall} #{@lsorder} #{@lsinvert} #{@lsuser}`.split
     m = l.each_index.select{|n| l[n] =~ /#{@searched}/}.reverse
     i = m.find { |n| n < @index }
@@ -656,7 +672,7 @@ def main_getkey # GET KEY FROM USER
   when ';' # Show command history 
     w_r_info("Command history (latest on top):\n\n" + @history.join("\n"))
     @w_b.update = true
-  when 'y', 'Y'
+  when 'y', 'Y' # Copy path of selected item
     if @selected == nil
       w_b_info(" No selected item path to copy")
     else
@@ -1281,6 +1297,7 @@ def w_b_exec(cmd) # EXECUTE COMMAND FROM @W_B
         pager_show
         @w_r.update = false
       end
+      @change_tag = true
     }
   rescue
     w_b_info(" Failed to execute command (#{cmd})")
@@ -1308,12 +1325,13 @@ loop do # OUTER LOOP - CATCHING REFRESHES VIA 'r'
     @w_b = Curses::Window.new(1, 0, maxy - 1, 0)
     @w_l = Curses::Window.new(maxy - 3, (maxx/@width) - 1, 2, 0)
     @w_r = Curses::Window.new(maxy - 4, maxx - (maxx/@width), 2, maxx/@width)
+    @w_p = Curses::Window.new(1, maxx - (maxx/@width), maxy - 2, maxx/@width)
+    @w_p.fg, @w_p.bg = 255, 0
+    @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_t.update = true
     @w_b.update = true
-    @w_l.update = true
     @w_r.update = true
     @w_r.pager  = 0
     @w_r.pager_more = false
@@ -1323,13 +1341,14 @@ loop do # OUTER LOOP - CATCHING REFRESHES VIA 'r'
       tagged_info
       @w_r.update = false
     end
+    @change     = true
+    @change_tag = true
     loop do # INNER, CORE LOOP 
       begin # Jump to home dir if current dir is externally removed
         Dir.pwd
       rescue
         Dir.chdir
       end
-      system("printf \"\033]0;RTFM: #{Dir.pwd}\007\"")   # Set Window title to path 
       ls_cmd  = "ls #{@lsbase} #{@lsall} #{@lsorder} #{@lsinvert} #{@lsuser}" # Get files in current directory 
       @files  = `#{ls_cmd} 2>/dev/null`.split("\n")
       ls_cmd += %q[ -lhgG --time-style="long-iso" | awk '{printf "%s%12s%6s%6s%5s", $1,$4,$5,$3,$2 "\n"}']
@@ -1349,28 +1368,33 @@ loop do # OUTER LOOP - CATCHING REFRESHES VIA 'r'
         @index        = @files.index(@selected)
         @orderchange  = false
       end
-      @index     = @files.index(@selected) if @lsall != lsall_old # Change in showing all items must be handled
-      @index     = index_old if @files.index(@selected) == nil    # If item no longer is shown
-      @min_index = 0
-      @max_index = @files.size - 1
-      @index     = @max_index if @index > @max_index  # If deleted many items
-      @index     = 0 if @index < 0
-      @selected      = @files[@index]                 # Get text of selected item
-      @selected_safe = "\"#{@selected}\""             # Make it safe for commands
-      # Top window (info line) 
-      w_t_info
+      @index          = @files.index(@selected) if @lsall != lsall_old # Change in showing all items must be handled
+      @index          = index_old if @files.index(@selected) == nil    # If item no longer is shown
+      @min_index      = 0
+      @max_index      = @files.size - 1
+      @index          = @max_index if @index > @max_index  # If deleted many items
+      @index          = 0 if @index < 0
+      @selected       = @files[@index]                     # Get text of selected item
+      sel_old         = @selected_safe
+      @selected_safe  = "\"#{@selected}\""                 # Make it safe for commands
+      @selected_safe == sel_old ? @change = false : @change = true
+      @change         = true if @change_tag; @change_tag = false
+      if @change
+        system("printf \"\033]0;RTFM: #{Dir.pwd}\007\"")   # Set Window title to path 
+        # Top window (info line) 
+        w_t_info
+        @w_l.setpos(0,0)
+        list_dir(true)
+        @w_l.refresh
+      end
       # Bottom window (command line) Before @w_r to avoid image dropping out on startup
       w_b_info(nil) if @w_b.update
       # Left and right windows (browser & content viewer)
-      @w_l.setpos(0,0)
-      list_dir(true)
-      @w_l.refresh
       if @w_r.update and @preview
         w_r_show
         @w_r.fg = 255
       end
-      Curses.curs_set(1) # Clear residual cursor
-      Curses.curs_set(0) # ...from editing files 
+      Curses.curs_set(1); Curses.curs_set(0) # Clear residual cursor from editing files 
       @tag = false       # Clear tag pattern
       lsall_old = @lsall
       main_getkey        # Get key from user 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rtfm-filemanager
 version: !ruby/object:Gem::Version
-  version: 1.5.6
+  version: 1.6.0
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-15 00:00:00.000000000 Z
+date: 2021-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -33,10 +33,7 @@ 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 1.5.0: Expanded ''/'' to jump to the first match and ''n''
-  to jump to the next matched item (''j'' and ''J'' are now gone). New in 1.5.4: Fixed
-  command output error - now shown in right pane. New in 1.5.5/6: Fixed minor jump
-  issue when searching via ''/'''
+  other features. New in 1.6.0: RTFM now uses even less resources.'
 email: g@isene.com
 executables:
 - rtfm