diff --git a/bananaSPLIT/banana-split.ico b/bananaSPLIT/banana-split.ico new file mode 100644 index 0000000..4eae052 Binary files /dev/null and b/bananaSPLIT/banana-split.ico differ diff --git a/bananaSPLIT/bananaSPLIT.exe.spec b/bananaSPLIT/bananaSPLIT.exe.spec index d6190bd..4e17cdb 100644 --- a/bananaSPLIT/bananaSPLIT.exe.spec +++ b/bananaSPLIT/bananaSPLIT.exe.spec @@ -1,10 +1,10 @@ -# -*- mode: python -*- +# -*- mode: python ; coding: utf-8 -*- block_cipher = None a = Analysis(['guimain.py'], - pathex=['D:\\Emanuele\\Documenti\\workspace\\bananaSPLIT\\bananaSPLIT'], + pathex=['./libbananasplit', './UserInterface/CompiledUI', 'D:\\Emanuele\\Documenti\\workspace\\bananaSPLIT\\bananaSPLIT'], binaries=[], datas=[('C:\\Users\\Emanuele Trabattoni\\AppData\\Roaming\\Python\\Python37\\site-packages\\text_unidecode\\data.bin', '.\\text_unidecode')], hiddenimports=[], @@ -28,5 +28,6 @@ exe = EXE(pyz, bootloader_ignore_signals=False, strip=False, upx=True, + upx_exclude=[], runtime_tmpdir=None, - console=True , icon='banana.ico') + console=True , icon='banana-split.ico') diff --git a/bananaSPLIT/conf/defaults.json b/bananaSPLIT/conf/defaults.json index 766f158..5be872f 100644 --- a/bananaSPLIT/conf/defaults.json +++ b/bananaSPLIT/conf/defaults.json @@ -1,7 +1,7 @@ { "version": "v1.2", "paths": { - "lastUsed": "defaults.json", + "lastUsed": "spiripacchio.json", "configurationPath": "./conf/", "INworkPath": "C:/", "OUTworkPath": "C:/", diff --git a/bananaSPLIT/conf/spiripacchio.json b/bananaSPLIT/conf/spiripacchio.json index 66a0d74..b88fe7b 100644 --- a/bananaSPLIT/conf/spiripacchio.json +++ b/bananaSPLIT/conf/spiripacchio.json @@ -3,13 +3,11 @@ "paths": { "lastUsed": "spiripacchio.json", "configurationPath": "./conf/", - "INworkPath": "D:/Test", - "OUTworkPath": "C:/", + "INworkPath": "D:/Emanuele/Documenti/workspace/bananaSPLIT/TestFiles/FileBastardi", + "OUTworkPath": "H:/", "fileList": [ - "config.txt", - "GUARDIAN.txt", - "interrupts.txt", - "tlsdebug.txt" + "Files(100)(1).txt", + "Files(100)(2).txt" ] }, "docStruct": { diff --git a/bananaSPLIT/dist/bananaSPLIT.exe b/bananaSPLIT/dist/bananaSPLIT.exe deleted file mode 100644 index 45aeec1..0000000 Binary files a/bananaSPLIT/dist/bananaSPLIT.exe and /dev/null differ diff --git a/bananaSPLIT/dist/bananaconfEN.json b/bananaSPLIT/dist/bananaconfEN.json deleted file mode 100644 index 282714e..0000000 --- a/bananaSPLIT/dist/bananaconfEN.json +++ /dev/null @@ -1,64 +0,0 @@ -{ - "INworkPath": "D:\\Test\\", - "OUTworkPath": "D:\\Test\\Separati\\", - "OUTnameFormat":"TEST_{docnum}_{year:04d}{month:02d}{day:02d}_{title}.txt", - "docStruct": { - "docSep": "\\s*Copyright [(0-9)]+", - "dateFormat":"{month} {day:d}, {year:d}{}", - "dateWords": [ - "January", - "February", - "March", - "April", - "May", - "June", - "July", - "August", - "September", - "October", - "November", - "December" - ], - "headWords": [ - "BYLINE:", - "SECTION:", - "LENGTH:", - "DATELINE:", - "HIGHLIGHT:", - "Email:" - ], - "tailWords": [ - "Newstex ID" , - "NOTES", - "LANGUAGE:", - "GRAPHIC:", - "TYPE:", - "URL:", - "LOAD-DATE:", - "PUBLICATION-TYPE:", - "DOCUMENT-TYPE:", - "CHARTS:", - "JOURNAL-CODE:" - ] - }, - "settings": { - "encoding": "utf-8", - "monthPosition": 0, - "getNewsPaperName": true, - "nameNotFoundStr" : "--ND--", - "includeTitle" : true, - "removeDuplicates": true, - "showSkipped": false, - "showRemovedDuplicates": true, - "maxTitleLen": 32, - "loadTXT": true, - "loadDOCX": false, - "removeOldFiles":true, - "saveSeparateFiles": true, - "saveBodyFile": true, - "saveBodyNumber":true, - "delLF": false, - "delWordBreak": true, - "delChars": "'|@|#" - } -} diff --git a/bananaSPLIT/dist/bananaconfITA.json b/bananaSPLIT/dist/bananaconfITA.json deleted file mode 100644 index b6457d8..0000000 --- a/bananaSPLIT/dist/bananaconfITA.json +++ /dev/null @@ -1,61 +0,0 @@ -{ - "INworkPath": "C:\\Test\\", - "OUTworkPath": "C:\\Test\\Separati\\", - "OUTnameFormat":"TEST_{docnum}_{year:04d}{month:02d}{day:02d}_{papername}_{title}.txt", - "docStruct": { - "docSep": "Copyright [(0-9)]+", - "dateFormat":"{day:d} {month} {year:d} {}", - "dateWords": [ - "Gennaio", - "Febbraio", - "Marzo", - "Aprile", - "Maggio", - "Giugno", - "Luglio", - "Agosto", - "Settembre", - "Ottobre", - "Novembre", - "Dicembre" - ], - "headWords": [ - "BYLINE:", - "SECTION:", - "LENGTH:", - "DATELINE:", - "HIGHLIGHT:", - "Email:" - ], - "tailWords": [ - "LANGUAGE:", - "GRAPHIC:", - "TYPE:", - "URL:", - "LOAD-DATE:", - "PUBLICATION-TYPE:", - "DOCUMENT-TYPE:", - "CHARTS:" - ] - }, - "settings": { - "encoding": "utf-8", - "monthPosition": 0, - "getNewsPaperName": true, - "nameNotFoundStr" : "--ND--", - "includeTitle" : true, - "removeDuplicates": true, - "showSkipped": false, - "showRemovedDuplicates": true, - "maxTitleLen": 32, - "loadTXT": true, - "loadDOCX": false, - "removeOldFiles":true, - "saveSeparateFiles": true, - "saveBodyFile": true, - "saveBodyNumber":true, - "delLF": false, - "delWordBreak": true, - "delChars": "'|@|#" - } -} diff --git a/bananaSPLIT/guimain.py b/bananaSPLIT/guimain.py index 421a1ac..9e42ca2 100644 --- a/bananaSPLIT/guimain.py +++ b/bananaSPLIT/guimain.py @@ -3,8 +3,6 @@ Created on 2 nov 2019 @author: Emanuele Trabattoni TODO LIST -1- Aggiungere le icone ai tasti (giulia) - ''' import sys, copy, json import PyQt5.QtWidgets diff --git a/bananaSPLIT/guimain.spec b/bananaSPLIT/guimain.spec new file mode 100644 index 0000000..3d45dd0 --- /dev/null +++ b/bananaSPLIT/guimain.spec @@ -0,0 +1,37 @@ +# -*- mode: python ; coding: utf-8 -*- + +block_cipher = None + + +a = Analysis(['guimain.py'], + pathex=['./libbananasplit', './UserInterface/CompiledUI--name=bananaSPLIT.exe', 'D:\\Emanuele\\Documenti\\workspace\\bananaSPLIT\\bananaSPLIT'], + binaries=[], + datas=[('C:\\Users\\Emanuele Trabattoni\\AppData\\Roaming\\Python\\Python37\\site-packages\\text_unidecode\\data.bin', '.\\text_unidecode')], + hiddenimports=[], + hookspath=[], + runtime_hooks=[], + excludes=[], + win_no_prefer_redirects=False, + win_private_assemblies=False, + cipher=block_cipher, + noarchive=False) +pyz = PYZ(a.pure, a.zipped_data, + cipher=block_cipher) +exe = EXE(pyz, + a.scripts, + [], + exclude_binaries=True, + name='guimain', + debug=False, + bootloader_ignore_signals=False, + strip=False, + upx=True, + console=True , icon='banana.ico') +coll = COLLECT(exe, + a.binaries, + a.zipfiles, + a.datas, + strip=False, + upx=True, + upx_exclude=[], + name='guimain')