From fa7861b34ac38b1f6cbfd271e4e18cfd62905ab6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Paul=20M=C3=BCller?= <dev@craban.de>
Date: Mon, 29 Jan 2024 11:27:14 +0100
Subject: [PATCH] enh: always perform CSS rebranding after `dcor develop`

---
 CHANGELOG                           |  1 +
 dcor_control/cli/develop.py         | 14 +++++++++++++-
 dcor_control/inspect/config_ckan.py |  1 +
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index fb18f01..3ecbe90 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 0.9.6
  - enh: always encrypt beaker session cookies
  - enh: set up cookies more strictly
+ - enh: always perform CSS rebranding after `dcor develop`
  - ref: migrate to dcor_shared 0.6.0
  - setup: pin uwsgi==2.0.21 due to non-working harakiri
 0.9.5
diff --git a/dcor_control/cli/develop.py b/dcor_control/cli/develop.py
index b03ec55..133f3ae 100644
--- a/dcor_control/cli/develop.py
+++ b/dcor_control/cli/develop.py
@@ -4,8 +4,9 @@
 import uuid
 
 import click
+from dcor_shared.paths import get_ckan_config_path
 
-from ..inspect import reload_supervisord
+from ..inspect import config_ckan, reload_supervisord
 
 
 @click.command()
@@ -26,6 +27,17 @@ def develop():
     ]:
         migrate_to_editable(name)
 
+    # Redo the CSS branding
+    print("Applying DCOR CSS branding")
+    ckan_ini = get_ckan_config_path()
+    ckan_cmd = f"ckan -c {ckan_ini} dcor-theme-main-css-branding"
+    sp.check_output(ckan_cmd, shell=True)
+    # set config option
+    config_ckan.check_ckan_ini_option(
+        key="ckan.theme",
+        value="dcor_theme_main/dcor_theme_main",
+        autocorrect=True)
+
     reload_supervisord()
     click.secho('DONE', fg=u'green', bold=True)
 
diff --git a/dcor_control/inspect/config_ckan.py b/dcor_control/inspect/config_ckan.py
index b45b11c..e572bfa 100644
--- a/dcor_control/inspect/config_ckan.py
+++ b/dcor_control/inspect/config_ckan.py
@@ -130,6 +130,7 @@ def check_dcor_theme_main_css(autocorrect):
      """
     ckan_ini = get_ckan_config_path()
     opt = get_actual_ckan_option("ckan.theme")
+    # TODO: Check whether the paths created by this script are setup correctly
     if opt != "dcor_theme_main/dcor_theme_main":
         if autocorrect:
             print("Applying DCOR theme main css")