re-implement only_increment by comparing inodes

[BackupPC.git] / lib / BackupPC / View.pm

diff --git a/lib/BackupPC/View.pm b/lib/BackupPC/View.pm
index c8664af..cfebe69 100644 (file)
--- a/lib/BackupPC/View.pm
+++ b/lib/BackupPC/View.pm
@@ -48,6 +48,8 @@ use BackupPC::FileZIO;
 use Data::Dumper;
 use Encode qw/from_to/;
 
+use Data::Dump qw(dump);
+
 sub new
 {
     my($class, $bpc, $host, $backups, $options) = @_;
@@ -74,7 +76,7 @@ sub dirCache
     my($m, $backupNum, $share, $dir) = @_;
     my($i, $level);
 
-    #print STDERR "dirCache($backupNum, $share, $dir)\n";
+    print STDERR "dirCache($backupNum, $share, $dir)\n";
     $dir = "/$dir" if ( $dir !~ m{^/} );
     $dir =~ s{/+$}{};
     return if ( $m->{num} == $backupNum
@@ -93,6 +95,9 @@ sub dirCache
     $m->{share} = $share;
     $m->{dir} = $dir;
 
+    my $previous_increment_entry;
+    my $increment_backupNum = $backupNum; # used in loop
+
     #
     # merge backups, starting at the requested one, and working
     # backwards until we get to level 0.
@@ -103,7 +108,8 @@ sub dirCache
        #
        # skip backups with the same or higher level
        #
-       next if ( $m->{backups}[$i]{level} >= $level );
+       #next if ( $m->{backups}[$i]{level} >= $level );
+       # FIXME ASA skip all but first?
 
        $level = $m->{backups}[$i]{level};
        $backupNum = $m->{backups}[$i]{num};
@@ -123,6 +129,8 @@ sub dirCache
         #print(STDERR "Opening $path (share=$share, mangle=$mangle)\n");
 
         my $dirOpts    = { %{$m->{dirOpts} || {} } };
+        $dirOpts->{inode} = 1 if $m->{dirOpts}->{only_increment}; # ASA - detect unchanged
+#warn "# dirOpts = ",dump $dirOpts;
         my $attribOpts = { compress => $compress };
         if ( $legacyCharset ) {
             $dirOpts->{charsetLegacy}
@@ -157,12 +165,32 @@ sub dirCache
            #
            # skip special files
            #
-            next if ( defined($m->{files}{$fileUM})
+            next if ( 0 # defined($m->{files}{$fileUM}) # ASA - need fallthrough
                    || $file eq ".."
                    || $file eq "."
                    || $file eq "backupInfo"
                    || $mangle && $file eq "attrib" );
 
+
+               # ASA - we only skip files when invoked with share name
+               if ( $m->{dirOpts}->{only_increment} && $share ) {
+                       if ( defined $previous_increment_entry->{$fileUM}
+                       && $previous_increment_entry->{$fileUM}->{inode} == $entry->{inode} ) {
+                               warn "# -- $backupNum $fileUM\n";
+                               $previous_increment_entry->{$fileUM}->{_hide}++;
+                               next;
+                       } elsif ( $backupNum < $increment_backupNum ) {
+                               warn "# << $backupNum $fileUM\n";
+                               $previous_increment_entry->{$fileUM}->{_hide}++;
+                               next;
+                       } else {
+                               warn "# ++ $backupNum $fileUM ",dump $entry;
+                               $previous_increment_entry->{$fileUM} = $entry;
+                       }
+               } else {
+                       next if defined($m->{files}{$fileUM});
+               }
+
             if ( defined($attr) && defined(my $a = $attr->get($fileUM)) ) {
                 $m->{files}{$fileUM} = $a;
                 #
@@ -223,6 +251,7 @@ sub dirCache
            $m->{files}{$fileUM}{inode}       = $entry->{inode}
                                                     if ( $m->{dirOpts}{inode} );
         }
+
        #
        # Also include deleted files
        #
@@ -244,9 +273,17 @@ sub dirCache
                $m->{files}{$fileUM}{inode}      = 0;
            }
        }
-
-       last if $m->{dirOpts}->{only_increment}; # XXX ASA Search extension
     }
+
+       # ASA create increment
+       if ( $m->{dirOpts}->{only_increment} ) {
+               warn "# previous_increment_entry = ",dump $previous_increment_entry;
+               foreach my $file ( grep { exists $previous_increment_entry->{$_}->{_hide} } keys %$previous_increment_entry ) {
+                       delete $m->{files}{$file};
+                       warn "OLD $file\n";
+               }
+       }
+
     #
     # Prune deleted files
     #