From e000b438eceb804cd3a30cfebce660c0d93a0c2a Mon Sep 17 00:00:00 2001
From: emanuele <emanuele@hubble>
Date: Thu, 2 Apr 2020 15:40:40 +0200
Subject: [PATCH] corretto path di uscita

---
 bananaSPLIT/conf/defaults.json               | 15 +++++++++------
 bananaSPLIT/conf/linux.json                  | 17 +++++++++++------
 bananaSPLIT/guimain.py                       |  8 ++++----
 bananaSPLIT/libbananasplit/libfancylogger.py |  2 +-
 4 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/bananaSPLIT/conf/defaults.json b/bananaSPLIT/conf/defaults.json
index 9c7c3b8..62d4923 100644
--- a/bananaSPLIT/conf/defaults.json
+++ b/bananaSPLIT/conf/defaults.json
@@ -1,16 +1,19 @@
 {
 	"version": "v1.2",
 	"paths": {
-		"lastUsed": "defaults.json",
+		"lastUsed": "linux.json",
 		"configurationPath": "./conf/",
-		"INworkPath": "C:/",
-		"OUTworkPath": "C:/",
+		"INworkPath": "/home/emanuele/Documents/LocalEclipseWorkspace/bananaSPLIT/TestFiles",
+		"OUTworkPath": "/home/emanuele/Desktop",
 		"fileList": [
-			"bdlog.txt"
+			"GUARDIAN 1993.txt",
+			"NYT 1990.txt",
+			"NYT 1994.txt",
+			"NYT 1997.txt"
 		]
 	},
 	"docStruct": {
-		"fileVersNew": true,
+		"fileVersNew": false,
 		"language": "English",
 		"languageIdx": 1,
 		"docSep": "\\s*Copyright [(0-9)]+",
@@ -38,7 +41,7 @@
 		}
 	},
 	"settings": {
-		"encoding": "ansi",
+		"encoding": "windows-1252",
 		"monthPosition": 0,
 		"getNewsPaperName": true,
 		"nameNotFoundStr": "ND",
diff --git a/bananaSPLIT/conf/linux.json b/bananaSPLIT/conf/linux.json
index 1f3349b..f3bb7b2 100644
--- a/bananaSPLIT/conf/linux.json
+++ b/bananaSPLIT/conf/linux.json
@@ -1,14 +1,19 @@
 {
 	"version": "v1.2",
 	"paths": {
-		"lastUsed": "linux",
+		"lastUsed": "linux.json",
 		"configurationPath": "./conf/",
-		"INworkPath": "/home/emanuele/Documents",
-		"OUTworkPath": "/home/emanuele/Documents",
-		"fileList": []
+		"INworkPath": "/home/emanuele/Documents/LocalEclipseWorkspace/bananaSPLIT/TestFiles/",
+		"OUTworkPath": "/home/emanuele/Desktop/",
+		"fileList": [
+			"GUARDIAN 1993.txt",
+			"NYT 1990.txt",
+			"NYT 1994.txt",
+			"NYT 1997.txt"
+		]
 	},
 	"docStruct": {
-		"fileVersNew": true,
+		"fileVersNew": false,
 		"language": "English",
 		"languageIdx": 1,
 		"docSep": "\\s*Copyright [(0-9)]+",
@@ -36,7 +41,7 @@
 		}
 	},
 	"settings": {
-		"encoding": "ansi",
+		"encoding": "windows-1252",
 		"monthPosition": 0,
 		"getNewsPaperName": true,
 		"nameNotFoundStr": "ND",
diff --git a/bananaSPLIT/guimain.py b/bananaSPLIT/guimain.py
index 9e42ca2..9141e54 100644
--- a/bananaSPLIT/guimain.py
+++ b/bananaSPLIT/guimain.py
@@ -161,18 +161,18 @@ class bananaMain(PyQt5.QtWidgets.QMainWindow):
 	def selezSorg(self):
 		rv = PyQt5.QtWidgets.QFileDialog.getExistingDirectory(self,"Seleziona Cartella Sorgente",self.conf.getParam('paths','INworkPath'))
 		if rv is not "":
-			self.conf.setParam(keys=('paths','INworkPath',), val=rv)
+			self.conf.setParam(keys=('paths','INworkPath',), val=rv+"/")
 			self.ui.lbl_sorg.setText(rv)
-			self.logger.info("Selezionata Cartella Sorgente: {}".format(rv))
+			self.logger.info("Selezionata Cartella Sorgente: {}".format(rv+"/"))
 			self.fillFileList()
 		pass
 	
 	def selezDest(self):
 		rv = PyQt5.QtWidgets.QFileDialog.getExistingDirectory(self,"Seleziona Cartella Destinazione",self.conf.getParam('paths','OUTworkPath'))
 		if rv is not "":
-			self.conf.setParam(keys=('paths','OUTworkPath',), val=rv)
+			self.conf.setParam(keys=('paths','OUTworkPath',), val=rv+"/")
 			self.ui.lbl_dest.setText(rv)
-			self.logger.info("Selezionata Cartella Destinazione: {}".format(rv))
+			self.logger.info("Selezionata Cartella Destinazione: {}".format(rv+"/"))
 		pass
 	
 	def openFileDialog(self, name, path):
diff --git a/bananaSPLIT/libbananasplit/libfancylogger.py b/bananaSPLIT/libbananasplit/libfancylogger.py
index 8dd95d7..d990a47 100644
--- a/bananaSPLIT/libbananasplit/libfancylogger.py
+++ b/bananaSPLIT/libbananasplit/libfancylogger.py
@@ -72,7 +72,7 @@ class fancyLogger(QObject):
 		print(self.LYELLOW, end='')
 		self.LOGGER.warning(msg)
 		print(self.RST, end='')
-		self.sendLog.emit(f"<FONT COLOR='##fc9403'>WARNING | {msg} </br>")
+		self.sendLog.emit(f"<FONT COLOR='#fc9403'>WARNING | {msg} </br>")
 		pass
 	
 	def error(self, msg="Undefined Error"):