jrd/irssi
1
0
Fork 0
forked from PsychoticNinja/irssi
Code Issues Pull Requests Projects Releases Wiki Activity

sync buf.pl

Browse Source
This commit is contained in:
ailin-nemui 2016-09-22 04:21:15 +02:00
parent c98f896dfc
commit d39ad6e559
1 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
scripts/buf.pl
View File

@ -5,7 +5,7 @@ use Irssi qw(command signal_add signal_add_first active_win
settings_get_str settings_get_bool channels windows settings_get_str settings_get_bool channels windows
settings_add_str settings_add_bool get_irssi_dir settings_add_str settings_add_bool get_irssi_dir
window_find_refnum signal_stop); window_find_refnum signal_stop);
$VERSION = '2.13'; $VERSION = '2.20';
%IRSSI = ( %IRSSI = (
authors => 'Juerd', authors => 'Juerd',
contact => 'juerd@juerd.nl', contact => 'juerd@juerd.nl',
@ -13,10 +13,8 @@ $VERSION = '2.13';
description => 'Saves the buffer for /upgrade, so that no information is lost', description => 'Saves the buffer for /upgrade, so that no information is lost',
license => 'Public Domain', license => 'Public Domain',
url => 'http://juerd.nl/irssi/', url => 'http://juerd.nl/irssi/',
changed => 'Mon May 13 19:41 CET 2002', changed => 'Thu Sep 22 01:37 CEST 2016',
changes => 'Severe formatting bug removed * oops, I ' . changes => 'Fixed file permissions (leaked everything via filesystem)',
'exposed Irssi to ircII foolishness * sorry ' .
'** removed logging stuff (this is a fix)',
note1 => 'This script HAS TO BE in your scripts/autorun!', note1 => 'This script HAS TO BE in your scripts/autorun!',
note2 => 'Perl support must be static or in startup', note2 => 'Perl support must be static or in startup',
); );
@ -39,9 +37,15 @@ use Data::Dumper;
my %suppress; my %suppress;
sub _filename { sprintf '%s/scrollbuffer', get_irssi_dir }
sub upgrade { sub upgrade {
open BUF, q{>}, sprintf('%s/scrollbuffer', get_irssi_dir) or die $!; my $fn = _filename;
print BUF join("\0", map $_->{server}->{address} . $_->{name}, channels), "\n"; my $old_umask = umask 0077;
open my $fh, q{>}, $fn or die "open $fn: $!";
umask $old_umask;
print $fh join("\0", map $_->{server}->{address} . $_->{name}, channels), "\n";
for my $window (windows) { for my $window (windows) {
next unless defined $window; next unless defined $window;
next if $window->{name} eq 'status'; next if $window->{name} eq 'status';
@ -57,36 +61,39 @@ sub upgrade {
redo if defined $line; redo if defined $line;
} }
} }
printf BUF "%s:%s\n%s", $window->{refnum}, $lines, $buf; printf $fh "%s:%s\n%s", $window->{refnum}, $lines, $buf;
} }
close BUF; close $fh;
unlink sprintf("%s/sessionconfig", get_irssi_dir); unlink sprintf("%s/sessionconfig", get_irssi_dir);
command 'layout save'; command 'layout save';
command 'save'; command 'save';
} }
sub restore { sub restore {
open BUF, q{<}, sprintf('%s/scrollbuffer', get_irssi_dir) or die $!; my $fn = _filename;
my @suppress = split /\0/, <BUF>; open my $fh, q{<}, $fn or die "open $fn: $!";
unlink $fn or warn "unlink $fn: $!";
my @suppress = split /\0/, readline $fh;
if (settings_get_bool 'upgrade_suppress_join') { if (settings_get_bool 'upgrade_suppress_join') {
chomp $suppress[-1]; chomp $suppress[-1];
@suppress{@suppress} = (2) x @suppress; @suppress{@suppress} = (2) x @suppress;
} }
active_win->command('^window scroll off'); active_win->command('^window scroll off');
while (my $bla = <BUF>){ while (my $bla = readline $fh){
chomp $bla; chomp $bla;
my ($refnum, $lines) = split /:/, $bla; my ($refnum, $lines) = split /:/, $bla;
next unless $lines; next unless $lines;
my $window = window_find_refnum $refnum; my $window = window_find_refnum $refnum;
unless (defined $window){ unless (defined $window){
<BUF> for 1..$lines; readline $fh for 1..$lines;
next; next;
} }
my $view = $window->view; my $view = $window->view;
$view->remove_all_lines(); $view->remove_all_lines();
$view->redraw(); $view->redraw();
my $buf = ''; my $buf = '';
$buf .= <BUF> for 1..$lines; $buf .= readline $fh for 1..$lines;
my $sep = settings_get_str 'upgrade_separator'; my $sep = settings_get_str 'upgrade_separator';
$sep .= "\n" if $sep ne ''; $sep .= "\n" if $sep ne '';
$window->gui_printtext_after(undef, MSGLEVEL_CLIENTNOTICE, "$buf\cO$sep"); $window->gui_printtext_after(undef, MSGLEVEL_CLIENTNOTICE, "$buf\cO$sep");
@ -119,3 +126,10 @@ signal_add 'event join' => 'suppress';
unless (-f sprintf('%s/scripts/autorun/buf.pl', get_irssi_dir)) { unless (-f sprintf('%s/scripts/autorun/buf.pl', get_irssi_dir)) {
Irssi::print('PUT THIS SCRIPT IN ~/.irssi/scripts/autorun/ BEFORE /UPGRADING!!'); Irssi::print('PUT THIS SCRIPT IN ~/.irssi/scripts/autorun/ BEFORE /UPGRADING!!');
} }
# Remove any left-over file. If 'session' doesn't exist (created by irssi
# during /UPGRADE), neither should our file.
unless (-e sprintf('%s/session', get_irssi_dir)) {
my $fn = _filename;
unlink $fn or warn "unlink $fn: $!" if -e $fn;
}