Fix #17 - Improve parsing HP printer (laser) data

elad-bar · Feb 20, 2020 · 1e09928 · 1e09928
1 parent 62d36d7
commit 1e09928
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -61,3 +61,7 @@ target/
 ConsumableConfigDyn.json
 ProductConfigDyn.json
 ProductUsageDyn.json
+ConsumableConfigDyn.xml
+final.json
+ProductConfigDyn.xml
+ProductUsageDyn.xml
diff --git a/__main__.py b/__main__.py
@@ -6,7 +6,7 @@
 from custom_components.hpprinter.HPDeviceData import *
 
 logging.basicConfig(level=logging.DEBUG,
-                    filename='myapp.log',
+                    filename='component.log',
                     filemode='w')
 
 _LOGGER = logging.getLogger(__name__)
@@ -33,7 +33,7 @@ def store_data(file, content):
 
     @staticmethod
     def data_provider(data_type):
-        with open(f'samples/ink/{data_type}.json') as json_file:
+        with open(f'samples/HPLJ M401dne/{data_type}.json') as json_file:
             data = json.load(json_file)
 
             return data

diff --git a/custom_components/hpprinter/HPDeviceData.py b/custom_components/hpprinter/HPDeviceData.py
@@ -114,7 +114,7 @@ def set_usage_data(self):
                     printer_consumables = consumables_data.get("Consumable")
 
                     if printer_consumables is not None:
-                        if "ConsumableStation" in printer_consumables:
+                        if "ConsumableTypeEnum" in printer_consumables:
                             self.set_printer_consumable_usage_data(printer_consumables)
                         else:
                             for key in printer_consumables: