* Changed BackupPC::Lib so that user check is optional in new()

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

diff --git a/lib/BackupPC/View.pm b/lib/BackupPC/View.pm
index 4cb6da2..0572bfe 100644 (file)
--- a/lib/BackupPC/View.pm
+++ b/lib/BackupPC/View.pm
@@ -31,7 +31,7 @@
 #
 #========================================================================
 #
-# Version 1.6.0_CVS, released 10 Dec 2002.
+# Version 2.0.0beta2, released 13 Apr 2003.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -45,6 +45,7 @@ use File::Path;
 use BackupPC::Lib;
 use BackupPC::Attrib qw(:all);
 use BackupPC::FileZIO;
+use Data::Dumper;
 
 sub new
 {
@@ -72,6 +73,7 @@ sub dirCache
     my($m, $backupNum, $share, $dir) = @_;
     my($i, $level);
 
+    #print STDERR "dirCache($backupNum, $share, $dir)\n";
     $dir = "/$dir" if ( $dir !~ m{^/} );
     $dir =~ s{/+$}{};
     return if ( $m->{num} == $backupNum
@@ -103,7 +105,7 @@ sub dirCache
     #
     $m->{mergeNums} = [];
     for ( $i = $m->{idx} ; $level > 0 && $i >= 0 ; $i-- ) {
-       #print("Do $i ($m->{backups}[$i]{noFill},$m->{backups}[$i]{level})\n");
+       #print(STDERR "Do $i ($m->{backups}[$i]{noFill},$m->{backups}[$i]{level})\n");
        #
        # skip backups with the same or higher level
        #
@@ -123,7 +125,7 @@ sub dirCache
             $sharePathM = $share . $dir;
         }
         $path .= $sharePathM;
-       #print("Opening $path\n");
+       #print(STDERR "Opening $path (share=$share)\n");
        if ( !opendir(DIR, $path) ) {
             if ( $i == $m->{idx} ) {
                 #
@@ -148,6 +150,7 @@ sub dirCache
             $file = $1 if ( $file =~ /(.*)/ );
             my $fileUM = $file;
             $fileUM = $m->{bpc}->fileNameUnmangle($fileUM) if ( $mangle );
+            #print(STDERR "Doing $fileUM\n");
            #
            # skip special files
            #
@@ -231,6 +234,7 @@ sub dirCache
        next if ( $m->{files}{$file}{type} != BPC_FTYPE_DELETED );
        delete($m->{files}{$file});
     }
+    #print STDERR "Returning:\n", Dumper($m->{files});
 }
 
 #
@@ -239,12 +243,18 @@ sub dirCache
 sub fileAttrib
 {
     my($m, $backupNum, $share, $path) = @_;
-    my $dir = $path;
-    $dir =~ s{(.*)/(.*)}{$1};
-    my $file = $2;
 
-    $m->dirCache($backupNum, $share, $dir);
-    return $m->{files}{$file};
+    if ( $path =~ s{(.*)/+(.+)}{$1} ) {
+        my $file = $2;
+        $m->dirCache($backupNum, $share, $path);
+        return $m->{files}{$file};
+    } else {
+        #print STDERR "Got empty $path\n";
+        $m->dirCache($backupNum, "", "");
+        my %attr = %{$m->{files}{$share}};
+        $attr{relPath} = "/";
+        return \%attr;
+    }
 }
 
 #
@@ -302,24 +312,39 @@ sub find
 {
     my($m, $backupNum, $share, $path, $depth, $callback, @callbackArgs) = @_;
 
+    #
+    # First call the callback on the given $path
+    #
+    my $attr = $m->fileAttrib($backupNum, $share, $path);
+    return -1 if ( !defined($attr) );
+    &$callback($attr, @callbackArgs);
+    return if ( $attr->{type} != BPC_FTYPE_DIR );
+
+    #
+    # Now recurse into subdirectories
+    #
+    $m->findRecurse($backupNum, $share, $path, $depth,
+                   $callback, @callbackArgs);
+}
+
+#
+# Same as find(), except the callback is not called on the current
+# $path, only on the contents of $path.  So if $path is a file then
+# no callback or recursion occurs.
+#
+sub findRecurse
+{
+    my($m, $backupNum, $share, $path, $depth, $callback, @callbackArgs) = @_;
+
     my $attr = $m->dirAttrib($backupNum, $share, $path);
-    if ( !defined($attr) ) {
-        #
-        # maybe this is a file, not a directory; if so call the callback
-        # just on this file.
-        #
-        my $attr = $m->fileAttrib($backupNum, $share, $path);
-        return -1 if ( !defined($attr) );
-        &$callback($attr, @callbackArgs);
-        return;
-    }
-    foreach my $file ( keys(%$attr) ) {
+    return if ( !defined($attr) );
+    foreach my $file ( sort(keys(%$attr)) ) {
         &$callback($attr->{$file}, @callbackArgs);
         next if ( !$depth || $attr->{$file}{type} != BPC_FTYPE_DIR );
         #
         # For depth-first, recurse as we hit each directory
         #
-        $m->find($backupNum, $share, "$path/$file", $depth,
+        $m->findRecurse($backupNum, $share, "$path/$file", $depth,
                             $callback, @callbackArgs);
     }
     if ( !$depth ) {
@@ -328,7 +353,7 @@ sub find
         #
         foreach my $file ( keys(%{$attr}) ) {
             next if ( $attr->{$file}{type} != BPC_FTYPE_DIR );
-            $m->find($backupNum, $share, "$path/$file", $depth,
+            $m->findRecurse($backupNum, $share, "$path/$file", $depth,
                            $callback, @callbackArgs);
         }
     }