Use deepmerge for options (#157)

Add an optional extended description…

hassio/addons/addon.py

@@ -8,6 +8,7 @@ import shutil
 import tarfile
 from tempfile import TemporaryDirectory
 
+from deepmerge import Merger
 import voluptuous as vol
 from voluptuous.humanize import humanize_error
 
@@ -30,6 +31,8 @@ _LOGGER = logging.getLogger(__name__)
 RE_VOLUME = re.compile(MAP_VOLUME)
 RE_WEBUI = re.compile(r"^(.*\[HOST\]:)\[PORT:(\d+)\](.*)$")
 
+MERGE_OPT = Merger([(dict, ['merge'])], ['override'], ['override'])
+
 
 class Addon(object):
     """Hold data for addon inside HassIO."""
@@ -104,10 +107,10 @@ class Addon(object):
     def options(self):
         """Return options with local changes."""
         if self.is_installed:
-            return {
+            return MERGE_OPT.merge(
-                **self.data.system[self._id][ATTR_OPTIONS],
+                self.data.system[self._id][ATTR_OPTIONS],
-                **self.data.user[self._id][ATTR_OPTIONS],
+                self.data.user[self._id][ATTR_OPTIONS],
-            }
+            )
         return self.data.cache[self._id][ATTR_OPTIONS]
 
     @options.setter

setup.py

@@ -47,6 +47,7 @@ setup(
         'pyotp',
         'pyqrcode',
         'pytz',
-        'pyudev'
+        'pyudev',
+        'deepmerge'
     ]
 )