Working proof of concept for #223

syncany · Sep 11, 2014 · 3747c90 · 3747c90
1 parent b79a96a
commit 3747c90
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 1 deletion.
diff --git a/syncany-cli/src/main/java/org/syncany/cli/DownCommand.java b/syncany-cli/src/main/java/org/syncany/cli/DownCommand.java
@@ -28,12 +28,23 @@
 import joptsimple.OptionSpec;
 
 import org.syncany.operations.ChangeSet;
+import org.syncany.operations.daemon.LocalEventBus;
+import org.syncany.operations.daemon.messages.WatchEventResponse;
 import org.syncany.operations.down.DownOperationOptions;
 import org.syncany.operations.down.DownOperationOptions.DownConflictStrategy;
 import org.syncany.operations.down.DownOperationResult;
 import org.syncany.operations.down.DownOperationResult.DownResultCode;
 
+import com.google.common.eventbus.Subscribe;
+
 public class DownCommand extends Command {
+	private LocalEventBus eventBus;
+
+	public DownCommand() {
+		this.eventBus = LocalEventBus.getInstance();
+		this.eventBus.register(this);
+	}
+
 	@Override
 	public CommandScope getRequiredCommandScope() {	
 		return CommandScope.INITIALIZED_LOCALDIR;
@@ -108,6 +119,12 @@ public void printResults(DownOperationResult operationResult) {
 		else {
 			out.println("Sync down skipped, no remote changes.");
 		}
-
+	}
+
+	@Subscribe
+	public void onWatchEventReceived(WatchEventResponse watchEventResponse) {
+		if ("DOWNLOAD_FILE".equals(watchEventResponse.getAction())) {
+			out.print("Downloading " + watchEventResponse.getSubject() + " ...\r");
+		}
 	}
 }
diff --git a/syncany-lib/src/main/java/org/syncany/operations/Downloader.java b/syncany-lib/src/main/java/org/syncany/operations/Downloader.java
@@ -30,6 +30,8 @@
 import org.apache.commons.io.IOUtils;
 import org.syncany.config.Config;
 import org.syncany.database.MultiChunkEntry.MultiChunkId;
+import org.syncany.operations.daemon.LocalEventBus;
+import org.syncany.operations.daemon.messages.WatchEventResponse;
 import org.syncany.plugins.StorageException;
 import org.syncany.plugins.transfer.TransferManager;
 import org.syncany.plugins.transfer.files.MultiChunkRemoteFile;
@@ -45,10 +47,12 @@ public class Downloader {
 
 	private Config config;
 	private TransferManager transferManager;
+	private LocalEventBus eventBus;
 
 	public Downloader(Config config, TransferManager transferManager) {
 		this.config = config;
 		this.transferManager = transferManager;
+		this.eventBus = LocalEventBus.getInstance();
 	}
 
 	/** 
@@ -67,6 +71,8 @@ public void downloadAndDecryptMultiChunks(Set<MultiChunkId> unknownMultiChunkIds
 				logger.log(Level.INFO, "  + Decrypted multichunk exists locally " + multiChunkId + ". No need to download it!");				
 			}
 			else {
+				eventBus.post(new WatchEventResponse(config.getLocalDir().getAbsolutePath(), "DOWNLOAD_FILE", remoteMultiChunkFile.getName()));
+
 				logger.log(Level.INFO, "  + Downloading multichunk " + multiChunkId + " ...");
 				transferManager.download(remoteMultiChunkFile, localEncryptedMultiChunkFile);
 

diff --git a/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/WatchEventResponse.java b/syncany-lib/src/main/java/org/syncany/operations/daemon/messages/WatchEventResponse.java
@@ -40,4 +40,12 @@ public WatchEventResponse(String root, String action, String subject) {
 		this.action = action;
 		this.subject = subject;
 	}	
+
+	public String getAction() {
+		return action;
+	}
+
+	public String getSubject() {
+		return subject;
+	}
 }