rtfm-filemanager 7.0.5 → 7.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a868de1ca6a2f8cb3706cd0d297fa452c20e08b96fcac59146c560779b991f7d
-  data.tar.gz: 670836887ce9581a5d2083e7cd12c38e8c52817bd0bf5eb40ebfe62e4b66df96
+  metadata.gz: 03a8e8292ab2ffb9794497f688bf72000ea65dff64efdb5433847bbadac29b2e
+  data.tar.gz: 9c6e85c2a38c06c73568c41617f2137261a65d785139a68578412d6f56fe18af
 SHA512:
-  metadata.gz: 12ea6e3767d8816c3e80e85888521fd8a772014d3480b4f59e9bfa68c7c0fd7a83aa3bd1f0a901e35595895e8eda5f4d48397de629d5a5ef57d4e9149c7ecd88
-  data.tar.gz: b3376a6308e4a5e415ceb688074017ba8ce44d9dfd66fa0da9150b75b24b8b11a0a65488566b175695e8e77822d6080ddc86bf125fddf3c602ed8f5f8f0229a7
+  metadata.gz: 8c668b4c6ef30a233b217315a6dd47f3af79618a27e92ba1f162d827a83fa198f84c5e021ff8ba7a04af90241549e246e80cfd08fd10bfc0f017093b21db9933
+  data.tar.gz: 1e2664f8fc5eb7881b6048dce9f5896bfec8c3f674873640416627a8f1908d7685635971d44d96587afc4710f762248f00a75da37476512cb4b2f51dac803f0e

data/README.md

@@ -523,9 +523,16 @@ previewed by default in RTFM. The `preview.rb` explains how you add thesea:
 #   # plain text, Ruby, Python, shell
 #   txt, rb, py, sh = bat -n --color=always @s
 #
+#   # Alternative syntax highlighters (e.g., on macOS without bat)
+#   # txt, rb, py, sh = highlight -O ansi --force --line-numbers @s
+#
 #   # markdown via pandoc
 #   md = pandoc @s -t plain
 #
+#   # Alternative markdown viewers (e.g., lowdown, termmark)
+#   # md = lowdown -Tterm @s
+#   # md = termmark @s
+#
 #   # PDFs
 #   pdf = pdftotext -f 1 -l 4 @s -
 ```

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    = '7.0.4' # Fixed platform-specific issues for macOS/BSD and improved first-run message
+@version    = '7.0.9' # Fixed image preview for filenames with spaces and special characters
 
 # SAVE & STORE TERMINAL {{{1
 ORIG_STTY = `stty -g`.chomp
@@ -57,7 +57,7 @@ def check_image_redraw # {{{2
     img_processes = `pgrep w3mimgdisplay 2>/dev/null`.chomp
     if img_processes.empty? && File.exist?(@current_image_path)
       # Redraw the image
-      showimage(Shellwords.escape(@current_image_path))
+      showimage(@current_image_path)
     end
   rescue
     # Silently fail - we don't want focus checking to break anything
@@ -1634,13 +1634,15 @@ def undo_delete(operation) # {{{3
   if operation[:trash]
     # Restore from trash
     operation[:paths].each do |path_info|
-      source = File.join(TRASH_DIR, File.basename(path_info[:path]))
+      # Use the unique trash name if available (new format), otherwise fallback to basename (old format)
+      trash_name = path_info[:trash_name] || File.basename(path_info[:path])
+      source = File.join(TRASH_DIR, trash_name)
       dest = path_info[:path]
       
       if File.exist?(source)
         FileUtils.mv(source, dest)
       else
-        raise "Cannot restore #{path_info[:path]}: not found in trash"
+        raise "Cannot restore #{path_info[:path]}: not found in trash (looked for #{trash_name})"
       end
     end
   else
@@ -3197,7 +3199,7 @@ def delete_items # {{{3
   if @trash
     warning_text << "Items will be moved to:\n".fg(249)
     warning_text << "  ~/.rtfm/trash/\n".fg(240)
-    warning_text << "\nYou can restore them with " + "C-z".fg(156) + "\n".fg(249)
+    warning_text << "\nYou can restore them with " + "U".fg(156) + " (undo)\n".fg(249)
   else
     warning_text << "⚠️  WARNING: PERMANENT DELETION!\n".fg(196).b
     warning_text << "Files will be permanently removed\n".fg(196)
@@ -3220,18 +3222,27 @@ def delete_items # {{{3
     else
       # Record undo information before deletion
       if @trash
+        # Generate unique trash names to avoid overwriting
+        timestamp = Time.now.strftime('%Y%m%d_%H%M%S')
+        trash_mappings = paths.map do |p|
+          basename = File.basename(p)
+          # Add timestamp and a random suffix to ensure uniqueness
+          trash_name = "#{timestamp}_#{basename}_#{rand(1000..9999)}"
+          trash_path = File.join(TRASH_DIR, trash_name)
+          { path: p, trash_name: trash_name, trash_path: trash_path }
+        end
+        
         undo_info = {
           type: 'delete',
           trash: true,
-          paths: paths.map { |p| { path: p } },
+          paths: trash_mappings.map { |m| { path: m[:path], trash_name: m[:trash_name] } },
           timestamp: Time.now
         }
-      end
-      
-      esc = paths.map { |p| Shellwords.escape(p) }.join(' ')
-      if @trash
-        esc_trash = Shellwords.escape(TRASH_DIR)
-        command("mv -f #{esc} #{esc_trash}")
+        
+        # Move each file with its unique trash name
+        trash_mappings.each do |mapping|
+          command("mv -f #{Shellwords.escape(mapping[:path])} #{Shellwords.escape(mapping[:trash_path])}")
+        end
         # Only add to undo history if operation succeeded and we can undo it
         add_undo_operation(undo_info)
       else
@@ -4295,7 +4306,10 @@ def get_cached_file_metadata(file_path) # {{{2
   metadata = nil
   begin
     if file_path.match(@imagefile) && cmd?('identify')
-      metadata = `identify -format " [%wx%h %m %[colorspace] %[bit-depth]-bit]" #{Shellwords.escape(file_path)} 2>/dev/null`.strip
+      # Skip SVG files as identify can be very slow on them
+      unless file_path =~ /\.svg$/i
+        metadata = `identify -format " [%wx%h %m %[colorspace] %[bit-depth]-bit]" #{Shellwords.escape(file_path)} 2>/dev/null`.strip
+      end
     elsif file_path.match(@pdffile)
       info = `pdfinfo #{Shellwords.escape(file_path)} 2>/dev/null`
       pages = info[/^Pages:\s+(\d+)/, 1]
@@ -4647,9 +4661,12 @@ def render # RENDER ALL PANES {{{2
       if cached_meta
         text += cached_meta
       elsif @selected&.match(@imagefile) && cmd?('identify')
-        # Fallback for non-cached image metadata
-        meta = `identify -format " [%wx%h %m %[colorspace] %[bit-depth]-bit]" #{Shellwords.escape(@selected)} 2>/dev/null`
-        text += meta
+        # Skip SVG files as identify can be very slow on them
+        unless @selected =~ /\.svg$/i
+          # Fallback for non-cached image metadata
+          meta = `identify -format " [%wx%h %m %[colorspace] %[bit-depth]-bit]" #{Shellwords.escape(@selected)} 2>/dev/null`
+          text += meta
+        end
       elsif @selected&.match(@pdffile)
         # Fallback for non-cached PDF metadata
         info  = `pdfinfo #{Shellwords.escape(@selected)} 2>/dev/null`
@@ -5200,6 +5217,9 @@ def showcommand(cmd) # Helper function for showcontent {{{2
 end
 
 def showcontent # SHOW CONTENTS IN THE RIGHT WINDOW {{{2
+  # Only process content if preview is enabled
+  return unless @preview
+  
   if @pR.update
     showimage('clear') if @image
     @image = false
@@ -5283,7 +5303,7 @@ def showcontent # SHOW CONTENTS IN THE RIGHT WINDOW {{{2
             if file_size > 50_000_000  # 50MB limit for images
               @pR.say("Image too large for preview (#{(file_size / 1024.0 / 1024.0).round(1)}MB > 50MB limit)")
             else
-              showimage(Shellwords.escape(@selected))
+              showimage(@selected)
               @image = true
             end
           rescue => e
@@ -5411,8 +5431,12 @@ def showimage(image) # SHOW THE SELECTED IMAGE IN THE RIGHT WINDOW {{{2
       `echo "6;#{img_x};#{img_y};#{img_max_w};#{img_max_h};\n4;\n3;" | #{@imgdisplay} 2>/dev/null`
       @current_image_path = nil  # Clear tracking when image is cleared
     else
-      # Use the already-escaped image for shell commands
-      dimensions = `identify -format "%wx%h" #{image} 2>/dev/null`
+      # Ensure we have the absolute path
+      img_path = File.absolute_path(image)
+      
+      # Properly escape image path for shell commands
+      escaped_image = Shellwords.escape(img_path)
+      dimensions = `identify -format "%wx%h" #{escaped_image} 2>/dev/null`
       img_w, img_h = dimensions.split('x').map(&:to_i)
 
       # Fix: Use simultaneous scaling to prevent overflow
@@ -5425,10 +5449,11 @@ def showimage(image) # SHOW THE SELECTED IMAGE IN THE RIGHT WINDOW {{{2
         img_h = (img_h * scale).to_i
       end
 
-      # 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`
-      @current_image_path = unescaped  # Track currently displayed image
+      # Use the absolute path without extra quotes in the w3mimgdisplay protocol
+      `echo '0;1;#{img_x};#{img_y};#{img_w};#{img_h};;;;;#{img_path}
+4;
+3;' | #{@imgdisplay} 2>/dev/null`
+      @current_image_path = img_path  # Track currently displayed image
     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: 7.0.5
+  version: 7.0.9
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-19 00:00:00.000000000 Z
+date: 2025-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rcurses
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '7.4'
 description: |-
-  RTFM v7.0.5: Added fallback to 'cat' when pandoc or batcat are not available (Issue #8).
+  RTFM v7.0.9: Fixed image preview for filenames with spaces and special characters.
    A full featured terminal browser with syntax highlighted files, images shown in the terminal, videos thumbnailed, etc. Features include remote SSH/SFTP browsing, interactive SSH shell, comprehensive undo system, bookmarks, and much more. 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.
 email: g@isene.com
 executables: