From 35243fb62eebe785339c7708dfb6e6380c2d9570 Mon Sep 17 00:00:00 2001
From: Jakob Ketterl <jakob.ketterl@gmx.de>
Date: Thu, 17 Sep 2020 20:59:16 +0200
Subject: [PATCH] anticipate problems with old color schemes; counter with new
 config version

---
 config_webrx.py |  2 +-
 owrx/config.py  | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/config_webrx.py b/config_webrx.py
index 32753e5..00ea746 100644
--- a/config_webrx.py
+++ b/config_webrx.py
@@ -33,7 +33,7 @@ config_webrx: configuration options for OpenWebRX
 """
 
 # configuration version. please only modify if you're able to perform the associated migration steps.
-version = 2
+version = 3
 
 # NOTE: you can find additional information about configuring OpenWebRX in the Wiki:
 # https://github.com/jketterl/openwebrx/wiki/Configuration-guide
diff --git a/owrx/config.py b/owrx/config.py
index bdecd04..7c084a3 100644
--- a/owrx/config.py
+++ b/owrx/config.py
@@ -49,11 +49,19 @@ class ConfigMigratorVersion1(ConfigMigrator):
         return config
 
 
+class ConfigMigratorVersion2(ConfigMigrator):
+    def migrate(self, config):
+        if "waterfall_colors" in config and any(v > 0xFFFFFF for v in config["waterfall_colors"]):
+            config["waterfall_colors"] = [v >> 8 for v in config["waterfall_colors"]]
+        return config
+
+
 class Config:
     sharedConfig = None
-    currentVersion = 2
+    currentVersion = 3
     migrators = {
-        1: ConfigMigratorVersion1()
+        1: ConfigMigratorVersion1(),
+        2: ConfigMigratorVersion2(),
     }
 
     @staticmethod
@@ -130,5 +138,7 @@ class Config:
             return config
 
         logger.debug("migrating config from version %i", version)
-        migrator = Config.migrators[version]
-        return migrator.migrate(config)
+        migrators = [Config.migrators[i] for i in range(version, Config.currentVersion)]
+        for migrator in migrators:
+            config = migrator.migrate(config)
+        return config