Skip to content
This repository has been archived by the owner on Jul 26, 2022. It is now read-only.

Commit

Permalink
Add 'sy ls-remote' as REST/WS service
Browse files Browse the repository at this point in the history
  • Loading branch information
binwiederhier committed Sep 20, 2014
1 parent 76f9e94 commit a460dbf
Show file tree
Hide file tree
Showing 13 changed files with 168 additions and 22 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ private Request buildFolderRequestFromCommand(Command command, String commandNam
FolderRequest folderRequest = folderRequestClass.newInstance();

folderRequest.setRoot(root);
folderRequest.setId(new Random().nextInt());
folderRequest.setId(Math.abs(new Random().nextInt()));
folderRequest.setOptions(command.parseOptions(args));

return folderRequest;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

import org.syncany.operations.OperationOptions;
import org.syncany.operations.OperationResult;
import org.syncany.operations.ls_remote.LsRemoteOperation.LsRemoteOperationResult;
import org.syncany.operations.ls_remote.LsRemoteOperationResult;
import org.syncany.plugins.transfer.files.DatabaseRemoteFile;
import org.syncany.plugins.transfer.files.RemoteFile;

Expand All @@ -33,7 +33,7 @@ public CommandScope getRequiredCommandScope() {

@Override
public boolean canExecuteInDaemonScope() {
return false;
return true;
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion syncany-lib/src/main/java/org/syncany/Client.java
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
import org.syncany.operations.ls.LsOperationOptions;
import org.syncany.operations.ls.LsOperationResult;
import org.syncany.operations.ls_remote.LsRemoteOperation;
import org.syncany.operations.ls_remote.LsRemoteOperation.LsRemoteOperationResult;
import org.syncany.operations.ls_remote.LsRemoteOperationResult;
import org.syncany.operations.plugin.PluginOperation;
import org.syncany.operations.plugin.PluginOperationOptions;
import org.syncany.operations.plugin.PluginOperationResult;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
import org.syncany.operations.cleanup.CleanupOperationResult.CleanupResultCode;
import org.syncany.operations.down.DownOperation;
import org.syncany.operations.ls_remote.LsRemoteOperation;
import org.syncany.operations.ls_remote.LsRemoteOperation.LsRemoteOperationResult;
import org.syncany.operations.ls_remote.LsRemoteOperationResult;
import org.syncany.operations.status.StatusOperation;
import org.syncany.operations.status.StatusOperationResult;
import org.syncany.operations.up.UpOperation;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,8 @@ public void onResponse(Response response) {
// Serialize response
String responseMessage = MessageFactory.toResponse(response);

logger.log(Level.INFO, "Sending response message: " + responseMessage);

// Send to one or many receivers
boolean responseWithoutRequest = response.getRequestId() == null || response.getRequestId() <= 0;

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/*
* Syncany, www.syncany.org
* Copyright (C) 2011-2014 Philipp C. Heckel <philipp.heckel@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.syncany.operations.daemon.messages;

import org.syncany.operations.daemon.messages.api.FolderRequest;

public class LsRemoteFolderRequest extends FolderRequest {
// Nothing.
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/*
* Syncany, www.syncany.org
* Copyright (C) 2011-2014 Philipp C. Heckel <philipp.heckel@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.syncany.operations.daemon.messages;

import java.util.logging.Level;

import org.syncany.config.Config;
import org.syncany.operations.daemon.messages.api.FolderRequest;
import org.syncany.operations.daemon.messages.api.FolderRequestHandler;
import org.syncany.operations.daemon.messages.api.Response;
import org.syncany.operations.ls_remote.LsRemoteOperation;
import org.syncany.operations.ls_remote.LsRemoteOperationResult;

public class LsRemoteFolderRequestHandler extends FolderRequestHandler {
public LsRemoteFolderRequestHandler(Config config) {
super(config);
}

@Override
public Response handleRequest(FolderRequest request) {
try {
LsRemoteOperation operation = new LsRemoteOperation(config);
LsRemoteOperationResult operationResult = operation.execute();
LsRemoteFolderResponse response = new LsRemoteFolderResponse(operationResult, request.getId());

return response;
}
catch (Exception e) {
logger.log(Level.WARNING, "Cannot obtain status.", e);
return new BadRequestResponse(request.getId(), "Cannot execute operation: " + e.getMessage());
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/*
* Syncany, www.syncany.org
* Copyright (C) 2011-2014 Philipp C. Heckel <philipp.heckel@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.syncany.operations.daemon.messages;

import org.simpleframework.xml.Element;
import org.syncany.operations.daemon.messages.api.FolderResponse;
import org.syncany.operations.ls_remote.LsRemoteOperationResult;

public class LsRemoteFolderResponse extends FolderResponse {
@Element(required = true)
private LsRemoteOperationResult result;

public LsRemoteFolderResponse() {
// Nothing
}

public LsRemoteFolderResponse(LsRemoteOperationResult result, int requestId) {
super(200, requestId, null);
this.result = result;
}

@Override
public LsRemoteOperationResult getResult() {
return result;
}

public void setResult(LsRemoteOperationResult result) {
this.result = result;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
import org.syncany.operations.down.DownOperationOptions.DownConflictStrategy;
import org.syncany.operations.down.DownOperationResult.DownResultCode;
import org.syncany.operations.ls_remote.LsRemoteOperation;
import org.syncany.operations.ls_remote.LsRemoteOperation.LsRemoteOperationResult;
import org.syncany.operations.ls_remote.LsRemoteOperationResult;
import org.syncany.operations.up.UpOperation;
import org.syncany.plugins.transfer.StorageException;
import org.syncany.plugins.transfer.TransferManager;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import org.syncany.database.MultiChunkEntry.MultiChunkId;
import org.syncany.operations.ChangeSet;
import org.syncany.operations.OperationResult;
import org.syncany.operations.ls_remote.LsRemoteOperation.LsRemoteOperationResult;
import org.syncany.operations.ls_remote.LsRemoteOperationResult;

public class DownOperationResult implements OperationResult {
public enum DownResultCode {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
import org.syncany.database.SqlDatabase;
import org.syncany.database.VectorClock;
import org.syncany.operations.Operation;
import org.syncany.operations.OperationResult;
import org.syncany.plugins.transfer.StorageException;
import org.syncany.plugins.transfer.TransferManager;
import org.syncany.plugins.transfer.files.DatabaseRemoteFile;
Expand All @@ -45,6 +44,7 @@
*/
public class LsRemoteOperation extends Operation {
private static final Logger logger = Logger.getLogger(LsRemoteOperation.class.getSimpleName());

private TransferManager loadedTransferManager;
private SqlDatabase localDatabase;

Expand Down Expand Up @@ -74,7 +74,7 @@ public LsRemoteOperationResult execute() throws Exception {

transferManager.disconnect();

return new LsRemoteOperationResult(unknownRemoteDatabases);
return new LsRemoteOperationResult(new ArrayList<>(unknownRemoteDatabases));
}

private List<DatabaseRemoteFile> listUnknownRemoteDatabases(TransferManager transferManager, List<DatabaseRemoteFile> knownDatabases)
Expand Down Expand Up @@ -127,16 +127,4 @@ else if (knownDatabases.contains(remoteDatabaseFile)) {
return unknownRemoteDatabases;
}
}

public class LsRemoteOperationResult implements OperationResult {
private List<DatabaseRemoteFile> unknownRemoteDatabases;

public LsRemoteOperationResult(List<DatabaseRemoteFile> unknownRemoteDatabases) {
this.unknownRemoteDatabases = unknownRemoteDatabases;
}

public List<DatabaseRemoteFile> getUnknownRemoteDatabases() {
return unknownRemoteDatabases;
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
/*
* Syncany, www.syncany.org
* Copyright (C) 2011-2014 Philipp C. Heckel <philipp.heckel@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.syncany.operations.ls_remote;

import java.util.ArrayList;

import org.syncany.operations.OperationResult;
import org.syncany.plugins.transfer.files.DatabaseRemoteFile;

public class LsRemoteOperationResult implements OperationResult {
private ArrayList<DatabaseRemoteFile> unknownRemoteDatabases;

public LsRemoteOperationResult() {
// Nothing.
}

public LsRemoteOperationResult(ArrayList<DatabaseRemoteFile> unknownRemoteDatabases) {
this.unknownRemoteDatabases = unknownRemoteDatabases;
}

public ArrayList<DatabaseRemoteFile> getUnknownRemoteDatabases() {
return unknownRemoteDatabases;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
import org.syncany.operations.cleanup.CleanupOperation;
import org.syncany.operations.down.DownOperation;
import org.syncany.operations.ls_remote.LsRemoteOperation;
import org.syncany.operations.ls_remote.LsRemoteOperation.LsRemoteOperationResult;
import org.syncany.operations.ls_remote.LsRemoteOperationResult;
import org.syncany.operations.status.StatusOperation;
import org.syncany.operations.status.StatusOperationResult;
import org.syncany.operations.up.UpOperationResult.UpResultCode;
Expand Down

0 comments on commit a460dbf

Please sign in to comment.