diff --git a/SPEx/.env b/SPEx/.env deleted file mode 100644 index 1501006..0000000 --- a/SPEx/.env +++ /dev/null @@ -1,2 +0,0 @@ -PYTHONPATH=${workspaceFolder}:${PYTHONPATH}:${workspaceFolder}/spex/libbananasplit:${workspaceFolder}/iserInterface/compiledUI - diff --git a/SPEx/spex/conf/defaults.json b/SPEx/conf/defaults.json similarity index 100% rename from SPEx/spex/conf/defaults.json rename to SPEx/conf/defaults.json diff --git a/SPEx/spex/conf/languageconf.json b/SPEx/conf/languageconf.json similarity index 100% rename from SPEx/spex/conf/languageconf.json rename to SPEx/conf/languageconf.json diff --git a/SPEx/spex/conf/linux.json b/SPEx/conf/linux.json similarity index 100% rename from SPEx/spex/conf/linux.json rename to SPEx/conf/linux.json diff --git a/SPEx/spex/conf/loggerconf.json b/SPEx/conf/loggerconf.json similarity index 100% rename from SPEx/spex/conf/loggerconf.json rename to SPEx/conf/loggerconf.json diff --git a/SPEx/spex/conf/spiripacchio.json b/SPEx/conf/spiripacchio.json similarity index 100% rename from SPEx/spex/conf/spiripacchio.json rename to SPEx/conf/spiripacchio.json diff --git a/SPEx/poetry.lock b/SPEx/poetry.lock index f35d8b2..a52fed3 100644 --- a/SPEx/poetry.lock +++ b/SPEx/poetry.lock @@ -49,7 +49,7 @@ description = "A Python utility / library to sort Python imports." name = "isort" optional = false python-versions = ">=3.6,<4.0" -version = "5.5.2" +version = "5.6.3" [package.extras] colors = ["colorama (>=0.4.3,<0.5.0)"] @@ -92,6 +92,14 @@ version = "20.4" pyparsing = ">=2.0.2" six = "*" +[[package]] +category = "main" +description = "parse() is the opposite of format()" +name = "parse" +optional = false +python-versions = "*" +version = "1.18.0" + [[package]] category = "dev" description = "plugin and hook calling mechanisms for python" @@ -140,7 +148,7 @@ description = "Python bindings for the Qt cross platform application toolkit" name = "pyqt5" optional = false python-versions = ">=3.5" -version = "5.15.0" +version = "5.15.1" [package.dependencies] PyQt5-sip = ">=12.8,<13" @@ -230,7 +238,7 @@ python-versions = "*" version = "1.12.1" [metadata] -content-hash = "391a856937ccd31893cc680e0393cf0b980ab89f25c0cf9b46620994d66ab9bf" +content-hash = "e35375126d07552fb1e200007cf6bd02991d90c71eb261f21b33919e77395a58" lock-version = "1.0" python-versions = "^3.8" @@ -252,8 +260,8 @@ colorama = [ {file = "colorama-0.4.3.tar.gz", hash = "sha256:e96da0d330793e2cb9485e9ddfd918d456036c7149416295932478192f4436a1"}, ] isort = [ - {file = "isort-5.5.2-py3-none-any.whl", hash = "sha256:ba91218eee31f1e300ecc079ef0c524cea3fc41bfbb979cbdf5fd3a889e3cfed"}, - {file = "isort-5.5.2.tar.gz", hash = "sha256:171c5f365791073426b5ed3a156c2081a47f88c329161fd28228ff2da4c97ddb"}, + {file = "isort-5.6.3-py3-none-any.whl", hash = "sha256:2c1d044a96c74367ab12188593d134c596747d97aec43b9cdb12eea83b6889d2"}, + {file = "isort-5.6.3.tar.gz", hash = "sha256:3820dd92c3214290cda6351f2ae2cedd5170759bc434af600eaad4f7a82a6ade"}, ] lazy-object-proxy = [ {file = "lazy-object-proxy-1.4.3.tar.gz", hash = "sha256:f3900e8a5de27447acbf900b4750b0ddfd7ec1ea7fbaf11dfa911141bc522af0"}, @@ -290,6 +298,9 @@ packaging = [ {file = "packaging-20.4-py2.py3-none-any.whl", hash = "sha256:998416ba6962ae7fbd6596850b80e17859a5753ba17c32284f67bfff33784181"}, {file = "packaging-20.4.tar.gz", hash = "sha256:4357f74f47b9c12db93624a82154e9b120fa8293699949152b22065d556079f8"}, ] +parse = [ + {file = "parse-1.18.0.tar.gz", hash = "sha256:91666032d6723dc5905248417ef0dc9e4c51df9526aaeef271eacad6491f06a4"}, +] pluggy = [ {file = "pluggy-0.13.1-py2.py3-none-any.whl", hash = "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d"}, {file = "pluggy-0.13.1.tar.gz", hash = "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0"}, @@ -307,11 +318,11 @@ pyparsing = [ {file = "pyparsing-2.4.7.tar.gz", hash = "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1"}, ] pyqt5 = [ - {file = "PyQt5-5.15.0-5.15.0-cp35.cp36.cp37.cp38-abi3-macosx_10_6_intel.whl", hash = "sha256:14be35c0c1bcc804791a096d2ef9950f12c6fd34dd11dbe61b8c769fefcdf98c"}, - {file = "PyQt5-5.15.0-5.15.0-cp35.cp36.cp37.cp38-abi3-manylinux2014_x86_64.whl", hash = "sha256:3605d34ba6291b9194c46035e228d6d01f39d120cf5ecc70301c11e7900fed21"}, - {file = "PyQt5-5.15.0-5.15.0-cp35.cp36.cp37.cp38-none-win32.whl", hash = "sha256:e05c86b8c4f02d62a5b355d426fd8d063781dd44c6a3f916640a5beb40efe60a"}, - {file = "PyQt5-5.15.0-5.15.0-cp35.cp36.cp37.cp38-none-win_amd64.whl", hash = "sha256:5bac0fab1e9891d73400c2470a9cb810e6bdbc7027a84ae4d3ec83436f1109ec"}, - {file = "PyQt5-5.15.0.tar.gz", hash = "sha256:c6f75488ffd5365a65893bc64ea82a6957db126fbfe33654bcd43ae1c30c52f9"}, + {file = "PyQt5-5.15.1-5.15.1-cp35.cp36.cp37.cp38.cp39-abi3-macosx_10_13_intel.whl", hash = "sha256:b9e7cc3ec69f80834f3f7507478c77e4d42411d5e9e557350e61b2660d12abc2"}, + {file = "PyQt5-5.15.1-5.15.1-cp35.cp36.cp37.cp38.cp39-abi3-manylinux2014_x86_64.whl", hash = "sha256:b1ea7e82004dc7b311d1e29df2f276461016e2d180e10c73805ace4376125ed9"}, + {file = "PyQt5-5.15.1-5.15.1-cp35.cp36.cp37.cp38.cp39-none-win32.whl", hash = "sha256:4e47021c2b8e89a3bc64247dfb224144e5c8d77e3ab44f3842d120aab6b3cbd4"}, + {file = "PyQt5-5.15.1-5.15.1-cp35.cp36.cp37.cp38.cp39-none-win_amd64.whl", hash = "sha256:17a6d5258796bae16e447aa3efa00258425c09cf88ef68238762628a5dde7c6f"}, + {file = "PyQt5-5.15.1.tar.gz", hash = "sha256:d9a76b850246d08da9863189ecb98f6c2aa9b4d97a3e85e29330a264aed0f9a1"}, ] pyqt5-sip = [ {file = "PyQt5_sip-12.8.1-cp35-cp35m-macosx_10_6_intel.whl", hash = "sha256:bb5a87b66fc1445915104ee97f7a20a69decb42f52803e3b0795fa17ff88226c"}, diff --git a/SPEx/pyproject.toml b/SPEx/pyproject.toml index c1cf11f..be9f399 100644 --- a/SPEx/pyproject.toml +++ b/SPEx/pyproject.toml @@ -8,6 +8,7 @@ authors = ["Emanuele "] python = "^3.8" PyQt5 = ">=5.15.0" python-slugify = "*" +parse = "*" [tool.poetry.dev-dependencies] pytest = "^5.2" diff --git a/SPEx/spex.egg-info/PKG-INFO b/SPEx/spex.egg-info/PKG-INFO deleted file mode 100644 index 28be18c..0000000 --- a/SPEx/spex.egg-info/PKG-INFO +++ /dev/null @@ -1,11 +0,0 @@ -Metadata-Version: 1.2 -Name: spex -Version: 0.1.0 -Summary: UNKNOWN -Home-page: UNKNOWN -Author: Emanuele -Author-email: ema.trabattoni@gmail.com -License: UNKNOWN -Description: UNKNOWN -Platform: UNKNOWN -Requires-Python: >=3.8,<4.0 diff --git a/SPEx/spex.egg-info/SOURCES.txt b/SPEx/spex.egg-info/SOURCES.txt deleted file mode 100644 index 8f06725..0000000 --- a/SPEx/spex.egg-info/SOURCES.txt +++ /dev/null @@ -1,75 +0,0 @@ -README.rst -setup.py -spex/__init__.py -spex/guimain.py -spex/logo.ico -spex.egg-info/PKG-INFO -spex.egg-info/SOURCES.txt -spex.egg-info/dependency_links.txt -spex.egg-info/requires.txt -spex.egg-info/top_level.txt -spex/UserInterface/about.ui -spex/UserInterface/advopt.ui -spex/UserInterface/avanzatetitolo.ui.no -spex/UserInterface/avanzatetitolo2.ui.no -spex/UserInterface/avanzatetitolo3.ui -spex/UserInterface/mainwindow.ui -spex/UserInterface/selezout.ui -spex/UserInterface/titolow.ui -spex/UserInterface/compiledUI/about.py -spex/UserInterface/compiledUI/advopt.py -spex/UserInterface/compiledUI/avanzatetitolo.py -spex/UserInterface/compiledUI/avanzatetitolo2.py -spex/UserInterface/compiledUI/avanzatetitolo3.py -spex/UserInterface/compiledUI/mainwindow.py -spex/UserInterface/compiledUI/resources_rc.py -spex/UserInterface/compiledUI/selezout.py -spex/UserInterface/compiledUI/titolow.py -spex/UserInterface/resources/resources.qrc -spex/UserInterface/resources/icons/banana.ico -spex/UserInterface/resources/icons/icons8-add-folder-80.png -spex/UserInterface/resources/icons/icons8-arrow-80-back.png -spex/UserInterface/resources/icons/icons8-arrow-80.png -spex/UserInterface/resources/icons/icons8-banana-split-80.png -spex/UserInterface/resources/icons/icons8-documents-folder-80.png -spex/UserInterface/resources/icons/icons8-downloads-folder-80.png -spex/UserInterface/resources/icons/icons8-globe-earth-80.png -spex/UserInterface/resources/icons/icons8-info-80.png -spex/UserInterface/resources/icons/icons8-save-80.png -spex/UserInterface/resources/icons/icons8-smartphone-ram-100.png -spex/UserInterface/resources/icons/icons8-user-manual-80.png -spex/UserInterface/resources/icons/logo.png -spex/UserInterface/resources/icons/logo.svg -spex/UserInterface/resources/icons/logo2.png -spex/UserInterface/resources/icons/logo2.svg -spex/UserInterface/resources/icons/logo3.png -spex/UserInterface/resources/icons/logo3.svg -spex/UserInterface/resources/icons/logo4.png -spex/UserInterface/resources/icons/logo4.svg -spex/UserInterface/resources/translations/about_en.qm -spex/UserInterface/resources/translations/about_en.ts -spex/UserInterface/resources/translations/advopt_en.qm -spex/UserInterface/resources/translations/advopt_en.ts -spex/UserInterface/resources/translations/avanzatetitolo3_en.qm -spex/UserInterface/resources/translations/avanzatetitolo3_en.ts -spex/UserInterface/resources/translations/guimain_en.qm -spex/UserInterface/resources/translations/guimain_en.ts -spex/UserInterface/resources/translations/libconfload_en.qm -spex/UserInterface/resources/translations/libconfload_en.ts -spex/UserInterface/resources/translations/libsplit_en.qm -spex/UserInterface/resources/translations/libsplit_en.ts -spex/UserInterface/resources/translations/mainwindow_en.qm -spex/UserInterface/resources/translations/mainwindow_en.ts -spex/UserInterface/resources/translations/selezout_en.qm -spex/UserInterface/resources/translations/selezout_en.ts -spex/UserInterface/resources/translations/titolow_en.qm -spex/UserInterface/resources/translations/titolow_en.ts -spex/conf/defaults.json -spex/conf/languageconf.json -spex/conf/linux.json -spex/conf/loggerconf.json -spex/conf/spiripacchio.json -spex/libbananasplit/__init__.py -spex/libbananasplit/libconfload.py -spex/libbananasplit/libfancylogger.py -spex/libbananasplit/libsplit.py \ No newline at end of file diff --git a/SPEx/spex.egg-info/dependency_links.txt b/SPEx/spex.egg-info/dependency_links.txt deleted file mode 100644 index 8b13789..0000000 --- a/SPEx/spex.egg-info/dependency_links.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/SPEx/spex.egg-info/requires.txt b/SPEx/spex.egg-info/requires.txt deleted file mode 100644 index b2869b0..0000000 --- a/SPEx/spex.egg-info/requires.txt +++ /dev/null @@ -1,2 +0,0 @@ -PyQt5>=5.15.0 -python-slugify diff --git a/SPEx/spex.egg-info/top_level.txt b/SPEx/spex.egg-info/top_level.txt deleted file mode 100644 index 44d8968..0000000 --- a/SPEx/spex.egg-info/top_level.txt +++ /dev/null @@ -1 +0,0 @@ -spex diff --git a/SPEx/spex/UserInterface/__pycache__/compileUI.cpython-37.pyc b/SPEx/spex/UserInterface/__pycache__/compileUI.cpython-37.pyc deleted file mode 100644 index 6a3d6ad..0000000 Binary files a/SPEx/spex/UserInterface/__pycache__/compileUI.cpython-37.pyc and /dev/null differ diff --git a/SPEx/spex/UserInterface/__pycache__/guis.cpython-37.pyc b/SPEx/spex/UserInterface/__pycache__/guis.cpython-37.pyc deleted file mode 100644 index b05f3d9..0000000 Binary files a/SPEx/spex/UserInterface/__pycache__/guis.cpython-37.pyc and /dev/null differ diff --git a/SPEx/spex/UserInterface/__pycache__/mainwindow.cpython-37.pyc b/SPEx/spex/UserInterface/__pycache__/mainwindow.cpython-37.pyc deleted file mode 100644 index 0a02c2d..0000000 Binary files a/SPEx/spex/UserInterface/__pycache__/mainwindow.cpython-37.pyc and /dev/null differ diff --git a/SPEx/spex/guimain.py b/SPEx/spex/guimain.py index 4b59969..a3bbb9e 100644 --- a/SPEx/spex/guimain.py +++ b/SPEx/spex/guimain.py @@ -6,20 +6,21 @@ TODO LIST 1. rendere threaded lo splitter.. tentativo colore 100.. ''' -import sys, copy, json +import sys, copy, json, os import PyQt5.QtWidgets import PyQt5.QtGui -from mainwindow import Ui_mainwin -from selezout import Ui_selezout -from titolow import Ui_titolo -from avanzatetitolo3 import Ui_advtitolo3 as Ui_advtitolo -from advopt import Ui_editconf -from about import Ui_about -from libfancylogger import fancyLogger -from libconfload import bananaCONF -from libsplit import bananaSPLITTER +from userInterface.compiledUI.mainwindow import Ui_mainwin +from userInterface.compiledUI.selezout import Ui_selezout +from userInterface.compiledUI.titolow import Ui_titolo +from userInterface.compiledUI.avanzatetitolo3 import Ui_advtitolo3 as Ui_advtitolo +from userInterface.compiledUI.advopt import Ui_editconf +from userInterface.compiledUI.about import Ui_about + +from libbananasplit.libfancylogger import fancyLogger +from libbananasplit.libconfload import bananaCONF +from libbananasplit.libsplit import bananaSPLITTER from PyQt5.QtCore import QDir, QSize, QTranslator, pyqtSlot, pyqtSignal from PyQt5.QtWidgets import QMessageBox, QSizePolicy, QInputDialog @@ -581,6 +582,7 @@ if __name__ == '__main__': sys.excepthook = except_hook try: + print(os.getcwd()) LOGGER = fancyLogger(filepath=r"./conf/loggerconf.json",fileLog=False) conf = bananaCONF(workdir=r"./conf", logger=LOGGER) conf.open() diff --git a/SPEx/spex/libbananasplit/__pycache__/libconfload.cpython-37.pyc b/SPEx/spex/libbananasplit/__pycache__/libconfload.cpython-37.pyc deleted file mode 100644 index 8fe9f23..0000000 Binary files a/SPEx/spex/libbananasplit/__pycache__/libconfload.cpython-37.pyc and /dev/null differ diff --git a/SPEx/spex/libbananasplit/__pycache__/libfancylogger.cpython-37.pyc b/SPEx/spex/libbananasplit/__pycache__/libfancylogger.cpython-37.pyc deleted file mode 100644 index 24fe4eb..0000000 Binary files a/SPEx/spex/libbananasplit/__pycache__/libfancylogger.cpython-37.pyc and /dev/null differ diff --git a/SPEx/spex/libbananasplit/__pycache__/libsplit.cpython-37.pyc b/SPEx/spex/libbananasplit/__pycache__/libsplit.cpython-37.pyc deleted file mode 100644 index 587b751..0000000 Binary files a/SPEx/spex/libbananasplit/__pycache__/libsplit.cpython-37.pyc and /dev/null differ diff --git a/SPEx/spex/libbananasplit/libfancylogger.py b/SPEx/spex/libbananasplit/libfancylogger.py index 077b306..80f57a8 100644 --- a/SPEx/spex/libbananasplit/libfancylogger.py +++ b/SPEx/spex/libbananasplit/libfancylogger.py @@ -53,7 +53,7 @@ class fancyLogger(QObject): except IOError as e: print("Impossibile caricare la configurazione del logger: [{}]".format(e)) except Exception as ee: - print(f"libFancylogger error: {e}") + print(f"libFancylogger error: {ee}") pass def debug(self, msg="Undefined Debug"):