From 012c9491f7e38039dabec92be9cee09e847218d7 Mon Sep 17 00:00:00 2001
From: pommee <hugoh@hotmail.se>
Date: Wed, 12 Jun 2024 20:16:35 +0200
Subject: [PATCH] fix: correctly fetch changelog and better view in help screen

---
 application/help.py     | 26 ++++++++++++++++++++------
 application/styles.tcss | 16 +++++++++++++++-
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/application/help.py b/application/help.py
index f550837..528e437 100644
--- a/application/help.py
+++ b/application/help.py
@@ -1,5 +1,6 @@
 import webbrowser
 
+import requests
 from rich.text import Text
 from textual import on
 from textual.app import ComposeResult
@@ -7,7 +8,7 @@
 from textual.screen import ModalScreen
 from textual.widgets import Footer, Markdown, Static
 
-from application.helper import get_current_version
+from application.helper import POCKER_CONFIG_BASE_PATH, get_current_version
 
 HELP_MD = """
 Pocker is a tool for the terminal to do Docker related tasks.
@@ -66,9 +67,12 @@ def compose(self) -> ComposeResult:
         yield Footer()
         with VerticalScroll() as vertical_scroll:
             with Center():
-                yield Static(get_title(), classes="title")
-            yield Markdown(HELP_MD + self.read_changelog())
-        vertical_scroll.border_title = "Help"
+                yield Static(get_title(), id="title", classes="title")
+            yield Markdown(HELP_MD, id="help", classes="help")
+            yield Markdown(self.read_changelog(), id="changelog", classes="changelog")
+
+    def on_mount(self):
+        self.log(self.tree)
 
     @on(Markdown.LinkClicked)
     def on_markdown_link_clicked(self, event: Markdown.LinkClicked) -> None:
@@ -78,6 +82,16 @@ def action_go(self, href: str) -> None:
         webbrowser.open(href)
 
     def read_changelog(self):
-        file_path = "CHANGELOG.md"
+        file_path = POCKER_CONFIG_BASE_PATH / "CHANGELOG.md"
+        if not file_path.exists():
+            response = requests.get(
+                "https://raw.githubusercontent.com/pommee/Pocker/main/CHANGELOG.md"
+            )
+            if response.status_code == 200:
+                with open(file_path, "w") as file:
+                    file.write(response.text)
+            else:
+                return response.text
+
         with open(file_path, "r") as file:
-            return "---  \n### Changelog\n" + file.read()
+            return "---  \n# Changelog  \n\n" + file.read()
diff --git a/application/styles.tcss b/application/styles.tcss
index 984e85d..4e308fa 100644
--- a/application/styles.tcss
+++ b/application/styles.tcss
@@ -90,7 +90,6 @@ Toast {
 HelpScreen VerticalScroll {
     background: $surface;
     margin: 4 8;
-    border: round cornflowerblue;
     height: 1fr;
     .title {
         width: auto;
@@ -103,4 +102,19 @@ HelpScreen VerticalScroll {
         background: $primary-darken-1;
         text-style: bold;
     }
+    Markdown#changelog #block1 {
+        width: 100%;
+        border: none;
+        background: transparent;
+    }
+    MarkdownH1 {
+        width: auto;
+        border: none;
+        background: transparent;
+    }
+    MarkdownH2 {
+        width: auto;
+        border: none;
+        background: transparent;
+    }
 }