From 8dc7871d3362289e7f9513e980897ae42cb3f7f2 Mon Sep 17 00:00:00 2001
From: crunk <dvanderkleij@gmail.com>
Date: Fri, 25 Mar 2022 15:51:06 +0100
Subject: [PATCH] Css editor placeholder is the current custom theme if there
 is one

---
 verse/distribusisinfo.py |  5 +++--
 verse/editor.py          | 27 +++++++++++++++++++++++----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/verse/distribusisinfo.py b/verse/distribusisinfo.py
index b898011..9bbd80e 100644
--- a/verse/distribusisinfo.py
+++ b/verse/distribusisinfo.py
@@ -18,12 +18,13 @@ class DistribusisInfo:
             Distribusis.publictheme.isnot(None)
         ).all()
         for distribusi in distribusis:
+            user = User.query.filter_by(id=distribusi.userid).first()
             publictheme = (
                 f"{distribusi.distribusiname}/{distribusi.publictheme}",
-                f"{distribusi.publictheme} used in {distribusi.distribusiname}",  # noqa: E501
+                f"""{distribusi.publictheme} used in {distribusi.distribusiname}
+made by {user.username}""",
             )
             publicthemes.append(publictheme)
-        print(publicthemes)
         return publicthemes
 
     def visibledistribusis():
diff --git a/verse/editor.py b/verse/editor.py
index e7bbaa4..e16c4ec 100644
--- a/verse/editor.py
+++ b/verse/editor.py
@@ -138,7 +138,7 @@ def RenderDistribusiTemplate(current_distribusi):
 def RenderEditorTemplate(editorform, current_distribusi):
     htmlplaceholder = HtmlPlaceholder()
 
-    cssplaceholder = CssPlaceholder()
+    cssplaceholder = CssPlaceholder(current_distribusi)
     editorform.css.data = cssplaceholder
 
     files_uploaded = IsZipUploaded(current_distribusi)
@@ -153,10 +153,16 @@ def RenderEditorTemplate(editorform, current_distribusi):
     return template
 
 
-def CssPlaceholder():
+def CssPlaceholder(current_distribusi):
     cssplaceholder = "Try out your CSS here"
-    with open("themes/editor/placeholder.css") as f:
-        cssplaceholder = f.read()
+    distribusi = Distribusis.query.filter_by(
+        distribusiname=current_distribusi
+    ).first()
+    if distribusi is not None:
+        cssplaceholder = GetPublicCssFile(distribusi)
+    else:
+        with open("themes/editor/placeholder.css") as f:
+            cssplaceholder = f.read()
     return cssplaceholder
 
 
@@ -165,3 +171,16 @@ def HtmlPlaceholder():
     with open("themes/editor/placeholder.html") as f:
         htmlplaceholder = f.read()
     return htmlplaceholder
+
+
+def GetPublicCssFile(distribusi):
+    cssplaceholder = ""
+    publicthemefolder = os.path.join(
+        "themes/publicthemes", distribusi.distribusiname
+    )
+    for filename in os.listdir(publicthemefolder):
+        if filename.endswith(".css"):
+            cssfile = os.path.join(publicthemefolder, filename)
+        with open(cssfile) as f:
+            cssplaceholder = f.read()
+    return cssplaceholder