From fd9434868f8b373ec7caa2245d123c18ba03bcfc Mon Sep 17 00:00:00 2001 From: Emanuele Date: Mon, 16 Dec 2019 22:47:59 +0100 Subject: [PATCH] modificato il getParam ma non mi viene in mente un modo furbo per fare il set, ricorsivita' sul dizionario? --- bananaSPLIT/guimain.py | 13 ++++++++++--- bananaSPLIT/libbananasplit/libconfload.py | 15 +++++++++++---- bananaSPLIT/libbananasplit/testEN.json | 2 +- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/bananaSPLIT/guimain.py b/bananaSPLIT/guimain.py index 7b711b8..578bfea 100644 --- a/bananaSPLIT/guimain.py +++ b/bananaSPLIT/guimain.py @@ -50,6 +50,7 @@ class bananaMain(PyQt5.QtWidgets.QMainWindow): self.ui.btn_cartelladest.clicked.connect(self.selezDest) #connetti action tab + self.ui.actionLingua.triggered.connect(self.openLanguage) self.ui.actionAvanzate.triggered.connect(self.openAdvOpt) self.ui.actionCarica_Preset.triggered.connect(self.openLoadPreset) self.ui.actionSalva_Preset.triggered.connect(self.openSavePreset) @@ -68,18 +69,24 @@ class bananaMain(PyQt5.QtWidgets.QMainWindow): def openFileDialog(self, name, path): return PyQt5.QtWidgets.QFileDialog.getExistingDirectory(self,name) - def openLoadPreset(self, confloader=None): + def openLoadPreset(self): self.logger.debug("Apri Carica Preset") + self.logger.debug(str(self.conf.getParam('splitter','paths'))) pass - def openSavePreset(self, confloader=None): + def openSavePreset(self): self.logger.debug("Apri Salva Preset") + self.logger.debug(str(self.conf.setParam("pippo", 'splitter','paths', 'INworkPath'))) pass - def openAdvOpt(self, confloader=None): + def openAdvOpt(self): self.logger.debug("Apri Opzioni Avanzate") pass + def openLanguage(self): + self.logger.debug("Apri Opzioni Lingua") + pass + def selezSorg(self): rv = self.openFileDialog("Seleziona Cartella Sorgente", self.conf.getParam("")) self.logger.debug("Selezionata Cartella Sorgente: {}".format(rv)) diff --git a/bananaSPLIT/libbananasplit/libconfload.py b/bananaSPLIT/libbananasplit/libconfload.py index 0bc6c42..fb27884 100644 --- a/bananaSPLIT/libbananasplit/libconfload.py +++ b/bananaSPLIT/libbananasplit/libconfload.py @@ -4,6 +4,7 @@ Created on 2 nov 2019 @author: Emanuele Trabattoni ''' import json,os,glob,copy +from xml.dom import INUSE_ATTRIBUTE_ERR class bananaCONF(object): ''' @@ -71,12 +72,18 @@ class bananaCONF(object): def getFiles(self): return self.fileList - def getParam(self, k): - return self.settingsList[self.inUse][k] + def getParam(self, *keys): + rv = self.settingsList[self.inUse] + for k in keys: + rv = rv[k] + return rv pass - def setParam(self, k, v): - self.settingsList[self.inUse][k]=dict(v) + def setParam(self, val, *keys): + sv = self.settingsList[self.inUse] + for k in keys: + sv = sv[k] + sv = val pass diff --git a/bananaSPLIT/libbananasplit/testEN.json b/bananaSPLIT/libbananasplit/testEN.json index b9e9f25..8607e50 100644 --- a/bananaSPLIT/libbananasplit/testEN.json +++ b/bananaSPLIT/libbananasplit/testEN.json @@ -6,7 +6,7 @@ "logTimeFormat": "%m-%d %H:%M:%S" }, "splitter": { - "name": "", + "name": "", "paths": { "INworkPath": "D:\\Emanuele\\Documenti\\workspace\\bananaSPLIT\\TestFiles\\", "OUTworkPath": "H:\\",