Skip to content
Snippets Groups Projects
Commit 33c9fc56 authored by kk1205's avatar kk1205
Browse files

local upload IGAZÁN működik

parent 397572f2
Branches
No related tags found
No related merge requests found
No preview for this file type
No preview for this file type
...@@ -22,10 +22,10 @@ Application::Application(CloudManager cloudMan) : cm(cloudMan), cfs(*this){ ...@@ -22,10 +22,10 @@ Application::Application(CloudManager cloudMan) : cm(cloudMan), cfs(*this){
int main(int argc, char **argv) { int main(int argc, char **argv) {
LOG_ENTER_EXIT; LOG_ENTER_EXIT;
CloudManager cloudMan = CloudManager(); CloudManager cloudMan = CloudManager();
LocalCloudAdapter* lca = new LocalCloudAdapter("localcm"); LocalCloudAdapter lca("localcm");
cloudMan.addCloud(lca, lca->cloudID); cloudMan.addCloud(&lca, lca.cloudID);
Application application = Application(cloudMan); Application application(cloudMan);
application.cal = CloudAccessLayer(); application.cal = CloudAccessLayer();
application.cal.app = &(application); application.cal.app = &(application);
application.ui = UI(); application.ui = UI();
......
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
bool CloudAccessLayer::upload(FileDescriptor* fileDescriptor) { bool CloudAccessLayer::upload(FileDescriptor* fileDescriptor) {
LOG_ENTER_EXIT; LOG_ENTER_EXIT;
bool succesful = true; bool succesful = true;
try {
vector<Fragment> fragments = fileDescriptor->getFragments(); vector<Fragment> fragments = fileDescriptor->getFragments();
try {
if (fragments.size() == 0){ if (fragments.size() == 0){
throw CloudException("Nincs fragment a file-ban"); throw CloudException("Nincs fragment a file-ban");
} }
...@@ -22,9 +22,10 @@ bool CloudAccessLayer::upload(FileDescriptor* fileDescriptor) { ...@@ -22,9 +22,10 @@ bool CloudAccessLayer::upload(FileDescriptor* fileDescriptor) {
return false; return false;
} }
for each (Fragment f in fileDescriptor->getFragments()) for each (Fragment f in fragments)
{ {
CloudFile clf = CloudFile(f.getCloudId(), f.getCloudFileID()); CloudFile clf(f.getCloudId(), f.getCloudFileID());
cout << f.getCloudId();
if (!(app->cm.getCloudAdapter(f.getCloudId())->upload(clf))){ if (!(app->cm.getCloudAdapter(f.getCloudId())->upload(clf))){
succesful = false; succesful = false;
} }
...@@ -45,8 +46,8 @@ bool CloudAccessLayer::upload(LockFile lockFile) { ...@@ -45,8 +46,8 @@ bool CloudAccessLayer::upload(LockFile lockFile) {
FileDescriptor* CloudAccessLayer::download(FileDescriptor fileDescriptor) { FileDescriptor* CloudAccessLayer::download(FileDescriptor fileDescriptor) {
LOG_ENTER_EXIT; LOG_ENTER_EXIT;
try {
vector<Fragment> fragments = fileDescriptor.getFragments(); vector<Fragment> fragments = fileDescriptor.getFragments();
try {
if (fragments.size() == 0){ if (fragments.size() == 0){
throw CloudException("Nincs fragment a file-ban"); throw CloudException("Nincs fragment a file-ban");
} }
...@@ -57,7 +58,7 @@ FileDescriptor* CloudAccessLayer::download(FileDescriptor fileDescriptor) { ...@@ -57,7 +58,7 @@ FileDescriptor* CloudAccessLayer::download(FileDescriptor fileDescriptor) {
} }
FileDescriptor* fd = new FileDescriptor(fileDescriptor.getFileID()); FileDescriptor* fd = new FileDescriptor(fileDescriptor.getFileID());
for each (Fragment f in fd->getFragments()) for each (Fragment f in fragments)
{ {
CloudFile clf = CloudFile(f.getCloudId(), f.getCloudFileID()); CloudFile clf = CloudFile(f.getCloudId(), f.getCloudFileID());
fd->addFragment(app->cm.getCloudAdapter(f.getCloudId())->download(clf)); fd->addFragment(app->cm.getCloudAdapter(f.getCloudId())->download(clf));
...@@ -77,8 +78,8 @@ bool CloudAccessLayer::deleteFile(FileDescriptor fileDescriptor) { ...@@ -77,8 +78,8 @@ bool CloudAccessLayer::deleteFile(FileDescriptor fileDescriptor) {
LOG_ENTER_EXIT; LOG_ENTER_EXIT;
bool succesful = true; bool succesful = true;
try {
vector<Fragment> fragments = fileDescriptor.getFragments(); vector<Fragment> fragments = fileDescriptor.getFragments();
try {
if (fragments.size() == 0){ if (fragments.size() == 0){
throw CloudException("Nincs fragment a file-ban"); throw CloudException("Nincs fragment a file-ban");
} }
...@@ -88,8 +89,7 @@ bool CloudAccessLayer::deleteFile(FileDescriptor fileDescriptor) { ...@@ -88,8 +89,7 @@ bool CloudAccessLayer::deleteFile(FileDescriptor fileDescriptor) {
return false; return false;
} }
for each (Fragment f in fragments)
for each (Fragment f in fileDescriptor.getFragments())
{ {
CloudFile clf = CloudFile(f.getCloudId(), f.getCloudFileID()); CloudFile clf = CloudFile(f.getCloudId(), f.getCloudFileID());
app->cm.getCloudAdapter(f.getCloudId())->deleleFile(clf); app->cm.getCloudAdapter(f.getCloudId())->deleleFile(clf);
......
...@@ -16,8 +16,6 @@ using namespace std; ...@@ -16,8 +16,6 @@ using namespace std;
*/ */
class LocalCloudAdapter : public CloudAdapter { class LocalCloudAdapter : public CloudAdapter {
public: public:
string cloudID;
LocalCloudAdapter(string _cloudID); LocalCloudAdapter(string _cloudID);
/** /**
......
...@@ -20,8 +20,8 @@ Distributor::Distributor(CloudManager &cloudManager) : cloudManager(cloudManager ...@@ -20,8 +20,8 @@ Distributor::Distributor(CloudManager &cloudManager) : cloudManager(cloudManager
bool Distributor::distribute(FileDescriptor* fileDescriptor) { bool Distributor::distribute(FileDescriptor* fileDescriptor) {
LOG_ENTER_EXIT; LOG_ENTER_EXIT;
try {
vector<Fragment> fragments = fileDescriptor->getFragments(); vector<Fragment> fragments = fileDescriptor->getFragments();
try {
if (fragments.size() == 0){ if (fragments.size() == 0){
throw CloudException("Nincs fragment a file-ban"); throw CloudException("Nincs fragment a file-ban");
} }
...@@ -32,12 +32,12 @@ bool Distributor::distribute(FileDescriptor* fileDescriptor) { ...@@ -32,12 +32,12 @@ bool Distributor::distribute(FileDescriptor* fileDescriptor) {
} }
int index = 0; int index = 0;
for each (Fragment f in fileDescriptor->getFragments()) for (int i = 0; i < fragments.size(); i++)
{ {
string cloudID = cloudIDs.at(index % cloudIDs.size()); string cloudID = cloudIDs.at(index % cloudIDs.size());
f.setCloudID(cloudID); fragments.at(i).setCloudID(cloudID);
index++; index++;
} }
fileDescriptor->setFragments(fragments);
return true; return true;
} }
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment