rtfm-filemanager 8.0 → 8.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7a4b89db4d1b51d0fd284d272a38e984464001c59ba56073573a9970f368c2d
-  data.tar.gz: 28fb1c3993d2bd7a5bfc37963af077ebb902cd36b6afea714aee5e8392b995f3
+  metadata.gz: 2268b6df0d2f7e4c4c3b16441b1d38c60596271205935b7718d85c279ce583d0
+  data.tar.gz: 6900af4ed1b6b7ff9be6d6d62dc688c62f937dd752bc9a2e164b8eddca243c1b
 SHA512:
-  metadata.gz: 5949e6579609b8c5680d2d808f0f7c7df263560ec1c740105712189de44b20b6b6140daba57ef80b366f5556ec7b702f0a98ee85a39e1481e07c4b66d2297736
-  data.tar.gz: e48903d3b30df3318d1327eda8ae7150e3e40e7d27b081e190a8a8088c44eb0af400d501550844ac52e5f9a687759b22bed82231e339f857af1f238db7d77e41
+  metadata.gz: 45bc4528912e89d2002139c15c80b214b4824aaa0113f49269ed390bafb15c8a065a4602346abef6bd7163876b8e9d432784d5678d22b88184c48de5fbe33398
+  data.tar.gz: cb124815c4ace418b44d82f2bfadca9b1d7dec1b65d46beddc9c77009ccb5d21eea9b0e88fc2d98522935c7622d7187fe8ce28472ff3af1cc13e636cb5a80f12

data/CHANGELOG.md

@@ -5,11 +5,16 @@ All notable changes to RTFM will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [8.0.1] - 2026-03-07
+
+### Changed
+- **Harmonized key mappings** - `d` now consistently means delete across all modes (normal, archive, remote). `D` = extract (archive mode) or download (remote mode). Removed `P` move-out shortcut from archive mode.
+
 ## [8.0] - 2026-03-07
 
 ### Added
 - **Browse archives as virtual directories** - Press Enter on .zip, .tar.gz, .tar.bz2, .tar.xz, .rar, .7z files to browse their contents as if they were directories. Navigate with normal keys, press LEFT at root to exit. Yellow-green visual indicator distinguishes archive mode. Supports nested directories within archives. Press `x` to open archive with external program instead.
-- **Archive write operations** - Full read/write support for archives: extract entries (`d`), delete entries (`D`), add local files (`p`), and move out (`P` = extract + delete). Tag multiple entries with `t` for bulk operations. Supports zip, tar.gz, tar.bz2, tar.xz, rar, and 7z formats.
+- **Archive write operations** - Full read/write support for archives: delete entries (`d`), extract entries (`D`), add local files (`p`). Tag multiple entries with `t` for bulk operations. Supports zip, tar.gz, tar.bz2, tar.xz, rar, and 7z formats.
 - **Async background file operations** - Copy and move operations on multiple items or directories now run in a background thread with progress displayed in the bottom pane. The UI remains responsive during large operations. Single-file operations and symlinks remain synchronous for instant feedback.
 - **Scrollable diff viewer** - File comparison (`X`) now shows the full unified diff with scrollable navigation (j/k, PgUp/PgDn, Home/End). Press `s` to toggle between unified diff and side-by-side view. No more truncation at 15 lines.
 

data/README.md

@@ -324,13 +324,27 @@ user@server.com:/path # Production server
 |-----|--------|
 | `←` / `h` | Parent directory |
 | `→` / `ENTER` | Enter dir / show file info |
-| `d` | Download file |
+| `D` | Download file |
 | `u` | Upload tagged files |
 | `s` | Open SSH shell |
 | `Ctrl-e` | Exit remote mode |
 
 **Visual indicator:** Red background when in remote mode
 
+### Archive Browsing
+
+Press `Enter` on any archive file (.zip, .tar.gz, .tar.bz2, .tar.xz, .rar, .7z) to browse its contents as a virtual directory.
+
+| Key | Action |
+|-----|--------|
+| `d` | Delete entry from archive |
+| `D` | Extract entry to origin directory |
+| `p` | Add pre-tagged local files into archive |
+| `t` | Tag/untag for bulk operations |
+| `LEFT` | Parent directory / exit archive |
+
+**Visual indicator:** Yellow-green background when in archive mode
+
 ---
 
 ## Configuration

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    = '8.0' # Archive browsing, async file ops, scrollable diff viewer
+@version    = '8.0.2' # Archive browsing, async file ops, scrollable diff viewer
 
 # SAVE & STORE TERMINAL {{{1
 ORIG_STTY = `stty -g`.chomp
@@ -206,7 +206,7 @@ CONFIG_FILE   = File.join(RTFM_HOME, 'conf')
     >       = Follow symlink to the directory where the target resides
     Ctrl-r  = Show recently accessed files and directories (press number to jump)
     Ctrl-e  = Browse remote directories via SSH/SFTP (toggle remote mode)
-                In remote mode: d=download, u=upload, s=shell, →=file info, ←=parent dir
+                In remote mode: D=download, u=upload, s=shell, →=file info, ←=parent dir
                 SSH connections support comments: user@host:/path # Comment
 
   DIRECTORY VIEWS
@@ -270,7 +270,7 @@ CONFIG_FILE   = File.join(RTFM_HOME, 'conf')
     ENTER   = Browse inside archive (zip, tar, gz, bz2, xz, rar, 7z) - virtual browsing
               Press LEFT at archive root to exit back to normal browsing
     x       = Open archive with external program (bypass archive browsing)
-              Inside an archive: d=extract, D=delete, p=add files, t=tag, P=move out
+              Inside an archive: d=delete, D=extract, p=add files, t=tag
     z       = Extract tagged zipped archive to current directory
     Z       = Create zipped archive from tagged files/directories
 
@@ -2564,9 +2564,9 @@ end
 def render_side_by_side(lines1, lines2, name1, name2, offset, page_height) # {{{3
   half_width = (@pR.w - 7) / 2
   half_width = [half_width, 10].max
-  text = "\n"
-  text << sprintf("  %-#{half_width}s | %s\n", name1[0, half_width], name2[0, half_width]).fg(226)
-  text << "  " + "-" * half_width + "-+-" + "-" * half_width + "\n"
+  text = +"\n"
+  text << sprintf("  %-#{half_width}s \u2502 %s\n", name1[0, half_width], name2[0, half_width]).fg(226)
+  text << "  " + "\u2500" * half_width + "\u2500\u253C\u2500" + "\u2500" * half_width + "\n"
 
   max_lines = [lines1.size, lines2.size].max
   end_line = [offset + page_height, max_lines].min
@@ -2577,7 +2577,7 @@ def render_side_by_side(lines1, lines2, name1, name2, offset, page_height) # {{{
     same = lines1[i] == lines2[i]
     color = same ? 240 : (lines1[i].nil? ? 156 : (lines2[i].nil? ? 196 : 226))
 
-    text << sprintf("  %-#{half_width}s | %s\n", l1, l2).fg(color)
+    text << sprintf("  %-#{half_width}s \u2502 %s\n", l1, l2).fg(color)
   end
 
   text
@@ -2968,10 +2968,9 @@ def show_archive_file_info(entry) # {{{3
   if entry[:type] == 'directory'
     info_text << "  Enter  = Navigate into directory\n".fg(240)
   end
-  info_text << "  d      = Extract to origin directory\n".fg(240)
-  info_text << "  D      = Delete from archive\n".fg(240)
+  info_text << "  d      = Delete from archive\n".fg(240)
+  info_text << "  D      = Extract to origin directory\n".fg(240)
   info_text << "  p      = Add local files into archive\n".fg(240)
-  info_text << "  P      = Move out (extract + delete from archive)\n".fg(240)
   info_text << "  t      = Tag/untag for bulk operations\n".fg(240)
   info_text << "  LEFT   = Go to parent / exit archive\n".fg(240)
   @pR.say(info_text)
@@ -3854,7 +3853,7 @@ def build_remote_help # {{{3
   
   help_text << "Remote Navigation:\n".fg(226)
   help_text << "  • Use arrow keys to navigate directories\n"
-  help_text << "  • Press " + "d".fg(156) + " to download files\n"
+  help_text << "  • Press " + "D".fg(156) + " to download files\n"
   help_text << "  • Press " + "u".fg(156) + " to upload files\n"
   help_text << "  • Press " + "s".fg(156) + " to open SSH shell\n"
   help_text << "  • Press " + "→".fg(156) + " to view file info\n"
@@ -3875,17 +3874,6 @@ def copy_items # {{{3
 end
 
 def move_items # {{{3
-  if @archive_mode
-    # In archive mode, 'P' extracts then deletes (move out of archive)
-    return unless @archive_mode && @archive_path
-    entries = archive_tagged_or_selected
-    return if entries.empty?
-    archive_extract_entries
-    # Re-tag the entries so archive_delete_entries can find them
-    @tagged = entries.map { |e| "#{@archive_path}:#{e[:full_path]}" }
-    archive_delete_entries if @archive_mode
-    return
-  end
   copy_move_link('move')
   @pR.update = true
 end
@@ -3948,14 +3936,12 @@ end
 
 def delete_items # {{{3
   if @archive_mode
-    # In archive mode, 'd' key extracts to origin directory
-    archive_extract_entries
+    # In archive mode, 'd' = delete from archive (consistent with normal mode)
+    archive_delete_entries
     return
   end
   if @remote_mode
-    # In remote mode, 'd' key downloads the selected file
-    remote_download_selected
-    return
+    return  # No delete in remote mode; download is on 'D'
   end
   
   tagged_info
@@ -4064,8 +4050,13 @@ end
 
 def empty_trash # {{{3
   if @archive_mode
-    # In archive mode, 'D' deletes entries from archive
-    archive_delete_entries
+    # In archive mode, 'D' = extract entries to origin directory
+    archive_extract_entries
+    return
+  end
+  if @remote_mode
+    # In remote mode, 'D' = download selected file
+    remote_download_selected
     return
   end
   @pB.say(" Really empty Trash (~/.rtfm/trash)? (press 'y')")

data/docs/keyboard-reference.md

@@ -238,10 +238,22 @@ When viewing an image, `Ctrl-y` copies the actual image file - paste into GIMP,
 
 | Key | Action |
 |-----|--------|
-| `z` | Extract tagged archive |
+| `Enter` | Browse archive as virtual directory |
+| `x` | Open archive with external program (bypass browsing) |
+| `z` | Extract tagged archive to current directory |
 | `Z` | Create archive from tagged items |
 
-**Supported formats:** .zip, .tar, .gz, .bz2, .xz, .rar, .7z
+**Inside archive browsing mode:**
+
+| Key | Action |
+|-----|--------|
+| `d` | Delete entry from archive |
+| `D` | Extract entry to origin directory |
+| `p` | Add pre-tagged local files into archive |
+| `t` | Tag/untag entries for bulk operations |
+| `LEFT` | Go to parent directory / exit archive |
+
+**Supported formats:** .zip, .tar.gz, .tar.bz2, .tar.xz, .rar, .7z
 
 ## Git Operations
 
@@ -333,7 +345,7 @@ Useful for plugin development and debugging.
 | `↑` `↓` | Navigate files |
 | `←` `h` | Parent directory |
 | `→` `ENTER` | Show file info |
-| `d` | Download file |
+| `D` | Download file |
 | `u` | Upload tagged files |
 | `s` | Open SSH shell |
 

data/docs/remote-browsing.md

@@ -11,7 +11,7 @@ RTFM lets you browse and manage files on remote servers via SSH/SFTP as seamless
 1. Press `Ctrl-e` to enter remote mode
 2. Enter connection: `user@server.com:/path/to/directory`
 3. Navigate with normal keys
-4. Press `d` to download, `u` to upload
+4. Press `D` to download, `u` to upload
 5. Press `Ctrl-e` to return to local mode
 
 ## Connection Formats
@@ -90,13 +90,13 @@ Press `→` or `ENTER` on a file to see:
 ### Download Single File
 
 1. Navigate to file
-2. Press `d`
+2. Press `D`
 3. File downloads to your current local directory
 
 ### Download Multiple Files
 
 1. Tag files with `t`
-2. Press `d`
+2. Press `D`
 3. All tagged files download
 
 **Download location:** Current local directory (where you were before entering remote mode)
@@ -221,7 +221,7 @@ Tag local files → Ctrl-e → server:/var/www → u (upload)
 ### Backup Files
 
 ```
-Ctrl-e → server:/data → Tag files → d (download)
+Ctrl-e → server:/data → Tag files → D (download)
 ```
 
 ### Quick Config Edit

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rtfm-filemanager
 version: !ruby/object:Gem::Version
-  version: '8.0'
+  version: 8.0.2
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-07 00:00:00.000000000 Z
+date: 2026-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rcurses