Add a new parameters to add/remove pattern to/from the exludes list. Changed the output of list to a nice table.

Author: Erwin Mueller

syncman-cli/src/main/java/org/deventm/syncman/cli/CliController.java

@@ -1,14 +1,12 @@
 package org.deventm.syncman.cli;
 
-import java.io.File;
-import java.util.ArrayList;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
+import org.deventm.syncman.database.Database;
 import org.deventm.syncman.database.DatabaseException;
 import org.deventm.syncman.database.Device;
 import org.deventm.syncman.database.Path;
-import org.deventm.syncman.database.XMLDatabase;
 import org.deventm.syncman.output.CliOutput;
 import org.deventm.syncman.process.ProcessController;
 import org.deventm.synman.params.ParamsParser;
@@ -25,13 +23,11 @@ public class CliController {
      */
     private static final String LOG_PATH_NOT_EXISTS_SKIPPING = "Path '%s' do not exists, skipping.";
 
-    private static final String HOME = System.getProperty("user.home");
-
     private static final String LOG_DEVICE_NOT_EXISTS_SKIPPING = "Device '%s' do not exists, skipping.";
 
     private final Logger log = Logger.getLogger(CliController.class.getName());
 
-    private final XMLDatabase database;
+    private final Database database;
 
     private final ParamsParser parser;
 
@@ -41,7 +37,7 @@ public class CliController {
      * @param database
      * @param parser
      */
-    public CliController(XMLDatabase database, ParamsParser parser,
+    public CliController(Database database, ParamsParser parser,
 	    CliOutput output) {
 	this.database = database;
 	this.parser = parser;
@@ -62,6 +58,8 @@ public void run() throws CliException {
     private void run0() throws DatabaseException {
 	addPaths();
 	removePaths();
+	addExcludes();
+	removeExcludes();
 	if (parser.isList()) {
 	    output.listPaths(database.getDevices());
 	}
@@ -70,13 +68,39 @@ private void run0() throws DatabaseException {
 	}
     }
 
+    /**
+     * 
+     */
+    private void addExcludes() {
+	for (String devicestr : parser.getDevices()) {
+	    Device device = database.getDevice(devicestr);
+	    for (String exstr : parser.getAddExcludes()) {
+		database.addExclude(device, exstr);
+		output.outputAddEx(device, exstr);
+	    }
+	}
+    }
+
+    /**
+     * 
+     */
+    private void removeExcludes() {
+	for (String devicestr : parser.getDevices()) {
+	    Device device = database.getDevice(devicestr);
+	    for (String exstr : parser.getRemoveExcludes()) {
+		database.removeExclude(device, exstr);
+		output.outputRemoveEx(device, exstr);
+	    }
+	}
+    }
+
     /**
      * @throws DatabaseException
      * 
      */
     private void startSync() throws DatabaseException {
 	for (String devicestr : parser.getDevices()) {
-	    devicestr = devicestr.replaceFirst("^~", HOME);
+	    devicestr = new Device(devicestr).getDevice().getAbsolutePath();
 	    Device device = database.getDevice(devicestr);
 	    if (device == null) {
 		continue;
@@ -93,12 +117,9 @@ private void startSync() throws DatabaseException {
      */
     private void removePaths() throws DatabaseException {
 	for (String devicestr : parser.getDevices()) {
-	    devicestr = devicestr.replaceFirst("^~", HOME);
-	    Device device = new Device(new ArrayList<Path>(), new File(
-		    devicestr));
+	    Device device = new Device(devicestr);
 	    for (String pathstr : parser.getRemoves()) {
-		pathstr = pathstr.replaceFirst("^~", HOME);
-		Path path = new Path(new File(pathstr));
+		Path path = new Path(pathstr);
 		output.outputRemove(device, path);
 		database.removePath(device, path);
 	    }
@@ -111,9 +132,7 @@ private void removePaths() throws DatabaseException {
      */
     private void addPaths() throws DatabaseException {
 	for (String devicestr : parser.getDevices()) {
-	    devicestr = devicestr.replaceFirst("^~", HOME);
-	    Device device = new Device(new ArrayList<Path>(), new File(
-		    devicestr));
+	    Device device = new Device(devicestr);
 	    if (!device.exists()) {
 		if (log.isLoggable(Level.WARNING))
 		    log.warning(LOG_DEVICE_NOT_EXISTS_SKIPPING.replace("%s",
@@ -123,8 +142,7 @@ private void addPaths() throws DatabaseException {
 	    }
 
 	    for (String pathstr : parser.getAdds()) {
-		pathstr = pathstr.replaceFirst("^~", HOME);
-		Path path = new Path(new File(pathstr));
+		Path path = new Path(pathstr);
 
 		if (!path.exists()) {
 		    if (log.isLoggable(Level.WARNING))

syncman-database/src/main/java/org/deventm/syncman/database/Database.java

@@ -25,4 +25,15 @@ public abstract void removePath(Device device, Path path)
 
     public abstract Device getDevice(String devicestr);
 
+    /**
+     * @param device
+     * @param exstr
+     */
+    public abstract void addExclude(Device device, String exstr);
+
+    /**
+     * @param device
+     * @param exstr
+     */
+    public abstract void removeExclude(Device device, String exstr);
 }

syncman-database/src/main/java/org/deventm/syncman/database/Device.java

@@ -1,6 +1,7 @@
 package org.deventm.syncman.database;
 
 import java.io.File;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -10,13 +11,41 @@
  */
 public class Device {
 
+    private static final String HOME = System.getProperty("user.home");
+
     final File device;
 
+    final List<String> excludes;
+
     final List<Path> paths;
 
-    public Device(List<Path> paths, File device) {
+    public Device(List<Path> paths, File device, List<String> excludes) {
 	this.paths = paths;
 	this.device = device;
+	this.excludes = excludes;
+    }
+
+    public Device(List<Path> paths, String devicestr, List<String> excludes) {
+	devicestr = devicestr.replaceFirst("^~", HOME);
+	device = new File(devicestr);
+	this.paths = paths;
+	this.excludes = excludes;
+    }
+
+    /**
+     * @param devicestr
+     * 
+     */
+    public Device(String devicestr) {
+	this(new ArrayList<Path>(), devicestr, new ArrayList<String>());
+    }
+
+    /**
+     * @param path
+     * @return
+     */
+    public boolean contains(Path path) {
+	return paths.contains(path);
     }
 
     @Override
@@ -28,13 +57,27 @@ public boolean equals(Object obj) {
 	return false;
     }
 
+    /**
+     * @return
+     */
+    public boolean exists() {
+	return device.exists();
+    }
+
     /**
      * @return the device
      */
     public File getDevice() {
 	return device;
     }
 
+    /**
+     * @return the excludes
+     */
+    public List<String> getExcludes() {
+	return excludes;
+    }
+
     /**
      * @return the paths
      */
@@ -51,19 +94,4 @@ public int hashCode() {
     public String toString() {
 	return device.getAbsolutePath();
     }
-
-    /**
-     * @return
-     */
-    public boolean exists() {
-	return device.exists();
-    }
-
-    /**
-     * @param path
-     * @return
-     */
-    public boolean contains(Path path) {
-	return paths.contains(path);
-    }
 }

syncman-database/src/main/java/org/deventm/syncman/database/Path.java

@@ -11,6 +11,13 @@ public class Path {
 
     final File path;
 
+    private static final String HOME = System.getProperty("user.home");
+
+    public Path(String pathstr) {
+	pathstr = pathstr.replaceFirst("^~", HOME);
+	path = new File(pathstr);
+    }
+
     public Path(File path) {
 	this.path = path;
     }

syncman-filedatabase/src/main/java/org/deventm/syncman/database/XMLDatabase.java

@@ -6,7 +6,6 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
@@ -136,8 +135,30 @@ private Map<Device, Device> loadData0(File database)
      * @return
      */
     public Device getDevice(String devicestr) {
-	Device dev = new Device(new ArrayList<Path>(), new File(devicestr));
+	Device dev = new Device(devicestr);
 	return devices.get(dev);
     }
 
+    @Override
+    public void addExclude(Device device, String exstr) {
+	Device dev = devices.get(device);
+	if (dev == null) {
+	    return;
+	}
+
+	if (!dev.excludes.contains(exstr)) {
+	    dev.excludes.add(exstr);
+	}
+    }
+
+    @Override
+    public void removeExclude(Device device, String exstr) {
+	Device dev = devices.get(device);
+	if (dev == null) {
+	    return;
+	}
+
+	dev.excludes.remove(exstr);
+    }
+
 }