Browse Source

test progress bar

ming 3 years ago
parent
commit
de3341e809
2 changed files with 4 additions and 14 deletions
  1. 3 5
      main.py
  2. 1 9
      progress.html

+ 3 - 5
main.py

@@ -1,4 +1,4 @@
-from fastapi import FastAPI,Cookie, Depends, FastAPI, Query, WebSocket, status
+from fastapi import FastAPI,Cookie, Depends, FastAPI, Query, WebSocket, status, WebSocketDisconnect
 import openshot
 import openshot
 from os import listdir
 from os import listdir
 from os.path import isfile, isdir, join
 from os.path import isfile, isdir, join
@@ -121,17 +121,15 @@ async def make_anchor_video_v2(req:request2):
     #return {"https://www.choozmo.com:8888/progress_page"}
     #return {"https://www.choozmo.com:8888/progress_page"}
     return {"msg":"製作影片需要時間,請您耐心等候  稍後可以在www.choozmo.com:8168/"+req.name+".mp4 中觀看"} 
     return {"msg":"製作影片需要時間,請您耐心等候  稍後可以在www.choozmo.com:8168/"+req.name+".mp4 中觀看"} 
 
 
-@app.websocket("/ws/{client_id}")
-async def websocket_endpoint(websocket: WebSocket, client_id: int):
+@app.websocket("/progress")
+async def websocket_endpoint(websocket: WebSocket):
     await manager.connect(websocket)
     await manager.connect(websocket)
     try:
     try:
         while True:
         while True:
             data = await websocket.receive_text()
             data = await websocket.receive_text()
-            await manager.send_personal_message(f"You wrote: {data}", websocket)
             await manager.broadcast(data)
             await manager.broadcast(data)
     except WebSocketDisconnect:
     except WebSocketDisconnect:
         manager.disconnect(websocket)
         manager.disconnect(websocket)
-        await manager.broadcast(f"Client #{client_id} left the chat")
 
 
 
 
 
 

+ 1 - 9
progress.html

@@ -28,16 +28,8 @@
         <ul id='messages'>
         <ul id='messages'>
         </ul>
         </ul>
         <script>
         <script>
-            var client_id = Date.now()
-            
-            document.querySelector("#ws-id").textContent = client_id;
-            var ws = new WebSocket(`ws://www.choozmo.com:8888/ws/${client_id}`);
+            var ws = new WebSocket('ws://www.choozmo.com:8888/progress/');
             ws.onmessage = function(event) {
             ws.onmessage = function(event) {
-                var messages = document.getElementById('messages')
-                var message = document.createElement('li')
-                var content = document.createTextNode(event.data)
-                message.appendChild(content)
-                messages.appendChild(message)
                 var elem = document.getElementById("myBar");
                 var elem = document.getElementById("myBar");
                 elem.style.width = event.data + "%";
                 elem.style.width = event.data + "%";
                 elem.innerHTML = event.data  + "%";
                 elem.innerHTML = event.data  + "%";