Import upstream version 0.11~rc3~r2491

1 files changed, 63 insertions, 96 deletions

diff --git a/bin/bbackupd/BackupClientDirectoryRecord.h b/bin/bbackupd/BackupClientDirectoryRecord.h
index 9e4dda7a..fce3fc04 100644
--- a/bin/bbackupd/BackupClientDirectoryRecord.h
+++ b/bin/bbackupd/BackupClientDirectoryRecord.h
@@ -13,10 +13,13 @@
 #include <string>
 #include <map>
 
-#include "BoxTime.h"
 #include "BackupClientFileAttributes.h"
+#include "BackupDaemonInterface.h"
 #include "BackupStoreDirectory.h"
+#include "BoxTime.h"
 #include "MD5Digest.h"
+#include "ReadLoggingStream.h"
+#include "RunStatusProvider.h"
 
 class Archive;
 class BackupClientContext;
@@ -25,82 +28,6 @@ class BackupDaemon;
 // --------------------------------------------------------------------------
 //
 // Class
-//		Name:    ProgressNotifier
-//		Purpose: Provides methods for the backup library to inform the user
-//		         interface about its progress with the backup
-//		Created: 2005/11/20
-//
-// --------------------------------------------------------------------------
-class BackupClientDirectoryRecord;
-	
-class ProgressNotifier
-{
-	public:
-	virtual ~ProgressNotifier() { }
-	virtual void NotifyScanDirectory(
-		const BackupClientDirectoryRecord* pDirRecord,
-		const std::string& rLocalPath) = 0;
-	virtual void NotifyDirStatFailed(
-		const BackupClientDirectoryRecord* pDirRecord,
-		const std::string& rLocalPath,
-		const std::string& rErrorMsg) = 0;
-	virtual void NotifyFileStatFailed(
-		const BackupClientDirectoryRecord* pDirRecord,
-		const std::string& rLocalPath,
-		const std::string& rErrorMsg) = 0;
-	virtual void NotifyDirListFailed(
-		const BackupClientDirectoryRecord* pDirRecord,
-		const std::string& rLocalPath,
-		const std::string& rErrorMsg) = 0;
-	virtual void NotifyMountPointSkipped(
-		const BackupClientDirectoryRecord* pDirRecord,
-		const std::string& rLocalPath) = 0;
-	virtual void NotifyFileExcluded(
-		const BackupClientDirectoryRecord* pDirRecord,
-		const std::string& rLocalPath) = 0;
-	virtual void NotifyDirExcluded(
-		const BackupClientDirectoryRecord* pDirRecord,
-		const std::string& rLocalPath) = 0;
-	virtual void NotifyUnsupportedFileType(
-		const BackupClientDirectoryRecord* pDirRecord,
-		const std::string& rLocalPath) = 0;
-	virtual void NotifyFileReadFailed(
-		const BackupClientDirectoryRecord* pDirRecord,
-		const std::string& rLocalPath,
-		const std::string& rErrorMsg) = 0;
-	virtual void NotifyFileModifiedInFuture(
-		const BackupClientDirectoryRecord* pDirRecord,
-		const std::string& rLocalPath) = 0;
-	virtual void NotifyFileSkippedServerFull(
-		const BackupClientDirectoryRecord* pDirRecord,
-		const std::string& rLocalPath) = 0;
-	virtual void NotifyFileUploadException(
-		const BackupClientDirectoryRecord* pDirRecord,
-		const std::string& rLocalPath,
-		const BoxException& rException) = 0;
-	virtual void NotifyFileUploadServerError(
-		const BackupClientDirectoryRecord* pDirRecord,
-		const std::string& rLocalPath,
-		int type, int subtype) = 0;
-	virtual void NotifyFileUploading(
-		const BackupClientDirectoryRecord* pDirRecord,
-		const std::string& rLocalPath) = 0;
-	virtual void NotifyFileUploadingPatch(
-		const BackupClientDirectoryRecord* pDirRecord,
-		const std::string& rLocalPath) = 0;
-	virtual void NotifyFileUploaded(
-		const BackupClientDirectoryRecord* pDirRecord,
-		const std::string& rLocalPath,
-		int64_t FileSize) = 0;
-	virtual void NotifyFileSynchronised(
-		const BackupClientDirectoryRecord* pDirRecord,
-		const std::string& rLocalPath,
-		int64_t FileSize) = 0;
-};
-
-// --------------------------------------------------------------------------
-//
-// Class
 //		Name:    BackupClientDirectoryRecord
 //		Purpose: Implementation of record about directory for backup client
 //		Created: 2003/10/08
@@ -132,11 +59,12 @@ public:
 	//		Created: 8/3/04
 	//
 	// --------------------------------------------------------------------------
-	class SyncParams
+	class SyncParams : public ReadLoggingStream::Logger
 	{
 	public:
 		SyncParams(
-			BackupDaemon &rDaemon,
+			RunStatusProvider &rRunStatusProvider, 
+			SysadminNotifier &rSysadminNotifier,
 			ProgressNotifier &rProgressNotifier,
 			BackupClientContext &rContext);
 		~SyncParams();
@@ -144,7 +72,6 @@ public:
 		// No copying
 		SyncParams(const SyncParams&);
 		SyncParams &operator=(const SyncParams&);
-		ProgressNotifier &mrProgressNotifier;
 		
 	public:
 		// Data members are public, as accessors are not justified here
@@ -154,7 +81,9 @@ public:
 		box_time_t mMaxFileTimeInFuture;
 		int32_t mFileTrackingSizeThreshold;
 		int32_t mDiffingUploadSizeThreshold;
-		BackupDaemon &mrDaemon;
+		RunStatusProvider &mrRunStatusProvider;
+		SysadminNotifier &mrSysadminNotifier;
+		ProgressNotifier &mrProgressNotifier;
 		BackupClientContext &mrContext;
 		bool mReadErrorsOnFilesystemObjects;
 		
@@ -162,41 +91,79 @@ public:
 		box_time_t mUploadAfterThisTimeInTheFuture;
 		bool mHaveLoggedWarningAboutFutureFileTimes;
 	
+		bool StopRun() { return mrRunStatusProvider.StopRun(); }
+		void NotifySysadmin(SysadminNotifier::EventCode Event) 
+		{ 
+			mrSysadminNotifier.NotifySysadmin(Event); 
+		}
 		ProgressNotifier& GetProgressNotifier() const 
 		{ 
 			return mrProgressNotifier;
 		}
+		
+		/* ReadLoggingStream::Logger implementation */
+		virtual void Log(int64_t readSize, int64_t offset,
+			int64_t length, box_time_t elapsed, box_time_t finish)
+		{
+			mrProgressNotifier.NotifyReadProgress(readSize, offset,
+				length, elapsed, finish);
+		}
+		virtual void Log(int64_t readSize, int64_t offset,
+			int64_t length)
+		{
+			mrProgressNotifier.NotifyReadProgress(readSize, offset,
+				length);
+		}
+		virtual void Log(int64_t readSize, int64_t offset)
+		{
+			mrProgressNotifier.NotifyReadProgress(readSize, offset);
+		}
 	};
 
-	void SyncDirectory(SyncParams &rParams, int64_t ContainingDirectoryID, const std::string &rLocalPath,
+	void SyncDirectory(SyncParams &rParams,
+		int64_t ContainingDirectoryID,
+		const std::string &rLocalPath,
+		const std::string &rRemotePath,
 		bool ThisDirHasJustBeenCreated = false);
 
 private:
 	void DeleteSubDirectories();
 	BackupStoreDirectory *FetchDirectoryListing(SyncParams &rParams);
-	void UpdateAttributes(SyncParams &rParams, BackupStoreDirectory *pDirOnStore, const std::string &rLocalPath);
-	bool UpdateItems(SyncParams &rParams, const std::string &rLocalPath, BackupStoreDirectory *pDirOnStore,
+	void UpdateAttributes(SyncParams &rParams,
+		BackupStoreDirectory *pDirOnStore,
+		const std::string &rLocalPath);
+	bool UpdateItems(SyncParams &rParams, const std::string &rLocalPath,
+		const std::string &rRemotePath,
+		BackupStoreDirectory *pDirOnStore,
 		std::vector<BackupStoreDirectory::Entry *> &rEntriesLeftOver,
-		std::vector<std::string> &rFiles, const std::vector<std::string> &rDirs);
-	int64_t UploadFile(SyncParams &rParams, const std::string &rFilename, const BackupStoreFilename &rStoreFilename,
-		int64_t FileSize, box_time_t ModificationTime, box_time_t AttributesHash, bool NoPreviousVersionOnServer);
-	void SetErrorWhenReadingFilesystemObject(SyncParams &rParams, const char *Filename);
-	void RemoveDirectoryInPlaceOfFile(SyncParams &rParams, BackupStoreDirectory *pDirOnStore, int64_t ObjectID, const std::string &rFilename);
+		std::vector<std::string> &rFiles,
+		const std::vector<std::string> &rDirs);
+	int64_t UploadFile(SyncParams &rParams,
+		const std::string &rFilename,
+		const BackupStoreFilename &rStoreFilename,
+		int64_t FileSize, box_time_t ModificationTime,
+		box_time_t AttributesHash, bool NoPreviousVersionOnServer);
+	void SetErrorWhenReadingFilesystemObject(SyncParams &rParams,
+		const char *Filename);
+	void RemoveDirectoryInPlaceOfFile(SyncParams &rParams,
+		BackupStoreDirectory* pDirOnStore,
+		BackupStoreDirectory::Entry* pEntry,
+		const std::string &rFilename);
 
 private:
-	int64_t 		mObjectID;
+	int64_t 	mObjectID;
 	std::string 	mSubDirName;
-	bool 			mInitialSyncDone;
-	bool 			mSyncDone;
+	bool 		mInitialSyncDone;
+	bool 		mSyncDone;
 
 	// Checksum of directory contents and attributes, used to detect changes
 	uint8_t mStateChecksum[MD5Digest::DigestLength];
 
-	std::map<std::string, box_time_t>						*mpPendingEntries;
-	std::map<std::string, BackupClientDirectoryRecord *>	mSubDirectories;
+	std::map<std::string, box_time_t> *mpPendingEntries;
+	std::map<std::string, BackupClientDirectoryRecord *> mSubDirectories;
 	// mpPendingEntries is a pointer rather than simple a member
-	// variables, because most of the time it'll be empty. This would waste a lot
-	// of memory because of STL allocation policies.
+	// variable, because most of the time it'll be empty. This would
+	// waste a lot of memory because of STL allocation policies.
 };
 
 #endif // BACKUPCLIENTDIRECTORYRECORD__H