unfinished

Author: Michal Mitter

.gitignore

@@ -1,15 +1,8 @@
-config.py
 config.cfg
 __pycache__/
 *.py[cod]
 .idea
-tasks_config.py
-tmp/
-flags/
-maps/
 venv/
 logs/
-app/static/node_modules/
-/app/static/package-lock.json
-/scripts/events/
-/scripts/elysium/
+tmp/
+Anders.Gaming.LibTech3.exe

.gitmodules

@@ -1,35 +1,29 @@
 # Greatshot
-Demo analysis, cutting, video rendering for IdTech3 games mainly Wolfenstein: Enemy Territory
+Demo analysis, cutting, IdTech3 games mainly Wolfenstein: Enemy Territory (etpro, legacy) and RTCW (RTCWPro)
 [![Discord](https://img.shields.io/discord/546291405404897290?label=discord)](https://discord.gg/p59kWdF)
 [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=BRRRFPT7N9NP6&currency_code=EUR&source=url)
-## what it can do:
+
+## Rewrite branch:
+
+This branch doesn't have rendering stuff and Gamestv integration for simplier installation. Gamestv integration doesn't work anymore because login process was changed.
+
+## Features:
 - cut demos (dm_84/tv_84) -> dm_84
 - export demos (dm_84/tv_84) to json and analyze it to output:
 	- hit regions (headshots) counter
 	- fast consecutive kills <img src="/app/static/excellent.png" height="25" width="25"/> [example](https://streamable.com/a5tx7)
 	- consecutive headshots - [example](https://streamable.com/e4ogi)
-	- revive stats
-- download ETTV demo (tv_84) from [gamestv.org](http://gamestv.org)
-- render demo to video and publish it - [example](https://streamable.com/2d77)
-- link highlights and statistics in comments of gamestv match
-- render highlights from gamestv match
-- add player name + flag to highlight [example](https://streamable.com/zn7r4)
-
-## what it could do in future:
-- create database of players with statistics
-- visualize timeline of match
-- retrieve true damage stats when its bugged to 0
-- support other IdTech3 games/mods: RTCW, Quake3, ...
+	- revive stats (only for ETTV)
 
 This project uses  [hannes's](http://www.crossfire.nu/user/view/id/6710) modified [Tech3 Demo API - 0.1](http://www.crossfire.nu/news/4632/tech3-demo-api-01) to cut and export demos.
 It was modified to be able to cut [ETTV](http://wolfwiki.anime.net/index.php/ETTV:Viewer%27s_Guide) demo with selected player's POV. My modification: [Tech3 Demo API](https://github.com/mittermichal/Anders.Gaming.LibTech3)
 
-## Self-hosting
+## Run:
 
-with python3:
+with python3.12: 
 - `pip install -r requirements.txt`
-- download parsing application from https://github.com/mittermichal/Anders.Gaming.LibTech3/releases its path is then referenced in `PARSERPATH` in `config.cfg` in the next step
-- create `config.cfg` and `config.py` from `config.sample.cfg` and `config.sample.py`
-- run `python init_db.py` ... this should create sqlite database
-- run `python web.py`
-- open `localhost:5111` in browser
+- download parsing application from https://github.com/mittermichal/Anders.Gaming.LibTech3/releases its path is then referenced in `PARSERPATH` in `config.cfg`
+- run `python greatshot_web.py`
+- open `localhost:5000` in browser
+
+alternatively use poetry to install dependencies

README.md

@@ -1,5 +1,4 @@
 import subprocess
-import sys
 import os
 from enum import Enum
 from sqlalchemy import Column, Integer, String, ForeignKey, SmallInteger
@@ -392,3 +391,8 @@ class RtcwWeapon(Enum):
     WP_SMOKE_GRENADE = 45
     WP_BINOCULARS = 46
     WP_NUM_WEAPONS = 47
+
+
+class LegacyWeapon(Enum):
+    # TODO rewrite
+    pass

alembic.ini

@@ -1,26 +1,35 @@
-from flask import Flask, config
-from flask_socketio import SocketIO
+import os
+import secrets
+from flask import Flask
 
-app_config = config.Config('.')
-app_config.from_pyfile('config.cfg')
-socketio = SocketIO(async_mode="eventlet", engineio_logger=True, cors_allowed_origins=app_config['APPHOST'])
+config_path = 'config.cfg'
 
 
-def create_app(debug=False):
+def create_app():
     """Create an application."""
     app = Flask(__name__)
-    app.config.from_pyfile('../config.cfg')
-    from app.views.renders import renders
-    app.register_blueprint(renders)
-
+    app.config.from_pyfile(f'../{config_path}')
+    if 'INDEXER' not in app.config:
+        if os.name == 'nt':  # windows
+            app.config['INDEXER'] = r'indexTarget/app\upload\%s/exportJsonFile/app\download\exports\%s.txt/exportBulletEvents/1/exportDemo/1/exportChatMessages/1/exportRevives/1'
+        else:
+            app.config['INDEXER'] = r'indexTarget\\app/upload/%s\\exportJsonFile\\app/download/exports/%s.txt\\exportBulletEvents\\1\\exportDemo\\1\\exportChatMessages\\1\\exportRevives\\1'
     from app.views.main import flask_app as main_blueprint
     app.register_blueprint(main_blueprint)
-
-    socketio.init_app(app, cookie=None)
     return app
 
-# flask_app = Flask(__name__)
-# flask_app.config.from_pyfile('config.cfg')
-# flask_app.register_blueprint(renders)
-# socketio = SocketIO(flask_app, cookie=None)
 
+def init_config():
+    if not os.path.exists(config_path):
+        print(f'{config_path} not found, creating one with default values')
+        if os.name == 'nt':  # windows
+            parser_path = 'Anders.Gaming.LibTech3.exe'
+        else:
+            parser_path = 'LibTech3-linux-x86-64'
+        with open(config_path, 'w') as f:
+            f.write(
+                f"SECRET_KEY='{secrets.token_hex()}'\n"
+                f"PARSERPATH='{parser_path}'\n"
+                f"MAX_CONTENT_LENGTH = 50 * 1024 * 1024"
+                f"DEBUG=True  # set to false for production"
+            )