rtfm-filemanager 3.11 → 3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebffa8209855842bb1f85971814b3596c48530543ea7840841e96698ae5043bd
-  data.tar.gz: 80ff8bf414f6349576d97ef8867f227737b1d58ca8e037255ac7d1c492a57ff5
+  metadata.gz: e77bc5690f12f9c61ea2dd2df952abbeef8b3395dbee1b849695064d9cec841f
+  data.tar.gz: 9c5e0c83c062bc41b75213092f8ae248637a515ac6c43ae11e1528e827966db2
 SHA512:
-  metadata.gz: 0055e265aa75f6aba0e8092550eea179fb232d98549fad0ea22c241e71c794fd2fb583ae7f3f0b629001823c924b8f38d9dc339d0dd83f24b3e851a2bc078493
-  data.tar.gz: 982c7e5a217e1d4f6700c9a1b1bfd3e6cb72650902251aea6613a8ea22d9c0560bfb4f4dc0fac7a88b1244f6f38f19356b3b4527537542844bc3b746552545ca
+  metadata.gz: afb42ff066cbb903e0e3ce8952077fa9ca5c4dcfd5727c9cc4ee3ca0c424cc7bb57e8c18888c10387d1698447f66abf682e5ec3973445e3bd9f962dcc340b7e7
+  data.tar.gz: efd38391d2677563495dd128ea817dcce6a69aa58305515263976a1879c01a6f6df58226bdc241ec2b4db3544a823bf0f921ee0e8a1acd79751f6f7dd3a0a07f

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.11" 
+@version    = "3.14" 
 
 # PRELIMINARIES
 @help = <<HELPTEXT
@@ -211,42 +211,43 @@ begin # BASIC SETUP
 
   # INITIALIZE VARIABLES 
   ## These can be set by user in .rtfm.conf
-  @lsbase     = "--group-directories-first" # Basic ls setup
-  @lslong     = false # Set short form ls (toggled by pressing "l")
-  @lsall      = ""    # Set "ls -a" to false (toggled by pressing "a" - sets it to "-a")
-  @lsorder    = ""    # Change the order/sorting by pressing 'o' (circular toggle)
-  @lsinvert   = ""    # Set to "-r" to reverse/invert sorting order
-  @lsuser     = ""    # Set this variable in .rtfm.conf to any 'ls' switch you want to customize directory listings
-  @width      = 4     # Set width of the left pane to the default ⅓ of the terminal width
-  @history    = []    # Initialize the command line history array
-  @border     = false
-  @preview    = true
-  @runmailcap = false # Set to 'true' in .rtfm.conf if you want to use run-mailcap instead of xdg-open
-  @batuse     = true  # Use batcat for syntax highlighting
+  @lsbase      = "--group-directories-first" # Basic ls setup
+  @lslong      = false # Set short form ls (toggled by pressing "l")
+  @lsall       = ""    # Set "ls -a" to false (toggled by pressing "a" - sets it to "-a")
+  @lsorder     = ""    # Change the order/sorting by pressing 'o' (circular toggle)
+  @lsinvert    = ""    # Set to "-r" to reverse/invert sorting order
+  @lsuser      = ""    # Set this variable in .rtfm.conf to any 'ls' switch you want to customize directory listings
+  @width       = 4     # Set width of the left pane to the default ⅓ of the terminal width
+  @history     = []    # Initialize the command line history array
+  @rubyhistory = []    # Initialize the command line history array for ruby commands
+  @border      = false
+  @preview     = true
+  @runmailcap  = false # Set to 'true' in .rtfm.conf if you want to use run-mailcap instead of xdg-open
+  @batuse      = true  # Use batcat for syntax highlighting
   ## These are automatically written on exit
-  @marks      = {}    # Initialize (book)marks hash
-  @hash       = {}    # Initialize the sha directory hashing
-  @tagged     = []    # Initialize the tagged array - for collecting all tagged items
+  @marks       = {}    # Initialize (book)marks hash
+  @hash        = {}    # Initialize the sha directory hashing
+  @tagged      = []    # Initialize the tagged array - for collecting all tagged items
   ## These should not be set by user in .rtfm.conf
-  @directory  = {}    # Initialize the directory hash for remembering directories visited
-  @searched   = ""    # Initialize the active searched for items
-  @lsfiles    = ""    # File types to show (initially set to all file types) - not saved on exit
-  @lsmatch    = ""    # Files to match (initially set to matching all files) - not saved on exit
-  @index      = 0     # Set chosen item to first on startup
-  @cont       = ""
-  @tagsize    = 0
-  @navi       = ""
-  @marks["'"] = Dir.pwd
+  @directory   = {}    # Initialize the directory hash for remembering directories visited
+  @searched    = ""    # Initialize the active searched for items
+  @lsfiles     = ""    # File types to show (initially set to all file types) - not saved on exit
+  @lsmatch     = ""    # Files to match (initially set to matching all files) - not saved on exit
+  @index       = 0     # Set chosen item to first on startup
+  @cont        = ""
+  @tagsize     = 0
+  @navi        = ""
+  @marks["'"]  = Dir.pwd
   ## File type recognizers
-  @imagefile  = /\.jpg$|\.JPG$|\.jpeg$|\.png$|\.bmp$|\.gif$|\.tif$|\.tiff$/
-  @pptfile    = /\.ppt$/
-  @xlsfile    = /\.xls$/
-  @docfile    = /\.doc$/
-  @docxfile   = /\.docx$/
-  @xlsxfile   = /\.xlsx$/
-  @pptxfile   = /\.pptx$/
-  @oolofile   = /\.odt$|\.odc$|\.odp$|\.odg$/
-  @pdffile    = /\.pdf$|\.ps$/
+  @imagefile   = /\.jpg$|\.JPG$|\.jpeg$|\.png$|\.bmp$|\.gif$|\.tif$|\.tiff$/
+  @pptfile     = /\.ppt$/
+  @xlsfile     = /\.xls$/
+  @docfile     = /\.doc$/
+  @docxfile    = /\.docx$/
+  @xlsxfile    = /\.xlsx$/
+  @pptxfile    = /\.pptx$/
+  @oolofile    = /\.odt$|\.odc$|\.odp$|\.odg$/
+  @pdffile     = /\.pdf$|\.ps$/
   ## Get variables from config file (written back to .rtf.conf upon exit via 'q')
   if File.exist?(Dir.home+'/.rtfm.conf')
     load(Dir.home+'/.rtfm.conf')
@@ -876,7 +877,7 @@ def main_getkey # GET KEY FROM USER
     @break = true
   when '@' # Enter "Ruby debug"
     @w_b.nohistory = false
-    cmd = w_b_getstr("◆ ", "")
+    cmd = w_b_getstr("◆ ", "", true)
     @w_b.clr
     @w_b.refresh
     @w_b.update = true
@@ -884,8 +885,8 @@ def main_getkey # GET KEY FROM USER
     info = "Command: #{cmd}\n\n"
     begin
       info += eval(cmd).to_s
-    rescue StandardError => e
-      info += "Error: #{e.inspect}"
+    rescue Exception => err
+      info += "Error: #{err.inspect}"
     end
     w_r_info(info)
     @w_r.update = false
@@ -912,6 +913,10 @@ def conf_write
   conf += "@hash = #{@hash}\n"
   conf.sub!(/^@tagged.*\[.*\]\n/, "")
   conf += "@tagged = #{@tagged}\n"
+  conf.sub!(/^@history.*\[.*\]\n/, "")
+  conf += "@history = #{@history}\n"
+  conf.sub!(/^@rubyhistory.*\[.*\]\n/, "")
+  conf += "@rubyhistory = #{@rubyhistory}\n"
   if @write_conf_all
     conf.sub!(/^@lslong.*\n/, "") 
     conf += "@lslong = #{@lslong}\n"
@@ -1128,7 +1133,7 @@ def copy_move_link(type) # COPY OR MOVE TAGGED ITEMS (COPY IF "keep == true")
         FileUtils.ln_s(item, dest)
         w_b_info(" Item(s) symlinked here.")
       end
-    rescue StandardError => err
+    rescue Exception => err
       w_b_info(err.to_s)
     end
   end
@@ -1222,16 +1227,19 @@ def w_r_doc # GET FULL CONTENT TO PAGE
   @w_r << @w_r.text
 end
 def w_r_info(info) # SHOW INFO IN THE RIGHT WINDOW
-  image_show("clear") if @image; @image = false
-  @w_r.clr
-  @w_r.refresh
-  w_r_width = Curses.cols - (Curses.cols * @width / 10) - 2
-  info.gsub!(/(.{1,#{w_r_width}})( +|$\n?)|(.{1,#{w_r_width}})/, "\\1\\3\n")
-  @w_r.text      = info
-  @w_r.pager_cmd = ""
-  pager_start
-  pager_show
-  @w_r.update = false
+  begin
+    image_show("clear") if @image; @image = false
+    @w_r.clr
+    @w_r.refresh
+    w_r_width = Curses.cols - (Curses.cols * @width / 10) - 2
+    info.gsub!(/(.{1,#{w_r_width}})( +|$\n?)|(.{1,#{w_r_width}})/, "\\1\\3\n")
+    @w_r.text      = info
+    @w_r.pager_cmd = ""
+    pager_start
+    pager_show
+    @w_r.update = false
+  rescue
+  end
 end
 def marks_info # SHOW MARKS IN RIGHT WINDOW
   @w_r.fg = 183
@@ -1426,14 +1434,19 @@ def w_b_info(info) # SHOW INFO IN @W_B
   @w_b.write
   @w_b.update = false
 end
-def w_b_getstr(pretext, text) # A SIMPLE READLINE-LIKE ROUTINE
+def w_b_getstr(pretext, text, ruby=false) # A SIMPLE READLINE-LIKE ROUTINE
   Curses.curs_set(1)
   Curses.echo
   stk = 0
-  @history.insert(stk, text)
-  pos = @history[stk].length
   chr = ""
-  @history_copy = @history.map(&:clone)
+  if ruby
+    @rubyhistory.insert(stk, text)
+    @history_copy = @rubyhistory.map(&:clone)
+  else
+    @history.insert(stk, text)
+    @history_copy = @history.map(&:clone)
+  end
+  pos = @history_copy[stk].length
   while chr != "ENTER"
     @w_b.setpos(0,0)
     init_pair(250, 250, 238)
@@ -1544,11 +1557,14 @@ def w_b_getstr(pretext, text) # A SIMPLE READLINE-LIKE ROUTINE
   end
   curstr = @history_copy[stk]
   @history_copy.shift if @w_b.nohistory
-  @history.insert(0, @history_copy[stk])
+  ruby ? @rubyhistory.insert(0, @history_copy[stk]) : @history.insert(0, @history_copy[stk])
   unless @w_b.nohistory
     @history.uniq!
     @history.compact!
     @history.delete("")
+    @rubyhistory.uniq!
+    @rubyhistory.compact!
+    @rubyhistory.delete("")
   end
   Curses.curs_set(0)
   Curses.noecho
@@ -1689,6 +1705,9 @@ loop do # OUTER LOOP - CATCHING REFRESHES VIA 'r'
       break if Curses.cols != maxx or Curses.lines != maxy # break on terminal resize 
       break if @break    # Break to outer loop, redrawing windows, if user hit 'r'
     end
+  rescue StandardError => err # Throw error nicely
+    w_r_info(err)
+    @w_r.update = false
   ensure # On exit: close curses, clear terminal 
     @write_conf_all = false
     conf_write if @write_conf # Write marks to config file

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rtfm-filemanager
 version: !ruby/object:Gem::Version
-  version: '3.11'
+  version: '3.14'
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-31 00:00:00.000000000 Z
+date: 2023-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -47,7 +47,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 3.11: Better history handling.'
+  other features. New in 3.14: Better error handling.'
 email: g@isene.com
 executables:
 - rtfm