rtfm-filemanager 1.8.1 → 1.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5dcdef99c7f6967e0925bb3b845e52234ad4b452addc8e6744e27d0a3245b34e
-  data.tar.gz: eb88eb47c8a8012f2572a552a488b0cd22d4bcca026603e950dc51853d80ac7d
+  metadata.gz: ba36c06ff3a1cff4dbbc5c54c81718f9e0fc00d6ccc515929745b149851df98a
+  data.tar.gz: bc386d6a5ccbdd83636f18932a911d9209f8ac793bb0c7dab5578ba8f9014f22
 SHA512:
-  metadata.gz: 3a148d5fdc968b8fbdbb0d506f55ce5c72362ca1e49f326e664e1b2d1baf7bad65a09e0c776394aebb190376857d29b81c1d6aef2a5e20e767279b1e45155064
-  data.tar.gz: 0b0545fe445c78e284817bab8a83319935e9519117e809f8517f30d7354bb724b1b32af861588886a59e37edd6888f58eda54ed0fd98c48424be4da8d10d98ab
+  metadata.gz: c1f4e4e433fb79e31cd60ca124600055b08e1915577faa080dbf4abe0bd4b3591cd6227ed58497f6ae176009f69a9cb9f221e6953233bfef13944489a8eb4196
+  data.tar.gz: 1c3921183930265a0d3a15e1224944b7bd8a03dfb77f86e472ea49690418f701f2b90bc5f546f7714639ac60dd3bc1cdeaf43481693311f7c0653c2849a7b66a

data/bin/rtfm

@@ -135,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
@@ -142,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 
@@ -255,12 +258,19 @@ def getchr # PROCESS KEY PRESSES
       when 'C' then chr = "RIGHT"
       when 'D' then chr = "LEFT"
       when 'Z' then chr = "S-TAB"
-      when '2' then chr = "INS"    ; STDIN.getc
-      when '3' then chr = "DEL"    ; STDIN.getc
-      when '5' then chr = "PgUP"   ; STDIN.getc
-      when '6' then chr = "PgDOWN" ; STDIN.getc
-      when '7' then chr = "HOME"   ; STDIN.getc
-      when '8' then chr = "END"    ; STDIN.getc
+      when '2' then chr = "INS"    ; chr = "C-INS"    if STDIN.getc == "^"
+      when '3' then chr = "DEL"    ; chr = "C-DEL"    if STDIN.getc == "^"
+      when '5' then chr = "PgUP"   ; chr = "C-PgUP"   if STDIN.getc == "^"
+      when '6' then chr = "PgDOWN" ; chr = "C-PgDOWN" if STDIN.getc == "^"
+      when '7' then chr = "HOME"   ; chr = "C-HOME"   if STDIN.getc == "^"
+      when '8' then chr = "END"    ; chr = "C-END"    if 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 = "C-UP"
+      when 'b' then chr = "C-DOWN"
+      when 'c' then chr = "C-RIGHT"
+      when 'd' then chr = "C-LEFT"
       end
     end
   when "", "" then chr = "BACK"
@@ -302,17 +312,17 @@ def main_getkey # GET KEY FROM USER
     @write_conf = false
     exit 0
   # MOTION
-  when 'DOWN', 'j'
+  when 'DOWN', 'j', 'C-DOWN'
     var_resets
     @index = @index >= @max_index ? @min_index : @index + 1
     @w_r.update = true
     @w_b.update = true
-  when 'UP', 'k'
+  when 'UP', 'k', 'C-UP'
     var_resets
     @index = @index <= @min_index ? @max_index : @index - 1
     @w_r.update = true
     @w_b.update = true
-  when 'LEFT', 'h'
+  when 'LEFT', 'h', 'C-LEFT'
     var_resets
     cur_dir = Dir.pwd
     @directory[Dir.pwd] = @selected # Store this directory before leaving
@@ -321,7 +331,7 @@ def main_getkey # GET KEY FROM USER
     @directory[Dir.pwd] = File.basename(cur_dir) unless @directory.key?(Dir.pwd)
     @w_r.update = true
     @w_b.update = true
-  when 'RIGHT', 'l'
+  when 'RIGHT', 'l', 'C-RIGHT'
     var_resets
     @directory[Dir.pwd] = @selected # Store this directory before leaving
     mark_latest
@@ -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
@@ -961,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
@@ -1302,10 +1312,10 @@ def w_b_exec(cmd) # EXECUTE COMMAND FROM @W_B
     return
   end
   begin
-    status = Timeout::timeout(5) {
+    status = Timeout::timeout(15) {
       @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.8.1
+  version: 1.8.5
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-12 00:00:00.000000000 Z
+date: 2022-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -33,8 +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.8.0: The 5 latest directories visited are stored in marks
-  1-5 (1 being the very latest), 1.8.1: Small bug fix in the storing the 1-5 marks.'
+  other features. New in 1.8.5: Extended timeout for commands to 15 seconds.'
 email: g@isene.com
 executables:
 - rtfm