Spaces:

1hitonline
/

flaskdockernew

Sleeping

App Files Files Community

MySafeCode commited on Jan 30

Commit

0f9e483

verified ·

1 Parent(s): 54b22e0

Update app.py

Browse files

Files changed (1) hide show

app.py +119 -62

app.py CHANGED Viewed

@@ -12,43 +12,51 @@ pygame.init()
 WIDTH, HEIGHT = 800, 600
 shared = {
-    "latest_frame": None,
     "frame_count": 0,
-    "streaming": True
 }
-def capture_loop():
-    """Simple game loop - creates surface ONCE"""
     screen = pygame.Surface((WIDTH, HEIGHT))
-    circle_x, circle_y = WIDTH//2, HEIGHT//2
-    speed_x, speed_y = 4, 3
     while shared["streaming"]:
-        start_time = time.time()
-        # Update position
-        circle_x += speed_x
-        circle_y += speed_y
-        if circle_x < 30 or circle_x > WIDTH-30: speed_x *= -1
-        if circle_y < 30 or circle_y > HEIGHT-30: speed_y *= -1
-        # Draw on existing surface
-        screen.fill((25, 25, 45))
-        pygame.draw.circle(screen, (255, 80, 80), (int(circle_x), int(circle_y)), 30)
-        # Convert to JPEG
-        frame_str = pygame.image.tostring(screen, 'RGB')
-        img = Image.frombytes('RGB', (WIDTH, HEIGHT), frame_str)
-        buf = BytesIO()
-        img.save(buf, format='JPEG', quality=85)
-        shared["latest_frame"] = base64.b64encode(buf.getvalue()).decode('utf-8')
-        shared["frame_count"] += 1
-        # Control FPS
-        elapsed = time.time() - start_time
-        if elapsed < 1.0/30:
-            time.sleep(1.0/30 - elapsed)
 app = Flask(__name__)
@@ -57,29 +65,59 @@ HTML = '''<html>
     <style>
         body { background:#0f172a; color:white; text-align:center; padding:20px; }
         #streamImg { border:3px solid #60a5fa; width:400px; height:300px; }
     </style>
 </head>
 <body>
-    <h1>PyGame Stream</h1>
     <img id="streamImg" src="/stream">
-    <p>Frames: <span id="count">0</span></p>
     <script>
         function updateStream() {
             const img = document.getElementById('streamImg');
-            // ADD cache-busting timestamp
-            img.src = '/stream?t=' + new Date().getTime();
-            fetch('/stats')
                 .then(r => r.json())
                 .then(data => {
-                    document.getElementById('count').textContent = data.frame_count;
-                });
         }
-        // Update every 33ms (30 FPS)
-        setInterval(updateStream, 33);
-        // Start immediately
         updateStream();
     </script>
 </body>
 </html>'''
@@ -90,34 +128,53 @@ def index():
 @app.route('/stats')
 def stats():
-    return {'frame_count': shared['frame_count']}
 @app.route('/stream')
 def stream():
-    if shared['latest_frame']:
-        frame_bytes = base64.b64decode(shared['latest_frame'])
-        # ADD anti-cache headers
-        return Response(
-            frame_bytes,
-            mimetype='image/jpeg',
-            headers={
-                'Cache-Control': 'no-cache, no-store, must-revalidate',
-                'Pragma': 'no-cache',
-                'Expires': '0'
-            }
-        )
-    return Response(b'', mimetype='image/jpeg')
 if __name__ == "__main__":
-    # Start game thread
-    thread = threading.Thread(target=capture_loop, daemon=True)
-    thread.start()
-    # Wait for first frame
-    for _ in range(30):
-        if shared['latest_frame']:
-            break
-        time.sleep(0.1)
     # Start server
     app.run(

 WIDTH, HEIGHT = 800, 600
 shared = {
+    "current_file": "frame_a.jpg",
     "frame_count": 0,
+    "streaming": True,
+    "last_switch": time.time()
 }
+def pingpong_loop():
+    """Alternate between two files"""
     screen = pygame.Surface((WIDTH, HEIGHT))
+    # Two different colored circles
+    circles = [
+        {"x": 200, "y": 300, "color": (255, 80, 80), "size": 50},  # Red
+        {"x": 600, "y": 300, "color": (80, 180, 255), "size": 50}   # Blue
+    ]
     while shared["streaming"]:
+        # Switch files every 0.5 seconds
+        current_time = time.time()
+        if current_time - shared["last_switch"] > 0.5:
+            if shared["current_file"] == "frame_a.jpg":
+                shared["current_file"] = "frame_b.jpg"
+                # Draw blue circle
+                screen.fill((25, 25, 45))
+                pygame.draw.circle(screen, circles[1]["color"],
+                                 (circles[1]["x"], circles[1]["y"]), circles[1]["size"])
+            else:
+                shared["current_file"] = "frame_a.jpg"
+                # Draw red circle
+                screen.fill((25, 25, 45))
+                pygame.draw.circle(screen, circles[0]["color"],
+                                 (circles[0]["x"], circles[0]["y"]), circles[0]["size"])
+            # Save to file
+            frame_str = pygame.image.tostring(screen, 'RGB')
+            img = Image.frombytes('RGB', (WIDTH, HEIGHT), frame_str)
+            img.save(shared["current_file"], quality=85)
+            shared["last_switch"] = current_time
+            shared["frame_count"] += 1
+            # Log to console
+            print(f"Switched to: {shared['current_file']} | Frame: {shared['frame_count']}")
+        time.sleep(0.1)  # Check 10 times per second
 app = Flask(__name__)
     <style>
         body { background:#0f172a; color:white; text-align:center; padding:20px; }
         #streamImg { border:3px solid #60a5fa; width:400px; height:300px; }
+        .file-a { border-color: #ff5050 !important; }
+        .file-b { border-color: #50aaff !important; }
     </style>
 </head>
 <body>
+    <h1>PyGame Ping-Pong Test</h1>
     <img id="streamImg" src="/stream">
+    <p>Frame: <span id="count">0</span> | File: <span id="filename">none</span></p>
     <script>
+        let lastFrame = 0;
         function updateStream() {
             const img = document.getElementById('streamImg');
+            const timestamp = new Date().getTime();
+            // Force fresh request
+            fetch('/stream?_=' + timestamp)
+                .then(response => response.blob())
+                .then(blob => {
+                    const url = URL.createObjectURL(blob);
+                    img.src = url;
+                    // Clean up previous blob URL
+                    if (img.dataset.lastUrl) {
+                        URL.revokeObjectURL(img.dataset.lastUrl);
+                    }
+                    img.dataset.lastUrl = url;
+                    // Update stats
+                    return fetch('/stats?_=' + timestamp);
+                })
                 .then(r => r.json())
                 .then(data => {
+                    if (data.frame_count !== lastFrame) {
+                        document.getElementById('count').textContent = data.frame_count;
+                        document.getElementById('filename').textContent = data.current_file;
+                        // Visual feedback
+                        img.className = data.current_file === 'frame_a.jpg' ? 'file-a' : 'file-b';
+                        console.log(`New frame: ${data.frame_count} (${data.current_file})`);
+                        lastFrame = data.frame_count;
+                    }
+                })
+                .catch(err => console.log('Error:', err));
         }
+        // Update every 100ms (10 FPS)
+        setInterval(updateStream, 100);
         updateStream();
+        console.log('Ping-pong test started');
     </script>
 </body>
 </html>'''
 @app.route('/stats')
 def stats():
+    return {
+        'frame_count': shared['frame_count'],
+        'current_file': shared['current_file']
+    }
 @app.route('/stream')
 def stream():
+    try:
+        if os.path.exists(shared["current_file"]):
+            with open(shared["current_file"], 'rb') as f:
+                frame_bytes = f.read()
+            return Response(
+                frame_bytes,
+                mimetype='image/jpeg',
+                headers={
+                    'Cache-Control': 'no-cache, no-store, must-revalidate, max-age=0',
+                    'Pragma': 'no-cache',
+                    'Expires': '0',
+                    'Last-Modified': time.strftime('%a, %d %b %Y %H:%M:%S GMT', time.gmtime())
+                }
+            )
+    except Exception as e:
+        print(f"Stream error: {e}")
+    # Return a small black image as fallback
+    fallback = base64.b64decode('/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAUDBAQEAwUEBAQFBQUGBwwIBwcHBw8LCwkMEQ8SEhEPERETFhwXExQaFRERGCEYGh0dHx8fExciJCIeJBweHx7/2wBDAQUFBQcGBw4ICA4eFBEUHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh7/wAARCAABAAEDASIAAhEBAxEB/8QAFQABAQAAAAAAAAAAAAAAAAAAAAv/xAAUEAEAAAAAAAAAAAAAAAAAAAAA/8QAFQEBAQAAAAAAAAAAAAAAAAAAAAX/xAAUEQEAAAAAAAAAAAAAAAAAAAAA/9oADAMBAAIRAxEAPwCdABmX/9k=')
+    return Response(fallback, mimetype='image/jpeg')
 if __name__ == "__main__":
+    # Create initial files
+    screen = pygame.Surface((WIDTH, HEIGHT))
+    screen.fill((25, 25, 45))
+    pygame.draw.circle(screen, (255, 80, 80), (200, 300), 50)
+    img = Image.frombytes('RGB', (WIDTH, HEIGHT), pygame.image.tostring(screen, 'RGB'))
+    img.save("frame_a.jpg", quality=85)
+    screen.fill((25, 25, 45))
+    pygame.draw.circle(screen, (80, 180, 255), (600, 300), 50)
+    img = Image.frombytes('RGB', (WIDTH, HEIGHT), pygame.image.tostring(screen, 'RGB'))
+    img.save("frame_b.jpg", quality=85)
+    print("Created initial files: frame_a.jpg (red) and frame_b.jpg (blue)")
+    # Start ping-pong thread
+    thread = threading.Thread(target=pingpong_loop, daemon=True)
+    thread.start()
     # Start server
     app.run(