From 2e82e530d238729f27b16e0a6b1446f01b2d2b6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dennis=20Doll=C3=A9e?= <no.ploidy@simplelogin.com>
Date: Fri, 19 Apr 2024 17:17:21 +0200
Subject: [PATCH] Add release tag to html

---
 config.py                  | 4 +++-
 router.py                  | 3 ++-
 templates/base.html.jinja2 | 2 +-
 util.py                    | 9 ++++++++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/config.py b/config.py
index a08b182..8683501 100644
--- a/config.py
+++ b/config.py
@@ -2,10 +2,12 @@
 from pydantic import BaseSettings, Field
 
 from sources import *
+from util import get_release_tag
 
 class Settings(BaseSettings):
     debug: bool = Field(True, env="DEBUG")
     port: int = Field(8080, env="PORT")
+    release_tag: str = Field(get_release_tag())
 
     sources: List[type] = [
         Alamut,
@@ -32,4 +34,4 @@ def __init__(self):
         super().__init__()
         self.sources = [source for source in self.sources if source.is_complete(source)]
 
-settings = Settings()
\ No newline at end of file
+settings = Settings()
diff --git a/router.py b/router.py
index e736187..e023932 100644
--- a/router.py
+++ b/router.py
@@ -26,6 +26,7 @@ def index(request: Request):
         "index.html.jinja2", 
         {
             "request": request,
+            "release_tag": settings.release_tag,
         }
     )
 
@@ -304,4 +305,4 @@ async def websocket_endpoint(websocket: WebSocket, search: str):
             await send_log(f"Used all sources.", websocket)
 
     except WebSocketDisconnect:
-        await websocket.close()
\ No newline at end of file
+        await websocket.close()
diff --git a/templates/base.html.jinja2 b/templates/base.html.jinja2
index 24d6e87..79a56ea 100644
--- a/templates/base.html.jinja2
+++ b/templates/base.html.jinja2
@@ -68,7 +68,7 @@
     <footer class="footer mt-auto py-3 bg-light">
       <div class="container">
         <span class="text-muted">
-        Molclass - 2022
+        Molclass v{{ release_tag }}&nbsp;&nbsp;2022-2024
         </span>
         {% block footer %}
         {% endblock %}
diff --git a/util.py b/util.py
index 5c3ad3b..0a70670 100644
--- a/util.py
+++ b/util.py
@@ -1,5 +1,6 @@
 import os
 import sys
+import subprocess
 # https://molbiol-tools.ca/Amino_acid_abbreviations.htm
 protein_conversion = {
     "Ala": 	"A",
@@ -54,4 +55,10 @@ def relative_path(path: str) -> str:
     if getattr(sys, 'frozen', False) and hasattr(sys, '_MEIPASS'):
         return os.path.join(sys._MEIPASS, path)
     else:
-        return os.path.join(".", path)
\ No newline at end of file
+        return os.path.join(".", path)
+
+def get_release_tag() -> str:
+    tag = ""
+    result = subprocess.run(['git', 'describe', '--tags'], stdout=subprocess.PIPE)
+    tag = result.stdout.decode().strip()
+    return tag