versione 1.42

rilascio per versione 1.42
aggiunto logo mac
2020-10-23 23:26:21 +02:00 · 2020-10-23 21:23:41 +02:00 · 2020-10-23 16:54:16 +02:00
23 changed files with 394 additions and 169 deletions
--- a/.DS_Store
+++ b/.DS_Store
--- a/MacBuild/SPEx
+++ b/MacBuild/SPEx
--- a/MacBuild/conf/defaults.json
+++ 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": [
+			"'",
+			"@",
+			"#",
+			"$",
+			"%",
+			"^",
+			"&"
+		]
+	}
+}
--- a/MacBuild/conf/languageconf.json
+++ 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:"
+		]
+	}
+}
--- a/MacBuild/conf/linux.json
+++ 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": [
+			"'",
+			"@",
+			"#",
+			"$",
+			"%",
+			"^",
+			"&"
+		]
+	}
+}
--- a/MacBuild/conf/loggerconf.json
+++ 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"
+}
--- a/SPEx/conf/defaults.json
+++ b/SPEx/conf/defaults.json
@@ -1,5 +1,5 @@
 {
-	"version": "v1.41",
+	"version": "v1.42",
 	"paths": {
 		"lastUsed": "defaults.json",
 		"configurationPath": "./conf/",
--- a/SPEx/conf/linux.json
+++ b/SPEx/conf/linux.json
@@ -1,5 +1,5 @@
 {
-	"version": "v1.3",
+	"version": "v1.42",
 	"paths": {
 		"lastUsed": "linux.json",
 		"configurationPath": "./conf/",
--- a/SPEx/conf/loggerconf.json
+++ b/SPEx/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"
 }
--- 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')
--- a/SPEx/scripts/create_SPEX.zsh
+++ b/SPEx/scripts/create_SPEX.zsh
@@ -1,16 +1,25 @@
 #!/bin/zsh
+echo "Rimuovo i file precedenti"
+rm -rf ../bin/*

-pyinstaller --add-data="../.venv/lib/python3.8/site-packages/text_unidecode/data.bin":./text_unidecode \
-                --icon="../spex/logo.ico" \
+pyinstaller --add-data="../.venv/lib/python3.7/site-packages/text_unidecode/data.bin":./text_unidecode \
+                --icon="../spex/logo.icns" \
+                --noconfirm \
                --paths ./libbananasplit --paths ./UserInterface/compiledUI \
-                --name=SPEx  \
+                --name=SPEx \
                --onefile \
-                --windowed -y \
+                --windowed \
+                --osx-bundle-identifier="12parsec.software.SPEx" \
                ../spex/guimain.py 

 echo "Copio configurazione"
+cp -r ../conf ./dist/SPEx.app/Contents/MacOS/conf/
 cp -r ../conf ./dist/
 echo "Copio file binari"
-mv ./dist/ ../bin
+mv ./dist/ ../bin/
 echo "Rinuovo cartella build"
 rm -rf ./build
+echo "Firmo il codice"
+cd ../bin/dist
+#codesign --deep -s "12Parsec" SPEx.app
+#codesign --deep -s "12Parsec" SPEx
--- a/SPEx/spex/guimain.py
+++ b/SPEx/spex/guimain.py
@@ -622,8 +622,9 @@ if __name__ == '__main__':
    sys.excepthook = except_hook

    try:
-        print(f"Running directory {os.environ['WORKSPACELOC']}")
-        print(f"Pythonpath: {os.environ['PYTHONPATH']}")
+        #print(f"Running directory {os.environ['WORKSPACELOC']}")
+        #print(f"Pythonpath: {os.environ['PYTHONPATH']}")
+        print("LAUNCHDIR:", os.getcwd())
        LOGGER = fancyLogger(filepath=r"./conf/loggerconf.json", fileLog=False)
        conf = bananaCONF(workdir=r"./conf", logger=LOGGER)
        conf.open()
--- a/SPEx/spex/logo.icns
+++ b/SPEx/spex/logo.icns
--- a/TuxBuild/SPEx
+++ b/TuxBuild/SPEx
--- 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": [
+			"'",
+			"@",
+			"#",
+			"$",
+			"%",
+			"^",
+			"&"
+		]
+	}
 }
--- 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:"
+		]
+	}
+}
--- 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/",
--- 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"
+}
--- a/TuxBuild/logo.png
+++ b/TuxBuild/logo.png
--- a/WinBuild/SPEx.exe
+++ b/WinBuild/SPEx.exe
--- 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": {
--- 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/",
--- 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"
 }
Author	SHA1	Message	Date
Emanuele	94b83284e0	versione 1.42	2020-10-23 23:26:21 +02:00
Emanuele	977feb6722	rilascio per versione 1.42	2020-10-23 21:23:41 +02:00
Emanuele	b97b9f9855	aggiunto logo mac	2020-10-23 16:54:16 +02:00