Program version added

signag · Feb 22, 2024 · 2f1680b · 2f1680b
1 parent 874c278
commit 2f1680b
Show file tree

Hide file tree

Showing 9 changed files with 83 additions and 1 deletion.
diff --git a/raspiCamSrv/auth.py b/raspiCamSrv/auth.py
@@ -1,4 +1,5 @@
 import functools
+from raspiCamSrv.version import version
 
 from flask import (
     Blueprint,
@@ -26,6 +27,7 @@
 def register():
     logger.debug("In register")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     sc = cfg.serverConfig
     cp = cfg.cameraProperties
@@ -99,6 +101,7 @@ def register():
 @bp.route("/login", methods=("GET", "POST"))
 def login():
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     sc = cfg.serverConfig
     cp = cfg.cameraProperties
@@ -137,6 +140,7 @@ def login():
 @bp.route("/password", methods=("GET", "POST"))
 def password():
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     sc = cfg.serverConfig
     cp = cfg.cameraProperties

diff --git a/raspiCamSrv/config.py b/raspiCamSrv/config.py
@@ -2,6 +2,7 @@
 from werkzeug.exceptions import abort
 from raspiCamSrv.camCfg import CameraCfg
 from raspiCamSrv.camera_pi import Camera
+from raspiCamSrv.version import version
 
 from raspiCamSrv.auth import login_required
 import logging
@@ -14,6 +15,7 @@
 @login_required
 def main():
     g.hostname = request.host
+    g.version = version
     # Although not directly needed here, the camara needs to be initialized
     # in order to load the camera-specific parameters into configuration
     cam = Camera().cam
@@ -36,6 +38,7 @@ def main():
 def liveViewCfg():
     logger.debug("In liveViewCfg")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cp = cfg.cameraProperties
     sm = cfg.sensorModes
@@ -91,6 +94,7 @@ def liveViewCfg():
 def addLiveViewControls():
     logger.debug("In addLiveViewControls")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     cp = cfg.cameraProperties
@@ -117,6 +121,7 @@ def addLiveViewControls():
 def remLiveViewControls():
     logger.debug("In remLiveViewControls")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cp = cfg.cameraProperties
     sm = cfg.sensorModes
@@ -159,6 +164,7 @@ def remLiveViewControls():
 def photoCfg():
     logger.debug("In photoCfg")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cp = cfg.cameraProperties
     sm = cfg.sensorModes
@@ -213,6 +219,7 @@ def photoCfg():
 def addPhotoControls():
     logger.debug("In addPhotoControls")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     cp = cfg.cameraProperties
@@ -238,6 +245,7 @@ def addPhotoControls():
 def remPhotoControls():
     logger.debug("In remPhotoControls")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cp = cfg.cameraProperties
     sm = cfg.sensorModes
@@ -277,6 +285,7 @@ def remPhotoControls():
 def rawCfg():
     logger.debug("In rawCfg")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cp = cfg.cameraProperties
     sm = cfg.sensorModes
@@ -314,6 +323,7 @@ def rawCfg():
 def addRawControls():
     logger.debug("In addRawControls")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     cp = cfg.cameraProperties
@@ -339,6 +349,7 @@ def addRawControls():
 def remRawControls():
     logger.debug("In remRawControls")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cp = cfg.cameraProperties
     sm = cfg.sensorModes
@@ -378,6 +389,7 @@ def remRawControls():
 def videoCfg():
     logger.debug("In videoCfg")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cp = cfg.cameraProperties
     sm = cfg.sensorModes
@@ -432,6 +444,7 @@ def videoCfg():
 def addVideoControls():
     logger.debug("In addVideoControls")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     cp = cfg.cameraProperties
@@ -457,6 +470,7 @@ def addVideoControls():
 def remVideoControls():
     logger.debug("In remVideoControls")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cp = cfg.cameraProperties
     sm = cfg.sensorModes

diff --git a/raspiCamSrv/home.py b/raspiCamSrv/home.py
@@ -3,6 +3,7 @@
 from raspiCamSrv.auth import login_required
 from raspiCamSrv.camera_pi import Camera
 from raspiCamSrv.camCfg import CameraCfg, ServerConfig
+from raspiCamSrv.version import version
 from libcamera import controls
 import math
 import os
@@ -19,6 +20,7 @@
 def index():
     logger.debug("In index")
     g.hostname = request.host
+    g.version = version
     cam = Camera()
     logger.debug("Camera instantiated")
     cfg = CameraCfg()
@@ -61,6 +63,7 @@ def displayImage(photo: str):
 def focus_control():
     logger.debug("In focus_control")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     sc = cfg.serverConfig
@@ -139,6 +142,7 @@ def focus_control():
 def trigger_autofocus():
     logger.debug("In trigger_autofocus")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     sc = cfg.serverConfig
@@ -171,6 +175,7 @@ def trigger_autofocus():
 def set_zoom():
     logger.debug("In set_zoom")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     sc = cfg.serverConfig
@@ -204,6 +209,7 @@ def set_zoom():
 def zoom_in():
     logger.debug("In zoom_in")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     logger.debug("cfg.liveViewConfig.controls=%s",cfg.liveViewConfig.controls)
     cc = cfg.controls
@@ -240,6 +246,7 @@ def zoom_in():
 def zoom_out():
     logger.debug("In zoom_out")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     sc = cfg.serverConfig
@@ -289,6 +296,7 @@ def zoom_out():
 def zoom_full():
     logger.debug("In zoom_full")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     sc = cfg.serverConfig
@@ -311,6 +319,7 @@ def zoom_full():
 def pan_up():
     logger.debug("In pan_up")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     sc = cfg.serverConfig
@@ -340,6 +349,7 @@ def pan_up():
 def pan_left():
     logger.debug("In pan_left")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     sc = cfg.serverConfig
@@ -369,6 +379,7 @@ def pan_left():
 def pan_center():
     logger.debug("In pan_center")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     sc = cfg.serverConfig
@@ -398,6 +409,7 @@ def pan_center():
 def pan_right():
     logger.debug("In pan_right")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     sc = cfg.serverConfig
@@ -427,6 +439,7 @@ def pan_right():
 def pan_down():
     logger.debug("In pan_down")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     sc = cfg.serverConfig
@@ -470,6 +483,7 @@ def zoom_draw():
 def ae_control():
     logger.debug("In ae_control")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     sc = cfg.serverConfig
@@ -531,6 +545,7 @@ def ae_control():
 def exposure_control():
     logger.debug("In exposure_control")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     sc = cfg.serverConfig
@@ -593,6 +608,7 @@ def exposure_control():
 def image_control():
     logger.debug("In image_control")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     sc = cfg.serverConfig
@@ -656,6 +672,7 @@ def image_control():
 def meta_clear():
     logger.debug("In meta_clear")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     sc = cfg.serverConfig
@@ -673,6 +690,7 @@ def meta_clear():
 def meta_prev():
     logger.debug("In meta_prev")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     sc = cfg.serverConfig
@@ -691,6 +709,7 @@ def meta_prev():
 def meta_next():
     logger.debug("In meta_next")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     sc = cfg.serverConfig
@@ -710,6 +729,7 @@ def meta_next():
 def photoBuffer_add():
     logger.debug("In photoBuffer_add")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     sc = cfg.serverConfig
@@ -744,6 +764,7 @@ def photoBuffer_remove():
 def photoBuffer_prev():
     logger.debug("In photoBuffer_prev")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     sc = cfg.serverConfig
@@ -761,6 +782,7 @@ def photoBuffer_prev():
 def photoBuffer_next():
     logger.debug("In photoBuffer_next")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     sc = cfg.serverConfig
@@ -778,6 +800,7 @@ def photoBuffer_next():
 def show_photo():
     logger.debug("In show_photo")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     sc = cfg.serverConfig
@@ -791,6 +814,7 @@ def show_photo():
 def hide_photo():
     logger.debug("In hide_photo")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     sc = cfg.serverConfig
@@ -804,6 +828,7 @@ def hide_photo():
 def clear_buffer():
     logger.debug("In clear_buffer")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     sc = cfg.serverConfig
@@ -817,6 +842,7 @@ def clear_buffer():
 def take_photo():
     logger.debug("In take_photo")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     sc = cfg.serverConfig
@@ -843,6 +869,7 @@ def take_photo():
 def take_raw_photo():
     logger.debug("In take_raw_photo")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     sc = cfg.serverConfig
@@ -866,6 +893,7 @@ def take_raw_photo():
 def record_video():
     logger.debug("In record_video")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     sc = cfg.serverConfig
@@ -899,6 +927,7 @@ def record_video():
 def stop_recording():
     logger.debug("In stop_recording")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     sc = cfg.serverConfig
@@ -948,6 +977,7 @@ def generateHistogram(sc:ServerConfig):
 def show_histogram():
     logger.debug("In show_histogram")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     sc = cfg.serverConfig
@@ -965,6 +995,7 @@ def show_histogram():
 def show_metadata():
     logger.debug("In show_metadata")
     g.hostname = request.host
+    g.version = version
     cfg = CameraCfg()
     cc = cfg.controls
     sc = cfg.serverConfig