Skip to content

skip restoring terminals with missing working directory #2878

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
danthe1st wants to merge 1 commit into
base: master
Choose a base branch
from
+39 −32
Open

skip restoring terminals with missing working directory #2878

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
71 changes: 39 additions & 32 deletions ...l.view.ui/src/org/eclipse/terminal/view/ui/internal/view/TerminalsViewMementoHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
*******************************************************************************/
package org.eclipse.terminal.view.ui.internal.view;

import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
Expand Down Expand Up @@ -154,43 +156,48 @@ protected void restoreState(final TerminalsView view, IMemento memento) {
// Get all the "connection" memento's.
IMemento[] connections = memento.getChildren("connection"); //$NON-NLS-1$
for (IMemento connection : connections) {
// Create the properties container that holds the terminal properties
Map<String, Object> properties = new HashMap<>();

// Set the view id attributes
properties.put(ITerminalsConnectorConstants.PROP_ID, id);
properties.put(ITerminalsConnectorConstants.PROP_SECONDARY_ID, secondaryId);

// Restore the common attributes
properties.put(ITerminalsConnectorConstants.PROP_DELEGATE_ID,
connection.getString(ITerminalsConnectorConstants.PROP_DELEGATE_ID));
properties.put(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID,
connection.getString(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID));
if (connection.getBoolean(ITerminalsConnectorConstants.PROP_FORCE_NEW) != null) {
properties.put(ITerminalsConnectorConstants.PROP_FORCE_NEW,
connection.getBoolean(ITerminalsConnectorConstants.PROP_FORCE_NEW));
}
restoreConnection(id, secondaryId, connection);
}
}
}

// Restore the encoding
if (connection.getString(ITerminalsConnectorConstants.PROP_ENCODING) != null) {
properties.put(ITerminalsConnectorConstants.PROP_ENCODING,
connection.getString(ITerminalsConnectorConstants.PROP_ENCODING));
}
private void restoreConnection(String id, String secondaryId, IMemento connection) {
// Create the properties container that holds the terminal properties
Map<String, Object> properties = new HashMap<>();

// Set the view id attributes
properties.put(ITerminalsConnectorConstants.PROP_ID, id);
properties.put(ITerminalsConnectorConstants.PROP_SECONDARY_ID, secondaryId);

// Restore the common attributes
properties.put(ITerminalsConnectorConstants.PROP_DELEGATE_ID,
connection.getString(ITerminalsConnectorConstants.PROP_DELEGATE_ID));
properties.put(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID,
connection.getString(ITerminalsConnectorConstants.PROP_TERMINAL_CONNECTOR_ID));
if (connection.getBoolean(ITerminalsConnectorConstants.PROP_FORCE_NEW) != null) {
properties.put(ITerminalsConnectorConstants.PROP_FORCE_NEW,
connection.getBoolean(ITerminalsConnectorConstants.PROP_FORCE_NEW));
}

// Restore the working directory
if (connection.getString(ITerminalsConnectorConstants.PROP_PROCESS_WORKING_DIR) != null) {
properties.put(ITerminalsConnectorConstants.PROP_PROCESS_WORKING_DIR,
connection.getString(ITerminalsConnectorConstants.PROP_PROCESS_WORKING_DIR));
}
Optional<ILauncherDelegate> delegate = findDelegate(properties);
// Pass on to the memento handler
delegate.map(d -> d.getAdapter(IMementoHandler.class))
.ifPresent(mh -> mh.restoreState(connection, properties));
// Restore the terminal connection
delegate.ifPresent(d -> executeDelegate(properties, d));
// Restore the encoding
if (connection.getString(ITerminalsConnectorConstants.PROP_ENCODING) != null) {
properties.put(ITerminalsConnectorConstants.PROP_ENCODING,
connection.getString(ITerminalsConnectorConstants.PROP_ENCODING));
}

// Restore the working directory
String workingDirectory = connection.getString(ITerminalsConnectorConstants.PROP_PROCESS_WORKING_DIR);
if (workingDirectory != null) {
if (!Files.isDirectory(Path.of(workingDirectory))) {
return;
}
properties.put(ITerminalsConnectorConstants.PROP_PROCESS_WORKING_DIR, workingDirectory);
}
Optional<ILauncherDelegate> delegate = findDelegate(properties);
// Pass on to the memento handler
delegate.map(d -> d.getAdapter(IMementoHandler.class)).ifPresent(mh -> mh.restoreState(connection, properties));
// Restore the terminal connection
delegate.ifPresent(d -> executeDelegate(properties, d));
}

private Optional<ILauncherDelegate> findDelegate(Map<String, Object> properties) {
Expand Down
Loading