12Parsec/bananaSPLIT
3
0
Fork 0
Code Issues Releases Wiki Activity

corretto path di uscita

Browse Source
This commit is contained in:
emanuele
2020-04-02 15:40:40 +02:00
parent 200565e4c7
commit e000b438ec
4 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
bananaSPLIT/conf/defaults.json
View File

@@ -1,16 +1,19 @@
{ {
"version": "v1.2", "version": "v1.2",
"paths": { "paths": {
"lastUsed": "defaults.json", "lastUsed": "linux.json",
"configurationPath": "./conf/", "configurationPath": "./conf/",
"INworkPath": "C:/", "INworkPath": "/home/emanuele/Documents/LocalEclipseWorkspace/bananaSPLIT/TestFiles",
"OUTworkPath": "C:/", "OUTworkPath": "/home/emanuele/Desktop",
"fileList": [ "fileList": [
"bdlog.txt" "GUARDIAN 1993.txt",
"NYT 1990.txt",
"NYT 1994.txt",
"NYT 1997.txt"
] ]
}, },
"docStruct": { "docStruct": {
"fileVersNew": true, "fileVersNew": false,
"language": "English", "language": "English",
"languageIdx": 1, "languageIdx": 1,
"docSep": "\\s*Copyright [(0-9)]+", "docSep": "\\s*Copyright [(0-9)]+",
@@ -38,7 +41,7 @@
} }
}, },
"settings": { "settings": {
"encoding": "ansi", "encoding": "windows-1252",
"monthPosition": 0, "monthPosition": 0,
"getNewsPaperName": true, "getNewsPaperName": true,
"nameNotFoundStr": "ND", "nameNotFoundStr": "ND",

17
bananaSPLIT/conf/linux.json
View File

@@ -1,14 +1,19 @@
{ {
"version": "v1.2", "version": "v1.2",
"paths": { "paths": {
"lastUsed": "linux", "lastUsed": "linux.json",
"configurationPath": "./conf/", "configurationPath": "./conf/",
"INworkPath": "/home/emanuele/Documents", "INworkPath": "/home/emanuele/Documents/LocalEclipseWorkspace/bananaSPLIT/TestFiles/",
"OUTworkPath": "/home/emanuele/Documents", "OUTworkPath": "/home/emanuele/Desktop/",
"fileList": [] "fileList": [
"GUARDIAN 1993.txt",
"NYT 1990.txt",
"NYT 1994.txt",
"NYT 1997.txt"
]
}, },
"docStruct": { "docStruct": {
"fileVersNew": true, "fileVersNew": false,
"language": "English", "language": "English",
"languageIdx": 1, "languageIdx": 1,
"docSep": "\\s*Copyright [(0-9)]+", "docSep": "\\s*Copyright [(0-9)]+",
@@ -36,7 +41,7 @@
} }
}, },
"settings": { "settings": {
"encoding": "ansi", "encoding": "windows-1252",
"monthPosition": 0, "monthPosition": 0,
"getNewsPaperName": true, "getNewsPaperName": true,
"nameNotFoundStr": "ND", "nameNotFoundStr": "ND",

8
bananaSPLIT/guimain.py
View File

@@ -161,18 +161,18 @@ class bananaMain(PyQt5.QtWidgets.QMainWindow):
def selezSorg(self): def selezSorg(self):
rv = PyQt5.QtWidgets.QFileDialog.getExistingDirectory(self,"Seleziona Cartella Sorgente",self.conf.getParam('paths','INworkPath')) rv = PyQt5.QtWidgets.QFileDialog.getExistingDirectory(self,"Seleziona Cartella Sorgente",self.conf.getParam('paths','INworkPath'))
if rv is not "": 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.ui.lbl_sorg.setText(rv)
self.logger.info("Selezionata Cartella Sorgente: {}".format(rv)) self.logger.info("Selezionata Cartella Sorgente: {}".format(rv+"/"))
self.fillFileList() self.fillFileList()
pass pass
def selezDest(self): def selezDest(self):
rv = PyQt5.QtWidgets.QFileDialog.getExistingDirectory(self,"Seleziona Cartella Destinazione",self.conf.getParam('paths','OUTworkPath')) rv = PyQt5.QtWidgets.QFileDialog.getExistingDirectory(self,"Seleziona Cartella Destinazione",self.conf.getParam('paths','OUTworkPath'))
if rv is not "": 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.ui.lbl_dest.setText(rv)
self.logger.info("Selezionata Cartella Destinazione: {}".format(rv)) self.logger.info("Selezionata Cartella Destinazione: {}".format(rv+"/"))
pass pass
def openFileDialog(self, name, path): def openFileDialog(self, name, path):

2
bananaSPLIT/libbananasplit/libfancylogger.py
View File

@@ -72,7 +72,7 @@ class fancyLogger(QObject):
print(self.LYELLOW, end='') print(self.LYELLOW, end='')
self.LOGGER.warning(msg) self.LOGGER.warning(msg)
print(self.RST, end='') 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 pass
def error(self, msg="Undefined Error"): def error(self, msg="Undefined Error"):