sysview-py 0.4.0__tar.gz → 0.4.2__tar.gz

{sysview_py-0.4.0 → sysview_py-0.4.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: sysview-py
-Version: 0.4.0
+Version: 0.4.2
 Summary: Add your description here
 Author: Michael Wilson
 Author-email: Michael Wilson <mw@1wilson.org>

{sysview_py-0.4.0 → sysview_py-0.4.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sysview-py"
-version = "0.4.0"
+version = "0.4.2"
 description = "Add your description here"
 readme = "README.md"
 authors = [

{sysview_py-0.4.0 → sysview_py-0.4.2}/src/sysview_py/db.py

@@ -51,10 +51,11 @@ class SysviewDB:
         reports = []
         host_types = self.get_types(hostname)
         for host_type in host_types:
-            sql = f"SELECT rowid,raw_report  from reports WHERE type = '{host_type}' AND hostname= '{hostname}' ORDER BY rowid DESC LIMIT 1"
-            report_id, latest_report = self._cursor.execute(sql).fetchone()
+            sql = f"SELECT rowid,raw_report,date  from reports WHERE type = '{host_type}' AND hostname= '{hostname}' ORDER BY rowid DESC LIMIT 1"
+            report_id, latest_report, report_date = self._cursor.execute(sql).fetchone()
             latest_report = Report(raw_report=latest_report, report_id=report_id)
             latest_report.parse()
+            latest_report.date = datetime.datetime.fromtimestamp(report_date)
             reports.append(latest_report)
         return reports
 
@@ -89,7 +90,7 @@ class SysviewDB:
         self._connection.commit()
 
     def get_last_changed_item(self, item):
-        sql = f"SELECT report_id,raw_item FROM items WHERE command = '{item.command}' AND hostname = '{item.host}' AND NOT status = '{item.status}' ORDER BY rowid DESC LIMIT 1"
+        sql = f"SELECT report_id,raw_item FROM items WHERE command = '{item.command}' AND hostname = '{item.host}' AND NOT status = '{item.status} AND report_id < {item.report_id}' ORDER BY rowid DESC LIMIT 1"
         last_changed_item = self._cursor.execute(sql).fetchone()
         if last_changed_item is not None:
             report_id = last_changed_item[0]
@@ -97,10 +98,11 @@ class SysviewDB:
             last_changed_item = ReportItem(raw_item, report_id=report_id)
             last_changed_item.parse()
             sql = f"SELECT date FROM reports WHERE rowid = '{last_changed_item.report_id}'"
-            report_date = datetime.datetime.utcfromtimestamp(
-                self._cursor.execute(sql).fetchone()[0]
+            report_date = datetime.datetime.fromtimestamp(
+                self._cursor.execute(sql).fetchone()[0],
             )
             last_changed_item.date = report_date
+            last_changed_item.host = item.host
         return last_changed_item
 
     def get_item_history(self, item, max_len=10):

{sysview_py-0.4.0 → sysview_py-0.4.2}/src/sysview_py/sysview.py

@@ -58,12 +58,8 @@ class Sysview:
         env = Environment(
             loader=PackageLoader("sysview_py"), autoescape=select_autoescape()
         )
-        html = env.get_template("card_view.html").render(
-            items=self.hosts, title="Hosts", active="Hosts", path="", auto_refresh=True
-        )
-        html_path = self.html_root / "index.html"
-        with open(html_path, "w") as f:
-            f.write(html)
+        for host in self.hosts:
+            host.all_items
         for host in self.hosts:
             html = env.get_template("card_view.html").render(
                 items=host.all_items,
@@ -103,6 +99,12 @@ class Sysview:
         html_path = self.html_root / f"services.html"
         with open(html_path, "w") as f:
             f.write(html)
+        html = env.get_template("card_view.html").render(
+            items=self.hosts, title="Hosts", active="Hosts", path="", auto_refresh=True
+        )
+        html_path = self.html_root / "index.html"
+        with open(html_path, "w") as f:
+            f.write(html)
 
     def get_latest_reports(self):
         for host in self.hosts: