Blender setup: allow to select installation directory

maarzt · maarzt · commit 14b849a510c5 · 2022-11-22T13:25:58.000+01:00
diff --git a/mastodon-plugin/src/main/java/org/mastodon/blender/setup/BlenderSetupController.java b/mastodon-plugin/src/main/java/org/mastodon/blender/setup/BlenderSetupController.java
@@ -79,8 +79,8 @@ private void setState( State state )
 	@Override
 	public void setBlenderPath( Path blenderPath )
 	{
-		this.blenderPath = blenderPath;
-		frame.setBlenderPath( blenderPath );
+		this.blenderPath = deriveBinaryFromDirectory( blenderPath );
+		frame.setBlenderPath( this.blenderPath );
 		if ( this.blenderPath == null)
 			setState( State.PATH_NOT_SET );
 		else if ( Files.isDirectory( this.blenderPath ) )
@@ -95,6 +95,21 @@ else if ( !BlenderSetupUtils.isMastodonAddonInstalled( this.blenderPath ))
 			setState( State.ADDON_INSTALLED );
 	}
 
+	private Path deriveBinaryFromDirectory( Path blenderPath )
+	{
+		if ( blenderPath == null )
+			return null;
+		if ( Files.isDirectory( blenderPath ) ) {
+			Path blenderExe = blenderPath.resolve( "blender.exe" );
+			if ( Files.exists( blenderExe ) && Files.isExecutable( blenderExe ) )
+				return blenderExe;
+			Path blenderBinary = blenderPath.resolve( "blender" );
+			if ( Files.exists( blenderBinary ) && Files.isExecutable( blenderBinary ) )
+				return blenderBinary;
+		}
+		return blenderPath;
+	}
+
 	@Override
 	public void installAddonClicked()
 	{
diff --git a/mastodon-plugin/src/main/java/org/mastodon/blender/setup/BlenderSetupView.java b/mastodon-plugin/src/main/java/org/mastodon/blender/setup/BlenderSetupView.java
@@ -34,6 +34,7 @@
 import javax.swing.JDialog;
 import javax.swing.JLabel;
 import javax.swing.JTextArea;
+import javax.swing.filechooser.FileFilter;
 import net.miginfocom.swing.MigLayout;
 import org.mastodon.ui.util.FileChooser;
 
@@ -80,9 +81,6 @@ public class BlenderSetupView extends JDialog
 
 		setLayout( new MigLayout("insets dialog, fill", "[][grow]") );
 
-		// TODO: Allow to select directory.
-		// TODO: Make setup not modal
-
 		final String introText = "<html><body>"
 				+ "Mastodon can use Blender to visualise cell trackings in 3D. "
 				+ "In order to achieve this, it is required to install "
@@ -178,7 +176,32 @@ private JComponent setFonStyle( JComponent component, int style )
 	private void onSelectPathClicked()
 	{
 		String selectedFile = blenderPath == null ? null : blenderPath.toString();
-		File file = FileChooser.chooseFile( this, selectedFile, FileChooser.DialogType.LOAD );
+		FileFilter filenameFilter = new FileFilter()
+		{
+			@Override
+			public boolean accept( File f )
+			{
+				if ( f.isDirectory() )
+					return true;
+				String name = f.getName();
+				return name.equals( "blender" )
+						|| name.equals( "blender-softwaregl" )
+						|| name.equals( "blender.exe" )
+						|| name.equals( "Blender" );
+			}
+
+			@Override
+			public String getDescription()
+			{
+				return "Blender Binary (blender.exe etc.)";
+			}
+		};
+		File file = FileChooser.chooseFile( this,
+				selectedFile,
+				filenameFilter,
+				"Select Blender Installation",
+				FileChooser.DialogType.LOAD,
+				FileChooser.SelectionMode.FILES_AND_DIRECTORIES );
 		if(file == null)
 			return;
 		listener.setBlenderPath( file.toPath() );
