0.03a release, dependencies fix

Author: Natlies

README.md

@@ -12,19 +12,21 @@ make sure your path includes only 64-bit python, adapt the following line as nee
 PATH=C:\Python\Python37\Scripts\;C:\Python\Python37\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\Git\cmd
 cd c:\empires
 pip install -r requirements.txt
-pyinstaller build-tools\empires-server.spec --distpath ..\dist_mini003_x64
-
+copy build-tools\empires-server.spec .
+pyinstaller empires-server.spec --distpath ..\dist_mini003_x64 --clean
 
 ## 32 bit build:
 open another cmd
 make sure your path includes only 32-bit python, adapt the following line as needed and run:
 PATH=C:\Python\Python37-32\Scripts\;C:\Python\Python37-32\;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;C:\Windows\System32\WindowsPowerShell\v1.0\;C:\Program Files\Git\cmd
 cd c:\empires
 pip install -r requirements.txt
-pyinstaller build-tools\empires-server.spec --distpath ..\dist_mini003_x86
+copy build-tools\empires-server.spec .
+pyinstaller empires-server.spec --distpath ..\dist_mini003_x86 --clean
 
 ## Inno Setup installer
 open the build-tools/empires_inno_setup.iss file and play it
+test it!
 
 
 

build-tools/empires_inno_setup.iss

@@ -95,6 +95,10 @@ Filename: "{app}\RaiseTheEmpires.ini"; Section: "InstallSettings"; Flags: uninsd
 Filename: "{app}\RaiseTheEmpires.ini"; Section: "InstallSettings"; Check: Is64BitInstallMode; Key: "Arch"; String: "x64"
 Filename: "{app}\RaiseTheEmpires.ini"; Section: "InstallSettings"; Check: not Is64BitInstallMode; Key: "Arch"; String: "x86"
 
+[UninstallDelete]
+Type: files; Name: "{app}\RaiseTheEmpires.ini"
+Type: dirifempty; Name: "{app}"
+
 [Run]
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
 

empires-server.py

@@ -2,10 +2,11 @@
 import getopt
 import sys
 
-import texteditor
-
 os.environ["PBR_VERSION"] = '5.4.3'
+if not os.environ.get('EDITOR'):
+    os.environ["EDITOR"] = 'notepad'  # system specific!
 
+import editor
 from tendo import singleton
 opts, args = getopt.getopt(sys.argv[1:],"",["debug"])
 debug = ("--debug", '') in opts
@@ -40,7 +41,7 @@
 # import logging.config
 
 version = "0.03a"
-release_date = 'Saturday, 05 Oct 2019'
+release_date = 'Monday, 14 Oct 2019'
 
 COMPRESS_MIMETYPES = ['text/html', 'text/css', 'text/xml', 'application/json', 'application/javascript',
                       'application/x-amf']
@@ -1689,7 +1690,7 @@ def delete_save(message):
 
 @app.errorhandler(500)
 def server_error_page(error):
-    text = texteditor.open(filename=os.path.join(log_path(), "log.txt"))
+    text = editor.edit(filename=os.path.join(log_path(), "log.txt"))
     return 'It went wrong'
 
 

requirements.txt

@@ -2,8 +2,10 @@ pyinstaller
 tendo
 py3amf
 flask
+flask_session
 flask_sqlalchemy
 flask_compress
 flask_socketio
 libscrc
-daiquiri
+daiquiri
+python-editor

save_engine.py

@@ -5,10 +5,9 @@
 import sys
 from datetime import datetime
 import daiquiri
+import editor
 from flask import session
 import logging
-import texteditor
-
 
 def lookup_object(id):
     [game_object] = [e for e in  session['user_object']["userInfo"]["world"]["objects"] if e['id'] == id]
@@ -56,7 +55,7 @@ def exception_handler(exc_type, exc_value, exc_traceback):
         return
 
     logger.error("Uncaught exception", exc_info=(exc_type, exc_value, exc_traceback))
-    text = texteditor.open(filename=os.path.join(log_path(), "log.txt"))
+    text = editor.edit(filename=os.path.join(log_path(), "log.txt"))
 
 # logger = logging.getLogger(__name__)
 # handler = logging.StreamHandler(stream=sys.stdout)

templates/changelog.txt

@@ -1,4 +1,5 @@
 alpha v0.03a
+    0.03a release, dependencies fix Nat 14/10/2019 01:36
     battle damage quest fix, release build, readme Nat 13/10/2019 22:42
     liberty bond battle reward thebatmanwa 13/10/2019 22:29
     Revert "Flag_bug_solved" thebatmanwa 13/10/2019 15:59