convert helpers/init_host into a pure function

this will probably not work…

Author: igalic

libiocage/lib/Distribution.py

@@ -27,7 +27,7 @@ class DistributionGenerator:
     def __init__(self, host, zfs=None, logger=None):
         self.logger = libiocage.lib.helpers.init_logger(logger)
         self.zfs = libiocage.lib.helpers.init_zfs(zfs)
-        libiocage.lib.helpers.init_host(self, host)
+        self.host = libiocage.lib.helpers.init_host(host, self.logger)
 
         self.available_releases = None
 

libiocage/lib/Jail.py

@@ -61,7 +61,6 @@ class JailGenerator:
             release (stored in `zpool/iocage/base/<RELEASE>)
     """
 
-    _class_host = libiocage.lib.Host.HostGenerator
     _class_storage = libiocage.lib.Storage.Storage
 
     def __init__(self, data={}, zfs=None, host=None, logger=None, new=False):
@@ -86,8 +85,7 @@ def __init__(self, data={}, zfs=None, host=None, logger=None, new=False):
 
         self.logger = libiocage.lib.helpers.init_logger(logger)
         self.zfs = libiocage.lib.helpers.init_zfs(zfs)
-
-        libiocage.lib.helpers.init_host(self, host)
+        self.host = libiocage.lib.helpers.init_host(host, self.logger)
 
         if isinstance(data, str):
             data = {
@@ -905,8 +903,6 @@ def __dir__(self):
 
 class Jail(JailGenerator):
 
-    _class_host = libiocage.lib.Host.HostGenerator
-
     def start(self, *args, **kwargs):
         return list(JailGenerator.start(self, *args, **kwargs))
 

libiocage/lib/Jails.py

@@ -24,7 +24,7 @@ def __init__(self,
                  zfs=None):
 
         self.logger = libiocage.lib.helpers.init_logger(logger)
-        libiocage.lib.helpers.init_host(self, host)
+        self.host = libiocage.lib.helpers.init_host(host, self.logger)
 
         # this could be wrong..er.. now?:
         self.zfs = libiocage.lib.helpers.init_zfs(zfs)

libiocage/lib/Prompts.py

@@ -4,8 +4,8 @@
 
 class Prompts:
     def __init__(self, host=None, logger=None):
-        self.logger = logger
-        libiocage.lib.helpers.init_host(self, host)
+        self.logger = libiocage.lib.helpers.init_logger(logger)
+        self.host = libiocage.lib.helpers.init_host(host, self.logger)
 
     def release(self):
         default = None

libiocage/lib/Release.py

@@ -35,7 +35,7 @@ def __init__(self, name=None,
 
         self.logger = libiocage.lib.helpers.init_logger(logger)
         self.zfs = libiocage.lib.helpers.init_zfs(zfs)
-        libiocage.lib.helpers.init_host(self, host)
+        self.host = libiocage.lib.helpers.init_host(host, self.logger)
 
         if not libiocage.lib.helpers.validate_name(name):
             raise NameError(f"Invalid 'name' for Release: '{name}'")

libiocage/lib/Releases.py

@@ -4,9 +4,9 @@
 
 class Releases:
     def __init__(self, host=None, zfs=None, logger=None):
-        libiocage.lib.helpers.init_host(self, host)
-        self.logger = logger
-        self.zfs = zfs
+        self.logger = libiocage.lib.helpers.init_logger(logger)
+        self.zfs = libiocage.lib.helpers.init_zfs(zfs)
+        self.host = libiocage.lib.helpers.init_host(host, self.logger)
 
     @property
     def dataset(self):

libiocage/lib/helpers.py

@@ -20,19 +20,12 @@ def get_zfs():
     return libzfs.ZFS(history=True, history_prefix="<iocage>")
 
 
-def init_host(self, host=None):
+def init_host(host: libiocage.lib.Host.Host=None, logger:
+              libiocage.lib.Logger.Logger=None) -> libiocage.lib.Host.Host:
     if host:
-        self.host = host
-    else:
-        try:
-            logger = self.logger
-        except:
-            logger = None
-
-        try:
-            self.host = self._class_host(logger=logger)
-        except:
-            self.host = libiocage.lib.Host.HostGenerator(logger=logger)
+        return host
+
+    return libiocage.lib.Host.HostGenerator(logger=logger)
 
 
 def init_datasets(self, datasets=None):