Improved handling of failing to load filter from v1 session files

nsherry4 · Jan 22, 2024 · c9c4964 · c9c4964
1 parent 7629667
commit c9c4964
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/LibPeakaboo/src/main/java/org/peakaboo/controller/plotter/SavedSessionV1.java b/LibPeakaboo/src/main/java/org/peakaboo/controller/plotter/SavedSessionV1.java
@@ -41,7 +41,7 @@ public List<String> loadInto(PlotController plotController) {
 		this.data.loadInto(plotController.data());
 
 		//restore filtering settings
-		this.filtering.loadInto(plotController.filtering());
+		this.filtering.loadInto(plotController.filtering(), errors);
 
 		//restore fitting settings
 		errors.addAll(this.fitting.loadInto(plotController.fitting()));

diff --git a/...aboo/src/main/java/org/peakaboo/controller/plotter/filtering/SavedFilteringSessionV1.java b/...aboo/src/main/java/org/peakaboo/controller/plotter/filtering/SavedFilteringSessionV1.java
@@ -16,14 +16,15 @@ public class SavedFilteringSessionV1 {
 
 
 	@Deprecated(since = "6", forRemoval = true)
-	public void loadInto(FilteringController controller) {
+	public void loadInto(FilteringController controller, List<String> errors) {
 		FilterSet filterset = controller.getFilteringModel().filters;
 		filterset.clear();
 		for (SerializedFilterV1 f : this.filters) {
 			try {
-				filterset.add(f.getFilter());
+				filterset.add(f.getFilter(errors).orElseThrow());
 			} catch (Exception e) {
-				PeakabooLog.get().log(Level.SEVERE, "Failed to restore filter", e);
+				errors.add("Failed to restore filter " + f.getClazz());
+				PeakabooLog.get().log(Level.WARNING, "Failed to restore filter " + f.getClazz(), e);
 			}
 		}
 	}

diff --git a/LibPeakaboo/src/main/java/org/peakaboo/filter/model/SerializedFilterV1.java b/LibPeakaboo/src/main/java/org/peakaboo/filter/model/SerializedFilterV1.java
@@ -2,7 +2,10 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
+import java.util.logging.Level;
 
+import org.peakaboo.app.PeakabooLog;
 import org.peakaboo.framework.bolt.plugin.core.BoltPlugin;
 import org.peakaboo.framework.bolt.plugin.core.PluginDescriptor;
 
@@ -85,9 +88,9 @@ public void setSettingsMap(Map<String, Object> settings) {
 	}
 
 	@Deprecated(since = "6", forRemoval = true)
-	public Filter getFilter() {
+	public Optional<Filter> getFilter(List<String> errors) {
 		//If it already exists, just return it, otherwise build a filter
-		if (filter != null) { return filter; }
+		if (filter != null) { return Optional.of(filter); }
 
 		for (PluginDescriptor<? extends Filter> plugin : FilterRegistry.system().getPlugins()) {
 			if (
@@ -109,12 +112,17 @@ public Filter getFilter() {
 						filter.getParameterGroup().deserialize(this.settings);
 					}
 				} catch (IllegalArgumentException e) {
-					throw new RuntimeException("Cannot build plugin: " + plugin.getName(), e);
+					var msg = "Cannot restore settings for " + plugin.getName();
+					errors.add(msg);
+					PeakabooLog.get().log(Level.WARNING, msg, e);
 				}
-				return filter;
+				return Optional.of(filter);
 			}
 		}
-		throw new RuntimeException("Cannot find plugin " + uuidOrClazz);
+		var msg = "Cannot restore plugin " + uuidOrClazz;
+		errors.add(msg);
+		PeakabooLog.get().log(Level.WARNING, msg);
+		return Optional.empty();
 	}