filecon 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d62cae7fca7f8ef2348b79ac2df27edfafbc5da7ada9523a2fad5b38de27e5a9
-  data.tar.gz: 20fe942d398a0dd68e27a5cdc5b40d16d296e33399327494aaa608d847401e47
+  metadata.gz: df1c9b636fd924aa180e49679581afcb96338d18d854ab359046cbf91e048642
+  data.tar.gz: deb0a271ed914d69e8d4c7a138a83a1d7942c5a451de227b9c23d3637dea89f3
 SHA512:
-  metadata.gz: 1d2ac9423eecd422db9ac518ba264ef56b3f9d17823950f648e56eff3de0dd08326daba18bfd8eeeba51d76e072a060f4be5c6542a50c709623adac370f080f0
-  data.tar.gz: 198c5fa607c36cbc86808d42e3b0a806d83832ba5432827c871526d8ebaebaaa8cc3864f7a486e586b00ce2e983086e81184d08fe993f93ca2fa58fd7b0c9fd6
+  metadata.gz: cdd7f22ae47392a10f1485dad5fdebd98860604e28bac74e214a13ca9b3d9b4f0b838878e8e523f827c91d724246c620fb8c526dcfbe97fb67817c4d3253bc40
+  data.tar.gz: 75e4a171320400619c0923ed985c9b93f598c454477cec23adad90b78adad58e2f8533e7ff535ac428c595cf39f26c212b7a709c173fc4802b4a405ab54cd6c0

data/README.md

@@ -21,8 +21,8 @@ Filecon runs on Typr, whose self-contained terminal layer ships its own precompi
 - **Directory browsing with MIME-type detection** — files are typed from a packaged MIME database and colored accordingly, with optional `file --mime-type` magic detection for unknowns
 - **Fastest possible navigation** — hint numbers (1–9, 0) open rows directly; TAB pages hints beyond the first ten
 - **Default `[/]:search` in popups** — command and history popups open in search mode: start typing to distill the list down to the matches, then press a number hint to pick from the few remaining results. The listing itself searches the same way
-- **Mouse support** — click a row to open it with its default action; the mouse wheel scrolls the listing (pointer-only mode is planned)
-- **Command execution modes** — commands run in one of four ways, chosen by prefix: `|` status line, `=` text viewer, `+` new terminal window, `!` Ruby eval; per-MIME-type command sets with `%name`, `%dir`, `%file`, `%str` substitution
+- **Mouse support** — click a row to open it with its default action, right-click to open its command list; the mouse wheel scrolls the listing (pointer-only mode is planned)
+- **Command execution modes** — commands run in one of four ways, chosen by prefix: `|` status line, `=` text viewer, `+` new terminal window, `!` Ruby eval; per-MIME-type command sets with `%name`, `%dir`, `%file`, `%cmd`, `%str` substitution
 - **Customizable column views** — view columns run shell commands with `%name` substitution (content preview, char/word/line counts, type info, disk usage, man-page descriptions)
 - **Directory and command history with a frequency counter** — entries stored as `[count, entry]` pairs, most-used first then most-recent; `frequency_limit` controls how many frequent entries lead the list
 - **Shell history import** — on first run, `~/.bash_history` and `~/.zsh_history` are validated, alias-resolved, and merged into the command history; directory paths referenced by those commands are collected into the directory history
@@ -46,11 +46,10 @@ filecon [directory]
 **Navigation**
 - Arrow keys / Page Up/Down / Home / End — Navigate files
 - Backspace — Go to parent directory
-- Number keys — Open file with default command
+- Number keys — Open file with default command; Alt+number — Open command list for the file
 - Tab — Cycle hint numbers for rows beyond the first 10
 
 **Actions**
-- `o` — Open list of all commands for selected file
 - `c` — Command history
 - `x` — List all executables from $PATH directories
 - `h` — Help
@@ -66,6 +65,7 @@ filecon [directory]
 - `M` — Mark range
 - `a` — Mark all
 - `i` — Invert mark
+- `Enter` — Open the command list for marked files
 
 **Directory**
 - `~` — Go to home directory
@@ -73,12 +73,12 @@ filecon [directory]
 - `d` — Directory history
 
 **Other**
-- Enter — Select / confirm
+- Enter — Select / confirm (also: open the command list for marked files)
 - Esc — Quit
 
 ### Mouse
 
-Click a row to open it with its default action; the mouse wheel scrolls the listing. Mouse reporting is enabled automatically when Filecon starts.
+Click a row to open it with its default action, right-click to open its command list; the mouse wheel scrolls the listing. Mouse reporting is enabled automatically when Filecon starts.
 
 ### Popups and search
 
@@ -102,7 +102,7 @@ State and history files live under `~/.local/share/filecon/`.
 - `=` — display output in the text viewer
 - `!` — evaluate as Ruby code
 
-**Substitution variables:** `%name` (file path), `%dir` (directory picker), `%file` (file picker), `%str` (text input)
+**Substitution variables:** `%name` (file path), `%dir` (directory picker), `%file` (file picker), `%cmd` (PATH executable picker), `%str` (text input)
 
 See `filecon(1)` for the full manual.
 

data/bin/filecon

@@ -1,9 +1,11 @@
 #!/usr/bin/ruby
 
 require "fileutils"
+require "tmpdir"
 require "yaml"
 require_relative "../lib/filecon"
 
+log = nil
 begin
   config_dir = File.expand_path("~/.config/filecon")
   config_path = File.join(config_dir, "config.yaml")
@@ -34,7 +36,7 @@ begin
     cmd_history: parse[ch_path],
     path: { config: config_path, state: state_dir, dir_history: dh_path,
             cmd_history: ch_path },
-    directory: ARGV.first || ?., keymap: { open_file: ?o, cmd_history: ?c, dir_history: ?d, recurse: ?R, open_current: ?` },
+    directory: ARGV.first || ?., keymap: { cmd_history: ?c, dir_history: ?d, recurse: ?R, open_current: ?` },
     colors: config["colors"] || {},
     views: config["views"] || {},
     commands: config["commands"] || {},
@@ -46,9 +48,12 @@ begin
   app.import_shell_history
   app.fly
 rescue => e
+  log = File.join(Dir.tmpdir, "filecon_error.log")
   $stderr.puts "#{e.class}: #{e.message}\n#{e.backtrace.first(10).join("\n")}"
-  File.write File.join(Dir.tmpdir, "filecon_error.log"),
-    "#{e.class}: #{e.message}\n#{e.backtrace.first(10).join("\n")}"
+  File.write log, "#{e.class}: #{e.message}\n#{e.backtrace.first(10).join("\n")}"
 ensure
   Typr.exit
+  if log
+    $stderr.puts "filecon crashed: details in #{log}"
+  end
 end

data/config.yaml

@@ -17,7 +17,7 @@
 
 # Suffix appended to term for opening files in a new window.
 # Example: if term is "foot", term_hold becomes "foot --hold"
-term_hold: " --hold"
+# term_hold: " --hold"
 
 # Maximum number of history entries to retain.
 # Older entries beyond this limit are automatically pruned.
@@ -113,6 +113,8 @@ colors:
 #
 #   %file  - Opens file picker, inserts chosen path
 #
+#   %cmd   - Lists the PATH, picks an executable, inserts its path
+#
 #   %str   - Prompts for text input, inserts the string
 #
 # SPECIAL CATEGORIES:
@@ -270,7 +272,7 @@ commands:
 
 views:
   content:
-    content: "head -n 50 %name"
+    content: "cat %name | strings | head -n 50 "
 
   types:
     type: true
@@ -278,7 +280,7 @@ views:
     description: "file -b %name"
 
   disk_use:
-    du: "du -hs %name | cut -wf1"
+    du: "du -s %name | cut -wf1"
 
   count:
     chars: "wc -m %name | cut -wf1"

data/filecon.1

@@ -27,7 +27,7 @@ Navigate files
 Go to parent directory
 .TP
 .B Number keys
-Open file with default command
+Open file with default command; Alt+number opens the command list for the file
 .TP
 .B Tab
 Cycle hint numbers for rows beyond the first 10
@@ -66,15 +66,13 @@ Open commands for current directory
 Navigate to home directory
 .TP
 .B Return
-Confirm: cd into directories or open files
+Confirm: cd into directories or open files; with marked files,
+open the command list for them
 .TP
 .B Escape
 Quit
 .SH FILECON KEYS
 .TP
-.B o
-Open list of all commands for selected file
-.TP
 .B c
 Browse command history
 .PP
@@ -122,6 +120,9 @@ Prompt to pick a directory
 .B %file
 Prompt to pick a file
 .TP
+.B %cmd
+Prompt to pick a PATH executable
+.TP
 .B %str
 Prompt for a text string (line input)
 .SH VIEWS

data/lib/filecon/version.rb

@@ -1,3 +1,3 @@
 module Filecon
-  VERSION = "0.2.1"
+  VERSION = "0.3.0"
 end

data/lib/filecon.rb

@@ -10,6 +10,7 @@ class Filecon::App < Typr::Browser
   include Typr
 
   def cd dir, append=false
+    @selected[:rows] = [] unless append
     if dir.is_a? Array
       dirs = dir.filter_map { |d| d = File.expand_path(d.to_s); Dir.exist?(d) ? d : nil }
       dirs.each_with_index { |d, i|
@@ -29,8 +30,16 @@ class Filecon::App < Typr::Browser
 
   def execute; cd ENV["PATH"].split(":"); add_path_column end
 
-#switch_view
-  def switch_to id=nil
+  def pick type='file', **kw
+    return super unless type == :cmd
+    dir = @directory
+    execute
+    result = super
+    cd dir
+    result
+  end
+
+  def change_view id=nil
     return unless id
     id = @views.keys[id] if id.is_a? Integer
     view = @views[id]
@@ -45,7 +54,9 @@ class Filecon::App < Typr::Browser
         cmd = built[0] == ?| ? built : ?| + built
         open cmd + " 2>&1"
       end
-      io.read(width).to_s.scrub.gsub(/[\n\t]/, ?|)
+      cell = io.read(width).to_s.scrub.strip
+      value = coerce_type cell
+      value.is_a?(String) || cell.empty? ? cell.gsub(/[\n\t]/, ?|) : value
     }.compact }
     @sequence = [ NAME ] + view.keys.map{ |head|
       @header.index(head.to_s) || (@header += [head.to_s]; @header.count-1) }
@@ -69,21 +80,30 @@ class Filecon::App < Typr::Browser
     end
 
     commands = @commands.values_at( *types ).map(&:to_a).flatten( 1 ).uniq
+    alt = false
     pair = if default; commands.first
     else move left+1,top+1
       if id.is_a?(Array); draw "#{id.count.to_s} files: (#{ 
         types.join ?, })".ljust width
       else print id end
       pop = id ? top+2 : top
-      return unless cmd = Grid.new( left:left+1, top: pop, right: -1,
+      picker = Grid.new( left:left+1, top: pop, right: -1,
       bottom: [ pop + commands.count - 1, Typr.height ].min,
       input:commands, border: :light, format: [:min, :max],
-      borders: { top: nil }, alternate: false, hints: "1234567890",
-      colors: {columns: @colors[:commands] || [:green, :red] }  ).pick( :row, column: 0 )
+      borders: { top: nil }, alternate: false,
+      colors: {columns: @colors[:commands] || [:green, :red] } )
+      return unless cmd = picker.pick( :row, column: 0 )
+      alt = picker.modifier == :alt
       commands[ cmd ]
     end
+    dir = @directory
     cmd = build pair.last, id, pair.first
     return unless cmd
+    if alt
+      edited = Typr.read_line "> ", left: left, top: @user.top, initial: cmd
+      return unless edited
+      cmd = edited
+    end
     if cmd[0] == ?|
       display = cmd[1..-1]
       record :cmd, cmd
@@ -92,12 +112,39 @@ class Filecon::App < Typr::Browser
       nc, ac = @colors[:commands] || [:green, :red]
       @user.show "> #{color_code(nc)}#{pair.first}#{color_code(ac)}:#{display}" \
         "#{color_code(@colors[:default])} : #{output.lines.last}"
+      show
       Typr.read_key
     else
       record :cmd, cmd unless cmd[0..2] == '!cd'
       run( cmd )
-      show
     end
+    Array(id).sort.reverse.each { |i| refresh_row i } if id && cmd[0..2] != '!cd' && @directory == dir
+    @selected[:rows] = [] if id && @directory != dir
+    show #unless cmd[0] == ?|
+  end
+
+  def refresh_row id
+    return unless row = @data[id]
+    name = row[NAME]
+    return delete_row id unless File.symlink?(name) || File.exist?(name)
+    updated = scan_file name
+    updated[-2,2] = row[-2,2]
+    @data[id] = updated
+    process id
+  end
+
+  def delete_row id
+    @data.delete_at id
+    @layer.delete_at id if @layer
+    if @map
+      @map.delete id
+      @map.map!{ |i| i > id ? i - 1 : i }
+    end
+    @colors[:fields] = @colors[:fields].map { |(row,col),color|
+      row == id ? nil : row > id ? [[row - 1, col], color] : [[row, col], color] }.compact.to_h
+    @start = rows - height if @start > rows - height
+    @start = 0 if @start < 0
+    @selected[:rows] = []
   end
 
   def build str, id, name=nil
@@ -105,21 +152,18 @@ class Filecon::App < Typr::Browser
     reset = color_code( @colors[:default] )
     prefix = name ? "#{color_code(nc)}#{name}#{color_code(ac)}:" : ""
     cmd = ""
-    while str[/\%(name|dir|file|str)/]
+    while str[/\%(name|cmd|dir|file|str)/]
       cmd += $`
       case $&
         when '%name'; cmd += ?"+( id.nil? ? @directory :
           id.is_a?( Array ) ? id.map{ |id|
           @data[id][NAME] }.join('" "') :
           @data[id][NAME] )+?"
-        when '%dir'
-          @user.show "> #{prefix}#{cmd}#{$&}#{$'}#{reset}"
-          return unless dir = pick(:directory)
-          cmd += ?" + dir + ?"
-        when '%file'
+        when '%dir', '%file', '%cmd'
           @user.show "> #{prefix}#{cmd}#{$&}#{$'}#{reset}"
-          return unless file = pick(:file)
-          cmd += ?" + file + ?"
+          result = pick( { '%dir' => :directory, '%file' => :file, '%cmd' => :cmd }[$&] )
+          return unless result
+          cmd += ?" + result + ?"
         when '%str'
           prompt = cmd.empty? || cmd.end_with?(' ') ? cmd : "#{cmd} "
           query = Typr.read_line "> #{prefix}#{prompt}", left: left, top: @user.top
@@ -171,12 +215,18 @@ class Filecon::App < Typr::Browser
       fields[[i,1]] = [fc[1], :grey20]
     }
 
-    n = popup(input: pairs, hints:"1234567890", format:[:min,:max],
+    picker = popup(input: pairs, format:[:min,:max],
       alternate: true, left: left, bottom: -2,
-      colors: { columns: fc, fields: fields }).pick(:row, column: :all)
+      colors: { columns: fc, fields: fields })
+    n = picker.pick(:row, column: :all)
     return unless n
 
     entry = ordered[n][1]
+    if is_cmd and picker.modifier == :alt
+      edited = Typr.read_line "> ", left: left, top: @user.top, initial: entry
+      return unless edited
+      entry = edited
+    end
     record type, entry
 
     if is_cmd
@@ -284,6 +334,9 @@ class Filecon::App < Typr::Browser
   def help
     info = "\nFILECON - a terminal file manager\n\n" \
       "HINTS: press a number (1-9,0) to open that file with its default action.\n" \
+      "       Alt+number opens the command list for that file instead.\n" \
+      "       Right-click a file to open its command list.\n" \
+      "       Mark files with m, then Return opens their command list.\n" \
       "       TAB cycles pages of hints.\n\n" \
       "COMMANDS:\n" \
       "  e[x]ecute      browse all executables on your PATH\n" \
@@ -311,7 +364,6 @@ class Filecon::App < Typr::Browser
     @keymap[:open_current] = ?`
     @keymap[:execute] = ?x
     @keymap[:recurse] = ?R
-    @user.bindings.insert 1, "[o]pen"
     @user.bindings.insert 7, "[R]ecurse"
     @user.bindings.insert 8, "[c]ommands"
     @user.bindings.insert 9, "e[x]ecute"
@@ -319,6 +371,11 @@ class Filecon::App < Typr::Browser
     @user.reset
   end
 
+  def confirm
+    return unless @selected[:rows].any?
+    open_file @selected[:rows], false
+  end
+
   def open_current; open_file nil, false, ["directory", "inode"] - [??] + ["default"] end
 
   def fly
@@ -332,14 +389,16 @@ class Filecon::App < Typr::Browser
         when Typr::Mouse
           if key.wheel? and key.press?
             send( key.wheel_up? ? @keymap[:up] : @keymap[:down] )
-          elsif key.press? and key.left?
+          elsif key.press? and ( key.left? or key.right? )
             id = hit( key.y, key.x )
-            open_file( id, true ) if id.is_a? Integer
+            open_file( id, !key.right? ) if id.is_a? Integer
           end
           @user.reset
         else
+          alt = key.is_a?(String) && key[/\A\e(\d)\z/]
+          key = key[1] if alt
           id = send( key )
-          open_file( id, true) if id.is_a? Integer
+          open_file( id, !alt ) if id.is_a? Integer
           @user.reset
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: filecon
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Kilian Reitmayr