new version 0.0.9:

* sync will only connect when needed * fix get missing derivatives junit test * better log level management in junit tests
Piwigo · Nov 12, 2015 · 3831877 · 3831877
1 parent d32a8fd
commit 3831877
Show file tree

Hide file tree

Showing 10 changed files with 41 additions and 19 deletions.
diff --git a/remotesync-api/pom.xml b/remotesync-api/pom.xml
@@ -143,7 +143,7 @@
 	<parent>
 		<groupId>piwigo</groupId>
 		<artifactId>remotesync</artifactId>
-		<version>0.0.8</version>
+		<version>0.0.9</version>
 		<relativePath>../remotesync</relativePath>
 	</parent>
 </project>
diff --git a/...nse/PwgGetMissingDerivativesResponse.java → ...nse/PwgGetMissingDerivativesResponse.java b/...nse/PwgGetMissingDerivativesResponse.java → ...nse/PwgGetMissingDerivativesResponse.java
@@ -10,6 +10,12 @@
  ******************************************************************************/
 package org.piwigo.remotesync.api.response;
 
-@org.piwigo.remotesync.generator.Generated
+import java.util.List;
+
+import org.simpleframework.xml.ElementList;
+
 public class PwgGetMissingDerivativesResponse extends PwgCommonResponse {
+
+	@ElementList(required=false)
+	public List<String> urls;
 }
diff --git a/remotesync-api/src/main/java/org/piwigo/remotesync/api/sync/ConnectedWalker.java b/remotesync-api/src/main/java/org/piwigo/remotesync/api/sync/ConnectedWalker.java
@@ -16,6 +16,7 @@
 
 import org.piwigo.remotesync.api.ISyncConfiguration;
 import org.piwigo.remotesync.api.client.AuthenticatedWSClient;
+import org.piwigo.remotesync.api.client.WSClient;
 import org.piwigo.remotesync.api.exception.ClientServerException;
 import org.piwigo.remotesync.api.request.PwgCategoriesAddRequest;
 import org.piwigo.remotesync.api.request.PwgImagesAddSimpleRequest;
@@ -33,6 +34,9 @@ public ConnectedWalker(ISyncConfiguration syncConfiguration) {
 	}
 
 	protected void connect() throws IOException {
+		if (client != null)
+			return;
+
 		try {
 			logger.info("Connecting... ");
 			client = new AuthenticatedWSClient(syncConfiguration).login();
@@ -45,9 +49,13 @@ protected void connect() throws IOException {
 	}
 
 	protected void disconnect() {
+		if (client == null)
+			return;
+
 		try {
 			logger.info("Disconnecting... ");
 			client.logout();
+			client = null;
 			logger.info("Disconnect successful");
 		} catch (ClientServerException e) {
 			logger.error("Unable to disconnect : " + e.getMessage());
@@ -57,8 +65,6 @@ protected void disconnect() {
 	@Override
 	protected void handleStart(File startDirectory, Collection<File> results) throws IOException {
 		super.handleStart(startDirectory, results);
-		//TODO only connect when needed
-		connect();
 	}
 
 	@Override
@@ -67,8 +73,11 @@ protected void handleEnd(Collection<File> results) throws IOException {
 		disconnect();
 	}
 
+
 	@Override
-	protected Integer createAlbum(File directory, Integer parentAlbumId) {
+	protected Integer createAlbum(File directory, Integer parentAlbumId) throws IOException {
+		connect();
+
 		try {
 			return client.sendRequest(new PwgCategoriesAddRequest(directory.getName()).setParent(parentAlbumId)).id;
 		} catch (ClientServerException e) {
@@ -78,7 +87,9 @@ protected Integer createAlbum(File directory, Integer parentAlbumId) {
 	}
 
 	@Override
-	protected Integer createImage(File file, Integer albumId) {
+	protected Integer createImage(File file, Integer albumId) throws IOException {
+		connect();
+
 		try {
 			PwgImagesAddSimpleRequest request = new PwgImagesAddSimpleRequest(file);
 			// FIXME should we upload an image without album?

diff --git a/remotesync-api/src/main/java/org/piwigo/remotesync/api/sync/SyncDirectoryWalker.java b/remotesync-api/src/main/java/org/piwigo/remotesync/api/sync/SyncDirectoryWalker.java
@@ -81,7 +81,7 @@ public void walk() throws IOException {
 		walk(startDirectory, null);
 	}
 
-	protected abstract Integer createAlbum(File directory, Integer parentAlbumId);
+	protected abstract Integer createAlbum(File directory, Integer parentAlbumId) throws IOException;
 
-	protected abstract Integer createImage(File file, Integer albumId);
+	protected abstract Integer createImage(File file, Integer albumId) throws IOException;
 }
diff --git a/remotesync-api/src/main/java/org/piwigo/remotesync/api/util/FileUtil.java b/remotesync-api/src/main/java/org/piwigo/remotesync/api/util/FileUtil.java
@@ -116,7 +116,7 @@ public static File getFile(Class<?> clazz, String resourceName, boolean checkExi
 
 			return file;
 		} catch (Exception exception) {
-			logger.error(exception.getMessage(), exception);
+			logger.debug(exception.getMessage(), exception);
 			return null;
 		}
 	}

diff --git a/remotesync-api/src/test/java/org/piwigo/remotesync/api/test/APITest.java b/remotesync-api/src/test/java/org/piwigo/remotesync/api/test/APITest.java
@@ -119,7 +119,7 @@ public void testFakePasswordConverter() throws ParseException {
 		doTestFakePasswordConverter("a");
 		doTestFakePasswordConverter("1");
 		doTestFakePasswordConverter("password");
-		doTestFakePasswordConverter("1234567890&é(-è_çà)^$ù*,;:!?./§µ%MP");
+		doTestFakePasswordConverter("1234567890");
 	}
 
 	private void doTestFakePasswordConverter(String password) throws ParseException {

diff --git a/remotesync-api/src/test/java/org/piwigo/remotesync/api/test/AbstractTestCase.java b/remotesync-api/src/test/java/org/piwigo/remotesync/api/test/AbstractTestCase.java
@@ -29,7 +29,7 @@
 public abstract class AbstractTestCase extends TestCase {
 
 	static {
-		((ch.qos.logback.classic.Logger) LoggerFactory.getLogger("ROOT")).setLevel(Level.INFO);
+		((ch.qos.logback.classic.Logger) LoggerFactory.getLogger("ROOT")).setLevel(RemotesyncAPIAllTests.TEST_LOG_LEVEL);
 	}
 
 	private static IClient client;

diff --git a/remotesync-api/src/test/java/org/piwigo/remotesync/api/test/RemotesyncAPIAllTests.java b/remotesync-api/src/test/java/org/piwigo/remotesync/api/test/RemotesyncAPIAllTests.java
@@ -10,18 +10,20 @@
  ******************************************************************************/
 package org.piwigo.remotesync.api.test;
 
-import org.slf4j.LoggerFactory;
-
-import ch.qos.logback.classic.Level;
 import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
+import ch.qos.logback.classic.Level;
 
 public class RemotesyncAPIAllTests extends TestCase {
 
+	//when using mvn
+	public static Level TEST_LOG_LEVEL = Level.INFO;
+
 	public static Test suite() {
-		((ch.qos.logback.classic.Logger) LoggerFactory.getLogger("ROOT")).setLevel(Level.DEBUG);
-
+		//debug only when using suite
+		TEST_LOG_LEVEL = Level.DEBUG;
+
 		TestSuite suite = new TestSuite(RemotesyncAPIAllTests.class.getName());
 		// $JUnit-BEGIN$
 		suite.addTestSuite(FileUtilTest.class);

diff --git a/remotesync-ui/pom.xml b/remotesync-ui/pom.xml
@@ -17,7 +17,7 @@
 		<dependency>
 			<groupId>piwigo</groupId>
 			<artifactId>remotesync-api</artifactId>
-			<version>0.0.8</version>
+			<version>0.0.9</version>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.pivot</groupId>
@@ -73,7 +73,7 @@
 	<parent>
 		<groupId>piwigo</groupId>
 		<artifactId>remotesync</artifactId>
-		<version>0.0.8</version>
+		<version>0.0.9</version>
 		<relativePath>../remotesync</relativePath>
 	</parent>
 </project>
diff --git a/remotesync/pom.xml b/remotesync/pom.xml
@@ -14,8 +14,11 @@
 	<groupId>piwigo</groupId>
 	<artifactId>remotesync</artifactId>
 	<name>Piwigo Remote Sync</name>
-	<version>0.0.8</version>
+	<version>0.0.9</version>
 	<packaging>pom</packaging>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
 	<modules>
 		<module>../remotesync-api</module>
 		<module>../remotesync-ui</module>