12Parsec/bananaSPLIT
3
0
Fork 0
Code Issues Releases Wiki Activity

Compare commits

base: 12Parsec:b69303b5431f7ccde1233f54b632988f3b04a277
Branches Tags
12Parsec:gui-devel 12Parsec:code-gui-devel 12Parsec:lib-devel 12Parsec:master
12Parsec:v1.42_macOS 12Parsec:v1.42_All 12Parsec:v1.41_Linux64 12Parsec:v1.41_Win64 12Parsec:v1.3b_Linux64 12Parsec:v1.3b_Win64 12Parsec:v1.3b-Linux 12Parsec:v1.3b-Windows 12Parsec:v0.4b 12Parsec:v0.4a
...
compare: 12Parsec:v1.42_All
Branches Tags
12Parsec:code-gui-devel 12Parsec:gui-devel 12Parsec:lib-devel 12Parsec:master
12Parsec:v1.42_macOS 12Parsec:v1.42_All 12Parsec:v1.41_Linux64 12Parsec:v1.41_Win64 12Parsec:v1.3b_Linux64 12Parsec:v1.3b_Win64 12Parsec:v1.3b-Linux 12Parsec:v1.3b-Windows 12Parsec:v0.4b 12Parsec:v0.4a

3 Commits
b69303b543 ... v1.42_All

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
23 changed files with 394 additions and 169 deletions
Expand all files Collapse all files

BIN
.DS_Store vendored
View File

Binary file not shown.

BIN
MacBuild/SPEx Normal file
View File

Binary file not shown.

69
MacBuild/conf/defaults.json Normal file
View File

@@ -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": [
"'",
"@",
"#",
"$",
"%",
"^",
"&"
]
}
}

76
MacBuild/conf/languageconf.json Normal file
View File

@@ -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:"
]
}
}

67
MacBuild/conf/linux.json Normal file
View File

@@ -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": [
"'",
"@",
"#",
"$",
"%",
"^",
"&"
]
}
}

5
MacBuild/conf/loggerconf.json Normal file
View File

@@ -0,0 +1,5 @@
{
"logFile": "./SPEx.log",
"logFormat": "%(asctime)s|%(levelname)-8s| %(message)-50s",
"logTimeFormat": "%m-%d %H:%M:%S"
}

2
SPEx/conf/defaults.json
View File

@@ -1,5 +1,5 @@
{ {
"version": "v1.41", "version": "v1.42",
"paths": { "paths": {
"lastUsed": "defaults.json", "lastUsed": "defaults.json",
"configurationPath": "./conf/", "configurationPath": "./conf/",

2
SPEx/conf/linux.json
View File

@@ -1,5 +1,5 @@
{ {
"version": "v1.3", "version": "v1.42",
"paths": { "paths": {
"lastUsed": "linux.json", "lastUsed": "linux.json",
"configurationPath": "./conf/", "configurationPath": "./conf/",

2
SPEx/conf/loggerconf.json
View File

@@ -1,5 +1,5 @@
{ {
"logFile": "D:\\Test\\bananaSPLIT.log", "logFile": "./SPEx.log",
"logFormat": "%(asctime)s|%(levelname)-8s| %(message)-50s", "logFormat": "%(asctime)s|%(levelname)-8s| %(message)-50s",
"logTimeFormat": "%m-%d %H:%M:%S" "logTimeFormat": "%m-%d %H:%M:%S"
} }

8
SPEx/scripts/SPEx.exe.spec
View File

@@ -3,10 +3,10 @@
block_cipher = None block_cipher = None
a = Analysis(['../spex/guimain.py'], a = Analysis(['..\\spex\\guimain.py'],
pathex=['./libbananasplit', './UserInterface/compiledUI', '/home/emanuele/VScode/bananaSPLIT/SPEx/scripts'], pathex=['./libbananasplit', './UserInterface/compiledUI', 'D:\\Emanuele\\Documenti\\VScode\\bananaSPLIT\\SPEx\\scripts'],
binaries=[], 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=[], hiddenimports=[],
hookspath=[], hookspath=[],
runtime_hooks=[], runtime_hooks=[],
@@ -30,4 +30,4 @@ exe = EXE(pyz,
upx=True, upx=True,
upx_exclude=[], upx_exclude=[],
runtime_tmpdir=None, runtime_tmpdir=None,
console=False , icon='../spex/logo.ico') console=False , icon='..\\spex\\logo.ico')

19
SPEx/scripts/create_SPEX.zsh
View File

@@ -1,16 +1,25 @@
#!/bin/zsh #!/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 \ pyinstaller --add-data="../.venv/lib/python3.7/site-packages/text_unidecode/data.bin":./text_unidecode \
--icon="../spex/logo.ico" \ --icon="../spex/logo.icns" \
--noconfirm \
--paths ./libbananasplit --paths ./UserInterface/compiledUI \ --paths ./libbananasplit --paths ./UserInterface/compiledUI \
--name=SPEx \ --name=SPEx \
--onefile \ --onefile \
--windowed -y \ --windowed \
--osx-bundle-identifier="12parsec.software.SPEx" \
../spex/guimain.py ../spex/guimain.py
echo "Copio configurazione" echo "Copio configurazione"
cp -r ../conf ./dist/SPEx.app/Contents/MacOS/conf/
cp -r ../conf ./dist/ cp -r ../conf ./dist/
echo "Copio file binari" echo "Copio file binari"
mv ./dist/ ../bin mv ./dist/ ../bin/
echo "Rinuovo cartella build" echo "Rinuovo cartella build"
rm -rf ./build rm -rf ./build
echo "Firmo il codice"
cd ../bin/dist
#codesign --deep -s "12Parsec" SPEx.app
#codesign --deep -s "12Parsec" SPEx

5
SPEx/spex/guimain.py
View File

@@ -622,8 +622,9 @@ if __name__ == '__main__':
sys.excepthook = except_hook sys.excepthook = except_hook
try: try:
print(f"Running directory {os.environ['WORKSPACELOC']}") #print(f"Running directory {os.environ['WORKSPACELOC']}")
print(f"Pythonpath: {os.environ['PYTHONPATH']}") #print(f"Pythonpath: {os.environ['PYTHONPATH']}")
print("LAUNCHDIR:", os.getcwd())
LOGGER = fancyLogger(filepath=r"./conf/loggerconf.json", fileLog=False) LOGGER = fancyLogger(filepath=r"./conf/loggerconf.json", fileLog=False)
conf = bananaCONF(workdir=r"./conf", logger=LOGGER) conf = bananaCONF(workdir=r"./conf", logger=LOGGER)
conf.open() conf.open()

BIN
SPEx/spex/logo.icns Normal file
View File

Binary file not shown.

BIN
TuxBuild/SPEx
View File

Binary file not shown.

137
TuxBuild/conf/defaults.json
View File

@@ -1,70 +1,69 @@
{ {
"version": "v1.41", "version": "v1.42",
"paths": { "paths": {
"lastUsed": "defaults.json", "lastUsed": "defaults.json",
"configurationPath": "./conf/", "configurationPath": "./conf/",
"INworkPath": "C://", "INworkPath": "C://",
"OUTworkPath": "C://", "OUTworkPath": "C://",
"fileList": [ "fileList": [
"bdlog.txt" ]
] },
}, "docStruct": {
"docStruct": { "fileVersNew": false,
"fileVersNew": false, "language": "English",
"language": "English", "languageIdx": 1,
"languageIdx": 1, "docSep": "\\s*Copyright [(0-9)]+",
"docSep": "\\s*Copyright [(0-9)]+", "beginOfDocument": "\\s*Body",
"beginOfDocument": "\\s*Body", "endOfDocument": "\\s*End of Document",
"endOfDocument": "\\s*End of Document", "dateFormat": "{month} {day:d}, {year:d}{}",
"dateFormat": "{month} {day:d}, {year:d}{}", "outPrefix": "",
"outPrefix": "", "outSuffix": "",
"outSuffix": "", "outExt": ".txt",
"outExt": ".txt", "outDateType": "jpn",
"outDateType": "jpn", "outNameFormat": "",
"outNameFormat": "", "outDate": true,
"outDate": true, "outTitle": true,
"outTitle": true, "outNumber": true,
"outNumber": true, "numberPos": 1,
"numberPos": 1, "datePos": 2,
"datePos": 2, "titlePos": 3,
"titlePos": 3, "maxTitleLen": 16,
"maxTitleLen": 16, "outNameSep": "-",
"outNameSep": "-", "customSep": "=",
"customSep": "=", "dateFormats": {
"dateFormats": { "jpn": "{year:04d}{month:02d}{day:02d}",
"jpn": "{year:04d}{month:02d}{day:02d}", "it": "{day:02d}{month:02d}{year:04d}",
"it": "{day:02d}{month:02d}{year:04d}", "usa": "{month:02d}{year:04d}{day:02d}"
"usa": "{month:02d}{year:04d}{day:02d}" }
} },
}, "settings": {
"settings": { "uiLang": "en",
"uiLang": "en", "winW": 800,
"winW": 800, "winH": 700,
"winH": 700, "encoding": "windows-1252",
"encoding": "windows-1252", "monthPosition": 0,
"monthPosition": 0, "getNewsPaperName": true,
"getNewsPaperName": true, "nameNotFoundStr": "ND",
"nameNotFoundStr": "ND", "includeTitle": true,
"includeTitle": true, "removeDuplicates": true,
"removeDuplicates": true, "showSkipped": false,
"showSkipped": false, "showRemovedDuplicates": false,
"showRemovedDuplicates": false, "loadTXT": true,
"loadTXT": true, "loadDOCX": false,
"loadDOCX": false, "removeOldFiles": true,
"removeOldFiles": true, "saveSeparateFiles": true,
"saveSeparateFiles": true, "saveBodyFile": true,
"saveBodyFile": true, "saveBodyNumber": true,
"saveBodyNumber": true, "delLF": false,
"delLF": false, "delWordBreak": true,
"delWordBreak": true, "delChars": [
"delChars": [ "'",
"'", "@",
"@", "#",
"#", "$",
"$", "%",
"%", "^",
"^", "&"
"&" ]
] }
}
} }

152
TuxBuild/conf/languageconf.json
View File

@@ -1,76 +1,76 @@
{ {
"Italiano": { "Italiano": {
"dateWords": [ "dateWords": [
"Gennaio", "Gennaio",
"Febbraio", "Febbraio",
"Marzo", "Marzo",
"Aprile", "Aprile",
"Maggio", "Maggio",
"Giugno", "Giugno",
"Luglio", "Luglio",
"Agosto", "Agosto",
"Settembre", "Settembre",
"Ottobre", "Ottobre",
"Novembre", "Novembre",
"Dicembre" "Dicembre"
], ],
"headWords": [ "headWords": [
"BYLINE:", "BYLINE:",
"SECTION:", "SECTION:",
"LENGTH:", "LENGTH:",
"DATELINE:", "DATELINE:",
"HIGHLIGHT:", "HIGHLIGHT:",
"Email:" "Email:"
], ],
"tailWords": [ "tailWords": [
"Newstex ID:", "Newstex ID:",
"NOTES:", "NOTES:",
"LANGUAGE:", "LANGUAGE:",
"GRAPHIC:", "GRAPHIC:",
"TYPE:", "TYPE:",
"URL:", "URL:",
"LOAD-DATE:", "LOAD-DATE:",
"PUBLICATION-TYPE:", "PUBLICATION-TYPE:",
"DOCUMENT-TYPE:", "DOCUMENT-TYPE:",
"CHARTS:", "CHARTS:",
"JOURNAL-CODE:" "JOURNAL-CODE:"
] ]
}, },
"English": { "English": {
"dateWords": [ "dateWords": [
"January", "January",
"February", "February",
"March", "March",
"April", "April",
"May", "May",
"June", "June",
"July", "July",
"August", "August",
"September", "September",
"October", "October",
"November", "November",
"December" "December"
], ],
"headWords": [ "headWords": [
"BYLINE:", "BYLINE:",
"SECTION:", "SECTION:",
"LENGTH:", "LENGTH:",
"DATELINE:", "DATELINE:",
"HIGHLIGHT:", "HIGHLIGHT:",
"Email:" "Email:"
], ],
"tailWords": [ "tailWords": [
"Newstex ID:", "Newstex ID:",
"NOTES:", "NOTES:",
"LANGUAGE:", "LANGUAGE:",
"GRAPHIC:", "GRAPHIC:",
"TYPE:", "TYPE:",
"URL:", "URL:",
"LOAD-DATE:", "LOAD-DATE:",
"PUBLICATION-TYPE:", "PUBLICATION-TYPE:",
"DOCUMENT-TYPE:", "DOCUMENT-TYPE:",
"CHARTS:", "CHARTS:",
"JOURNAL-CODE:" "JOURNAL-CODE:"
] ]
} }
} }

2
TuxBuild/conf/linux.json
View File

@@ -1,5 +1,5 @@
{ {
"version": "v1.3", "version": "v1.42",
"paths": { "paths": {
"lastUsed": "linux.json", "lastUsed": "linux.json",
"configurationPath": "./conf/", "configurationPath": "./conf/",

10
TuxBuild/conf/loggerconf.json
View File

@@ -1,5 +1,5 @@
{ {
"logFile": "D:\\Test\\bananaSPLIT.log", "logFile": "./SPEx.log",
"logFormat": "%(asctime)s|%(levelname)-8s| %(message)-50s", "logFormat": "%(asctime)s|%(levelname)-8s| %(message)-50s",
"logTimeFormat": "%m-%d %H:%M:%S" "logTimeFormat": "%m-%d %H:%M:%S"
} }

BIN
TuxBuild/logo.ico → TuxBuild/logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 24 KiB

After

Width:  |  Height:  |  Size: 24 KiB

BIN
WinBuild/SPEx.exe
View File

Binary file not shown.

3
WinBuild/conf/defaults.json
View File

@@ -1,12 +1,11 @@
{ {
"version": "v1.41", "version": "v1.42",
"paths": { "paths": {
"lastUsed": "defaults.json", "lastUsed": "defaults.json",
"configurationPath": "./conf/", "configurationPath": "./conf/",
"INworkPath": "C://", "INworkPath": "C://",
"OUTworkPath": "C://", "OUTworkPath": "C://",
"fileList": [ "fileList": [
"bdlog.txt"
] ]
}, },
"docStruct": { "docStruct": {

2
WinBuild/conf/linux.json
View File

@@ -1,5 +1,5 @@
{ {
"version": "v1.3", "version": "v1.42",
"paths": { "paths": {
"lastUsed": "linux.json", "lastUsed": "linux.json",
"configurationPath": "./conf/", "configurationPath": "./conf/",

2
WinBuild/conf/loggerconf.json
View File

@@ -1,5 +1,5 @@
{ {
"logFile": "D:\\Test\\bananaSPLIT.log", "logFile": "./SPEx.log",
"logFormat": "%(asctime)s|%(levelname)-8s| %(message)-50s", "logFormat": "%(asctime)s|%(levelname)-8s| %(message)-50s",
"logTimeFormat": "%m-%d %H:%M:%S" "logTimeFormat": "%m-%d %H:%M:%S"
} }