diff --git a/SPEx/conf/defaults.json b/SPEx/conf/defaults.json index 050778f..0d00d0d 100644 --- a/SPEx/conf/defaults.json +++ b/SPEx/conf/defaults.json @@ -6,7 +6,6 @@ "INworkPath": "C://", "OUTworkPath": "C://", "fileList": [ - "bdlog.txt" ] }, "docStruct": { diff --git a/SPEx/conf/spiripacchio.json b/SPEx/conf/spiripacchio.json deleted file mode 100644 index 3546491..0000000 --- a/SPEx/conf/spiripacchio.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "version": "v1.3", - "paths": { - "lastUsed": "spiripacchio.json", - "configurationPath": "./conf/", - "INworkPath": "D:/Emanuele/Documenti/workspace/bananaSPLIT/TestFiles/FileBastardi", - "OUTworkPath": "H:/", - "fileList": [] - }, - "docStruct": { - "fileVersNew": true, - "language": "English", - "languageIdx": 1, - "docSep": "\\s*Copyright [(0-9)]+", - "beginOfDocument": "\\s*Body", - "endOfDocument": "\\s*End of Document", - "dateFormat": "{month} {day:d}, {year:d}{}", - "outPrefix": "", - "outSuffix": "", - "outExt": ".txt", - "outDateType": "jpn", - "outNameFormat": "", - "outDate": true, - "outTitle": true, - "outNumber": true, - "numberPos": 1, - "datePos": 2, - "titlePos": 3, - "maxTitleLen": 16, - "outNameSep": "-", - "customSep": "=", - "dateFormats": { - "jpn": "{year:04d}{month:02d}{day:02d}", - "it": "{day:02d}{month:02d}{year:04d}", - "usa": "{month:02d}{year:04d}{day:02d}" - } - }, - "settings": { - "winW": 800, - "winH": 700, - "encoding": "windows-1252", - "monthPosition": 0, - "getNewsPaperName": true, - "nameNotFoundStr": "ND", - "includeTitle": true, - "removeDuplicates": true, - "showSkipped": false, - "showRemovedDuplicates": false, - "loadTXT": true, - "loadDOCX": false, - "removeOldFiles": true, - "saveSeparateFiles": true, - "saveBodyFile": true, - "saveBodyNumber": true, - "delLF": false, - "delWordBreak": true, - "delChars": [ - "'", - "@", - "#", - "$", - "%", - "^", - "&" - ] - } -} \ No newline at end of file diff --git a/scripts/compileUI.py b/SPEx/scripts/compileUI.py similarity index 62% rename from scripts/compileUI.py rename to SPEx/scripts/compileUI.py index 7f93c74..0e1ad2b 100644 --- a/scripts/compileUI.py +++ b/SPEx/scripts/compileUI.py @@ -11,23 +11,27 @@ def updateInterfaces(): command = r"pyuic5.exe "+f print(command) rv = subprocess.run(command, capture_output=True) - fp = open(r".\\CompiledUI\\"+f.replace("ui","py"), 'w') - fp.write(str(rv.stdout, encoding='utf-8').replace('\r', '')) - fp.close() + if rv.returncode == 0: + fp = open(r".\\CompiledUI\\"+f.replace("ui","py"), 'w') + fp.write(str(rv.stdout, encoding='utf-8').replace('\r', '')) + fp.close() + else: + print("Command Failure") def updateResources(): command = r'pyrcc5.exe '+'.\\resources\\resources.qrc' print (command) rv = subprocess.run(command, capture_output=True) - fp = open(r".\\compiledUI\\resources_rc.py", 'w') - fp.write(str(rv.stdout, encoding='utf-8').replace('\r', '')) - fp.close() + if rv.returncode == 0: + fp = open(r".\\compiledUI\\resources_rc.py", 'w') + fp.write(str(rv.stdout, encoding='utf-8').replace('\r', '')) + fp.close() + else: + print("Command Failure") if __name__ == '__main__': - os.chdir("..\\UserInterface") print(os.getcwd()) + os.chdir(r"..\spex\userInterface") updateInterfaces() updateResources() - - pass \ No newline at end of file diff --git a/scripts/convert.py b/SPEx/scripts/convert.py similarity index 100% rename from scripts/convert.py rename to SPEx/scripts/convert.py diff --git a/scripts/libtestmain.py b/SPEx/scripts/libtestmain.py similarity index 100% rename from scripts/libtestmain.py rename to SPEx/scripts/libtestmain.py diff --git a/scripts/releaseLanguages.py b/SPEx/scripts/releaseLanguages.py similarity index 53% rename from scripts/releaseLanguages.py rename to SPEx/scripts/releaseLanguages.py index c34c8c8..a3aeb7f 100644 --- a/scripts/releaseLanguages.py +++ b/SPEx/scripts/releaseLanguages.py @@ -5,14 +5,11 @@ Created on 10 apr 2020 ''' import os,glob import subprocess -from bananaSPLIT.scripts.compileUI import updateResources if __name__ == '__main__': tsfiles = glob.glob("..\\UserInterface\\resources\\translations\\*.ts") for ts in tsfiles: - tso = "..\\UserInterface\\resources\\translations\\"+os.path.splitext((os.path.split(ts)[1]))[0]+".qm" + tso = "..\\SPEx\\userInterface\\resources\\translations\\"+os.path.splitext((os.path.split(ts)[1]))[0]+".qm" subprocess.run(f'lrelease.exe {ts} -qm {tso}') - os.chdir("..\\UserInterface") - #print(os.getcwd()) - #updateResources() + os.chdir("..\\SPEx\\userInterface") pass \ No newline at end of file diff --git a/scripts/updateLanguages.py b/SPEx/scripts/updateLanguages.py similarity index 50% rename from scripts/updateLanguages.py rename to SPEx/scripts/updateLanguages.py index 93611d4..84600cd 100644 --- a/scripts/updateLanguages.py +++ b/SPEx/scripts/updateLanguages.py @@ -9,12 +9,12 @@ langs = ["en"] if __name__ == '__main__': uifiles = glob.glob("..\\*\\*.ui", recursive=True) - pyfiles = ['..\\guimain.py','..\\libbananasplit\\libsplit.py','..\\libbananasplit\\libconfload.py'] + pyfiles = ['..\\SPEx\\guimain.py','..\\SPEx\\libbananasplit\\libsplit.py','..\\SPEx\\libbananasplit\\libconfload.py'] for l in langs: for ui in uifiles: - uio = "..\\UserInterface\\resources\\translations\\"+os.path.splitext((os.path.split(ui)[1]))[0]+f"_{l}.ts" + uio = "..\\SPEx\\userInterface\\resources\\translations\\"+os.path.splitext((os.path.split(ui)[1]))[0]+f"_{l}.ts" subprocess.run(f'lupdate.exe {ui} -ts {uio}') for py in pyfiles: - pyo = "..\\UserInterface\\resources\\translations\\"+os.path.splitext((os.path.split(py)[1]))[0]+f"_{l}.ts" + pyo = "..\\SPEx\\userInterface\\resources\\translations\\"+os.path.splitext((os.path.split(py)[1]))[0]+f"_{l}.ts" print(subprocess.run(f'pylupdate5.exe {py} -ts {pyo}')) pass \ No newline at end of file diff --git a/scripts/__pycache__/compileUI.cpython-37.pyc b/scripts/__pycache__/compileUI.cpython-37.pyc deleted file mode 100644 index 16f596e..0000000 Binary files a/scripts/__pycache__/compileUI.cpython-37.pyc and /dev/null differ diff --git a/scripts/__pycache__/releaseLanguages.cpython-37.pyc b/scripts/__pycache__/releaseLanguages.cpython-37.pyc deleted file mode 100644 index 399c58b..0000000 Binary files a/scripts/__pycache__/releaseLanguages.cpython-37.pyc and /dev/null differ diff --git a/scripts/__pycache__/updateLanguages.cpython-37.pyc b/scripts/__pycache__/updateLanguages.cpython-37.pyc deleted file mode 100644 index 2aefd1b..0000000 Binary files a/scripts/__pycache__/updateLanguages.cpython-37.pyc and /dev/null differ