rtfm-filemanager 1.8.5 → 1.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba36c06ff3a1cff4dbbc5c54c81718f9e0fc00d6ccc515929745b149851df98a
-  data.tar.gz: bc386d6a5ccbdd83636f18932a911d9209f8ac793bb0c7dab5578ba8f9014f22
+  metadata.gz: bf493d83fee60a64a7e96aa22ce90f194e921cbaa2f43978ab27372b76f4358c
+  data.tar.gz: 05237ec325e5ad63750ded55a7ca0fbcfd6adb8492b88be3b664376f494ab17a
 SHA512:
-  metadata.gz: c1f4e4e433fb79e31cd60ca124600055b08e1915577faa080dbf4abe0bd4b3591cd6227ed58497f6ae176009f69a9cb9f221e6953233bfef13944489a8eb4196
-  data.tar.gz: 1c3921183930265a0d3a15e1224944b7bd8a03dfb77f86e472ea49690418f701f2b90bc5f546f7714639ac60dd3bc1cdeaf43481693311f7c0653c2849a7b66a
+  metadata.gz: 2d8bf1b20d5208b0336a41499613100b9c9a8b49d7540c1d8d675140ecc026e2ce40085b4475326f639baccd32afff9b6537b8b4ec7a4fe17f08a3a0264fe399
+  data.tar.gz: 4fd143cca5f4460f8fffb13cecca3a61f0cec8072638fa9b28f39382e8734905581eec50eeaa0f3117a08bd00bf0ad9d7533bf3f2fd4e7b2a209c0b724ab1ebc

data/bin/rtfm

@@ -137,7 +137,7 @@ begin # BASIC SETUP
   end
   
   if cmd?('/usr/lib/w3m/w3mimgdisplay')
-    @w3mimgdisplay = "/usr/lib/w3m/w3mimgdisplay"
+    @imgdisplay = "/usr/lib/w3m/w3mimgdisplay"
     @showimage = true
   else
     @showimage = false
@@ -234,9 +234,26 @@ def get_ls_color(type) # GET THE COLOR FOR THE FILETYPE FROM IMPORTED LS_COLORS
   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 |
+    begin
+      fg   = pair[0].to_i
+      atr  = pair[1].to_i
+      atr == 1 ? atr = Curses::A_BOLD : atr = 0
+      text = pair[2]
+      text.gsub!(/\t/, '')
+      init_pair(fg, fg, 0)
+      @w_r.attron(color_pair(fg) | atr) { @w_r << text }
+    rescue
+    end
+  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")
   color_array = input.split("¤¤")
   color_array = color_array.drop(1)
@@ -1071,21 +1088,6 @@ def tagged_info # SHOW THE LIST OF TAGGED ITEMS IN @w_r
   @tagged.empty? ? info += "(None)" : info += @tagged.join("\n")
   w_r_info(info)
 end
-def syntax_highlight(input) # SYNTAX HIGHLIGHTING FROM ANSI COLOR CODES
-  color_ary  = color_parse(input)
-  color_ary.each do | pair |
-    begin
-      fg   = pair[0].to_i
-      atr  = pair[1].to_i
-      atr == 1 ? atr = Curses::A_BOLD : atr = 0
-      text = pair[2]
-      text.gsub!(/\t/, '')
-      init_pair(fg, fg, 0)
-      @w_r.attron(color_pair(fg) | atr) { @w_r << text }
-    rescue
-    end
-  end
-end
 def image_show(image)# SHOW THE SELECTED IMAGE IN THE RIGHT WINDOW
   # Pass "clear" to clear the window for previous image
   return unless @showimage
@@ -1100,10 +1102,11 @@ def image_show(image)# SHOW THE SELECTED IMAGE IN THE RIGHT WINDOW
     img_max_w   = char_w * (Curses.cols - Curses.cols/@width - 2)
     img_max_h   = char_h * (Curses.lines - 4)
     if image == "clear"
+      `clear`
       img_x     -= char_w
       img_max_w += char_w + 2
       img_max_h += 2
-      `echo "6;#{img_x};#{img_y};#{img_max_w};#{img_max_h};\n4;\n3;" | #{@w3mimgdisplay} 2>/dev/null`
+      `echo "6;#{img_x};#{img_y};#{img_max_w};#{img_max_h};\n4;\n3;" | #{@imgdisplay} 2>/dev/null`
     else
       img_w,img_h = `identify -format "%[fx:w]x%[fx:h]" #{image} 2>/dev/null`.split('x')
       img_w       = img_w.to_i
@@ -1116,7 +1119,7 @@ def image_show(image)# SHOW THE SELECTED IMAGE IN THE RIGHT WINDOW
         img_w = img_w * img_max_h / img_h
         img_h = img_max_h
       end
-      `echo "0;1;#{img_x};#{img_y};#{img_w};#{img_h};;;;;\"#{image}\"\n4;\n3;" | #{@w3mimgdisplay} 2>/dev/null`
+      `echo "0;1;#{img_x};#{img_y};#{img_w};#{img_h};;;;;\"#{image}\"\n4;\n3;" | #{@imgdisplay} 2>/dev/null`
     end
   rescue
     @w_r.clr
@@ -1315,10 +1318,11 @@ def w_b_exec(cmd) # EXECUTE COMMAND FROM @W_B
     status = Timeout::timeout(15) {
       @w_r.clr
       begin
-        @w_r.pager_cmd = "#{cmd} | #{bat} -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`
+        @w_r.pager_cmd = "#{cmd} 2>/dev/null"
+        @w_r.text = `#{@w_r.pager_cmd} 2>/dev/null`
       end
       unless @w_r.text == "" or @w_r.text == nil
         pager_start

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rtfm-filemanager
 version: !ruby/object:Gem::Version
-  version: 1.8.5
+  version: 1.8.9
 platform: ruby
 authors:
 - Geir Isene
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-06 00:00:00.000000000 Z
+date: 2022-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: curses
@@ -33,7 +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.5: Extended timeout for commands to 15 seconds.'
+  other features. New in 1.8.9: Fixed images overlap in the kitty terminal'
 email: g@isene.com
 executables:
 - rtfm