Locking kb. kész van. Tesztelni kell még.

skeleton/Program/Source/dataAccess/CloudFileSystem.cpp

@@ -101,36 +101,46 @@ void CloudFileSystem::lock(FileDescriptor fileDescriptor) {
 
 	string lockFileName(fileDescriptor.getFileID() + ".lck");
 
+	for each (string cloudId in fileDescriptor.getUniqueClouds())
+	{
 		ofstream lockFileTmp(fragFolder + lockFileName, std::ios::binary);
 
 		// TODO
 		lockFileTmp << "Client ID comes here";
 		lockFileTmp.close();
 
-
-	//LockFile lockFile(fragment.getCloudId(), lockFileName);
-	//application.cal.upload(lockFile);
+		LockFile lockFile(cloudId, lockFileName);
+		application.cal.upload(lockFile);
+	}
 }
 
 void CloudFileSystem::unlock(FileDescriptor fileDescriptor) {
 	LOG_ENTER_EXIT;
 
-	//Get lockfile by some business logic
-	for each (Fragment fragment in fileDescriptor.getFragments())
+	for each (string cloudId in fileDescriptor.getUniqueClouds())
 	{
-		LockFile lockFile(fragment.getCloudId(), fragment.getCloudFileID() + ".lck");
+		LockFile lockFile(cloudId, fileDescriptor);
 		application.cal.deleteFile(lockFile);
 	}
 }
 
-void CloudFileSystem::isLocked(FileDescriptor fileDescriptor) {
+bool CloudFileSystem::isLocked(FileDescriptor fileDescriptor) {
 	LOG_ENTER_EXIT;
 
-	//Get lockfile by some business logic
-	LockFile lockFile("", "");
+	bool isLockedResult = false;
+
+	for each (string cloudId in fileDescriptor.getUniqueClouds())
+	{
+		LockFile lockFile(cloudId, fileDescriptor);
+
+		if (application.cal.checkExists(lockFile))
+		{
+			isLockedResult = true;
+			break;
+		}
+	}
 
-	//TODO: CloudAccessLayer needs a function to check if file exists
-	application.cal.download(lockFile);
+	return isLockedResult;
 }
 
 Distributor* CloudFileSystem::getDistributor() {

skeleton/Program/Source/dataAccess/CloudFileSystem.h

@@ -182,8 +182,9 @@ private:
 	/**
 	 * Determines weather a file is locked
 	 * @param fileDescriptor descriptor of the file to be determined
+	 * @return true if any of the fragments are locked, false otherwise
 	 */
-	void isLocked(FileDescriptor fileDescriptor);
+	bool isLocked(FileDescriptor fileDescriptor);
 };
 
 #endif //_CLOUDFILESYSTEM_H
\ No newline at end of file

skeleton/Program/Source/fileModel/FileDescriptor.cpp

@@ -40,3 +40,16 @@ void FileDescriptor::addFragment(Fragment frag){
 	LOG_ENTER_EXIT;
 	fragments.push_back(frag);
 }
+
+
+std::set<std::string> FileDescriptor::getUniqueClouds()
+{
+	set<string> clouds;
+
+	for each (Fragment fragment in getFragments())
+	{
+		clouds.insert(fragment.getCloudId());
+	}
+
+	return clouds;
+}

skeleton/Program/Source/fileModel/FileDescriptor.h

@@ -5,6 +5,7 @@
 #include <string>
 #include <vector>
 #include "Fragment.h"
+#include <set>
 
 using namespace std;
 
@@ -63,6 +64,11 @@ public:
 	 */
 	void addFragment(Fragment frag);
 
+	/**
+	* Returns the unique cloudIDs from the list of fragments.
+	* @return set of the unique cloudIDs
+	*/
+	std::set<std::string> getUniqueClouds();
 };
 
 #endif //_FILEDESCRIPTOR_H
\ No newline at end of file

skeleton/Program/Source/fileModel/LockFile.cpp

@@ -6,3 +6,9 @@
  */
 	
 LockFile::LockFile(string _cloudID, string _cloudFileID) : CloudFile(_cloudID, _cloudFileID) { LOG_ENTER_EXIT; }
+
+LockFile::LockFile(string _cloudID, FileDescriptor fileDescriptor) 
+	: CloudFile(_cloudID, fileDescriptor.getFileID() + ".lck")
+{
+	LOG_ENTER_EXIT;
+}

skeleton/Program/Source/fileModel/LockFile.h

@@ -7,6 +7,7 @@
 #define _LOCKFILE_H
 
 #include "CloudFile.h"
+#include "FileDescriptor.h"
 
 /**
  * LockFile class
@@ -20,6 +21,13 @@ public:
 	 * @param _cloudFileID path on cloud
 	 */
 	LockFile(string _cloudID, string _cloudFileID);
+
+	/**
+	 * Constructor for LockFile. Generates fileID from fileDescriptor's ID.
+	 * @param _cloudID ID of its cloud
+	 * @param fileDescriptor FileDescriptor describing the file to generate a LockFile for
+	 */
+	LockFile(string _cloudID, FileDescriptor fileDescriptor);
 };
 
 #endif //_LOCKFILE_H
\ No newline at end of file