From 5725c14b83f9b972bfeb502052f9a8cfbab55c20 Mon Sep 17 00:00:00 2001
From: Emanuele <ema.trabattoni@gmail.com>
Date: Mon, 30 Mar 2020 13:16:56 +0200
Subject: [PATCH] selezione della versione del file, filtraggio tipo per txt

---
 bananaSPLIT/conf/defaults.json         | 1 +
 bananaSPLIT/guimain.py                 | 6 +++++-
 bananaSPLIT/libbananasplit/libsplit.py | 6 ++++--
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/bananaSPLIT/conf/defaults.json b/bananaSPLIT/conf/defaults.json
index 74d2ef5..7fd02d7 100644
--- a/bananaSPLIT/conf/defaults.json
+++ b/bananaSPLIT/conf/defaults.json
@@ -29,6 +29,7 @@
 		]
 	},
 	"docStruct": {
+		"fileVersNew": true,
 		"language": "English",
 		"docSep": "\\s*Copyright [(0-9)]+",
 		"beginOfDocument":"\\s*Body",
diff --git a/bananaSPLIT/guimain.py b/bananaSPLIT/guimain.py
index 833f4cc..8345a44 100644
--- a/bananaSPLIT/guimain.py
+++ b/bananaSPLIT/guimain.py
@@ -76,6 +76,8 @@ class bananaMain(PyQt5.QtWidgets.QMainWindow):
 		try:
 			self.ui.lbl_sorg.setText(self.conf.getParam('paths','INworkPath'))
 			self.ui.lbl_dest.setText(self.conf.getParam('paths','OUTworkPath'))
+			self.ui.rad_fileNew.setChecked(self.conf.getParam('docStruct', 'fileVersNew'))
+			self.ui.rad_fileOld.setChecked(not self.conf.getParam('docStruct', 'fileVersNew'))		
 			self.fillFileList()
 		except:
 			self.log.critical("MainWindow: Configurazione non accettata")
@@ -88,7 +90,9 @@ class bananaMain(PyQt5.QtWidgets.QMainWindow):
 		self.advopt.fillInterface()
 		
 	def fillFileList(self):
-		fl = QDir(self.conf.getParam('paths','INworkPath')).entryList(QDir.NoDotAndDotDot | QDir.Files)
+		fl = QDir(self.conf.getParam('paths','INworkPath'))
+		fl.setNameFilters(['*.txt','*.TXT'])
+		fl.entryList(QDir.NoDotAndDotDot | QDir.Files)
 		self.ui.lst_files.clear()
 		for f in fl:
 			self.ui.lst_files.addItem(PyQt5.QtWidgets.QListWidgetItem(f))
diff --git a/bananaSPLIT/libbananasplit/libsplit.py b/bananaSPLIT/libbananasplit/libsplit.py
index 92babe4..3a5f11e 100644
--- a/bananaSPLIT/libbananasplit/libsplit.py
+++ b/bananaSPLIT/libbananasplit/libsplit.py
@@ -43,7 +43,10 @@ class bananaSPLITTER(QRunnable):
 		try:
 			self.openFile()
 			self.remEmptyLines()
-			self.splitFile()
+			if self.docStruct['fileVersNew']:
+				self.newSplitFile()
+			else:
+				self.splitFile()
 			
 			if self.settings['removeDuplicates']:
 				self.log.info("Controllo se ci sono dei duplicati..")
@@ -165,7 +168,6 @@ class bananaSPLITTER(QRunnable):
 							else:
 								newsPaperName = self.settings['nameNotFoundStr']
 							newsName = False
-							
 				except IndexError:
 					self.log.error("Errore inaspettato, contatta il tuo sviluppatore di fiducia!")
 					pass