rtfm-filemanager 1.7.4 → 1.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bf04ac71f0e3cfc2c028dfc50ed8db7c85855a5c1292b3ae3f5f1f3ae1f2cfa
-  data.tar.gz: 58871496975eac0839a8b43793b6fc75303705754fcfce5dd362f4b9dff9b37f
+  metadata.gz: c06c860c6a58770b3899d93cbfd71b5f16b4ad635acfc083ab3e68df036b4e42
+  data.tar.gz: 7ee9845c3f0e713f05277853c862bf468b52c56ed4d192e1078bfe5ae38f5508
 SHA512:
-  metadata.gz: 83160f2faa5b44caca7df16b0b2e6fafdc043da42eb376db0c1ec28e3cc38330aa53ff1d803e2bca64a0912528b5f41fbe51c976b7a02b9cca1a495591115932
-  data.tar.gz: 27264dc09670b0b5fbb031cd595b85eca494d72183003628e97a32319ed43049a8add382ce320e7796696d6c4b80e0f559c9f9e31ac9cd501db9324d8229a00a
+  metadata.gz: 250153cf7ac7dde5f6b9d50b160cd0a4091e60ac699f80ecec7ea084e925de5b71eec65410afb56f78747351b048c115a8b9cd62fdbf9d8a25e1038aafd737b8
+  data.tar.gz: b27356aac6130b6e2e3ee78f6bc61b225ca083b7e128dd820c15f09bd1c55c0363a031bdc7e6d92a6134e26a556205a453a2c92af8620e12c0937c5eef68f2d3

data/bin/rtfm

@@ -46,6 +46,7 @@ JUMPING AND MARKS
            Press '-' and a letter to delete that mark
  M       = Show marked items in right pane
  '       = 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
  n       = Jump to the next item matched by '/'
  N       = Jump to the previous item matched by '/'
@@ -134,6 +135,7 @@ begin # BASIC SETUP
   def cmd?(command)
     system("which #{command} > /dev/null 2>&1")
   end
+  
   if cmd?('/usr/lib/w3m/w3mimgdisplay')
     @w3mimgdisplay = "/usr/lib/w3m/w3mimgdisplay"
     @showimage = true
@@ -141,6 +143,8 @@ begin # BASIC SETUP
     @showimage = false
   end
   @showimage = false unless (cmd?('xwininfo') and cmd?('xdotool'))
+  
+  cmd?('bat') ? @bat = "bat" : @bat = "batcat"
 
   STDIN.set_encoding(Encoding::UTF_8) # Set encoding for STDIN 
   LScolors = `echo $LS_COLORS` # Import LS_COLORS 
@@ -261,6 +265,13 @@ def getchr # PROCESS KEY PRESSES
       when '7' then chr = "HOME"   ; STDIN.getc
       when '8' then chr = "END"    ; STDIN.getc
       end
+    when 'O'   # Set Ctrl+ArrowKey equal to ArrowKey; May be used for other purposes in the future
+      case $stdin.getc
+      when 'a' then chr = "UP"
+      when 'b' then chr = "DOWN"
+      when 'c' then chr = "RIGHT"
+      when 'd' then chr = "LEFT"
+      end
     end
   when "", "" then chr = "BACK"
   when "" then chr = "WBACK"
@@ -315,7 +326,7 @@ def main_getkey # GET KEY FROM USER
     var_resets
     cur_dir = Dir.pwd
     @directory[Dir.pwd] = @selected # Store this directory before leaving
-    @marks["'"] = Dir.pwd
+    mark_latest
     Dir.chdir("..")
     @directory[Dir.pwd] = File.basename(cur_dir) unless @directory.key?(Dir.pwd)
     @w_r.update = true
@@ -323,14 +334,14 @@ def main_getkey # GET KEY FROM USER
   when 'RIGHT', 'l'
     var_resets
     @directory[Dir.pwd] = @selected # Store this directory before leaving
-    @marks["'"] = Dir.pwd
+    mark_latest
     open_selected()
     @w_r.update = true
     @w_b.update = true
   when 'x'   # Force open with file opener (used to open HTML files in browser)
     var_resets
     @directory[Dir.pwd] = @selected # Store this directory before leaving
-    @marks["'"] = Dir.pwd
+    mark_latest
     open_selected(true)
     @w_r.update = true
     @w_b.update = true
@@ -370,8 +381,6 @@ def main_getkey # GET KEY FROM USER
     @w_r.update = false
     @w_b.update = true
   when 'M' # Show marks 
-    @marks = @marks.sort.to_h
-    @w_r.fg = 147
     marks_info
     @w_r.update = false
     @w_b.update = true
@@ -387,6 +396,7 @@ def main_getkey # GET KEY FROM USER
       rescue
         w_b_info(" No such directory")
       end
+      mark_latest
       @marks["'"] = dir_before
     end
     @w_r.update = true
@@ -394,13 +404,13 @@ def main_getkey # GET KEY FROM USER
   when '~' # Go to home dir
     var_resets
     @directory[Dir.pwd] = @selected # Store this directory before leaving
-    @marks["'"] = Dir.pwd
+    mark_latest
     Dir.chdir
     @w_r.update = true
     @w_b.update = true
   when 'f' # Follow symlink
     @directory[Dir.pwd] = @selected # Store this directory before leaving
-    @marks["'"] = Dir.pwd
+    mark_latest
     if File.symlink?(@selected) 
       begin
         Dir.chdir(File.dirname(File.readlink(@selected)))
@@ -426,7 +436,7 @@ def main_getkey # GET KEY FROM USER
         jumpdir = File.dirname(jumpdir)
       end
       @directory[Dir.pwd] = @selected # Store this directory before leaving
-      @marks["'"] = Dir.pwd
+      mark_latest
       Dir.chdir(jumpdir)
       @w_r.pager = 0
     end
@@ -594,8 +604,8 @@ def main_getkey # GET KEY FROM USER
       text    += [[195, 0, ps]]
       disk     = `df -H | head -8`
       text    += [[172, 0, disk]]
-      dmesg    = "\nDMESG:\n"
-      dmesg   += `dmesg | tail -6`
+      dmesg    = "\nDMESG (latest first):\n"
+      dmesg   += `dmesg | tail -6`.split("\n").sort.reverse.join("\n")
       text    += [[219, 0, dmesg]]
       w_r_info(ansifix(text))
     rescue
@@ -603,7 +613,7 @@ def main_getkey # GET KEY FROM USER
     end
   # RIGHT PANE
   when 'ENTER' # Refresh right pane
-    @w_r.clr # First clear the window, then clear any previously showing image
+    @w_r.fill # First clear the window, then clear any previously showing image
     image_show("clear") if @image; @image = false
     @w_r.update = true
     @w_b.update = true
@@ -766,6 +776,14 @@ def ansifix(text) # Format [[fg, attr, text]]
   end
   return output
 end
+def mark_latest
+  @marks["5"] = @marks["4"]
+  @marks["4"] = @marks["3"]
+  @marks["3"] = @marks["2"]
+  @marks["2"] = @marks["1"]
+  @marks["1"] = @marks["'"]
+  @marks["'"] = Dir.pwd
+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 + "/"
@@ -887,7 +905,7 @@ end
 def open_selected(html = nil) # OPEN SELECTED ITEM (when pressing RIGHT)
   if File.directory?(@selected) # Rescue for permission error
     begin
-      @marks["'"] = Dir.pwd
+      mark_latest
       Dir.chdir(@selected)
     rescue
     end
@@ -953,8 +971,8 @@ def w_r_show # SHOW CONTENTS IN THE RIGHT WINDOW
     # TEXT 
     elsif File.read(@selected).force_encoding("UTF-8").valid_encoding? and @w_r.pager == 0
       begin # View the file as text if it is utf-8
-        @w_r.pager_cmd = "batcat -n --color=always #{@selected_safe} 2>/dev/null"
-        @w_r.text      = `batcat -n --color=always --line-range :#{@w_r.maxy} #{@selected_safe} 2>/dev/null`
+        @w_r.pager_cmd = "#{@bat} -n --color=always #{@selected_safe} 2>/dev/null"
+        @w_r.text      = `#{@bat} -n --color=always --line-range :#{@w_r.maxy} #{@selected_safe} 2>/dev/null`
         pager_start
         syntax_highlight(@w_r.text)
       rescue
@@ -1036,6 +1054,8 @@ def w_r_info(info) # SHOW INFO IN THE RIGHT WINDOW
   @w_r.update = false
 end
 def marks_info # SHOW MARKS IN RIGHT WINDOW
+  @w_r.fg = 183
+  @marks = @marks.sort.to_h
   info = "MARKS:\n"
   unless @marks.empty?
     @marks.each do |mark, dir|
@@ -1295,7 +1315,7 @@ def w_b_exec(cmd) # EXECUTE COMMAND FROM @W_B
     status = Timeout::timeout(5) {
       @w_r.clr
       begin
-        @w_r.pager_cmd = "#{cmd} | batcat -n --color=always 2>/dev/null"
+        @w_r.pager_cmd = "#{cmd} | #{bat} -n --color=always 2>/dev/null"
         @w_r.text = `#{@w_r.pager_cmd} 2>/dev/null`
       rescue
         @w_r.text = `#{cmd} 2>/dev/null`

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rtfm-filemanager
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.8.3
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-11 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -33,7 +33,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 1.7.4: Fixed bug on jumping to mark and then pressing PgUp'
+  other features. New in 1.8.3: Fixed bug on Ctrl+ArrowKey, added bat as possible
+  command for batcat'
 email: g@isene.com
 executables:
 - rtfm