diff --git a/bananaSPLIT/libbabanasplit/__init__.py b/bananaSPLIT/libbananasplit/__init__.py similarity index 100% rename from bananaSPLIT/libbabanasplit/__init__.py rename to bananaSPLIT/libbananasplit/__init__.py diff --git a/bananaSPLIT/libbabanasplit/libconfload.py b/bananaSPLIT/libbananasplit/libconfload.py similarity index 100% rename from bananaSPLIT/libbabanasplit/libconfload.py rename to bananaSPLIT/libbananasplit/libconfload.py diff --git a/bananaSPLIT/libbabanasplit/libfancylogger.py b/bananaSPLIT/libbananasplit/libfancylogger.py similarity index 91% rename from bananaSPLIT/libbabanasplit/libfancylogger.py rename to bananaSPLIT/libbananasplit/libfancylogger.py index e028f2f..b6420fd 100644 --- a/bananaSPLIT/libbabanasplit/libfancylogger.py +++ b/bananaSPLIT/libbananasplit/libfancylogger.py @@ -3,7 +3,7 @@ Created on 2 nov 2019 @author: Emanuele Trabattoni ''' -import sys +import sys, os import json import logging import colorama @@ -13,7 +13,7 @@ class fancyLogger(object): Colorizza il logger di python, per un' esperienza stile willy wonka ''' def __init__(self, name="Logger", consoleLog=True, fileLog=True): - settings = json.load(open("./testSettings.json"))["logger"] + settings = json.load(open(os.getcwd()+r"\libbananasplit\testEN.json"))["logger"] colorama.init(convert=True) self.LRED = colorama.Fore.LIGHTRED_EX self.RED = colorama.Fore.RED diff --git a/bananaSPLIT/libbabanasplit/libsplit.py b/bananaSPLIT/libbananasplit/libsplit.py similarity index 97% rename from bananaSPLIT/libbabanasplit/libsplit.py rename to bananaSPLIT/libbananasplit/libsplit.py index 2d80fd6..5c189e7 100644 --- a/bananaSPLIT/libbabanasplit/libsplit.py +++ b/bananaSPLIT/libbananasplit/libsplit.py @@ -236,7 +236,6 @@ class bananaSPLITTER(threading.Thread): out.close() except IOError as e: print("OOPS! Qualcosa e\' andato storto, non riesco a scrivere il file: {}".format(e)) - continue pass if __name__ == "__main__": diff --git a/bananaSPLIT/libbabanasplit/testEN.json b/bananaSPLIT/libbananasplit/testEN.json similarity index 100% rename from bananaSPLIT/libbabanasplit/testEN.json rename to bananaSPLIT/libbananasplit/testEN.json diff --git a/bananaSPLIT/libbabanasplit/testITA.json b/bananaSPLIT/libbananasplit/testITA.json similarity index 100% rename from bananaSPLIT/libbabanasplit/testITA.json rename to bananaSPLIT/libbananasplit/testITA.json diff --git a/bananaSPLIT/libtestmain.py b/bananaSPLIT/libtestmain.py index d3a04b0..093a9ba 100644 --- a/bananaSPLIT/libtestmain.py +++ b/bananaSPLIT/libtestmain.py @@ -3,13 +3,15 @@ Created on 1 dic 2019 @author: Emanuele Trabattoni ''' +import os from libsplit import bananaSPLITTER from libconfload import bananaCONF from libfancylogger import fancyLogger - +print(os.getcwd()) logger = fancyLogger(fileLog = False) -confl = bananaCONF() +confl = bananaCONF(workdir=r"./libbananasplit", logger=logger) +splconf = confl.use("testEN") splitter = bananaSPLITTER()