meltingplot.rpi-camera 0.0.2__tar.gz → 0.0.3__tar.gz

{meltingplot_rpi_camera-0.0.2/meltingplot.rpi_camera.egg-info → meltingplot_rpi_camera-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meltingplot.rpi_camera
-Version: 0.0.2
+Version: 0.0.3
 Summary: RPi Camera MJPEG Streamer.
 Home-page: 
 Author: Tim Schneider
@@ -210,6 +210,7 @@ License:                                  Apache License
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: click
+Requires-Dist: piexif
 Provides-Extra: test
 Requires-Dist: pytest-cov; extra == "test"
 Requires-Dist: pytest-mock; extra == "test"
@@ -259,7 +260,7 @@ To install the required dependencies, run:
     python3 -m venv --system-site-packages venv
     source venv/bin/activate
     pip install meltingplot.rpi_camera
-    sudo rpi-camera install
+    rpi-camera install
 
 Usage
 -----

{meltingplot_rpi_camera-0.0.2 → meltingplot_rpi_camera-0.0.3}/README.rst

@@ -29,7 +29,7 @@ To install the required dependencies, run:
     python3 -m venv --system-site-packages venv
     source venv/bin/activate
     pip install meltingplot.rpi_camera
-    sudo rpi-camera install
+    rpi-camera install
 
 Usage
 -----

{meltingplot_rpi_camera-0.0.2 → meltingplot_rpi_camera-0.0.3}/meltingplot/rpi_camera/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2024-11-27T21:05:27+0100",
+ "date": "2024-12-02T11:25:54+0100",
  "dirty": false,
  "error": null,
- "full-revisionid": "9922b35613936eaed383a1153f17e24c4f7b98c3",
- "version": "0.0.2"
+ "full-revisionid": "693a3d12e8aab7ea9139e0cd97f1eadd687edc1c",
+ "version": "0.0.3"
 }
 '''  # END VERSION_JSON
 

meltingplot_rpi_camera-0.0.3/meltingplot/rpi_camera/cli/install.py

@@ -0,0 +1,73 @@
+"""Install the RPi Camera as a systemd service."""
+
+import click
+
+
+@click.command()
+def install():
+    """Install the RPi Camera as a systemd service."""
+    import os
+    import getpass
+    import grp
+    import subprocess
+    import sys
+    import tempfile
+
+    # Get the path of the service file
+    rpi_camera_service_file = os.path.join(sys.prefix, 'rpi-camera.service')
+
+    service_content = None
+
+    # Read the content of the service file
+    with open(rpi_camera_service_file, 'r') as file:
+        service_content = file.read()
+
+    # Replace User and Group with the current user and group
+    current_user = getpass.getuser()
+    current_group = grp.getgrgid(os.getgid()).gr_name
+    service_content = service_content.replace('User=pi', f'User={current_user}', 1)
+    service_content = service_content.replace('Group=pi', f'Group={current_group}', 1)
+
+    click.echo(f"Installing the service as user/group: {current_user}/{current_group}")
+
+    # Save the modified content to a temp file
+    with tempfile.NamedTemporaryFile('wt+') as tmp_file:
+        tmp_file.write(service_content)
+        tmp_file.flush()
+
+        # Copy the service file to /etc/systemd/system
+        subprocess.check_output(['sudo', 'cp', tmp_file.name, '/etc/systemd/system/rpi-camera.service'])
+
+    executable_file = os.path.join(sys.exec_prefix, 'bin/rpi-camera')
+
+    # Make the rpi-camera command available outside the venv
+    subprocess.check_output(['sudo', 'ln', '-sf', executable_file, '/usr/local/bin/rpi-camera'])
+
+    click.echo('Configuring static IP for wlan0 using nmcli to 10.42.0.3')
+
+    # Set the static IP for wlan0 using nmcli
+    subprocess.check_output(['sudo', 'nmcli', 'con', 'mod', 'preconfigured', 'ipv4.addresses', '10.42.0.3/24'])
+    subprocess.check_output(['sudo', 'nmcli', 'con', 'mod', 'preconfigured', 'ipv4.gateway', '10.42.0.1'])
+    subprocess.check_output(['sudo', 'nmcli', 'con', 'mod', 'preconfigured', 'ipv4.dns', '10.42.0.1'])
+    subprocess.check_output(['sudo', 'nmcli', 'con', 'mod', 'preconfigured', 'ipv4.method', 'manual'])
+
+    # Bring the connection down and up to apply changes
+    subprocess.check_output(['sudo', 'nmcli', 'con', 'down', 'preconfigured'])
+    subprocess.check_output(['sudo', 'nmcli', 'con', 'up', 'preconfigured'])
+
+    click.echo('Install reboot on wifi disconnect service')
+    wifi_script_file = os.path.join(sys.prefix, 'reboot_on_wifi_disconnect.sh')
+    subprocess.check_output(['sudo', 'cp', '-f', wifi_script_file, '/usr/local/bin/reboot_on_wifi_disconnect.sh'])
+    subprocess.check_output(['sudo', 'chmod', '+x', '/usr/local/bin/reboot_on_wifi_disconnect.sh'])
+    subprocess.check_output(['sudo', '/usr/local/bin/reboot_on_wifi_disconnect.sh', 'install'])
+
+    # Reload the systemd daemon
+    subprocess.check_output(['sudo', 'systemctl', 'daemon-reload'])
+
+    # Enable the service
+    subprocess.check_output(['sudo', 'systemctl', 'enable', 'rpi-camera'])
+
+    # Start the service
+    subprocess.check_output(['sudo', 'systemctl', 'start', 'rpi-camera'])
+
+    click.echo('The RPi Camera has been installed as a systemd service.')

{meltingplot_rpi_camera-0.0.2 → meltingplot_rpi_camera-0.0.3}/meltingplot/rpi_camera/server.py

@@ -43,6 +43,8 @@ from picamera2 import Picamera2
 from picamera2.encoders import MJPEGEncoder
 from picamera2.outputs import FileOutput
 
+import piexif
+
 
 PAGE = """\
 <html>
@@ -69,15 +71,49 @@ PAGE = """\
 class StreamingOutput(io.BufferedIOBase):
     """A class that buffers the video frames and notifies waiting threads when a new frame is available."""
 
-    def __init__(self):
-        """Initialize the streaming output with a frame buffer and condition."""
+    def __init__(self, rotation: int = 0):
+        """
+        Initialize the streaming output with a frame buffer and condition.
+
+        Args:
+            rotation (int): The rotation angle for the JPEG image. Must be one of
+                            [0, 90, 180, 270]. Default is 0.
+
+        Raises:
+            ValueError: If the rotation value is not one of [0, 90, 180, 270].
+
+        Attributes:
+            frame (None): Placeholder for the frame buffer.
+            condition (Condition): Condition variable for thread synchronization.
+        """
         self.frame = None
         self.condition = Condition()
 
+        # Set the orientation of the JPEG image based on the rotation value
+        # more info: http://sylvana.net/jpegcrop/exif_orientation.html
+        if rotation == 0:
+            orientation = 1
+        elif rotation == 90:
+            orientation = 6
+        elif rotation == 180:
+            orientation = 3
+        elif rotation == 270:
+            orientation = 8
+        else:
+            raise ValueError("Invalid rotation value")
+
+        exif_data = piexif.dump({
+            "0th": {
+                piexif.ImageIFD.Orientation: orientation,
+            },
+        })
+        jpeg_app_len = len(exif_data) + 2
+        self._jpeg_app1 = b"\xff\xe1" + (jpeg_app_len).to_bytes(2, byteorder="big") + exif_data
+
     def write(self, buf):
         """Write the buffer to the stream and notify waiting threads."""
         with self.condition:
-            self.frame = buf
+            self.frame = buf[:2] + self._jpeg_app1 + buf[2:]
             self.condition.notify_all()
 
 
@@ -173,14 +209,22 @@ def start():
     Raise:
         Exception: If there is an error during the server execution or camera operation.
     """
-    frame_buffer = StreamingOutput()
+    frame_buffer = StreamingOutput(rotation=180)
     HttpHandler.frame_buffer = frame_buffer
     StreamingHandler.frame_buffer = frame_buffer
 
-    picam2 = Picamera2()
+    try:
+        picam2 = Picamera2()
+    except IndexError as e:
+        logging.error("Error initializing the camera: %s - is a RPi camera connected?", str(e))
+        raise
+
     picam2.configure(picam2.create_video_configuration(main={"size": (1920, 1080)}))
     picam2.start_recording(MJPEGEncoder(), FileOutput(frame_buffer))
-    picam2.set_controls({"AfMode": controls.AfModeEnum.Continuous})
+    picam2.set_controls({
+        "AfMode": controls.AfModeEnum.Continuous,
+        "FrameRate": 10,
+    })
 
     try:
 

{meltingplot_rpi_camera-0.0.2 → meltingplot_rpi_camera-0.0.3/meltingplot.rpi_camera.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: meltingplot.rpi_camera
-Version: 0.0.2
+Version: 0.0.3
 Summary: RPi Camera MJPEG Streamer.
 Home-page: 
 Author: Tim Schneider
@@ -210,6 +210,7 @@ License:                                  Apache License
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: click
+Requires-Dist: piexif
 Provides-Extra: test
 Requires-Dist: pytest-cov; extra == "test"
 Requires-Dist: pytest-mock; extra == "test"
@@ -259,7 +260,7 @@ To install the required dependencies, run:
     python3 -m venv --system-site-packages venv
     source venv/bin/activate
     pip install meltingplot.rpi_camera
-    sudo rpi-camera install
+    rpi-camera install
 
 Usage
 -----

{meltingplot_rpi_camera-0.0.2 → meltingplot_rpi_camera-0.0.3}/meltingplot.rpi_camera.egg-info/SOURCES.txt

@@ -1,6 +1,7 @@
 LICENSE
 MANIFEST.in
 README.rst
+reboot_on_wifi_disconnect.sh
 requirements.txt
 requirements_test.txt
 rpi-camera.service

{meltingplot_rpi_camera-0.0.2 → meltingplot_rpi_camera-0.0.3}/meltingplot.rpi_camera.egg-info/requires.txt

@@ -1,4 +1,5 @@
 click
+piexif
 
 [test]
 pytest-cov

meltingplot_rpi_camera-0.0.3/reboot_on_wifi_disconnect.sh

@@ -0,0 +1,65 @@
+#!/bin/bash
+
+# Function to check if wlan0 is connected
+check_wlan0_connected() {
+    iw dev wlan0 link | grep -q "Connected"
+}
+
+# Function to check if 10.42.0.1 is reachable
+check_ip_reachable() {
+    ping -c 1 10.42.0.1 &> /dev/null
+}
+
+# Function to install the systemd service
+install_service() {
+    # Create a systemd service file for this script
+    cat <<EOF | sudo tee /etc/systemd/system/reboot_on_wifi_disconnect.service
+[Unit]
+Description=Reboot on Lost WiFi
+After=network.target NetworkManager.service
+
+[Service]
+ExecStartPre=/bin/sleep 60
+ExecStart=/usr/local/bin/reboot_on_wifi_disconnect.sh
+Restart=always
+User=root
+Type=simple
+
+[Install]
+WantedBy=multi-user.target
+EOF
+
+    # Reload systemd manager configuration
+    sudo systemctl daemon-reload
+
+    # Enable the service to start on boot
+    sudo systemctl enable reboot_on_wifi_disconnect.service
+
+    # Start the service immediately
+    sudo systemctl start reboot_on_wifi_disconnect.service
+}
+
+# Main function to monitor WiFi connection
+monitor_wifi() {
+    failure_count=0
+    while true; do
+        # Check connection status every second for 5 seconds
+        if ! check_wlan0_connected || ! check_ip_reachable; then
+            failure_count=$((failure_count + 1))
+            if [ "$failure_count" -ge 3 ]; then
+                echo "wlan0 is not connected or 10.42.0.1 is not reachable for 3 consecutive checks. Rebooting..."
+                reboot
+            fi
+        else
+            failure_count=0
+        fi
+        sleep 1
+    done
+}
+
+# Check if the script is called with "install" argument
+if [ "$1" == "install" ]; then
+    install_service
+else
+    monitor_wifi
+fi

meltingplot_rpi_camera-0.0.3/requirements.txt

@@ -0,0 +1,2 @@
+click
+piexif

{meltingplot_rpi_camera-0.0.2 → meltingplot_rpi_camera-0.0.3}/setup.py

@@ -50,6 +50,7 @@ setup(
     data_files=[
         ('', [
             'rpi-camera.service',
+            'reboot_on_wifi_disconnect.sh',
             ]),
     ],
 )

meltingplot_rpi_camera-0.0.2/meltingplot/rpi_camera/cli/install.py

@@ -1,55 +0,0 @@
-"""Install the RPi Camera as a systemd service."""
-
-import click
-
-
-@click.command()
-def install():
-    """Install the RPi Camera as a systemd service."""
-    import os
-    import getpass
-    import grp
-    import subprocess
-    import sys
-    import tempfile
-
-    # Get the path of the service file
-    service_file = os.path.join(sys.prefix, 'rpi-camera.service')
-
-    service_content = None
-
-    # Read the content of the service file
-    with open(service_file, 'r') as file:
-        service_content = file.read()
-
-    # Replace User and Group with the current user and group
-    current_user = getpass.getuser()
-    current_group = grp.getgrgid(os.getgid()).gr_name
-    service_content = service_content.replace('User=pi', f'User={current_user}', 1)
-    service_content = service_content.replace('Group=pi', f'Group={current_group}', 1)
-
-    click.echo(f"Installing the service as user/group: {current_user}/{current_group}")
-
-    # Save the modified content to a temp file
-    with tempfile.NamedTemporaryFile('wt+') as tmp_file:
-        tmp_file.write(service_content)
-        tmp_file.flush()
-
-        # Copy the service file to /etc/systemd/system
-        subprocess.check_output(['sudo', 'cp', tmp_file.name, '/etc/systemd/system/rpi-camera.service'])
-
-    # Reload the systemd daemon
-    subprocess.run(['sudo', 'systemctl', 'daemon-reload'])
-
-    # Enable the service
-    subprocess.run(['sudo', 'systemctl', 'enable', 'rpi-camera'])
-
-    # Start the service
-    subprocess.run(['sudo', 'systemctl', 'start', 'rpi-camera'])
-
-    executable_file = os.path.join(sys.prefix, 'bin/rpi-camera')
-
-    # Make the rpi-camera command available outside the venv
-    subprocess.run(['sudo', 'ln', '-sf', executable_file, '/usr/local/bin/rpi-camera'])
-
-    print('The RPi Camera has been installed as a systemd service.')

meltingplot_rpi_camera-0.0.2/requirements.txt

@@ -1 +0,0 @@
-click