diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index c30e46c..0000000 Binary files a/.DS_Store and /dev/null differ diff --git a/.gitignore b/.gitignore index d3dc25c..ca45b59 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ TestFiles __pycache__ .vscode .venv +*.zip diff --git a/MacBuild/README.txt b/MacBuild/README.txt new file mode 100644 index 0000000..5953fed --- /dev/null +++ b/MacBuild/README.txt @@ -0,0 +1 @@ +Prima di aprire il programma copiare la cartella conf nella home del proprio utente. \ No newline at end of file diff --git a/MacBuild/SPEx b/MacBuild/SPEx new file mode 100644 index 0000000..65ba311 Binary files /dev/null and b/MacBuild/SPEx differ diff --git a/MacBuild/conf/defaults.json b/MacBuild/conf/defaults.json new file mode 100644 index 0000000..a0da5f1 --- /dev/null +++ b/MacBuild/conf/defaults.json @@ -0,0 +1,69 @@ +{ + "version": "v1.42", + "paths": { + "lastUsed": "defaults.json", + "configurationPath": "./conf/", + "INworkPath": "C://", + "OUTworkPath": "C://", + "fileList": [ + ] + }, + "docStruct": { + "fileVersNew": false, + "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": { + "uiLang": "en", + "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/MacBuild/conf/languageconf.json b/MacBuild/conf/languageconf.json new file mode 100644 index 0000000..99c89d8 --- /dev/null +++ b/MacBuild/conf/languageconf.json @@ -0,0 +1,76 @@ +{ + "Italiano": { + "dateWords": [ + "Gennaio", + "Febbraio", + "Marzo", + "Aprile", + "Maggio", + "Giugno", + "Luglio", + "Agosto", + "Settembre", + "Ottobre", + "Novembre", + "Dicembre" + ], + "headWords": [ + "BYLINE:", + "SECTION:", + "LENGTH:", + "DATELINE:", + "HIGHLIGHT:", + "Email:" + ], + "tailWords": [ + "Newstex ID:", + "NOTES:", + "LANGUAGE:", + "GRAPHIC:", + "TYPE:", + "URL:", + "LOAD-DATE:", + "PUBLICATION-TYPE:", + "DOCUMENT-TYPE:", + "CHARTS:", + "JOURNAL-CODE:" + ] + }, + "English": { + "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:" + ] + } +} diff --git a/MacBuild/conf/linux.json b/MacBuild/conf/linux.json new file mode 100644 index 0000000..00ef358 --- /dev/null +++ b/MacBuild/conf/linux.json @@ -0,0 +1,67 @@ +{ + "version": "v1.42", + "paths": { + "lastUsed": "linux.json", + "configurationPath": "./conf/", + "INworkPath": "/home/", + "OUTworkPath": "/home/", + "fileList": [] + }, + "docStruct": { + "fileVersNew": false, + "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/MacBuild/conf/loggerconf.json b/MacBuild/conf/loggerconf.json new file mode 100644 index 0000000..90103a9 --- /dev/null +++ b/MacBuild/conf/loggerconf.json @@ -0,0 +1,5 @@ +{ + "logFile": "./SPEx.log", + "logFormat": "%(asctime)s|%(levelname)-8s| %(message)-50s", + "logTimeFormat": "%m-%d %H:%M:%S" +} diff --git a/SPEx/scripts/SPEx.exe.spec b/SPEx/scripts/SPEx.exe.spec index 917dd43..82cc6d3 100644 --- a/SPEx/scripts/SPEx.exe.spec +++ b/SPEx/scripts/SPEx.exe.spec @@ -3,10 +3,10 @@ block_cipher = None -a = Analysis(['../spex/guimain.py'], - pathex=['./libbananasplit', './UserInterface/compiledUI', '/home/emanuele/VScode/bananaSPLIT/SPEx/scripts'], +a = Analysis(['..\\spex\\guimain.py'], + pathex=['./libbananasplit', './UserInterface/compiledUI', 'D:\\Emanuele\\Documenti\\VScode\\bananaSPLIT\\SPEx\\scripts'], binaries=[], - datas=[('../.venv/lib/python3.8/site-packages/text_unidecode/data.bin', './text_unidecode')], + datas=[('..\\.venv\\Lib\\site-packages\\text_unidecode\\data.bin', '.\\text_unidecode')], hiddenimports=[], hookspath=[], runtime_hooks=[], @@ -30,4 +30,4 @@ exe = EXE(pyz, upx=True, upx_exclude=[], runtime_tmpdir=None, - console=False , icon='../spex/logo.ico') + console=False , icon='..\\spex\\logo.ico') diff --git a/TuxBuild/SPEx b/TuxBuild/SPEx index a0ed5a1..2941801 100755 Binary files a/TuxBuild/SPEx and b/TuxBuild/SPEx differ diff --git a/TuxBuild/conf/defaults.json b/TuxBuild/conf/defaults.json index e9e4504..a0da5f1 100644 --- a/TuxBuild/conf/defaults.json +++ b/TuxBuild/conf/defaults.json @@ -1,70 +1,69 @@ -{ - "version": "v1.41", - "paths": { - "lastUsed": "defaults.json", - "configurationPath": "./conf/", - "INworkPath": "C://", - "OUTworkPath": "C://", - "fileList": [ - "bdlog.txt" - ] - }, - "docStruct": { - "fileVersNew": false, - "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": { - "uiLang": "en", - "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": [ - "'", - "@", - "#", - "$", - "%", - "^", - "&" - ] - } +{ + "version": "v1.42", + "paths": { + "lastUsed": "defaults.json", + "configurationPath": "./conf/", + "INworkPath": "C://", + "OUTworkPath": "C://", + "fileList": [ + ] + }, + "docStruct": { + "fileVersNew": false, + "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": { + "uiLang": "en", + "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/TuxBuild/conf/languageconf.json b/TuxBuild/conf/languageconf.json index 5b1457d..99c89d8 100644 --- a/TuxBuild/conf/languageconf.json +++ b/TuxBuild/conf/languageconf.json @@ -1,76 +1,76 @@ -{ - "Italiano": { - "dateWords": [ - "Gennaio", - "Febbraio", - "Marzo", - "Aprile", - "Maggio", - "Giugno", - "Luglio", - "Agosto", - "Settembre", - "Ottobre", - "Novembre", - "Dicembre" - ], - "headWords": [ - "BYLINE:", - "SECTION:", - "LENGTH:", - "DATELINE:", - "HIGHLIGHT:", - "Email:" - ], - "tailWords": [ - "Newstex ID:", - "NOTES:", - "LANGUAGE:", - "GRAPHIC:", - "TYPE:", - "URL:", - "LOAD-DATE:", - "PUBLICATION-TYPE:", - "DOCUMENT-TYPE:", - "CHARTS:", - "JOURNAL-CODE:" - ] - }, - "English": { - "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:" - ] - } -} +{ + "Italiano": { + "dateWords": [ + "Gennaio", + "Febbraio", + "Marzo", + "Aprile", + "Maggio", + "Giugno", + "Luglio", + "Agosto", + "Settembre", + "Ottobre", + "Novembre", + "Dicembre" + ], + "headWords": [ + "BYLINE:", + "SECTION:", + "LENGTH:", + "DATELINE:", + "HIGHLIGHT:", + "Email:" + ], + "tailWords": [ + "Newstex ID:", + "NOTES:", + "LANGUAGE:", + "GRAPHIC:", + "TYPE:", + "URL:", + "LOAD-DATE:", + "PUBLICATION-TYPE:", + "DOCUMENT-TYPE:", + "CHARTS:", + "JOURNAL-CODE:" + ] + }, + "English": { + "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:" + ] + } +} diff --git a/TuxBuild/conf/linux.json b/TuxBuild/conf/linux.json index d3cff84..00ef358 100644 --- a/TuxBuild/conf/linux.json +++ b/TuxBuild/conf/linux.json @@ -1,5 +1,5 @@ { - "version": "v1.3", + "version": "v1.42", "paths": { "lastUsed": "linux.json", "configurationPath": "./conf/", diff --git a/TuxBuild/conf/loggerconf.json b/TuxBuild/conf/loggerconf.json index 51b10ab..90103a9 100644 --- a/TuxBuild/conf/loggerconf.json +++ b/TuxBuild/conf/loggerconf.json @@ -1,5 +1,5 @@ -{ - "logFile": "D:\\Test\\bananaSPLIT.log", - "logFormat": "%(asctime)s|%(levelname)-8s| %(message)-50s", - "logTimeFormat": "%m-%d %H:%M:%S" -} +{ + "logFile": "./SPEx.log", + "logFormat": "%(asctime)s|%(levelname)-8s| %(message)-50s", + "logTimeFormat": "%m-%d %H:%M:%S" +} diff --git a/TuxBuild/logo.ico b/TuxBuild/logo.png similarity index 97% rename from TuxBuild/logo.ico rename to TuxBuild/logo.png index f12b602..31f7ded 100644 Binary files a/TuxBuild/logo.ico and b/TuxBuild/logo.png differ diff --git a/WinBuild/SPEx.exe b/WinBuild/SPEx.exe index f0b3e0f..7317f89 100644 Binary files a/WinBuild/SPEx.exe and b/WinBuild/SPEx.exe differ diff --git a/WinBuild/conf/defaults.json b/WinBuild/conf/defaults.json index e9e4504..f4e20c1 100644 --- a/WinBuild/conf/defaults.json +++ b/WinBuild/conf/defaults.json @@ -1,12 +1,11 @@ { - "version": "v1.41", + "version": "v1.42", "paths": { "lastUsed": "defaults.json", "configurationPath": "./conf/", "INworkPath": "C://", "OUTworkPath": "C://", "fileList": [ - "bdlog.txt" ] }, "docStruct": { diff --git a/WinBuild/conf/linux.json b/WinBuild/conf/linux.json index d3cff84..00ef358 100644 --- a/WinBuild/conf/linux.json +++ b/WinBuild/conf/linux.json @@ -1,5 +1,5 @@ { - "version": "v1.3", + "version": "v1.42", "paths": { "lastUsed": "linux.json", "configurationPath": "./conf/", diff --git a/WinBuild/conf/loggerconf.json b/WinBuild/conf/loggerconf.json index 51b10ab..b5333ea 100644 --- a/WinBuild/conf/loggerconf.json +++ b/WinBuild/conf/loggerconf.json @@ -1,5 +1,5 @@ { - "logFile": "D:\\Test\\bananaSPLIT.log", + "logFile": "./SPEx.log", "logFormat": "%(asctime)s|%(levelname)-8s| %(message)-50s", "logTimeFormat": "%m-%d %H:%M:%S" }