Too many changes to list

running in to bug in CameraStreamer with native exceptions
This commit is contained in:
Banks Troutman
2019-11-21 05:32:19 -05:00
parent 35509c0162
commit 48da9f5dfd
21 changed files with 678 additions and 211 deletions

View File

@@ -2,37 +2,25 @@ package com.chameleonvision.classabstraction.config;
import com.chameleonvision.classabstraction.util.ProgramDirectoryUtilities;
import com.chameleonvision.settings.GeneralSettings;
import com.chameleonvision.settings.SettingsManager;
import com.chameleonvision.util.FileHelper;
import com.chameleonvision.vision.camera.CameraDeserializer;
import com.chameleonvision.vision.camera.USBCamera;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.IOException;
import java.lang.reflect.Array;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
public class ConfigManager {
private ConfigManager() {}
private static final Path SettingsPath = Paths.get(ProgramDirectoryUtilities.getProgramDirectory(), "settings");
private static final Path cameraConfigPath = Paths.get(ProgramDirectoryUtilities.getProgramDirectory(), "cameras");
private static final Path cameraConfigPath = Paths.get(SettingsPath.toString(), "cameras");
public static GeneralSettings settings = new GeneralSettings();
public static void initializeSettings() {
boolean settingsFolderExists = Files.exists(SettingsPath);
if (!settingsFolderExists) {
if (Files.notExists(SettingsPath)) {
try {
Files.createDirectory(SettingsPath);
} catch (IOException e) {
@@ -42,11 +30,10 @@ public class ConfigManager {
// try to load the settings file and deserialize it
Path settingsFilePath = Paths.get(SettingsPath.toString(), "settings.json");
boolean settingsFileExists = Files.exists(settingsFilePath);
if (!settingsFileExists) {
if (Files.notExists(settingsFilePath)) {
try {
FileHelper.Serializer(settings, settingsFilePath);
FileHelper.Serializer(settingsFilePath, settings);
} catch (IOException e) {
e.printStackTrace();
}
@@ -57,53 +44,41 @@ public class ConfigManager {
System.err.println("Failed to load settings.json, using defaults.");
}
}
// try to load camera file and deserialize it
// var cameraConfigs = initializeCameraConfig();
}
public static List<CameraConfig> initializeCameraConfig(List<String> cameraNames) {
public static List<CameraConfig> initializeCameraConfig(List<CameraConfig> preliminaryConfigs) {
var configList = new ArrayList<CameraConfig>();
// loop over all the camera names and try to create settings folders for it
cameraNames.forEach((cameraName) -> {
final Path cameraConfigFolder = Paths.get(cameraConfigPath.toString(), String.format("%s\\", cameraName));
final Path cameraConfigPath = Paths.get(cameraConfigFolder.toString(), String.format("%s.json", cameraName));
preliminaryConfigs.forEach((preliminaryConfig) -> {
final Path cameraConfigFolderPath = Paths.get(cameraConfigPath.toString(), String.format("%s\\", preliminaryConfig.name));
final Path cameraConfigPath = Paths.get(cameraConfigFolderPath.toString(), "camera.json");
// check if the config folder exists, and if not, create it
boolean cameraConfigFolderExists = Files.exists(cameraConfigFolder);
if (!cameraConfigFolderExists) {
if (Files.notExists(cameraConfigFolderPath)) {
try {
Files.createDirectory(cameraConfigFolder);
} catch (IOException e) {
e.printStackTrace();
}
}
// try to deserialize the file
var camJsonFile = new File(cameraConfigPath.toString());
if(camJsonFile.exists() && camJsonFile.length() > 0) {
try {
var config = FileHelper.DeSerializer(cameraConfigPath, CameraConfig.class);
configList.add(config);
Files.createDirectory(cameraConfigFolderPath);
} catch (IOException e) {
e.printStackTrace();
}
} else {
// create a default one
configList.add(new CameraConfig(
70.0,
cameraConfigPath.toString(),
cameraName,
cameraName
));
CameraConfig config = preliminaryConfig;
if(!Files.exists(cameraConfigPath)) {
try {
FileHelper.Serializer(cameraConfigPath, preliminaryConfig);
} catch (IOException e) {
e.printStackTrace();
}
} else {
try {
config = FileHelper.DeSerializer(cameraConfigPath, CameraConfig.class);
} catch (IOException e) {
e.printStackTrace();
}
}
configList.add(config);
}
});
return configList;