rtfm-filemanager 3.5 → 3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe11017b37608ece785d04b740e858ee400a3518f7ec6e2e90d318c36069d431
-  data.tar.gz: c1f526b4b1a347c106915e6c4e03486e1adf1464c8050e153b625f1510fa6aa7
+  metadata.gz: 4e42eb95b56118347846698cdfba4ff623a1e26232f27b65eca95ccc6fee9ccf
+  data.tar.gz: 18b33ed860c9b92d7c6001bdb1b218010dece44855a1724d35242cd29ebfa1c9
 SHA512:
-  metadata.gz: 8cb52b1a6b0d7bd0db5f76486cde99416a1a3fcb9ceee3d1e5e0cc912c6c79c567e104982e9fa32f6a8f53a7cbbe34481f72d30980e24c9a2ffc31ac544db96e
-  data.tar.gz: 8376fb44256d84321f755842daa76009c5e116a86024977bd1af5bc01c24915198b51c0c082f2e609cd6181ee5dfef36484a6394a376da8f08f1816ad76c5567
+  metadata.gz: d4b834369ab3664df99aaa15272daea2f2f64bfaefc32ec740e6517e55fa9e177c21a32e134efe349d610909d5d0c565b6b0d4fb97a3c3d708a2fe9a24560ffd
+  data.tar.gz: 62b6910acae2d26a51c9a00beae8f7521c5d2b7c2cf8773248d965c838e12e706b875f3acb0ca8ff6b1db47cf03a89b70410d53716c04fd7ba4015dcdd7cd835

data/README.md

@@ -64,6 +64,9 @@ of the selected item (directory or file) is shown in the right pane. The right
 pane is also used to show information such as the currently tagged items, your
 (book)marks, output from commands, etc. 
 
+When you start RTFM, you can supply a directory path as an argument to let
+RTFM start up in that directory.
+
 You can run any command in the bottom "command bar" and have the output
 presented in the right pane. Use LEFT and RIGHT keys to go back and forth on
 the command line, HOME to beginning of line, END to end of line, Backspace or

data/bin/rtfm

@@ -14,7 +14,7 @@
 #             for any damages resulting from its use. Further, I am under no
 #             obligation to maintain or extend this software. It is provided 
 #             on an 'as is' basis without any expressed or implied warranty.
-@version    = "3.5"
+@version    = "3.9"
 
 # PRELIMINARIES
 @help = <<HELPTEXT
@@ -177,6 +177,7 @@ end
 begin # BASIC SETUP
   require 'fileutils'
   require 'io/console'
+  require 'io/wait'
   require 'date'
   require 'timeout'
   require 'curses'
@@ -199,7 +200,6 @@ begin # BASIC SETUP
   cmd?('bat') ? @bat = "bat" : @bat = "batcat"
 
   STDIN.set_encoding(Encoding::UTF_8) # Set encoding for STDIN 
-  LScolors = `echo $LS_COLORS` # Import LS_COLORS 
 
   ## Curses setup 
   Curses.init_screen
@@ -251,8 +251,10 @@ begin # BASIC SETUP
   if File.exist?(Dir.home+'/.rtfm.conf')
     load(Dir.home+'/.rtfm.conf')
   end
+  Dir.chdir(ARGV[0]) if Dir.exist?(ARGV[0]) and ARGV[0] !~ /\/tmp/
 end
-class Curses::Window # CLASS EXTENSION 
+# CLASS EXTENSIONS
+class Curses::Window 
   attr_accessor :fg, :bg, :attr, :text, :update, :pager, :pager_more, :pager_cmd, :locate, :nohistory
   # General extensions (see https://github.com/isene/Ruby-Curses-Class-Extension)
   def clr
@@ -282,16 +284,6 @@ class Curses::Window # CLASS EXTENSION
   # RTFM specific extensions
 end
 # GENERIC FUNCTIONS 
-def get_ls_color(type) # GET THE COLOR FOR THE FILETYPE FROM IMPORTED LS_COLORS
-  bold    = 0
-  begin
-    color = LScolors.match(/#{type}=\d*;\d*;(\d*)/)[1]
-    bold  = 1 if LScolors.match(/#{type}=\d*;\d*;\d*;1/)
-  rescue
-    color = 7 # Default color
-  end
-  return color.to_i, bold
-end
 def syntax_highlight(input) # SYNTAX HIGHLIGHTING FROM ANSI COLOR CODES
   color_ary  = color_parse(input)
   color_ary.each do | pair |
@@ -308,13 +300,15 @@ def syntax_highlight(input) # SYNTAX HIGHLIGHTING FROM ANSI COLOR CODES
   end
 end
 def color_parse(input) # PARSE ANSI COLOR SEQUENCES
-  input.gsub!( /\e\[\d;38;5;(\d+);*(\d*)m/, '¤¤\1¤¤\2¤¤')
-  input.gsub!( /\e\[38;5;(\d+);*(\d*)m/, '¤¤\1¤¤\2¤¤')
-  input.gsub!( /\e\[\d;38;2;(\d+);*(\d*);\d*m/, '¤¤\1¤¤\2¤¤')
-  input.gsub!( /\e\[38;2;(\d+);*(\d*);\d*m/, '¤¤\1¤¤\2¤¤')
-  input.gsub!( /\e\[0m/, "\t")
+  input.gsub!(/\e\[\d;38;5;(\d+);*(\d*)m/, '¤¤\1¤¤\2¤¤')
+  input.gsub!(/\e\[38;5;(\d+);*(\d*)m/, '¤¤\1¤¤\2¤¤')
+  input.gsub!(/\e\[\d;38;2;(\d+);*(\d*);\d*m/, '¤¤\1¤¤\2¤¤')
+  input.gsub!(/\e\[38;2;(\d+);*(\d*);\d*m/, '¤¤\1¤¤\2¤¤')
+  input.gsub!(/\e\[\d+;(\d+);*(\d*)m/, '¤¤\1¤¤\2¤¤')
+  input.gsub!(/\e\[0m/, "")
   color_array = input.split("¤¤")
   color_array = color_array.drop(1)
+  #color_array.map! { |x| x || 0 }
   output = color_array.each_slice(3).to_a
   return output
 end
@@ -325,9 +319,9 @@ def getchr # PROCESS KEY PRESSES
   c = STDIN.getch(min: 0, time: 3)
   case c
   when "\e"    # ANSI escape sequences
-    case $stdin.getc
+    case STDIN.getc
     when '['   # CSI
-      case $stdin.getc
+      case STDIN.getc
       when 'A' then chr = "UP"
       when 'B' then chr = "DOWN"
       when 'C' then chr = "RIGHT"
@@ -341,7 +335,7 @@ def getchr # PROCESS KEY PRESSES
       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
+      case STDIN.getc
       when 'a' then chr = "C-UP"
       when 'b' then chr = "C-DOWN"
       when 'c' then chr = "C-RIGHT"
@@ -351,6 +345,7 @@ def getchr # PROCESS KEY PRESSES
   when "", "" then chr = "BACK"
   when "" then chr = "WBACK"
   when "" then chr = "LDEL"
+  when "" then chr = "C-C"
   when "" then chr = "C-G"
   when "" then chr = "C-L"
   when "" then chr = "C-N"
@@ -360,7 +355,7 @@ def getchr # PROCESS KEY PRESSES
   when "" then chr = "C-Y"
   when "\r" then chr = "ENTER"
   when "\t" then chr = "TAB"
-  when /./  then chr = c
+  when /[[:print:]]/  then chr = c
   end
   return chr
 end
@@ -960,7 +955,8 @@ end
 def get_files(win) # The core of the directory listings
   ls_cmd  = "ls 2>/dev/null #{@lsbase} #{@lsall} #{@lsorder} #{@lsinvert} #{@lsuser}" # Get files in current directory 
   ls_cmd += @selected_safe if win == "right"
-  @files  = `#{ls_cmd}`.split("\n")
+  @cfiles = `#{ls_cmd} --color`.split("\n")
+  @files  = @cfiles.map {|f| f.sub(/^\e\[.*\dm(..*$)/, '\1').sub(/\e.+/, '')}
   ls_cmd += " -H " if win == "right"
   ls_cmd += %q[ -lh --time-style="long-iso" | awk '{printf "%s%s%s%11s%6s%6s", $1, " " $3, ":" $4,$6,$7,$5"\n"}']
   @fspes  = `#{ls_cmd}`.split("\n").drop(1)
@@ -1027,7 +1023,8 @@ def list_dir(active) # LIST CONTENT OF A DIRECTORY (BOTH active AND RIGHT WINDOW
     @cont = ""
   end
   while ix < @files.size and t < win.maxy do
-    str = @files[ix]
+    str  = @files[ix]
+    cstr = @cfiles[ix]
     active ? str_path = str : str_path = "#{@selected}/#{str}" 
     begin # Add items matching @tag to @tagged
       if str.match(/#{@tag}/) and @tag != false
@@ -1036,25 +1033,9 @@ def list_dir(active) # LIST CONTENT OF A DIRECTORY (BOTH active AND RIGHT WINDOW
       end
     rescue
     end
-    # Determine the filetype of the item 
-    ftype = ""
-    ftype = str.match(/\.([^.]*$)/)[1] if str.match?(/\.([^.]*$)/)
-    # Set special filetypes (sequence matters)
-    ftype = "bd" if File.blockdev?(str_path)
-    ftype = "cd" if File.chardev?(str_path)
-    ftype = "pi" if File.pipe?(str_path)
-    ftype = "st" if File.sticky?(str_path)
-    ftype = "so" if File.socket?(str_path)
-    ftype = "ex" if File.executable?(str_path)
-    ftype = "di" if File.directory?(str_path)
-    ftype = "ln" if File.symlink?(str_path) 
-    begin
-      File.stat(str_path) # Checking if not an orphaned link
-    rescue
-      ftype = "or"        # Set to orphant if no link target
-    end
     fg = 7; bold = 0; bg = 0 # Set default color
-    fg, bold = get_ls_color(ftype) unless ftype == "" # Color from LS_COLORS
+    fl = color_parse(cstr)
+    fg, bold = fl[0][0].to_i, fl[0][1].to_i unless fl[0] == nil
     init_pair(fg, fg, bg)
     file_marker = color_pair(fg)
     file_marker = file_marker | Curses::A_BOLD if bold == 1
@@ -1461,7 +1442,7 @@ def w_b_getstr(pretext, text) # A SIMPLE READLINE-LIKE ROUTINE
     @w_b.setpos(0,pretext.length + pos)
     @w_b.refresh
     chr = getchr
-    if chr == "C-G"
+    if chr == 'C-G' or chr == 'C-C'
       Curses.curs_set(0)
       Curses.noecho
       @w_b.update = true
@@ -1554,6 +1535,11 @@ def w_b_getstr(pretext, text) # A SIMPLE READLINE-LIKE ROUTINE
       @history[stk].insert(pos,chr)
       pos += 1
     end
+    while STDIN.ready?
+      chr = STDIN.getc
+      @history[stk].insert(pos,chr)
+      pos += 1
+    end
   end
   curstr = @history[stk]
   @history.shift if @w_b.nohistory
@@ -1708,7 +1694,7 @@ loop do # OUTER LOOP - CATCHING REFRESHES VIA 'r'
     close_screen
     # If launched via the script "r", return current dir and "r" will cd to that
     begin
-      File.write(ARGV[0], Dir.pwd) if ARGV[0] and ARGV[0].match(/\/tmp\/tmp/)
+      File.write(ARGV[0], Dir.pwd) if ARGV[0] and ARGV[0].match(/\/tmp/)
     rescue
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rtfm-filemanager
 version: !ruby/object:Gem::Version
-  version: '3.5'
+  version: '3.9'
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-03 00:00:00.000000000 Z
+date: 2023-05-24 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 3.5: Simplified install :-)'
+  other features. New in 3.9: You can now paste onto the bottom command line. Removed
+  control chars in input.'
 email: g@isene.com
 executables:
 - rtfm