rtfm-filemanager 1.8.0 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a5fdd577ea09bf7b15b8f6e13dc554ac9db1b8643d39ad64091d1db3ce550ff
-  data.tar.gz: a2747f9fb64d1b841a79598016d8b6b659cf386ecc2b6f49bb375fd948d4a174
+  metadata.gz: 7b7b362688bbb8de0e062756835444e2da6e0839230eb47a285c868eef411e60
+  data.tar.gz: 2841157d83e87786b7add7ec78df710872a8c24f2a8b6cba207dacbd273220c2
 SHA512:
-  metadata.gz: b4952148b138ccea17ef1d3834e378acbb3aa275ed580343c02ea5566f07f09cb92373dbd05d23a7b3395fe0196bf48dbcf9aa0b714cda6d2d07712d8c9b4696
-  data.tar.gz: 9f33313d3e6d14ff4c76afc808b7c3f429b8bf1eefe928fccb8ccd5e756f5f12640219750b15f547f7e7b8627e8c5aa2b1c5f10bc3844672fdb657ffb0099104
+  metadata.gz: c78d672f9879fecbab67cd2360f3337d994cdbc839e1064ac186cbb1160692da914a6cafba40861ecd9dd2adde55fde18077272c2f102aa60fd94a271d47244d
+  data.tar.gz: cff47671b8b2072e782d98dc05a4bc0885de48223ed4debfaebf38961ef0ed4d4ffb6bae119b1af443f64cf45adf59bfcd52abc6bd14b1ec61229fab460c1ed6

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
@@ -371,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
@@ -596,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
@@ -605,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
@@ -773,7 +781,7 @@ def mark_latest
   @marks["4"] = @marks["3"]
   @marks["3"] = @marks["2"]
   @marks["2"] = @marks["1"]
-  @marks["1"] = Dir.pwd
+  @marks["1"] = @marks["'"]
   @marks["'"] = Dir.pwd
 end
 # TOP WINDOW FUNCTIONS 
@@ -963,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
@@ -1046,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|
@@ -1305,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.8.0
+  version: 1.8.4
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-12-12 00:00:00.000000000 Z
+date: 2021-12-18 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)'
+  other features. New in 1.8.4: Catch more Control+Key sequences'
 email: g@isene.com
 executables:
 - rtfm