don't pull whole directory on diff (sigh!)

[bak-git.git] / bak-git-server.pl

diff --git a/bak-git-server.pl b/bak-git-server.pl
index a826934..2b223c6 100755 (executable)
--- a/bak-git-server.pl
+++ b/bak-git-server.pl
@@ -90,6 +90,11 @@ warn "dir: $dir listen: $server_ip:9001\n"
 sub pull_changes {
        my $hostname = shift;
        system "find $hostname -type f | sed 's,$hostname,,' > /tmp/$hostname.list";
+       if ( @_ ) {
+               open(my $files, '>>', "/tmp/$hostname.list");
+               print $files "$_\n" foreach @_;
+               close($files);
+       }
        system "rsync -avv --files-from /tmp/$hostname.list root\@$hostname:/ $hostname/"
 }
 
@@ -99,12 +104,20 @@ while (my $client = $server->accept()) {
        warn "<<< $line\n";
        my ($user,$hostname,$pwd,$command,$rel_path,$message) = split(/\s+/,$line,6);
 
-       my $on_host = $1 if $rel_path =~ s/^([^:]+):(.+)$/$2/ && -e $1;
+       my $on_host = '';
+       if ( $rel_path =~ s/^([^:]+):(.+)$/$2/ ) {
+               if ( -e $1 ) {
+                       $on_host = $1;
+               } else {
+                       print $client "host $1 doesn't exist in backup\n";
+                       next;
+               }
+       }
        my $path = $rel_path =~ m{^/} ? $rel_path : "$pwd/$rel_path";
 
-       $message ||= '';
-       warn "$hostname [$command] $path | $message\n";
-       $message ||= "$hostname [$command] $path";
+       warn "$hostname [$command] $on_host:$path | $message\n";
+       $message ||= "$path [$command]";
+       $message = "$hostname: $message";
 
        my $dir = $path;
        $dir =~ s{/[^/]+$}{};
@@ -133,7 +146,7 @@ while (my $client = $server->accept()) {
        } elsif ( $command =~ m{(diff|status|log|ch)} ) {
                $command .= ' --stat' if $command eq 'log';
                $command = 'log --patch-with-stat' if $command =~ m/^ch/;
-               pull_changes $hostname if $command eq 'diff';
+               pull_changes( $hostname ) if $command eq 'diff';
                if ( $on_host ) {
                        system 'rsync', '-avv', "root\@$on_host:$path", "$on_host/$path";
                        open(my $diff, '-|', "diff -Nuw $hostname$path $on_host$path");