Merge branch 'release/0.3.3'

cryptomator · Nov 5, 2022 · a6b6e19 · a6b6e19
2 parents 16c7b9b + bd9e361
commit a6b6e19
Show file tree

Hide file tree

Showing 20 changed files with 38 additions and 27 deletions.
diff --git a/jfuse-api/pom.xml b/jfuse-api/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>jfuse-parent</artifactId>
-		<version>0.3.2</version>
+		<version>0.3.3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jfuse-api</artifactId>

diff --git a/jfuse-api/src/main/java/module-info.java b/jfuse-api/src/main/java/module-info.java
@@ -9,6 +9,7 @@
 	requires static org.jetbrains.annotations;
 
 	exports org.cryptomator.jfuse.api;
+	exports org.cryptomator.jfuse.api.platforms to org.cryptomator.jfuse.linux.aarch64, org.cryptomator.jfuse.linux.amd64, org.cryptomator.jfuse.mac, org.cryptomator.jfuse.win;
 
 	uses FuseBuilder;
 }
diff --git a/jfuse-api/src/main/java/org/cryptomator/jfuse/api/Fuse.java b/jfuse-api/src/main/java/org/cryptomator/jfuse/api/Fuse.java
@@ -165,19 +165,24 @@ private int fuseLoop(FuseMount mount) {
 	/**
 	 * Unmounts (if needed) this fuse file system and frees up system resources.
 	 * <p>
+	 * This method is idempotent and closing multiple times will be no-op.
+	 * <p>
 	 * <strong>Important:</strong> Before closing, a graceful unmount via system tools (e.g. {@code fusermount -u}) should be attempted.
 	 */
 	@Override
 	@Blocking
 	@MustBeInvokedByOverriders
-	public void close() throws TimeoutException {
+	public synchronized void close() throws TimeoutException {
+		if (!fuseScope.isAlive()) {
+			return; // already closed
+		}
 		try {
 			var fuseMount = this.mount.getAndSet(UNMOUNTED);
 			fuseMount.unmount();
 			executor.shutdown();
 			boolean exited = executor.awaitTermination(10, TimeUnit.SECONDS);
 			if (!exited) {
-				throw new TimeoutException("fuse main loop continued runn");
+				throw new TimeoutException("fuse main loop continued run");
 			}
 			fuseMount.destroy();
 		} catch (InterruptedException e) {

diff --git a/jfuse-api/src/main/java/org/cryptomator/jfuse/api/FuseBuilder.java b/jfuse-api/src/main/java/org/cryptomator/jfuse/api/FuseBuilder.java
@@ -1,5 +1,8 @@
 package org.cryptomator.jfuse.api;
 
+import org.cryptomator.jfuse.api.platforms.Architecture;
+import org.cryptomator.jfuse.api.platforms.OperatingSystem;
+import org.cryptomator.jfuse.api.platforms.SupportedPlatform;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Arrays;

diff --git a/...g/cryptomator/jfuse/api/Architecture.java → ...tor/jfuse/api/platforms/Architecture.java b/...g/cryptomator/jfuse/api/Architecture.java → ...tor/jfuse/api/platforms/Architecture.java
@@ -1,4 +1,4 @@
-package org.cryptomator.jfuse.api;
+package org.cryptomator.jfuse.api.platforms;
 
 /**
  * CPU architecture

diff --git a/...ryptomator/jfuse/api/OperatingSystem.java → .../jfuse/api/platforms/OperatingSystem.java b/...ryptomator/jfuse/api/OperatingSystem.java → .../jfuse/api/platforms/OperatingSystem.java
@@ -1,4 +1,4 @@
-package org.cryptomator.jfuse.api;
+package org.cryptomator.jfuse.api.platforms;
 
 /**
  * Operating System

diff --git a/...ptomator/jfuse/api/SupportedPlatform.java → ...fuse/api/platforms/SupportedPlatform.java b/...ptomator/jfuse/api/SupportedPlatform.java → ...fuse/api/platforms/SupportedPlatform.java
@@ -1,4 +1,6 @@
-package org.cryptomator.jfuse.api;
+package org.cryptomator.jfuse.api.platforms;
+
+import org.cryptomator.jfuse.api.FuseBuilder;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

diff --git a/...tomator/jfuse/api/SupportedPlatforms.java → ...use/api/platforms/SupportedPlatforms.java b/...tomator/jfuse/api/SupportedPlatforms.java → ...use/api/platforms/SupportedPlatforms.java
@@ -1,4 +1,4 @@
-package org.cryptomator.jfuse.api;
+package org.cryptomator.jfuse.api.platforms;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;

diff --git a/jfuse-examples/pom.xml b/jfuse-examples/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>jfuse-parent</artifactId>
-		<version>0.3.2</version>
+		<version>0.3.3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jfuse-examples</artifactId>

diff --git a/jfuse-linux-aarch64/pom.xml b/jfuse-linux-aarch64/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<artifactId>jfuse-parent</artifactId>
 		<groupId>org.cryptomator</groupId>
-		<version>0.3.2</version>
+		<version>0.3.3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jfuse-linux-aarch64</artifactId>

diff --git a/jfuse-linux-aarch64/src/main/java/org/cryptomator/jfuse/linux/aarch64/LinuxFuseBuilder.java b/jfuse-linux-aarch64/src/main/java/org/cryptomator/jfuse/linux/aarch64/LinuxFuseBuilder.java
@@ -1,12 +1,12 @@
 package org.cryptomator.jfuse.linux.aarch64;
 
-import org.cryptomator.jfuse.api.Architecture;
 import org.cryptomator.jfuse.api.Errno;
 import org.cryptomator.jfuse.api.Fuse;
 import org.cryptomator.jfuse.api.FuseBuilder;
 import org.cryptomator.jfuse.api.FuseOperations;
-import org.cryptomator.jfuse.api.OperatingSystem;
-import org.cryptomator.jfuse.api.SupportedPlatform;
+import org.cryptomator.jfuse.api.platforms.Architecture;
+import org.cryptomator.jfuse.api.platforms.OperatingSystem;
+import org.cryptomator.jfuse.api.platforms.SupportedPlatform;
 
 /**
  * Builds FUSE file system instances on Linux (aarch64).

diff --git a/jfuse-linux-amd64/pom.xml b/jfuse-linux-amd64/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>jfuse-parent</artifactId>
-		<version>0.3.2</version>
+		<version>0.3.3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jfuse-linux-amd64</artifactId>

diff --git a/jfuse-linux-amd64/src/main/java/org/cryptomator/jfuse/linux/amd64/LinuxFuseBuilder.java b/jfuse-linux-amd64/src/main/java/org/cryptomator/jfuse/linux/amd64/LinuxFuseBuilder.java
@@ -1,12 +1,12 @@
 package org.cryptomator.jfuse.linux.amd64;
 
-import org.cryptomator.jfuse.api.Architecture;
 import org.cryptomator.jfuse.api.Errno;
 import org.cryptomator.jfuse.api.Fuse;
 import org.cryptomator.jfuse.api.FuseBuilder;
 import org.cryptomator.jfuse.api.FuseOperations;
-import org.cryptomator.jfuse.api.OperatingSystem;
-import org.cryptomator.jfuse.api.SupportedPlatform;
+import org.cryptomator.jfuse.api.platforms.Architecture;
+import org.cryptomator.jfuse.api.platforms.OperatingSystem;
+import org.cryptomator.jfuse.api.platforms.SupportedPlatform;
 
 /**
  * Builds FUSE file system instances on Linux (x86_64).

diff --git a/jfuse-mac/pom.xml b/jfuse-mac/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>jfuse-parent</artifactId>
-		<version>0.3.2</version>
+		<version>0.3.3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jfuse-mac</artifactId>

diff --git a/jfuse-mac/src/main/java/org/cryptomator/jfuse/mac/MacFuseBuilder.java b/jfuse-mac/src/main/java/org/cryptomator/jfuse/mac/MacFuseBuilder.java
@@ -1,12 +1,12 @@
 package org.cryptomator.jfuse.mac;
 
-import org.cryptomator.jfuse.api.Architecture;
 import org.cryptomator.jfuse.api.Errno;
 import org.cryptomator.jfuse.api.Fuse;
 import org.cryptomator.jfuse.api.FuseBuilder;
 import org.cryptomator.jfuse.api.FuseOperations;
-import org.cryptomator.jfuse.api.OperatingSystem;
-import org.cryptomator.jfuse.api.SupportedPlatform;
+import org.cryptomator.jfuse.api.platforms.Architecture;
+import org.cryptomator.jfuse.api.platforms.OperatingSystem;
+import org.cryptomator.jfuse.api.platforms.SupportedPlatform;
 
 import java.nio.file.Files;
 import java.nio.file.Path;

diff --git a/jfuse-tests/pom.xml b/jfuse-tests/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>jfuse-parent</artifactId>
-		<version>0.3.2</version>
+		<version>0.3.3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jfuse-tests</artifactId>

diff --git a/jfuse-win/pom.xml b/jfuse-win/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>jfuse-parent</artifactId>
-		<version>0.3.2</version>
+		<version>0.3.3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jfuse-win</artifactId>

diff --git a/jfuse-win/src/main/java/org/cryptomator/jfuse/win/WinFuseBuilder.java b/jfuse-win/src/main/java/org/cryptomator/jfuse/win/WinFuseBuilder.java
@@ -1,12 +1,12 @@
 package org.cryptomator.jfuse.win;
 
-import org.cryptomator.jfuse.api.Architecture;
 import org.cryptomator.jfuse.api.Errno;
 import org.cryptomator.jfuse.api.Fuse;
 import org.cryptomator.jfuse.api.FuseBuilder;
 import org.cryptomator.jfuse.api.FuseOperations;
-import org.cryptomator.jfuse.api.OperatingSystem;
-import org.cryptomator.jfuse.api.SupportedPlatform;
+import org.cryptomator.jfuse.api.platforms.Architecture;
+import org.cryptomator.jfuse.api.platforms.OperatingSystem;
+import org.cryptomator.jfuse.api.platforms.SupportedPlatform;
 
 /**
  * Builds FUSE file system instances on Windows.

diff --git a/jfuse/pom.xml b/jfuse/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.cryptomator</groupId>
 		<artifactId>jfuse-parent</artifactId>
-		<version>0.3.2</version>
+		<version>0.3.3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>jfuse</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 	<groupId>org.cryptomator</groupId>
 	<artifactId>jfuse-parent</artifactId>
 	<packaging>pom</packaging>
-	<version>0.3.2</version>
+	<version>0.3.3</version>
 	<name>jFUSE</name>
 	<description>Java bindings for FUSE using foreign functions &amp; memory API</description>
 	<url>https://github.com/cryptomator/jfuse</url>