From 28ebf13ddfd0f077a210ecd9da44787827aa454a Mon Sep 17 00:00:00 2001
From: Marco Locatelli <marco.locatelli@steamware.net>
Date: Fri, 10 Jun 2022 10:04:03 +0200
Subject: [PATCH] 1.5.0 revisione by Samu

---
 logger/FTLogger.py          | 29 +++++++++++++++++------------
 server/templates/about.html |  2 +-
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/logger/FTLogger.py b/logger/FTLogger.py
index 9fb7e55..1927b56 100644
--- a/logger/FTLogger.py
+++ b/logger/FTLogger.py
@@ -7,6 +7,8 @@ import os
 import os.path
 import FTL.FTLog
 
+from os.path import exists
+
 FTL.FTLog.Write(" FTLogger started")
 
 #configurazione per lavorare su server redis locale
@@ -56,15 +58,6 @@ if redSrv0.get('SETTINGS:FOLDER:CURRENT') is None:
         if redSrv0.get('SETTINGS:OUT:MIN:'+str(numCh)) is None:
             redSrv0.set('SETTINGS:OUT:MIN:'+str(numCh),0)
 
-def columnNames():
-    firstRow =  "Data Ora;"
-    firstRow += "Canale A;"
-    firstRow += "Canale B;"
-    firstRow += "Valore Grezzo;"
-    firstRow += "Valore Corretto;"
-    firstRow += "Valore Corretto e Mediato"+"\r\n"
-    return firstRow
-
 #funzione salva time+data e otto valori letti su file SE LOG è 1
 def fileSave():
     rawValue = getRedisVal('RTDATA:VALUE:RAW')
@@ -78,11 +71,23 @@ def fileSave():
     rawLastLog = datetime.datetime.now()
     #format date e time con strftime()
     lastLog = rawLastLog.strftime(dateFormat)
-    try:
+
+    # filepath completo
+    filePath = workingDirectory+"/"+dataFileName
+
+    # verifico se file esista
+    if(exists(filePath)):
         outFile = open(workingDirectory+"/"+dataFileName, "a")
-    except FileNotFoundError:
+    else:
         outFile = open(workingDirectory+"/"+dataFileName, "w+")
-        outFile.write(columnNames)
+        firstRow =  "Data e Ora;"
+        firstRow += "Canale A;"
+        firstRow += "Canale B;"
+        firstRow += "Valore Grezzo;"
+        firstRow += "Valore Corretto;"
+        firstRow += "Valore Corretto e Mediato"
+        outFile.write(firstRow+"\r\n")
+
     # dichiaro una stringa in cui accumulo i valori
     csvRow = str(lastLog) +";"
     # scrivo le letture del canale A
diff --git a/server/templates/about.html b/server/templates/about.html
index 97d7a0c..c8a90f7 100644
--- a/server/templates/about.html
+++ b/server/templates/about.html
@@ -29,7 +29,7 @@
                 <br>
                 Software di lettura e scrittura per canali analogici e digitali
                 <br>
-                V 1.4.3
+                V 1.5.0
             </div>
         </div>
 </main>