From 41b16f3b27f87d2f84e59387e78644c05756e307 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris+github@qwirx.com>
Date: Sat, 28 Apr 2007 17:31:38 +0000
Subject: Use ReadLoggingStream to log progress of file uploads. (refs #3)

---
 lib/backupclient/BackupStoreFileEncodeStream.cpp | 17 ++++++++++++++---
 lib/backupclient/BackupStoreFileEncodeStream.h   |  2 ++
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/lib/backupclient/BackupStoreFileEncodeStream.cpp b/lib/backupclient/BackupStoreFileEncodeStream.cpp
index c692f18e..cda18855 100644
--- a/lib/backupclient/BackupStoreFileEncodeStream.cpp
+++ b/lib/backupclient/BackupStoreFileEncodeStream.cpp
@@ -38,6 +38,7 @@ using namespace BackupStoreFileCryptVar;
 BackupStoreFileEncodeStream::BackupStoreFileEncodeStream()
 	: mpRecipe(0),
 	  mpFile(0),
+	  mpLogging(0),
 	  mStatus(Status_Header),
 	  mSendData(true),
 	  mTotalBlocks(0),
@@ -79,6 +80,13 @@ BackupStoreFileEncodeStream::~BackupStoreFileEncodeStream()
 		mpFile = 0;
 	}
 	
+	// Clear up logging stream
+	if(mpLogging)
+	{
+		delete mpLogging;
+		mpLogging = 0;
+	}
+	
 	// Free the recipe
 	if(mpRecipe != 0)
 	{
@@ -199,6 +207,9 @@ void BackupStoreFileEncodeStream::Setup(const char *Filename, BackupStoreFileEnc
 		{
 			// Open the file
 			mpFile = new FileStream(Filename);
+
+			// Create logging stream
+			mpLogging = new ReadLoggingStream(*mpFile);
 		
 			// Work out the largest possible block required for the encoded data
 			mAllocatedBufferSize = BackupStoreFile::MaxBlockSizeForChunkSize(maxBlockClearSize);
@@ -474,7 +485,7 @@ void BackupStoreFileEncodeStream::SkipPreviousBlocksInInstruction()
 	}
 	
 	// Move forward in the stream
-	mpFile->Seek(sizeToSkip, IOStream::SeekType_Relative);
+	mpLogging->Seek(sizeToSkip, IOStream::SeekType_Relative);
 }
 
 
@@ -518,14 +529,14 @@ void BackupStoreFileEncodeStream::EncodeCurrentBlock()
 	ASSERT(blockRawSize < mAllocatedBufferSize);
 
 	// Check file open
-	if(mpFile == 0)
+	if(mpFile == 0 || mpLogging == 0)
 	{
 		// File should be open, but isn't. So logical error.
 		THROW_EXCEPTION(BackupStoreException, Internal)
 	}
 	
 	// Read the data in
-	if(!mpFile->ReadFullBuffer(mpRawBuffer, blockRawSize, 0 /* not interested in size if failure */))
+	if(!mpLogging->ReadFullBuffer(mpRawBuffer, blockRawSize, 0 /* not interested in size if failure */))
 	{
 		// TODO: Do something more intelligent, and abort this upload because the file
 		// has changed
diff --git a/lib/backupclient/BackupStoreFileEncodeStream.h b/lib/backupclient/BackupStoreFileEncodeStream.h
index 1c748798..fb5d0851 100644
--- a/lib/backupclient/BackupStoreFileEncodeStream.h
+++ b/lib/backupclient/BackupStoreFileEncodeStream.h
@@ -17,6 +17,7 @@
 #include "CollectInBufferStream.h"
 #include "MD5Digest.h"
 #include "BackupStoreFile.h"
+#include "ReadLoggingStream.h"
 
 namespace BackupStoreFileCreation
 {
@@ -100,6 +101,7 @@ private:
 	Recipe *mpRecipe;
 	IOStream *mpFile;					// source file
 	CollectInBufferStream mData;		// buffer for header and index entries
+	ReadLoggingStream *mpLogging;
 	int mStatus;
 	bool mSendData;						// true if there's file data to send (ie not a symlink)
 	int64_t mTotalBlocks;				// Total number of blocks in the file
-- 
cgit v1.2.3