Refactor to #40

Author: bruno-f-cruz

harp/reader.py

@@ -76,8 +76,9 @@ def __dir__(self) -> Iterable[str]:
     def __getattr__(self, __name: str) -> RegisterReader:
         return self.registers[__name]
 
-    @staticmethod
+    @classmethod
     def from_file(
+        cls,
         filepath: PathLike,
         base_path: Optional[PathLike] = None,
         include_common_registers: bool = True,
@@ -118,13 +119,14 @@ def from_file(
             base_path = Path(base_path).absolute().resolve() / device.device
 
         reg_readers = {
-            name: _create_register_parser(device, name, _ReaderParams(base_path, epoch, keep_type))
+            name: _create_register_handler(device, name, _ReaderParams(base_path, epoch, keep_type))
             for name in device.registers.keys()
         }
-        return DeviceReader(device, reg_readers)
+        return cls(device, reg_readers)
 
-    @staticmethod
+    @classmethod
     def from_url(
+        cls,
         url: str,
         base_path: Optional[PathLike] = None,
         include_common_registers: bool = True,
@@ -169,13 +171,14 @@ def from_url(
             base_path = Path(base_path).absolute().resolve()
 
         reg_readers = {
-            name: _create_register_parser(device, name, _ReaderParams(base_path, epoch, keep_type))
+            name: _create_register_handler(device, name, _ReaderParams(base_path, epoch, keep_type))
             for name in device.registers.keys()
         }
-        return DeviceReader(device, reg_readers)
+        return cls(device, reg_readers)
 
-    @staticmethod
+    @classmethod
     def from_str(
+        cls,
         schema: str,
         base_path: Optional[PathLike] = None,
         include_common_registers: bool = True,
@@ -215,13 +218,14 @@ def from_str(
             base_path = Path(base_path).absolute().resolve()
 
         reg_readers = {
-            name: _create_register_parser(device, name, _ReaderParams(base_path, epoch, keep_type))
+            name: _create_register_handler(device, name, _ReaderParams(base_path, epoch, keep_type))
             for name in device.registers.keys()
         }
-        return DeviceReader(device, reg_readers)
+        return cls(device, reg_readers)
 
-    @staticmethod
+    @classmethod
     def from_model(
+        cls,
         model: Model,
         base_path: Optional[PathLike] = None,
         epoch: Optional[datetime] = None,
@@ -255,13 +259,14 @@ def from_model(
             base_path = Path(base_path).absolute().resolve()
 
         reg_readers = {
-            name: _create_register_parser(model, name, _ReaderParams(base_path, epoch, keep_type))
+            name: _create_register_handler(model, name, _ReaderParams(base_path, epoch, keep_type))
             for name in model.registers.keys()
         }
-        return DeviceReader(model, reg_readers)
+        return cls(model, reg_readers)
 
-    @staticmethod
+    @classmethod
     def from_dataset(
+        cls,
         dataset: PathLike,
         include_common_registers: bool = True,
         epoch: Optional[datetime] = None,
@@ -295,7 +300,7 @@ def from_dataset(
         is_dir = os.path.isdir(path)
         if is_dir:
             filepath = path / "device.yml"
-            return DeviceReader.from_file(
+            return cls.from_file(
                 filepath=filepath,
                 base_path=path,
                 include_common_registers=include_common_registers,