Merge pull request #2 from mikecarr/settings-file

Settings file

Author: mikecarr

.github/workflows/release.yml

@@ -3,13 +3,11 @@ name: Build and Release
 on:
   push:
     tags:
-      - 'v*.*.*'  # This will trigger the workflow on version tags, e.g., v1.0.0
+      - 'v*.*.*'
 
 jobs:
   build:
     runs-on: ubuntu-latest
-    permissions:
-      contents: write
 
     steps:
       - name: Checkout code
@@ -18,21 +16,21 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: '3.8'  # Specify your Python version
+          python-version: '3.8'
+
+      - name: Get version from tag
+        id: vars
+        run: echo "VERSION=${GITHUB_REF#refs/tags/} >> $GITHUB_ENV"
 
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install setuptools wheel
+          pip install setuptools wheel setuptools-scm
 
       - name: Build package
         run: |
           python setup.py sdist bdist_wheel
 
-      - name: "Build Changelog"
-        id: build_changelog
-        uses: mikepenz/release-changelog-builder-action@v5
-
       - name: Upload Package to Release
         uses: softprops/action-gh-release@v1
         with:

README.md

@@ -8,6 +8,8 @@ I wanted an easy way to edit files and watch videos on the Radxa
 python -m venv .venv
 source .venv/bin/activate
 pip install -r requirements.txt
+
+echo "FLASK_ENV=development > .env"
 ```
 
 
@@ -24,6 +26,9 @@ Video file selector
 Player
 ![alt text](images/v_player.png)
 
+Journalctl -f
+![alt text](images/journal.png)
+
 
 ### Packaging
 ```bash

images/editor.png

@@ -3,6 +3,10 @@
 import json
 import os
 import subprocess
+from importlib.metadata import version
+
+
+app_version = version('py-config-gs')
 
 # Configure logging
 logging.basicConfig(level=logging.DEBUG,  # Set the log level to DEBUG
@@ -12,15 +16,25 @@
 app = Flask(__name__)
 
 #SETTINGS_FILE = "/Users/mcarr/config/settings.json"
-SETTINGS_FILE = "/config/settings.json"
+#SETTINGS_FILE = "/config/settings.json"
+if os.getenv('FLASK_ENV') == 'development':
+    # In development, use the home folder settings file
+    SETTINGS_FILE = os.path.expanduser('~/config/settings.json')
+else:
+    # In production, use the config folder
+    SETTINGS_FILE = '/config/settings.json'
+
+# Log the SETTINGS_FILE path
+logger.info(f'Settings file path: {SETTINGS_FILE}')
+logger.info(f'App version: {app_version}')
 
 # Load settings.json
 with open(SETTINGS_FILE, 'r') as f:
     settings = json.load(f)
 
 # Access configuration files and video directory
 config_files = settings['config_files']
-VIDEO_DIR = settings['VIDEO_DIR']
+VIDEO_DIR = os.path.expanduser(settings['VIDEO_DIR']) 
 SERVER_PORT = settings['SERVER_PORT']
 
 logger.debug(f'Loaded settings: {settings}')
@@ -52,7 +66,7 @@ def stream():
 
 @app.route('/')
 def home():
-    return render_template('home.html', config_files=config_files)
+    return render_template('home.html', config_files=config_files, version=app_version)
 
 @app.route('/edit/<filename>', methods=['GET', 'POST'])
 def edit(filename):
@@ -86,13 +100,15 @@ def videos():
     logger.debug(f'Video files found: {video_files}')
     return render_template('videos.html', video_files=video_files)
 
+
 @app.route('/play/<filename>')
 def play(filename):
-    return render_template('play.html', filename=filename)
-
-# @app.route('/play/<filename>')
-# def play(filename):
-#     return send_from_directory(VIDEO_DIR, filename)
+    try:
+        # Ensure the file exists in the VIDEO_DIR and is served from there
+        return send_from_directory(VIDEO_DIR, filename)
+    except FileNotFoundError:
+        logger.error(f'Video file not found: {filename}')
+        return "File not found", 404
 
 @app.route('/temperature')
 def get_temperature():

images/home.png

@@ -86,9 +86,17 @@ p {
 }
 
 /* Footer Styles */
-footer {
+/* footer {
     margin-top: 20px;
     text-align: center;
     font-size: 0.8em;
     color: #666;
+} */
+footer {
+    position: fixed;
+    bottom: 0;
+    width: 100%;
+    background-color: #f1f1f1;
+    text-align: center;
+    padding: 10px;
 }

images/journal.png

@@ -0,0 +1,3 @@
+
+
+