X-Git-Url: https://ruderich.org/simon/gitweb/?p=fcscs%2Ffcscs.git;a=blobdiff_plain;f=bin%2Ffcscs;h=80c89bfde6f082ecca6ff674f7ee32d87388377c;hp=6741a91faff6cd2587c32bf4af6325110bc1da32;hb=f256721d6e8a23c7502bba1cec687bdfa16e1355;hpb=1beed87f2aa993a61aff87793fc4e5f32ea3369d diff --git a/bin/fcscs b/bin/fcscs index 6741a91..80c89bf 100755 --- a/bin/fcscs +++ b/bin/fcscs @@ -64,6 +64,7 @@ Short overview of the general usage, details below: - f: file paths - i: IPs - u: URLs + - c: checksums (e.g. MD5, SHA1, ..) - ... - /: search mode - for `normal' modes: @@ -366,6 +367,7 @@ package Screen { $fh = undef; # a failed open still writes a value to $fh return; } + $fh->autoflush(1); } foreach (@args) { @@ -557,9 +559,6 @@ sub select_match { $number = int($number / 10); } elsif ($char eq "\n" or $char eq $config->{setting}{alternative_return}) { - if ($number == 0) { # number without selection matches last entry - $number = 1; - } last; # Selecting a new mode requires falling through into the main input @@ -569,7 +568,8 @@ sub select_match { return { key => $char }; # All other mappings stay in the current mode. } elsif (defined (my $m = $config->{mapping}{simple}{$char})) { - $m->($char, $screen, $config, $input); + my $result = $m->($char, $screen, $config, $input); + last if defined $result->{select_match}; next; } else { @@ -584,6 +584,10 @@ sub select_match { $screen->draw_matches($config, $matches, \@remaining); $screen->refresh; } + # Number without selection matches last entry. + if ($number == 0) { + $number = 1; + } $screen->draw_matches($config, $matches, []); # remove matches @@ -691,6 +695,18 @@ sub mapping_paste { return {}; } +sub mapping_paste_now { + my ($key, $screen, $config, $input) = @_; + + $screen->debug('mapping_paste_now', 'started'); + + $config->{state}{handler} = $config->{handler}{paste}; + + return { + select_match => 1, + }; +} + sub mapping_yank { my ($key, $screen, $config, $input) = @_; @@ -704,6 +720,17 @@ sub mapping_yank { return {}; } +sub mapping_yank_now { + my ($key, $screen, $config, $input) = @_; + + $screen->debug('mapping_yank_now', 'started'); + + $config->{state}{handler} = $config->{handler}{yank}; + + return { + select_match => 1, + }; +} =head2 NORMAL MODES @@ -715,11 +742,13 @@ The following normal modes are available: =over 4 -=item B select relative/absolute paths +=item B select relative/absolute paths + +=item B select URLs -=item B select URLs +=item B select IPv4 and IPv6 addresses -=item B select IPv4 and IPv6 addresses +=item B select checksums (MD5, SHA1, SHA256, SHA512) =back @@ -733,7 +762,7 @@ sub mapping_mode_path { return { select => 'path select', matches => \@matches, - handler => $config->{handler}{yank}, + handler => $config->{handler}{path}, }; } sub mapping_mode_url { @@ -761,6 +790,18 @@ sub mapping_mode_ip { handler => $config->{handler}{ip}, }; } +sub mapping_mode_checksum { + my ($key, $screen, $config, $input) = @_; + + $screen->debug('mapping_mode_checksum', 'started'); + + my @matches = get_regex_matches($input, $config->{regex}{checksum}); + return { + select => 'checksum select', + matches => \@matches, + handler => $config->{handler}{checksum}, + }; +} =head2 SEARCH MODE (AND EXTEND MODE) @@ -1052,6 +1093,8 @@ them in parentheses): =item B select IPv4 and IPv6 addresses (C<\&mapping_mode_ip>) +=item B select checksums (e.g. MD5, SHA) (C<\&mapping_mode_checksum>) + =item B search for regex to get selection (C<\&mapping_mode_search>) =item B quit fcscs (C<\&mapping_quit>) @@ -1064,8 +1107,12 @@ The following simple mappings are available by default: =item B

enable pasting (C<\&mapping_paste>) +=item B

paste current selection (like C<\n> but paste) (C<\&mapping_paste_now>) + =item B enable yanking (copying) (C<\&mapping_yank>) +=item B yank current selection (like C<\n> but yank) (C<\&mapping_yank_now>) + =back Note that yanking only uses the GNU screen or Tmux paste buffer by default. To @@ -1101,12 +1148,15 @@ my %mapping_mode = ( f => \&mapping_mode_path, u => \&mapping_mode_url, i => \&mapping_mode_ip, + c => \&mapping_mode_checksum, '/' => \&mapping_mode_search, q => \&mapping_quit, ); my %mapping_simple = ( p => \&mapping_paste, + P => \&mapping_paste_now, y => \&mapping_yank, + Y => \&mapping_yank_now, ); =head2 ATTRIBUTES @@ -1224,6 +1274,8 @@ my %regex = ( # enough. ipv4 => qr!\b(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}(?:/\d{1,2})?)\b!, ipv6 => qr!\b((?:[0-9a-fA-F]{1,4})?(?::+[0-9a-fA-F]{1,4})+(?:/\d{1,3})?)\b!, + # MD5, SHA1, SHA256, SHA512 + checksum => qr!\b([0-9a-fA-F]{32}|[0-9a-fA-F]{40}|[0-9a-fA-F]{64}|[0-9a-fA-F]{128})\b!, ); =head2 HANDLERS @@ -1234,13 +1286,17 @@ The following handlers are available, defaults in parentheses. =over -=item B used to yank (copy) selection to paste buffer (C<\&handler_yank>) +=item B used to yank (copy) selection to paste buffer (C<\&handler_yank>) + +=item B used to paste selection into window (C<\&handler_paste>) -=item B used to paste selection into window (C<\&handler_paste>) +=item B used to handle paths (C<\&handler_yank>) -=item B used to open URLs (e.g. in a browser) (C<\&handler_url>) +=item B used to open URLs (e.g. in a browser) (C<\&handler_url>) -=item B used to handle IPs (C<\&handler_yank>) +=item B used to handle IPs (C<\&handler_yank>) + +=item B used to handle checksums (C<\&handler_yank>) =back @@ -1261,10 +1317,12 @@ Example: =cut my %handler = ( - yank => \&handler_yank, - paste => \&handler_paste, - url => \&handler_url, - ip => \&handler_yank, + yank => \&handler_yank, + paste => \&handler_paste, + path => \&handler_yank, + url => \&handler_url, + ip => \&handler_yank, + checksum => \&handler_yank, ); my %state = ( @@ -1287,10 +1345,13 @@ Create a new Curses attribute with the given fore- and background color. mapping_mode_path() mapping_mode_url() mapping_mode_ip() + mapping_mode_checksum() mapping_mode_search() mapping_paste() + mapping_paste_now() mapping_yank() + mapping_yank_now() mapping_quit() Used as mappings, see L above. @@ -1336,7 +1397,7 @@ Example: } return $result; - } + }; # Also update initial mode to use our new "URL mode". $config{setting}{initial_mode} = $config{mapping}{mode}{u}; @@ -1364,18 +1425,19 @@ package Fcscs { sub mapping_mode_path { return main::mapping_mode_path(@_); } sub mapping_mode_url { return main::mapping_mode_url(@_); } sub mapping_mode_ip { return main::mapping_mode_ip(@_); } + sub mapping_mode_checksum { return main::mapping_mode_checksum(@_); } sub mapping_mode_search { return main::mapping_mode_search(@_); } sub mapping_paste { return main::mapping_paste(@_); } + sub mapping_paste_now { return main::mapping_paste_now(@_); } sub mapping_yank { return main::mapping_yank(@_); } + sub mapping_yank_now { return main::mapping_yank_now(@_); } sub mapping_quit { return main::mapping_quit(@_); } sub handler_yank { return main::handler_yank(@_); } sub handler_paste { return main::handler_paste(@_); } sub handler_url { return main::handler_url(@_); } - sub debug { return main::debug(@_); } - sub get_regex_matches { return main::get_regex_matches(@_); } sub select_match { return main::select_match(@_); } @@ -1415,10 +1477,10 @@ package Fcscs { } # Make sure the file is not writable by other users. Doesn't handle # ACLs and see comment above about race conditions. - my @stat = stat $path or die $!; + my @stat = stat $path or $screen->die("Config '$decoded': $!"); my $mode = $stat[2]; if (($mode & Fcntl::S_IWGRP) or ($mode & Fcntl::S_IWOTH)) { - die "Config '$decoded' must not be writable by other users."; + $screen->die("Config '$decoded' must not be writable by other users."); } my $result = do $path;