From 9057a6b7f19c1681bdedf7a2e7d069f4416985bc Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Wed, 22 Dec 2021 12:50:00 +0100
Subject: [PATCH] Default to YAML for write format

---
 companion/src/storage/categorized.cpp | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/companion/src/storage/categorized.cpp b/companion/src/storage/categorized.cpp
index 7f9a52ce2..05540bbb0 100644
--- a/companion/src/storage/categorized.cpp
+++ b/companion/src/storage/categorized.cpp
@@ -25,20 +25,28 @@
 
 bool CategorizedStorageFormat::load(RadioData & radioData)
 {
-  if (getStorageType(filename) == STORAGE_TYPE_ETX ||
-     (getStorageType(filename) == STORAGE_TYPE_UNKNOWN && probeFormat() == STORAGE_TYPE_ETX))
+  StorageType st = getStorageType(filename);
+  if (st == STORAGE_TYPE_UNKNOWN) {
+    st = probeFormat();
+  }
+  if (st == STORAGE_TYPE_ETX || st == STORAGE_TYPE_YML) {
     return loadYaml(radioData);
-  else
+  } else {
     return loadBin(radioData);
+  }
 }
 
 bool CategorizedStorageFormat::write(const RadioData & radioData)
 {
-  if (getStorageType(filename) == STORAGE_TYPE_ETX ||
-     (getStorageType(filename) == STORAGE_TYPE_UNKNOWN && probeFormat() == STORAGE_TYPE_ETX))
+  StorageType st = getStorageType(filename);
+  if (st == STORAGE_TYPE_UNKNOWN) {
+    st = probeFormat();
+  }
+  if (st == STORAGE_TYPE_ETX || st == STORAGE_TYPE_UNKNOWN) {
     return writeYaml(radioData);
-  else
+  } else {
     return writeBin(radioData);
+  }
 }
 
 StorageType CategorizedStorageFormat::probeFormat()