cv-frames 0.0.2__tar.gz → 0.0.3__tar.gz

{cv_frames-0.0.2 → cv_frames-0.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cv-frames
-Version: 0.0.2
+Version: 0.0.3
 Summary: Read frames from OpenCV like humans
 Description-Content-Type: text/x-rst
 Requires-Dist: opencv-python

{cv_frames-0.0.2 → cv_frames-0.0.3}/cv_frames.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cv-frames
-Version: 0.0.2
+Version: 0.0.3
 Summary: Read frames from OpenCV like humans
 Description-Content-Type: text/x-rst
 Requires-Dist: opencv-python

{cv_frames-0.0.2 → cv_frames-0.0.3}/cvframes/iterate.py

@@ -55,7 +55,7 @@ def iterate_generic(
     count = start_frame
 
     if not capture.is_opened():
-        return
+        raise RuntimeError(f"Cannot open video file: {ipath}")
 
     try:
         while True:

{cv_frames-0.0.2 → cv_frames-0.0.3}/cvframes/web/server.py

@@ -33,14 +33,20 @@ async def broadcast_task(
         frame = await frame_queue.get()
         async with clients_lock:
             to_remove = set()
+            tasks = []
             for ws in clients:
                 if ws.closed:
                     to_remove.add(ws)
                     continue
-                try:
-                    await ws.send_bytes(frame)
-                except Exception:
-                    to_remove.add(ws)
+
+                async def send(ws):
+                    try:
+                        await ws.send_bytes(frame)
+                    except Exception:
+                        to_remove.add(ws)
+
+                tasks.append(asyncio.create_task(send(ws)))
+            await asyncio.gather(*tasks, return_exceptions=True)
             for ws in to_remove:
                 clients.remove(ws)
         frame_queue.task_done()
@@ -135,7 +141,6 @@ async def websocket_handler(request):
 
 async def main(http_port: int, tcp_port: int):
     app = web.Application()
-
     frame_queue: asyncio.Queue = asyncio.Queue()
     clients: set[web.WebSocketResponse] = set()
     clients_lock = asyncio.Lock()
@@ -150,11 +155,8 @@ async def main(http_port: int, tcp_port: int):
 
     # Get static paths relative to package
     index = pkg_resources.files("cvframes.web.static").joinpath("index.html")
-    static = pkg_resources.files("cvframes.web.static")
-
-    app.router.add_get("/", lambda request: web.FileResponse(index))
+    app.router.add_get("/", lambda request: web.FileResponse(str(index)))
     app.router.add_get("/ws", websocket_handler)
-    app.router.add_static("/static/", path=static, name="static")
 
     runner = web.AppRunner(app)
     await runner.setup()