autodetect current version of the application

NC3-LU · Feb 15, 2020 · cef18e7 · cef18e7
1 parent 16f21f4
commit cef18e7
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 12 deletions.
diff --git a/VERSION.json b/VERSION.json
diff --git a/survey/context_processors.py b/survey/context_processors.py
@@ -1,16 +1,32 @@
 
 import os
-import json
+import subprocess
 from csskp.settings import BASE_DIR
 
+
 def get_version(request):
-    try:
-        with open(os.path.join(BASE_DIR,'VERSION.json'), 'r') as json_file:
-            data = json.load(json_file)
-            version = "{}.{}.{}".format(data['major'], data['minor'],
-                                            data['hotfix'])
-    except:
-        version = "0.0.0"
+    version = (
+        os.environ.get("PKGVER")
+        or subprocess.run(["git",
+                           "-C",
+                           BASE_DIR,
+                           "describe",
+                           "--tags"], stdout=subprocess.PIPE)
+        .stdout.decode()
+        .strip()
+    )
+    version = version.split("-")
+    if len(version) == 1:
+        app_version = version[0]
+        version_url = "https://github.com/CASES-LU/Fit4Cybersecurity/releases/tag/{}".format(
+            version[0]
+        )
+    else:
+        app_version = "{} - {}".format(version[0], version[2][1:])
+        version_url = "https://github.com/CASES-LU/Fit4Cybersecurity/commits/{}".format(
+            version[2][1:]
+        )
     return {
-        'app_version': version
+        'app_version': app_version,
+        'version_url': version_url
     }
diff --git a/templates/survey/base.html b/templates/survey/base.html
@@ -73,8 +73,8 @@ <h4>Your web browser (Internet Explorer) is not compatible.</h4>
                     </a>
                 </li>
                 <li class="nav-item">
-                    <a class="nav-link" href="https://github.com/CASES-LU/Fit4Cybersecurity/releases/tag/v{{ app_version }}" title="{{ _('Version of Fit4Cybersecurity') }}" alt="{{ _('Version of Fit4Cybersecurity') }}" target="_blank">
-                        v{{ app_version }}
+                    <a class="nav-link" href="{{ version_url }}" title="{{ _('Version of Fit4Cybersecurity') }}" alt="{{ _('Version of Fit4Cybersecurity') }}" target="_blank">
+                        {{ app_version }}
                     </a>
                 </li>
             </ul>