From 0cb89600058460db8f33487803ce6cf340a771eb Mon Sep 17 00:00:00 2001
From: Matt <matthew.morley.ca@gmail.com>
Date: Wed, 27 Nov 2019 20:20:00 -0800
Subject: [PATCH] refactor pipelineConfigPath into CameraConfig

---
 .../com/chameleonvision/config/CameraConfig.java    |  4 ++++
 .../com/chameleonvision/config/PipelineConfig.java  | 13 ++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Main/src/main/java/com/chameleonvision/config/CameraConfig.java b/Main/src/main/java/com/chameleonvision/config/CameraConfig.java
index 4e11e15ee..ae8da033d 100644
--- a/Main/src/main/java/com/chameleonvision/config/CameraConfig.java
+++ b/Main/src/main/java/com/chameleonvision/config/CameraConfig.java
@@ -145,6 +145,10 @@ public class CameraConfig {
         return Files.exists(getConfigFolderPath());
     }
 
+    Path getPipelineFolderPath() {
+        return Paths.get(getConfigFolderPath().toString(), "pipelines");
+    }
+
     private boolean configExists() {
         return getConfigFolderExists() && Files.exists(getConfigPath());
     }
diff --git a/Main/src/main/java/com/chameleonvision/config/PipelineConfig.java b/Main/src/main/java/com/chameleonvision/config/PipelineConfig.java
index 9ac564342..ee7d766ef 100644
--- a/Main/src/main/java/com/chameleonvision/config/PipelineConfig.java
+++ b/Main/src/main/java/com/chameleonvision/config/PipelineConfig.java
@@ -15,7 +15,6 @@ public class PipelineConfig {
 
     public static final String CVPipeline2DPrefix = "CV2D";
     public static final String CVPipeline3DPrefix = "CV3D";
-    private final Path pipelineFolderPath;
 
     private final CameraConfig cameraConfig;
 
@@ -25,7 +24,6 @@ public class PipelineConfig {
      */
     public PipelineConfig(CameraConfig cameraConfig) {
         this.cameraConfig = cameraConfig;
-        pipelineFolderPath = Paths.get(cameraConfig.getConfigFolderPath().toString(), "pipelines");
     }
 
     void check() {
@@ -38,8 +36,9 @@ public class PipelineConfig {
 
     private boolean pipelinesExists() {
         cameraConfig.checkFolder();
-        (new File(pipelineFolderPath.toUri())).mkdirs();
-        var folderContents = new File(pipelineFolderPath.toUri()).listFiles();
+        //noinspection ResultOfMethodCallIgnored
+        (new File(cameraConfig.getPipelineFolderPath().toUri())).mkdirs();
+        var folderContents = new File(cameraConfig.getPipelineFolderPath().toUri()).listFiles();
         if(folderContents == null) return false;
         return cameraConfig.getConfigFolderExists() && folderContents.length > 0;
     }
@@ -47,7 +46,7 @@ public class PipelineConfig {
     private void save(CVPipelineSettings settings) {
 
         if (settings instanceof CVPipeline3dSettings) {
-            Path settingJsonPath = Paths.get(pipelineFolderPath.toString(),
+            Path settingJsonPath = Paths.get(cameraConfig.getPipelineFolderPath().toString(),
                     CVPipeline3DPrefix + settings.nickname.replace(' ', '_') + ".json");
             try {
                 JacksonHelper.serializer(settingJsonPath, settings);
@@ -55,7 +54,7 @@ public class PipelineConfig {
                 e.printStackTrace();
             }
         } else if (settings instanceof CVPipeline2dSettings) {
-            Path settingJsonPath = Paths.get(pipelineFolderPath.toString(),
+            Path settingJsonPath = Paths.get(cameraConfig.getPipelineFolderPath().toString(),
                     CVPipeline2DPrefix + settings.nickname.replace(' ', '_') + ".json");
             try {
                 JacksonHelper.serializer(settingJsonPath, settings);
@@ -75,7 +74,7 @@ public class PipelineConfig {
 
     public List<CVPipelineSettings> load() {
         check();
-        var pipelineDir = new File(pipelineFolderPath.toUri());
+        var pipelineDir = new File(cameraConfig.getPipelineFolderPath().toUri());
 
         File[] files = pipelineDir.listFiles();
         List<CVPipelineSettings> deserializedList = new ArrayList<>();