[Lib+CLI] On Demand Feature + New Class Structure

.editorconfig

@@ -0,0 +1,6 @@
+charset = utf-8
+indent_size = 4
+indent_style = space
+insert_final_newline = true
+root = true
+trim_trailing_whitespace = true

mjpeg_streamer/__init__.py

@@ -1,4 +1,5 @@
-from .mjpeg_streamer import MjpegServer, Stream
+from .server import MjpegServer, Server
+from .stream import ManagedStream, Stream, StreamBase
 
-__all__ = ["MjpegServer", "Stream"]
+__all__ = ["StreamBase", "ManagedStream", "MjpegServer", "Stream", "Server"]
 __version__ = "2024.2.8"

mjpeg_streamer/cli.py

@@ -1,19 +1,18 @@
 import argparse
 import re
-import threading
-from typing import List, Tuple, Union
+import time
+from typing import Dict, List, Tuple, Union
 
-import cv2
-
-from mjpeg_streamer import MjpegServer, Stream
+from .server import Server
+from .stream import ManagedStream
 
 
 def parse_args() -> argparse.Namespace:
     parser = argparse.ArgumentParser()
     parser.add_argument("--host", type=str, default="localhost")
     parser.add_argument("--port", type=int, default=8080)
     parser.add_argument(
-        "--prefix", type=str, default="source", help="Name prefix for the streams"
+        "--prefix", type=str, default="", help="Name prefix for the streams"
     )
     parser.add_argument(
         "--source",
@@ -34,84 +33,58 @@ def parse_args() -> argparse.Namespace:
     )
     args: argparse.Namespace = parser.parse_args()
     args.prefix = re.sub("[^0-9a-zA-Z]+", "_", args.prefix)
-    args.source: List[Union[int, str],] = [[0]] if args.source is None else args.source
+    args.source = [[0]] if args.source is None else args.source
     args.source = [item for sublist in args.source for item in sublist]
     args.source = list(set(args.source))
     return args
 
 
-def run(
-    cap: cv2.VideoCapture,
-    stream: Stream,
-    stop_event: threading.Event,
-    show_bandwidth: bool,
-) -> None:
-    while not stop_event.is_set():
-        ret, frame = cap.read()
-        if not ret:
-            stop_event.set()
-            break
-        stream.set_frame(frame)
-        if show_bandwidth:
-            global bandwidth
-            bandwidth[stream.name] = stream.get_bandwidth()
-    cap.release()
-
-
 def main() -> None:
     args = parse_args()
     size: Tuple[int, int] = (args.width, args.height)
-    server = MjpegServer(args.host, args.port)
-    threads: List[threading.Thread,] = []
-    stop_events: List[threading.Event,] = []
+    streams: List[ManagedStream] = []
+    server = Server(args.host, args.port)
 
     if args.show_bandwidth:
-        global bandwidth
-        bandwidth = {}  # dict[str, int]
+        bandwidth: Dict[str, int] = {}
 
     for source in args.source:
         source: Union[int, str] = int(source) if str(source).isdigit() else source
-        cap = cv2.VideoCapture(source)
         source_display = (
             re.sub("[^0-9a-zA-Z]+", "_", source) if isinstance(source, str) else source
         )
-        stream = Stream(
-            f"{args.prefix}_{source_display!s}",
+        stream = ManagedStream(
+            f"{args.prefix}{'_' if args.prefix else ''}{source_display!s}",
+            source=source,
             size=size,
             quality=args.quality,
             fps=args.fps,
         )
         server.add_stream(stream)
-        stop_event = threading.Event()
-        stop_events.append(stop_event)
-        thread = threading.Thread(
-            target=run, args=(cap, stream, stop_event, args.show_bandwidth)
-        )
-        threads.append(thread)
+        streams.append(stream)
 
     try:
-        for thread in threads:
-            thread.start()
+        for stream in streams:
+            stream.start()
         server.start()
         while True:
             if args.show_bandwidth:
+                for stream in streams:
+                    bandwidth[stream.name] = stream.get_bandwidth()
                 print(
                     f"{' | '.join([f'{k}: {round(v / 1024, 2)} KB/s' for k, v in bandwidth.items()])}",
                     end="\r",
                 )
+            else:
+                time.sleep(1)  # Keep the main thread alive, but don't consume CPU
     except KeyboardInterrupt:
-        for stop_event in stop_events:
-            stop_event.set()
-        server.stop()
-        for thread in threads:
-            thread.join()
+        print("\nExiting...")
     except Exception as e:
-        print(e)
-        for stop_event in stop_events:
-            stop_event.set()
+        print("Error:", e)
+    finally:
+        for stream in streams:
+            stream.stop()
         server.stop()
-        for thread in threads:
-            thread.join()
 
 
 if __name__ == "__main__":