From ea875146e52ab40e0bb5e380a855527cb2494eac Mon Sep 17 00:00:00 2001
From: Mickael PAPAMICA Asseline <mickael@papamica.com>
Date: Fri, 13 Jan 2023 21:16:46 +0100
Subject: [PATCH] add description, hint and default value for variable

---
 app/app.py           | 2 +-
 app/flaresolverr.yml | 9 +++++----
 app/template.yml.j2  | 8 ++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/app.py b/app/app.py
index 70875d2..8896013 100755
--- a/app/app.py
+++ b/app/app.py
@@ -20,10 +20,10 @@ def volumlist():
 def envvar():
     envvar = []
     var_name = "Nothing" 
-    grp_var =  []
     while var_name != "":
         var_name = input("Enter environment variable or press enter to exit : ")
         if var_name != "":
+            grp_var =  []
             var_description = input(f"  Enter description of variable {var_name} : ")
             var_hint = input(f"  Enter hint of variable {var_name} : ")
             var_default = input(f"  Enter default of variable {var_name} : ")
diff --git a/app/flaresolverr.yml b/app/flaresolverr.yml
index f72779a..e73a687 100644
--- a/app/flaresolverr.yml
+++ b/app/flaresolverr.yml
@@ -13,8 +13,8 @@
 #% DATA_LOCATION: Data localization (Example: /apps/service) [/_data/apps]
 #% URL: Service URL (Example: service.papamica.fr or service.com)
 #% NETWORK: Your Traefik network (Example: proxy) [proxy]
-#% ['TZ', 'CAPTCHA_SOLVER']: ['Time Zone', 'Captcha solver'] (['Europe/Paris', 'Check documentation on Github']) [['Europe/Paris', 'none']]
-#% ['TZ', 'CAPTCHA_SOLVER']: ['Time Zone', 'Captcha solver'] (['Europe/Paris', 'Check documentation on Github']) [['Europe/Paris', 'none']]
+#% TZ: Time Zone (Ex : Europe/Paris) [Europe/Paris]
+#% CAPTCHA_SOLVER: Captcha solver (Check documentation on Github) [none]
 
 # Work with Portainer
 version: '3.8'
@@ -22,9 +22,10 @@ services:
   flaresolverr:
     image: ghcr.io/flaresolverr/flaresolverr:latest
     volumes:
+      - $DATA_LOCATION/$SERVICE/test:/test
     environment:
-      - ['TZ', 'CAPTCHA_SOLVER']:$['TZ', 'CAPTCHA_SOLVER']
-      - ['TZ', 'CAPTCHA_SOLVER']:$['TZ', 'CAPTCHA_SOLVER']
+      - TZ:$TZ
+      - CAPTCHA_SOLVER:$CAPTCHA_SOLVER
     healthcheck:
       test: wget -s 'http://localhost:8191'
       interval: 1m
diff --git a/app/template.yml.j2 b/app/template.yml.j2
index 8353fbd..bb65002 100644
--- a/app/template.yml.j2
+++ b/app/template.yml.j2
@@ -16,10 +16,10 @@
 {%- if envvar is defined and envvar|length > 0 %}
   {%- for var in envvar %}
     {%- if not loop.last %}
-#% {{ var|upper }}: {{ var }} ({{ var }}) [{{ var }}]
+#% {{ var[0]|upper }}: {{ var[1] }} ({{ var[2] }}) [{{ var[3] }}]
     {%- endif %}
     {%- if loop.last %}
-#% {{ var.name|upper }}: {{ var.description }} ({{ var.hint }}) [{{ var.default_value }}]
+#% {{ var[0]|upper }}: {{ var[1] }} ({{ var[2] }}) [{{ var[3] }}]
     {%- endif %}
   {%- endfor %}
 {%- endif %}
@@ -44,10 +44,10 @@ services:
     environment:
   {%- for var in envvar %}
     {%- if not loop.last %}
-      - {{ var|upper }}:${{ var|upper }}
+      - {{ var[0]|upper }}:${{ var[0]|upper }}
     {%- endif %}
     {%- if loop.last %}
-      - {{ var|upper }}:${{ var|upper }}
+      - {{ var[0]|upper }}:${{ var[0]|upper }}
     {%- endif %}
   {%- endfor %}
 {%- endif %}