X-Git-Url: http://git.vrable.net/?a=blobdiff_plain;f=scandir.cc;h=043d35eeba637f2cba740c7ae0ef0d5ac5d96596;hb=358b7ac6f741088838fb84979c9127976eb34fdf;hp=d0f76d1a0eeba81ef286a4fb5669ae1234b86366;hpb=38c66f088ed65d2f42264c92add6e0b33eac2bfc;p=cumulus.git

diff --git a/scandir.cc b/scandir.cc
index d0f76d1..043d35e 100644
--- a/scandir.cc
+++ b/scandir.cc
@@ -15,12 +15,16 @@
 #include <vector>
 
 #include "store.h"
+#include "sha1.h"
 
 using std::string;
 using std::vector;
 
+static SegmentStore *segment_store;
 static OutputStream *info_dump = NULL;
 
+static SegmentPartitioner *index_segment, *data_segment;
+
 void scandir(const string& path);
 
 /* Converts time to microseconds since the epoch. */
@@ -29,7 +33,7 @@ int64_t encode_time(time_t time)
     return (int64_t)time * 1000000;
 }
 
-void dumpfile(int fd)
+void dumpfile(int fd, dictionary &file_info)
 {
     struct stat stat_buf;
     fstat(fd, &stat_buf);
@@ -42,6 +46,7 @@ void dumpfile(int fd)
         return;
     }
 
+    SHA1Checksum hash;
     while (true) {
         ssize_t res = read(fd, buf, sizeof(buf));
         if (res < 0) {
@@ -52,11 +57,15 @@ void dumpfile(int fd)
         } else if (res == 0) {
             break;
         } else {
+            hash.process(buf, res);
+            OutputStream *block = data_segment->new_object();
+            block->write(buf, res);
             size += res;
         }
     }
 
-    printf("    bytes=%Ld\n", size);
+    file_info["sha1"] = string((const char *)hash.checksum(),
+                               hash.checksum_size());
 }
 
 void scanfile(const string& path)
@@ -67,15 +76,14 @@ void scanfile(const string& path)
     char *buf;
     ssize_t len;
 
+    // Set to true if the item is a directory and we should recursively scan
+    bool recurse = false;
+
     dictionary file_info;
 
     lstat(path.c_str(), &stat_buf);
 
-    printf("%s:\n", path.c_str());
-    printf("  ino=%Ld, perm=%04o, uid=%d, gid=%d, nlink=%d, blksize=%d, size=%Ld\n",
-           (int64_t)stat_buf.st_ino, stat_buf.st_mode & 07777,
-           stat_buf.st_uid, stat_buf.st_gid, stat_buf.st_nlink,
-           (int)stat_buf.st_blksize, (int64_t)stat_buf.st_size);
+    printf("%s\n", path.c_str());
 
     file_info["mode"] = encode_u16(stat_buf.st_mode & 07777);
     file_info["atime"] = encode_u64(encode_time(stat_buf.st_atime));
@@ -88,23 +96,18 @@ void scanfile(const string& path)
 
     switch (stat_buf.st_mode & S_IFMT) {
     case S_IFIFO:
-        printf("    FIFO\n");
         inode_type = 'p';
         break;
     case S_IFSOCK:
-        printf("    socket\n");
         inode_type = 's';
         break;
     case S_IFCHR:
-        printf("    character device\n");
         inode_type = 'c';
         break;
     case S_IFBLK:
-        printf("    block device\n");
         inode_type = 'b';
         break;
     case S_IFLNK:
-        printf("    symlink\n");
         inode_type = 'l';
 
         /* Use the reported file size to allocate a buffer large enough to read
@@ -126,7 +129,6 @@ void scanfile(const string& path)
         delete[] buf;
         break;
     case S_IFREG:
-        printf("    regular file\n");
         inode_type = '-';
 
         /* Be paranoid when opening the file.  We have no guarantee that the
@@ -147,15 +149,14 @@ void scanfile(const string& path)
         flags = fcntl(fd, F_GETFL);
         fcntl(fd, F_SETFL, flags & ~O_NONBLOCK);
 
-        //dumpfile(fd);
         file_info["size"] = encode_u64(stat_buf.st_size);
+        dumpfile(fd, file_info);
         close(fd);
 
         break;
     case S_IFDIR:
-        printf("    directory\n");
         inode_type = 'd';
-        scandir(path);
+        recurse = true;
         break;
 
     default:
@@ -167,6 +168,11 @@ void scanfile(const string& path)
 
     info_dump->write_string(path);
     info_dump->write_dictionary(file_info);
+
+    // If we hit a directory, now that we've written the directory itself,
+    // recursively scan the directory.
+    if (recurse)
+        scandir(path);
 }
 
 void scandir(const string& path)
@@ -200,20 +206,25 @@ void scandir(const string& path)
 
 int main(int argc, char *argv[])
 {
-    FILE *dump = fopen("fileinfo", "w");
-    if (dump == NULL) {
-        fprintf(stderr, "Cannot open fileinfo: %m\n");
-        return 1;
-    }
+    segment_store = new SegmentStore(".");
+    SegmentWriter *sw = segment_store->new_segment();
+    info_dump = sw->new_object();
 
-    FileOutputStream os(dump);
-    info_dump = &os;
+    index_segment = new SegmentPartitioner(segment_store);
+    data_segment = new SegmentPartitioner(segment_store);
+
+    string uuid = SegmentWriter::format_uuid(sw->get_uuid());
+    printf("Backup UUID: %s\n", uuid.c_str());
 
     try {
-        scandir(".");
+        scanfile(".");
     } catch (IOException e) {
         fprintf(stderr, "IOException: %s\n", e.getError().c_str());
     }
 
+    delete index_segment;
+    delete data_segment;
+    delete sw;
+
     return 0;
 }