From 249d69bf92fd4daafa53a8efca24b74b14109101 Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 27 Nov 2019 20:06:49 -0800 Subject: [PATCH] Make directories and remove whitespaces from config --- Main/chameleon-vision.iml | 12 ++++++++++++ .../com/chameleonvision/config/PipelineConfig.java | 12 ++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Main/chameleon-vision.iml b/Main/chameleon-vision.iml index cafdd9cc1..5129d4c54 100644 --- a/Main/chameleon-vision.iml +++ b/Main/chameleon-vision.iml @@ -25,6 +25,18 @@ + + + + + + + + + + + + diff --git a/Main/src/main/java/com/chameleonvision/config/PipelineConfig.java b/Main/src/main/java/com/chameleonvision/config/PipelineConfig.java index 06d792d1c..9ac564342 100644 --- a/Main/src/main/java/com/chameleonvision/config/PipelineConfig.java +++ b/Main/src/main/java/com/chameleonvision/config/PipelineConfig.java @@ -38,21 +38,25 @@ public class PipelineConfig { private boolean pipelinesExists() { cameraConfig.checkFolder(); - return cameraConfig.getConfigFolderExists() - && Objects.requireNonNull(new File(pipelineFolderPath.toUri()).listFiles()).length > 0; + (new File(pipelineFolderPath.toUri())).mkdirs(); + var folderContents = new File(pipelineFolderPath.toUri()).listFiles(); + if(folderContents == null) return false; + return cameraConfig.getConfigFolderExists() && folderContents.length > 0; } private void save(CVPipelineSettings settings) { if (settings instanceof CVPipeline3dSettings) { - Path settingJsonPath = Paths.get(pipelineFolderPath.toString(), CVPipeline3DPrefix + settings.nickname); + Path settingJsonPath = Paths.get(pipelineFolderPath.toString(), + CVPipeline3DPrefix + settings.nickname.replace(' ', '_') + ".json"); try { JacksonHelper.serializer(settingJsonPath, settings); } catch (IOException e) { e.printStackTrace(); } } else if (settings instanceof CVPipeline2dSettings) { - Path settingJsonPath = Paths.get(pipelineFolderPath.toString(), CVPipeline2DPrefix + settings.nickname); + Path settingJsonPath = Paths.get(pipelineFolderPath.toString(), + CVPipeline2DPrefix + settings.nickname.replace(' ', '_') + ".json"); try { JacksonHelper.serializer(settingJsonPath, settings); } catch (IOException e) {