Minor tweaks

tests/conftest.py

@@ -13,7 +13,7 @@
 
 class TestTheme:
     """ Expected theme values for the tests """
-    panel_title_main = "bold yellow"
+    panel_title = "bold yellow"
     heading_h1 = "bold bright_green on dark_green"
     heading_h2 = "bold yellow"
     table_field = "bold bright_magenta"

tests/test_ui_domain_view.py

@@ -286,7 +286,7 @@ def test_domain_panel(self, view01, theme, display_timestamp):
         domain = view01.domain_panel()
         assert type(domain) is Panel
         assert domain.title == Text("gist.github.com")
-        assert domain.title.style == theme.panel_title_main
+        assert domain.title.style == theme.panel_title
 
         #
         # VT section
@@ -1552,7 +1552,10 @@ def test_domain_panel_urlhaus(self, view14, theme):
         assert table.columns[1]._cells == [
             Text(
                 "1+ online (3248 total)",
-                spans=[Span(9, 22, theme.table_value)],
+                spans=[
+                    Span(0, 9, theme.error),
+                    Span(9, 22, theme.table_value),
+                ],
             ),
             Text(
                 "abused_legit_malware in spamhaus\nlisted in surbl",

tests/test_ui_ip_view.py

@@ -147,7 +147,7 @@ def test_ip_panel(self, view01, theme, display_timestamp):
         ip = view01.ip_panel()
         assert type(ip) is Panel
         assert ip.title == Text("1.1.1.1")
-        assert ip.title.style == theme.panel_title_main
+        assert ip.title.style == theme.panel_title
 
         # Sections
         vt_section = ip.renderable.renderables[0]
@@ -264,6 +264,7 @@ def test_ip_panel(self, view01, theme, display_timestamp):
             Text(
                 "10 online (10 total)",
                 spans=[
+                    Span(0, 9, theme.error),
                     Span(9, 20, theme.table_value),
                 ]
             ),

wtfis/ui/base.py

@@ -69,7 +69,7 @@ def _gen_heading_text(self, heading: str, hyperlink: Optional[str] = None, type:
         elif type == "h2":
             text = Text(justify="center")
             return text.append(heading, style=f"{self.theme.heading_h2}{link_style}")
-        else:
+        else:  # pragma: no cover
             raise Exception(f"Invalid heading type \"{type}\"")
 
     def _gen_linked_field_name(self, name: str, hyperlink: str) -> Text:
@@ -111,14 +111,9 @@ def _gen_panel(
         self,
         renderable: RenderableType,
         title: Optional[str] = None,
-        main_panel: bool = False
     ) -> Panel:
         if title is not None:
-            if main_panel is True:
-                title_style = self.theme.panel_title_main
-            else:  # Note to future self: we might not need two panel title styles anymore
-                title_style = self.theme.panel_title_default
-            panel_title = Text(title, style=title_style)
+            panel_title = Text(title, style=self.theme.panel_title)
             return Panel(renderable, title=panel_title, expand=False)
         return Panel(renderable, expand=False)
 
@@ -261,12 +256,14 @@ def _gen_asn_text(
         asn: Optional[str],
         org: Optional[RenderableType],
     ) -> Optional[RenderableType]:
-        if not asn:
+        if asn == "0" or not asn:
             return None
 
-        text = Text(f"{asn.replace('AS', '')} (")
-        text.append(str(org), style=self.theme.asn_org)
-        text.append(")")
+        text = Text()
+        (text
+         .append(f"{asn.replace('AS', '')} (")
+         .append(str(org), style=self.theme.asn_org)
+         .append(")"))
         return text
 
     def _get_ip_enrichment(self, ip: str) -> Optional[Union[IpWhois, ShodanIp]]:
@@ -385,7 +382,7 @@ def bl_text(blocklist: str, status: str) -> Text:
                 text.append(status, self.theme.urlhaus_bl_med)
             elif status.endswith("_domain") or status == "listed":
                 text.append(status, self.theme.urlhaus_bl_high)
-            else:
+            else:  # pragma: no cover
                 raise Exception(f"Invalid URLhaus BL status: {status}")
             text.append(" in ").append(blocklist, style=self.theme.urlhaus_bl_name)
             return text
@@ -400,17 +397,18 @@ def bl_text(blocklist: str, status: str) -> Text:
                 hyperlink=enrich.urlhaus_reference,
             ) if enrich.urlhaus_reference else "Malware URLs:"
 
-            malware_urls_value = Text(
+            malware_urls_value = Text()
+            (malware_urls_value
+             .append(
                 (str(enrich.online_url_count)
-                 if enrich.url_count and enrich.url_count <= 100
-                 else f"{enrich.online_url_count}+") + " online",
+                    if enrich.url_count and enrich.url_count <= 100
+                    else f"{enrich.online_url_count}+") + " online",
                 style=self.theme.error if enrich.online_url_count > 0 else self.theme.warn,
-            )
-
-            malware_urls_value.append(
+             )
+             .append(
                 f" ({enrich.url_count} total)",
                 style=self.theme.table_value,
-            )
+             ))
 
             tags = smart_join(*enrich.tags, style=self.theme.tags) if enrich.tags else None
 

wtfis/ui/theme.py

@@ -1,6 +1,5 @@
 class Theme:
-    panel_title_default = "default"
-    panel_title_main = "bold yellow"
+    panel_title = "bold yellow"
     heading_h1 = "bold bright_green on dark_green"
     heading_h2 = "bold yellow"
     table_field = "bold bright_magenta"

wtfis/ui/view.py

@@ -51,7 +51,7 @@ def domain_panel(self) -> Panel:
                 content.append("")
                 content.append(section)
 
-        return self._gen_panel(self._gen_group(content), self.entity.data.id_, main_panel=True)
+        return self._gen_panel(self._gen_group(content), self.entity.data.id_)
 
     def resolutions_panel(self) -> Optional[Panel]:
         # Skip if no resolutions data
@@ -198,7 +198,7 @@ def ip_panel(self) -> Panel:
                 content.append("")
                 content.append(section)
 
-        return self._gen_panel(self._gen_group(content), self.entity.data.id_, main_panel=True)
+        return self._gen_panel(self._gen_group(content), self.entity.data.id_)
 
     def print(self, one_column: bool = False) -> None:
         renderables = [i for i in (