rtfm-filemanager 5.7 → 5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a98e564810c828a6973aa5a7b968b560ee32af1ff3a2c916a9ae31f15a30489
-  data.tar.gz: dafe630653b09a6effb439fc0d79fce6636473b5eaa4a6104858f7311a5b01a4
+  metadata.gz: e2af18af3c2d05afb1baf0a58d630b81b1b391d6cbbbc5bfb61bfc2e5f9a764f
+  data.tar.gz: 03f96975304611a76e08db2a6d974750c667bb8c5baa2e8afac5d408345ccbf1
 SHA512:
-  metadata.gz: 8c3ba0bbf931a118c75ce53c2388b139b8684d25c63c83df565659697daf218f59533a5506883ae24c2a79feb614973546377d57c2ab7531bb8ec63c44b49cc8
-  data.tar.gz: 6c65eca97ca5898cbd9774564e1175ba859d29af622553a0cd93070e6d1bc3355e0d0bc08ef66d606da00b48cb5b6fd7d789909b0f95bd7e5f4966db642ccad2
+  metadata.gz: f1dd0f689697528ec4a66cedb712f49b4050c1014e13131d878a1ca88d72a429dd38c0b9658e614db23988dc8a8ab1cfb27cda76a3e822ff0f080f7bf7b2000b
+  data.tar.gz: fc69c4b4fccbfacd3ddca202403be9a55b2ba9d69149fedbac9ee1d1238d6a5f13e69e24ee48a1d1d531d76e7c99579ab0c610753d7096c89a05fffe8d5c0db6

data/bin/rtfm

@@ -18,7 +18,7 @@
 #             get a great understanding of the code itself by simply sending
 #             or pasting this whole file into you favorite AI for coding with
 #             a prompt like this: "Help me understand every part of this code".
-@version    = '5.7' # Added use of @interactive on automatic opening of selected files
+@version    = '5.8' # Fixed bug on images with space in file name
 
 # SAVE & STORE TERMINAL {{{1
 ORIG_STTY = `stty -g`.chomp
@@ -1650,8 +1650,7 @@ def render # RENDER ALL PANES {{{2
     begin
       if @selected&.match(@imagefile)
         if cmd?('identify')
-          meta = `identify #{Shellwords.escape(@selected)} \
-  | awk '{printf " [%s %s %s %s] ", $3,$2,$5,$6}' 2>/dev/null`
+          meta = `identify -format " [%wx%h %m %[colorspace] %[bit-depth]-bit]" #{Shellwords.escape(@selected)} 2>/dev/null`
           text += meta
         end
       elsif @selected&.match(@pdffile)
@@ -1872,36 +1871,26 @@ end
 def get_interactive_program(file_path) # HELPER FOR OPEN_SELECTED TO USE @interactive {{{2
   begin
     inter_list = (@interactive || '').split(',').map(&:strip)
-
     if @runmailcap
-      # Check what run-mailcap would actually execute
-      # Use --norun to see the command without executing it
+      # Check what run-mailcap would execute. Use --norun to see the command without executing it
       mailcap_output = `run-mailcap --norun #{Shellwords.escape(file_path)} 2>/dev/null`.chomp
-
-      # Debug: log what we found
-      @pB.say("Debug: mailcap would run: '#{mailcap_output}'") unless mailcap_output.empty?
-
       if !mailcap_output.empty?
         # Extract the program name from the command
         # Handle cases like "/usr/bin/mplayer file.mp4" or "mplayer %s"
         cmd_parts = mailcap_output.split
         prog = cmd_parts.first
         prog = File.basename(prog) if prog
-
-        # Debug: log program detection
-        @pB.say("Debug: detected program = '#{prog}', in interactive list? #{inter_list.include?(prog)}")
-
         return prog if prog && inter_list.include?(prog)
       end
     else
       # Check what xdg-open would use
       mimetype = `file --mime-type -b #{Shellwords.escape(file_path)}`.chomp
       desktop_file = `xdg-mime query default #{Shellwords.escape(mimetype)}`.chomp
-
+      
       if desktop_file && !desktop_file.empty?
         # Read the desktop file to get the actual command
         desktop_path = nil
-        ['/usr/share/applications/', '/usr/local/share/applications/',
+        ['/usr/share/applications/', '/usr/local/share/applications/', 
          File.join(Dir.home, '.local/share/applications/')].each do |dir|
           path = File.join(dir, desktop_file)
           if File.exist?(path)
@@ -1909,7 +1898,6 @@ def get_interactive_program(file_path) # HELPER FOR OPEN_SELECTED TO USE @intera
             break
           end
         end
-
         if desktop_path
           content = File.read(desktop_path)
           exec_line = content[/^Exec=(.*)$/m, 1]
@@ -1930,24 +1918,21 @@ end
 
 def open_selected(html = nil) # OPEN SELECTED FILE {{{2
   require 'tmpdir' unless Dir.respond_to?(:tmpdir)
-
   if File.directory?(@selected) # Dir? just cd into it
     mark_latest
     Dir.chdir(@selected) rescue nil
     return
   end
-
+  
   # Check if this file should use an interactive program (same as § prefix logic)
   if !html && (prog = get_interactive_program(@selected))
     cmd = "#{prog} #{Shellwords.escape(@selected)}"
-
     # Use exactly the same logic as command_mode with § prefix (force interactive)
     # Restore shell tty so Ctrl-C/D work
     system("stty #{ORIG_STTY} < /dev/tty")
     # Clear to top-left
     system('clear < /dev/tty > /dev/tty')
     Cursor.show
-
     # Spawn on real tty
     pid = Process.spawn(cmd,
                        in:  '/dev/tty',
@@ -1959,7 +1944,6 @@ def open_selected(html = nil) # OPEN SELECTED FILE {{{2
       Process.kill('TERM', pid) rescue nil
       retry
     end
-
     # Restore raw/no-echo for RTFM
     system('stty raw -echo isig < /dev/tty')
     $stdin.raw!
@@ -1970,10 +1954,8 @@ def open_selected(html = nil) # OPEN SELECTED FILE {{{2
     render
     return
   end
-
   tmpfile = File.join(Dir.tmpdir, 'rtfm_err.log')
   paths   = (@tagged + [@selected]).uniq
-
   if html # html mode - open in HTML-browser
     esc = paths.map { |p| Shellwords.escape(p) }.join(' ')
     shell("xdg-open #{esc} &", err: tmpfile)
@@ -1987,7 +1969,6 @@ def open_selected(html = nil) # OPEN SELECTED FILE {{{2
     end
     return
   end
-
   if File.read(@selected).force_encoding('UTF-8').valid_encoding? # Pure text
     system("stty #{ORIG_STTY} < /dev/tty")
     # Clear to top-left
@@ -2003,14 +1984,12 @@ def open_selected(html = nil) # OPEN SELECTED FILE {{{2
     render
     return
   end
-
   if @runmailcap # Open with run-mailcap or xdg-open
     arg = paths.map { |p| Shellwords.escape(p) }.join(' ')
     shell("run-mailcap #{arg} &", err: tmpfile)
   else
     shell("xdg-open #{Shellwords.escape(@selected)} &", err: tmpfile)
   end
-
   # Clean up
   Rcurses.clear_screen; refresh; render
   if File.exist?(tmpfile)
@@ -2165,18 +2144,23 @@ def showimage(image) # SHOW THE SELECTED IMAGE IN THE RIGHT WINDOW {{{2
       img_max_h += 2
       `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]" #{Shellwords.escape(image)} 2>/dev/null`.split('x')
-      img_w        = img_w.to_i
-      img_h        = img_h.to_i
-      if img_w > img_max_w
-        img_h = img_h * img_max_w / img_w 
-        img_w = img_max_w
+      # Use the already-escaped image for shell commands
+      dimensions = `identify -format "%wx%h" #{image} 2>/dev/null`
+      img_w, img_h = dimensions.split('x').map(&:to_i)
+
+      # Fix: Use simultaneous scaling to prevent overflow
+      if img_w > img_max_w || img_h > img_max_h
+        scale_w = img_max_w.to_f / img_w
+        scale_h = img_max_h.to_f / img_h
+        scale = [scale_w, scale_h].min
+
+        img_w = (img_w * scale).to_i
+        img_h = (img_h * scale).to_i
       end
-      if img_h > img_max_h
-        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;" | #{@imgdisplay} 2>/dev/null`
+
+      # Fix: Unescape the filename for w3mimgdisplay protocol, then quote it
+      unescaped = image.gsub(/\\(.)/, '\1')  # Remove shell escaping
+      `echo "0;1;#{img_x};#{img_y};#{img_w};#{img_h};;;;;\"#{unescaped}\"\n4;\n3;" | #{@imgdisplay} 2>/dev/null`
     end
   rescue
     @pR.text = 'Error showing image'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rtfm-filemanager
 version: !ruby/object:Gem::Version
-  version: '5.7'
+  version: '5.8'
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-01 00:00:00.000000000 Z
+date: 2025-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rcurses
@@ -54,7 +54,7 @@ dependencies:
         version: '7.4'
 description: |-
   Major release - RTFM v5: Complete rewrite using rcurses (https://github.com/isene/rcurses). Massive improvements. AI integration.
-   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 is one of the most feature-packed terminal file managers. 5.7: Added use of @interactive on automatic opening of selected files.
+   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 is one of the most feature-packed terminal file managers. 5.8: Fixed bug on images with space in file name.
 email: g@isene.com
 executables:
 - rtfm