From b8676a685d5568bb50050a235114e991f5b87156 Mon Sep 17 00:00:00 2001
From: ZanSara <sarazanzo94@gmail.com>
Date: Fri, 16 Apr 2021 09:47:32 +0200
Subject: [PATCH] Moving the \r\n fix into the overlays rendering code to avoid
 duplicating efforts. Other minor refinements to the web-ui.

---
 zanzocam/web_ui/templates/home.html   | 16 ++++++++--------
 zanzocam/web_ui/templates/server.html |  6 +++---
 zanzocam/web_ui/templates/webcam.html |  3 +--
 zanzocam/webcam/main.py               |  4 ++--
 zanzocam/webcam/overlays.py           |  4 ++++
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/zanzocam/web_ui/templates/home.html b/zanzocam/web_ui/templates/home.html
index b1e9388c..e6c9bc56 100644
--- a/zanzocam/web_ui/templates/home.html
+++ b/zanzocam/web_ui/templates/home.html
@@ -20,7 +20,7 @@ <h3>WiFi:</h3>
                 <a href="/wifi" id="configure-wifi" class="button" style="margin: auto 0;">Configura il WiFi</a> 
             </div>
             <p>
-                Nome della rete (SSID): <b>{{ wifi_data.ssid }}</b><br>
+                Nome della rete (SSID): <b>{{ wifi_data.ssid or "[non configurato]"}}</b><br>
                 Password: <b id="wifi_pwd"></b><a id="wifi_pwd_button" onclick="toggle_wifi_password()" style="margin-left:1rem;">Mostra</a>
             </p>
         </div>
@@ -31,18 +31,18 @@ <h3>Server:</h3>
                 <a href="/server" id="configure-server" class="button" style="margin: auto 0;">Configura Dati Server</a> 
             </div>
             <p>
-                Protocollo: <b>{{ server_data.protocol }}</b><br>
+                Protocollo: <b>{{ server_data.protocol  or "[non configurato]"}}</b><br>
                 
                 {% if server_data.protocol=="HTTP" %}
-                URL: <b>{{ server_data.url }}</b><br>
+                URL: <b>{{ server_data.url  or "[non configurato]"}}</b><br>
 
                 {% elif server_data.protocol=="FTP" %}
-                Hostname: <b>{{ server_data.hostname }}</b><br>
-                Sottocartella: <b>{{ server_data.subfolder }}</b><br>
+                Hostname: <b>{{ server_data.hostname  or "[non configurato]"}}</b><br>
+                Sottocartella: <b>{{ server_data.subfolder  or "[non configurato]"}}</b><br>
                 Usa TLS: <b>{%if server_data.tls %}Si'{% else %}No{% endif %}</b><br>
                 {% endif %}
                 
-                Username: <b>{{ server_data.username }}</b><br>
+                Username: <b>{{ server_data.username or "[non configurato]" }}</b><br>
                 Password: <b id="server_pwd"></b><a id="server_pwd_button" onclick="toggle_server_password()" style="margin-left:1rem;">Mostra</a>
             </p>
         </div>
@@ -95,7 +95,7 @@ <h3>Riavvia ZANZOCAM:</h3>
         const button_wifi = document.getElementById("wifi_pwd_button");
         if( button_wifi.innerHTML == 'Mostra' ) {
             button_wifi.innerHTML = 'Nascondi';
-            field_wifi.innerHTML="{{ wifi_data.password }}";
+            field_wifi.innerHTML="{{ wifi_data.password  or '[non configurato]' }}";
         } else {
             button_wifi.innerHTML = 'Mostra';
             field_wifi.innerHTML="";
@@ -107,7 +107,7 @@ <h3>Riavvia ZANZOCAM:</h3>
         const button = document.getElementById("server_pwd_button");
         if( button.innerHTML == 'Mostra' ) {
             button.innerHTML = 'Nascondi';
-            field.innerHTML="{{ server_data.password }}";
+            field.innerHTML="{{ server_data.password  or '[non configurato]'}}";
         } else {
             button.innerHTML = 'Mostra';
             field.innerHTML="";
diff --git a/zanzocam/web_ui/templates/server.html b/zanzocam/web_ui/templates/server.html
index c11196bc..4611a206 100644
--- a/zanzocam/web_ui/templates/server.html
+++ b/zanzocam/web_ui/templates/server.html
@@ -23,17 +23,17 @@
                 </div>            
                 <div id="ftp-vars" style="display: none; flex-direction:column!important;">
                     <div class="row">
-                        <div class="column">
+                        <div class="column" style="padding:0;">
                             <label>Hostname:</label>
                             <input type="text" placeholder="example.com" id="server-hostname" name="server_hostname" value="{{ server_data.hostname }}">
                         </div>
                     </div>
                     <div class="row">
-                        <div class="column">
+                        <div class="column" style="padding:0;">
                             <label class="label-inline">Sottocartella (se necessaria):</label>
                             <input type="text" name="server_subfolder" value="{{ server_data.subfolder }}">
                         </div>
-                        <div class="column">
+                        <div class="column" style="padding:0;">
                             <label class="label-inline">Avanzate:</label>
                             <div style="padding: 10px;">
                                 <input type="checkbox" name="server_tls" {% if server_data.tls %}checked{%endif%}>
diff --git a/zanzocam/web_ui/templates/webcam.html b/zanzocam/web_ui/templates/webcam.html
index b7b021ef..e651963e 100644
--- a/zanzocam/web_ui/templates/webcam.html
+++ b/zanzocam/web_ui/templates/webcam.html
@@ -6,7 +6,7 @@
     Ricorda che altre opzioni come rotazione, inversione verticale o orizzontale, scritte, loghi etc... 
     verranno applicate piu' tardi, quando la foto verra' inviata al server. La preview serve unicamente
     a sistemare l'inquadratura e la messa a fuoco.<br><br>
-    <a href="/webcam-setup" >Clicca qui per aggiornare la preview</a> (o ricarica la pagina).
+    <a href="/webcam" >Clicca qui per aggiornare la preview</a> (o ricarica la pagina).
     </p>
 
     <img id="preview" src="/picture-preview" style="width:min(100%, 800px); min-height: 80px; border-radius:0.5rem; background: url('{{ url_for('static', filename='logos/loading.gif') }}') no-repeat center center;">
@@ -23,7 +23,6 @@
     <p id="feedback" class="center"></p>
 
     <div id="logs-block" style="display: none;">
-        <div class="center"><a href="/logs/text/picture" class="button" download="zanzocam-logs.txt">Scarica i log</a></div>
         <p style="margin:1rem;">Logs:</p>
         <p id="logs" style="white-space: pre-wrap;color:#eee;background-color:#222;padding:3rem;border-radius:1rem;"></p>
         <div class="center"><a href="/logs/text/picture" class="button" download="zanzocam-logs.txt">Scarica i log</a></div>
diff --git a/zanzocam/webcam/main.py b/zanzocam/webcam/main.py
index 941a5d6a..8d970dc6 100644
--- a/zanzocam/webcam/main.py
+++ b/zanzocam/webcam/main.py
@@ -104,7 +104,7 @@ def main():
             
             log_row(char="+")
             try:
-                log("Re-applying the old system configuration")
+                log(f"Re-applying the old system configuration:\n {initial_configuration}")
                 system.apply_system_settings(initial_configuration)
             except Exception as e:
                 log_error("Something unexpected occurred while re-applying the "
@@ -123,7 +123,7 @@ def main():
             errors_were_raised = True
             restore_required = False
             log_error("An error occurred while taking the picture", e)
-            log("Waiting 30 seconds and then trying again with the old configuration")
+            log(f"Waiting 30 seconds and then trying again with the old configuration: {initial_configuration}")
 
             sleep(30)
 
diff --git a/zanzocam/webcam/overlays.py b/zanzocam/webcam/overlays.py
index 2368863d..5edcc2ed 100644
--- a/zanzocam/webcam/overlays.py
+++ b/zanzocam/webcam/overlays.py
@@ -140,6 +140,10 @@ def create_text_overlay(self, photo_width: int, photo_height: int) -> Any:
             text_width, text_height = self.process_text(font, photo_width)
             text_size = (text_width + padding*2, text_height + padding*2)
 
+            # Some very popular browsers use \r\n to save newlines from 
+            # textareas: normalize
+            self.text = self.text.replace("\r\n", "\n")
+
             # Creates the image
             label = Image.new("RGBA", text_size, color=self.background_color)
             draw = ImageDraw.Draw(label)