Version 1.3.5

Add Flask-Session & Flask-Caching Updates for Python 3.8 - build scripts
filak · Mar 22, 2020 · f12e654 · f12e654
1 parent 6fb7df6
commit f12e654
Show file tree

Hide file tree

Showing 72 changed files with 24,109 additions and 159 deletions.
diff --git a/flask-app/!!build__mtw-server-win-service_Py3.7.bat b/flask-app/!!build__mtw-server-win-service_Py3.7.bat
@@ -0,0 +1,51 @@
+@echo off
+setlocal
+echo.
+set python=c:\Python37\Scripts\pyinstaller.exe
+echo Build using pyinstaller : %python%
+set targetDir=dist
+set fileHandle=mtw-server-win-service
+set srcFile=%fileHandle%.py
+set srcDir=mtw
+set logFile=!build_%fileHandle%.rep
+
+echo. > %logFile%
+
+echo.
+echo rem call %targetDir%\%fileHandle%.exe stop
+
+echo.
+echo Building %srcFile% ...
+
+CALL %python% --log-level ERROR --onefile ^
+              --hidden-import=_cffi_backend --hidden-import=pkg_resources.py2_warn ^
+              --add-data mtw_utils/pyuca/*.txt;pyuca ^
+              --distpath %targetDir% %srcFile% >> %logFile% 2>&1
+
+echo  - Done!
+echo.
+echo Cleaning static files %targetDir% ...
+
+RMDIR %targetDir%\static /S /Q
+RMDIR %targetDir%\templates /S /Q
+
+echo  - Done!
+echo.
+echo Copying files...
+
+MKDIR %targetDir%\static
+xcopy %srcDir%\static %targetDir%\static /E /Q /Y
+MKDIR %targetDir%\templates
+xcopy %srcDir%\templates %targetDir%\templates /E /Q /Y
+echo  - Done!
+echo.
+
+echo.
+echo rem call %targetDir%\%fileHandle%.exe install
+echo.
+echo rem call %targetDir%\%fileHandle%.exe start
+
+echo Finished
+echo.
+
+endlocal
diff --git a/...k-app/!!build__mtw-server-win-service.bat → ...!!build__mtw-server-win-service_Py3.8.bat b/...k-app/!!build__mtw-server-win-service.bat → ...!!build__mtw-server-win-service_Py3.8.bat
@@ -1,7 +1,8 @@
 @echo off
 setlocal
 echo.
-echo Build using pyinstaller
+set python=c:\Programs\Python\Python38\Scripts\pyinstaller.exe
+echo Build using pyinstaller : %python%
 set targetDir=dist
 set fileHandle=mtw-server-win-service
 set srcFile=%fileHandle%.py
@@ -16,7 +17,10 @@ echo rem call %targetDir%\%fileHandle%.exe stop
 echo.
 echo Building %srcFile% ...
 
-CALL c:\Python37\Scripts\pyinstaller.exe --log-level ERROR --onefile --hidden-import=pkg_resources.py2_warn --hidden-import=_cffi_backend --add-data mtw_utils/pyuca/*.txt;pyuca --distpath %targetDir% %srcFile% >> %logFile% 2>&1
+CALL %python% --log-level ERROR --onefile ^
+              --hidden-import=_cffi_backend ^
+              --add-data mtw_utils/pyuca/*.txt;pyuca ^
+              --distpath %targetDir% %srcFile% >> %logFile% 2>&1
 
 echo  - Done!
 echo.

diff --git a/flask-app/!!build__mtw-server-win-worker_Py3.7.bat b/flask-app/!!build__mtw-server-win-worker_Py3.7.bat
@@ -0,0 +1,36 @@
+@echo off
+setlocal
+echo.
+set python=c:\Python37\Scripts\pyinstaller.exe
+echo Build using pyinstaller : %python%
+set targetDir=dist
+set fileHandle=mtw-server-win-worker
+set srcFile=%fileHandle%.py
+set srcDir=mtw
+set logFile=!build_%fileHandle%.rep
+
+echo. > %logFile%
+
+echo.
+echo rem call %targetDir%\%fileHandle%.exe stop
+
+echo.
+echo Building %srcFile% ...
+
+CALL %python% --log-level ERROR --onefile ^
+              --hidden-import=_cffi_backend --hidden-import=pkg_resources.py2_warn ^
+              --add-data mtw_utils/pyuca/*.txt;pyuca ^
+              --distpath %targetDir% %srcFile% >> %logFile% 2>&1
+
+echo  - Done!
+
+
+echo.
+echo rem call %targetDir%\%fileHandle%.exe install
+echo.
+echo rem call %targetDir%\%fileHandle%.exe start
+
+echo Finished
+echo.
+
+endlocal
diff --git a/flask-app/!!build__mtw-server-win-worker.bat → .../!!build__mtw-server-win-worker_Py3.8.bat b/flask-app/!!build__mtw-server-win-worker.bat → .../!!build__mtw-server-win-worker_Py3.8.bat
@@ -1,10 +1,12 @@
 @echo off
 setlocal
 echo.
-echo Build using pyinstaller
+set python=c:\Programs\Python\Python38\Scripts\pyinstaller.exe
+echo Build using pyinstaller : %python%
 set targetDir=dist
 set fileHandle=mtw-server-win-worker
 set srcFile=%fileHandle%.py
+set srcDir=mtw
 set logFile=!build_%fileHandle%.rep
 
 echo. > %logFile%
@@ -15,7 +17,10 @@ echo rem call %targetDir%\%fileHandle%.exe stop
 echo.
 echo Building %srcFile% ...
 
-CALL c:\Python37\Scripts\pyinstaller.exe --log-level ERROR --onefile --hidden-import=_cffi_backend --hidden-import=pkg_resources.py2_warn --add-data mtw_utils/pyuca/*.txt;pyuca --distpath %targetDir% %srcFile% >> %logFile% 2>&1
+CALL %python% --log-level ERROR --onefile ^
+              --hidden-import=_cffi_backend ^
+              --add-data mtw_utils/pyuca/*.txt;pyuca ^
+              --distpath %targetDir% %srcFile% >> %logFile% 2>&1
 
 echo  - Done!
 

diff --git a/flask-app/!!build__set-mtw-admin.bat b/flask-app/!!build__set-mtw-admin.bat
diff --git a/flask-app/!!build__set-mtw-admin_Py3.7.bat b/flask-app/!!build__set-mtw-admin_Py3.7.bat
@@ -0,0 +1,25 @@
+@echo off
+setlocal
+echo.
+set python=c:\Python37\Scripts\pyinstaller.exe
+echo Build using pyinstaller : %python%
+set targetDir=dist
+set fileHandle=set-mtw-admin
+set srcFile=%fileHandle%.py
+set srcDir=mtw
+set logFile=!build_%fileHandle%.rep
+
+echo. > %logFile%
+
+echo.
+echo Building %srcFile% ...
+
+CALL %python% --log-level ERROR --onefile ^
+              --hidden-import=_cffi_backend --hidden-import=pkg_resources.py2_warn ^
+              --distpath %targetDir% %srcFile% >> %logFile% 2>&1
+
+echo.
+echo Finished
+echo.
+
+endlocal
diff --git a/flask-app/!!build__set-mtw-admin_Py3.8.bat b/flask-app/!!build__set-mtw-admin_Py3.8.bat
@@ -0,0 +1,25 @@
+@echo off
+setlocal
+echo.
+set python=c:\Programs\Python\Python38\Scripts\pyinstaller.exe
+echo Build using pyinstaller : %python%
+set targetDir=dist
+set fileHandle=set-mtw-admin
+set srcFile=%fileHandle%.py
+set srcDir=mtw
+set logFile=!build_%fileHandle%.rep
+
+echo. > %logFile%
+
+echo.
+echo Building %srcFile% ...
+
+CALL %python% --log-level ERROR --onefile ^
+              --hidden-import=_cffi_backend ^
+              --distpath %targetDir% %srcFile% >> %logFile% 2>&1
+
+echo.
+echo Finished
+echo.
+
+endlocal
diff --git a/flask-app/instance/cache/README.md b/flask-app/instance/cache/README.md
@@ -0,0 +1 @@
+## This is the MTW caching folder
diff --git a/flask-app/instance/conf/mesh.ttl b/flask-app/instance/conf/mesh.ttl
@@ -32,13 +32,13 @@ text:TextIndexES    rdfs:subClassOf   text:TextIndex .
 # A TDB dataset used for RDF storage
 <#dataset> 
     a tdb2:DatasetTDB2 ;
-    tdb2:location  "c:/Data/mesh-mtw/apache-jena-data/databases/mesh" ;
+    tdb2:location  "e:/apache-jena-data/databases/mesh" ;
     .
 
 # Text index description
 <#indexLucene> 
     a text:TextIndexLucene ;
-    text:directory "c:/Data/mesh-mtw/apache-jena-data/indexes/mesh" ;
+    text:directory "e:/apache-jena-data/indexes/mesh" ;
     text:entityMap <#entMap> ;
     text:storeValues true ;
     ##text:analyzer[ a text:StandardAnalyzer ] ;

diff --git a/flask-app/instance/conf/mtw.ini b/flask-app/instance/conf/mtw.ini
@@ -1,29 +1,34 @@
 # -*- coding: utf-8 -*-
-# *** Config version 1.0.9 ***
+# *** Config version 1.1.0 ***
 ### Important values are marked with !  ###
 ### ! This file MUST BE UTF-8 encoded ! ###
 ### ! Restart the App after modifying ! ###
-### ! Alway use forward slash:   /    ! ###
+### ! Alway use forward slash /       ! ###
+### ! Use trailing slash / (if not WITHOUT)
 ### ! '%' char must be doubled:  %%   ! ###
 
 
 [appconf]
 
+### ! Required ! ###
+### Host root link prefix - WITHOUT trailing slash ! ###
+#HOST_LINK = http://localhost:5900
+
 ### ! Background Worker host:port ! ###
 ## Default - production: http://localhost:55933/ - development: http://localhost:5903/ ##
-#WORKER_HOST = http://localhost:5903/
-WORKER_HOST = http://localhost:55933/
+WORKER_HOST = http://localhost:5903/
+#WORKER_HOST = http://localhost:55933/
 
 ### ! Always set ! ###
-TARGET_YEAR = 2020
+TARGET_YEAR = 2021
 
 ### Default previous version year - used for showing modifications ###
-PREV_YEAR_DEF = 2019
-PREV_YEARS = 2015,2016,2017,2018,2019
+PREV_YEAR_DEF = 2020
+PREV_YEARS = 2015,2016,2017,2018,2019,2020
 
 ### Date format:  YYYY-MM-DD ###
-REVISED_AFTER = 2019-01-01
-CREATED_AFTER = 2019-01-01
+REVISED_AFTER = 2020-01-01
+CREATED_AFTER = 2020-01-01
 
 ### ! Always set ! ###
 MARC_LIBCODE = CZ-PrNML
@@ -33,12 +38,12 @@ MARC_MESHCODE = czmesh
 ### Default MARC export style ###
 ##  line  - for yaz-marcdump conversion to ISO2709 ##
 ##  mrk   - for MarcEdit conversion to ISO2709 ##
-#MARC_LINE = line
+#MARC_LINE = mrk
 
 ### Default MARC tree style: def OR daw ###
 ##  def  - field 072 ##
 ##  daw  - field 686 ##
-#MARC_TREE = def
+#MARC_TREE = daw
 
 ### Available Bootstrap themes: slate, spacelab, flatly - default: slate ###
 #DEFAULT_THEME = spacelab
@@ -85,16 +90,35 @@ MESH_TREE = {
 #SRC_DIR = D:/Data/mesh/in
 #EXP_DIR = D:/Data/mesh/out
 
-
-### Default management database name ###
-#DATABASE_NAME = mtw.db
+### Custom concept prefix - default: F ###
+#PID_PREFIX_CONCEPT = F
 
 ### Base URL prefix - default: None ###
 #APP_URL_PREFIX = /fr
 
-### TODO (?) - currently not in use ###
-##PID_PREFIX_CONCEPT = F
-##PID_PREFIX_TERM = cze
+### Default management database name ###
+#DATABASE_NAME = mtw.db
+
+### Default - False
+DEV_DISABLE_CSRF = True
+
+## Flask-Caching params
+## See: https://flask-caching.readthedocs.io/en/latest/
+## - override:
+#CACHE_IGNORE_ERRORS = False
+## In production use: memcached
+CACHING = {"CACHE_TYPE": "filesystem", "CACHE_DEFAULT_TIMEOUT": 1800, "CACHE_THRESHOLD": 1000}
+#CACHING = {"CACHE_TYPE": "memcached", "CACHE_DEFAULT_TIMEOUT": 1800, "CACHE_KEY_PREFIX": "MTWC"}
+
+## Flask-Session params
+## See: https://pythonhosted.org/Flask-Session/
+## In production use: filesystem
+## - and set: "SESSION_COOKIE_SECURE": true
+SESSIONS = {"SESSION_COOKIE_NAME": "mtwsession", "SESSION_TYPE": "filesystem", "PERMANENT_SESSION_LIFETIME": 14400, "SESSION_KEY_PREFIX": "MTWS", 
+            "SESSION_FILE_THRESHOLD": 1000
+           }
+
+#SESSIONS = {"SESSION_COOKIE_NAME": "mtwsession", "SESSION_TYPE": "memcached", "PERMANENT_SESSION_LIFETIME": 14400, "SESSION_KEY_PREFIX": "MTWS"}
 
 
 [sparqlconf]

diff --git a/flask-app/instance/sessions/README.md b/flask-app/instance/sessions/README.md
@@ -0,0 +1 @@
+## This is the MTW sessions folder
diff --git a/flask-app/instance/temp/README.md b/flask-app/instance/temp/README.md
@@ -0,0 +1 @@
+## This is the MTW temp folder
diff --git a/flask-app/instance/temp/cache/README.md b/flask-app/instance/temp/cache/README.md