1 files changed, 41 insertions, 17 deletions

diff --git a/lib/backupstore/BackupStoreContext.h b/lib/backupstore/BackupStoreContext.h
index c33e7d50..48448360 100644
--- a/lib/backupstore/BackupStoreContext.h
+++ b/lib/backupstore/BackupStoreContext.h
@@ -45,7 +45,8 @@ class HousekeepingInterface
 class BackupStoreContext
 {
 public:
-	BackupStoreContext(int32_t ClientID, HousekeepingInterface &rDaemon,
+	BackupStoreContext(int32_t ClientID,
+		HousekeepingInterface* mpHousekeeping,
 		const std::string& rConnectionDetails);
 	~BackupStoreContext();
 private:
@@ -64,7 +65,7 @@ public:
 		Phase_Login		= 1,
 		Phase_Commands	= 2
 	};
-	
+
 	int GetPhase() const {return mProtocolPhase;}
 	std::string GetPhaseName() const
 	{
@@ -80,14 +81,23 @@ public:
 		}
 	}
 	void SetPhase(int NewPhase) {mProtocolPhase = NewPhase;}
-	
+
 	// Read only locking
 	bool SessionIsReadOnly() {return mReadOnly;}
 	bool AttemptToGetWriteLock();
 
-	void SetClientHasAccount(const std::string &rStoreRoot, int StoreDiscSet) {mClientHasAccount = true; mStoreRoot = rStoreRoot; mStoreDiscSet = StoreDiscSet;}
+	// Not really an API, but useful for BackupProtocolLocal2.
+	void ReleaseWriteLock()
+	{
+		if(mWriteLock.GotLock())
+		{
+			mWriteLock.ReleaseLock();
+		}
+	}
+
+	void SetClientHasAccount(const std::string &rStoreRoot, int StoreDiscSet) {mClientHasAccount = true; mAccountRootDir = rStoreRoot; mStoreDiscSet = StoreDiscSet;}
 	bool GetClientHasAccount() const {return mClientHasAccount;}
-	const std::string &GetStoreRoot() const {return mStoreRoot;}
+	const std::string &GetAccountRoot() const {return mAccountRootDir;}
 	int GetStoreDiscSet() const {return mStoreDiscSet;}
 
 	// Store info
@@ -106,7 +116,7 @@ public:
 	// Client marker
 	int64_t GetClientStoreMarker();
 	void SetClientStoreMarker(int64_t ClientStoreMarker);
-	
+
 	// Usage information
 	void GetStoreDiscUsageInfo(int64_t &rBlocksUsed, int64_t &rBlocksSoftLimit, int64_t &rBlocksHardLimit);
 	bool HardLimitExceeded();
@@ -125,13 +135,24 @@ public:
 	const BackupStoreDirectory &GetDirectory(int64_t ObjectID)
 	{
 		// External callers aren't allowed to change it -- this function
-		// merely turns the the returned directory const.
+		// merely turns the returned directory const.
 		return GetDirectoryInternal(ObjectID);
 	}
-	
+
 	// Manipulating files/directories
-	int64_t AddFile(IOStream &rFile, int64_t InDirectory, int64_t ModificationTime, int64_t AttributesHash, int64_t DiffFromFileID, const BackupStoreFilename &rFilename, bool MarkFileWithSameNameAsOldVersions);
-	int64_t AddDirectory(int64_t InDirectory, const BackupStoreFilename &rFilename, const StreamableMemBlock &Attributes, int64_t AttributesModTime, bool &rAlreadyExists);
+	int64_t AddFile(IOStream &rFile,
+		int64_t InDirectory,
+		int64_t ModificationTime,
+		int64_t AttributesHash,
+		int64_t DiffFromFileID,
+		const BackupStoreFilename &rFilename,
+		bool MarkFileWithSameNameAsOldVersions);
+	int64_t AddDirectory(int64_t InDirectory,
+		const BackupStoreFilename &rFilename,
+		const StreamableMemBlock &Attributes,
+		int64_t AttributesModTime,
+		int64_t ModificationTime,
+		bool &rAlreadyExists);
 	void ChangeDirAttributes(int64_t Directory, const StreamableMemBlock &Attributes, int64_t AttributesModTime);
 	bool ChangeFileAttributes(const BackupStoreFilename &rFilename, int64_t InDirectory, const StreamableMemBlock &Attributes, int64_t AttributesHash, int64_t &rObjectIDOut);
 	bool DeleteFile(const BackupStoreFilename &rFilename, int64_t InDirectory, int64_t &rObjectIDOut);
@@ -155,29 +176,32 @@ public:
 
 private:
 	void MakeObjectFilename(int64_t ObjectID, std::string &rOutput, bool EnsureDirectoryExists = false);
-	BackupStoreDirectory &GetDirectoryInternal(int64_t ObjectID);
-	void SaveDirectory(BackupStoreDirectory &rDir, int64_t ObjectID);
+	BackupStoreDirectory &GetDirectoryInternal(int64_t ObjectID,
+		bool AllowFlushCache = true);
+	void SaveDirectory(BackupStoreDirectory &rDir);
 	void RemoveDirectoryFromCache(int64_t ObjectID);
-	void DeleteDirectoryRecurse(int64_t ObjectID, int64_t &rBlocksDeletedOut, bool Undelete);
+	void ClearDirectoryCache();
+	void DeleteDirectoryRecurse(int64_t ObjectID, bool Undelete);
 	int64_t AllocateObjectID();
 
 	std::string mConnectionDetails;
 	int32_t mClientID;
-	HousekeepingInterface &mrDaemon;
+	HousekeepingInterface *mpHousekeeping;
 	int mProtocolPhase;
 	bool mClientHasAccount;
-	std::string mStoreRoot;	// has final directory separator
+	std::string mAccountRootDir;	// has final directory separator
 	int mStoreDiscSet;
+
 	bool mReadOnly;
 	NamedLock mWriteLock;
 	int mSaveStoreInfoDelay; // how many times to delay saving the store info
-	
+
 	// Store info
 	std::auto_ptr<BackupStoreInfo> mapStoreInfo;
 
 	// Refcount database
 	std::auto_ptr<BackupStoreRefCountDatabase> mapRefCount;
-	
+
 	// Directory cache
 	std::map<int64_t, BackupStoreDirectory*> mDirectoryCache;