Update main.py

main.py

@@ -13,109 +13,56 @@ STREAM_KEY = os.environ.get("STREAM_KEY")
 STREAM_URL = "rtmp://a.rtmp.youtube.com/live2/"
 BG_IMAGE = "https://images.unsplash.com/photo-1555400038-63f5ba517a47?q=80&w=1920&auto=format&fit=crop"
 
-# اسم الملف الصوتي المرفوع على الـ Space
 TICK_SOUND_FILE = "time.mp3"
 
 app = Flask(__name__)
 
-# ==========================================
-# منطق تحديد الوقت والحالة (رمضان/عيد/عد تنازلي)
-# ==========================================
 def get_current_status():
     try:
-        # جلب التاريخ الهجري الحالي بدقة
         res = requests.get("http://api.aladhan.com/v1/timingsByCity?city=Mecca&country=SA&method=4", timeout=5)
         data = res.json()['data']
-        
         hijri_date = data['date']['hijri']
+        date_str = hijri_date['date']
         h_day = int(hijri_date['day'])
         h_month = int(hijri_date['month']['number'])
         h_year = int(hijri_date['year'])
-        date_str = hijri_date['date']
 
         status = ""
         target_date_gregorian = None
         msg = ""
 
-        # الحالة 1: نحن في شهر رمضان (الشهر 9)
         if h_month == 9:
             status = "ramadan_live"
             msg = "جاء رمضان.. مبارك عليكم الشهر"
-        
-        # الحالة 2: نحن في عيد الفطر (الشهر 10، الأيام 1-3)
         elif h_month == 10 and h_day <= 3:
             status = "eid_live"
             msg = "عيد مبارك - كل عام وأنتم بخير"
-        
-        # الحالة 3: العد التنازلي (قبل رمضان أو بعد العيد)
         else:
             status = "counting"
-            # حساب موعد رمضان القادم
-            if h_month < 9:
-                target_h_year = h_year # نفس السنة
-            else:
-                target_h_year = h_year + 1 # السنة القادمة
-            
-            # تحويل 1 رمضان للسنة المستهدفة إلى ميلادي
+            target_h_year = h_year if h_month < 9 else h_year + 1
             conv_res = requests.get(f"http://api.aladhan.com/v1/hToG?date=01-09-{target_h_year}", timeout=5)
             g_data = conv_res.json()['data']['gregorian']
-            
-            target_date_str = g_data['date']
-            target_date_gregorian = datetime.strptime(target_date_str, "%d-%m-%Y")
-
-        return {
-            "status": status,
-            "msg": msg,
-            "hijri_str": date_str,
-            "target_date": target_date_gregorian
-        }
+            target_date_gregorian = datetime.strptime(g_data['date'], "%d-%m-%Y")
 
-    except Exception as e:
-        print(f"API Error: {e}")
-        # قيم افتراضية للحفاظ على استمرار البث عند الخطأ
-        return {
-            "status": "counting",
-            "msg": "",
-            "hijri_str": "1447-09-01", # تاريخ تقريبي
-            "target_date": datetime(2026, 2, 18, 0, 0, 0) # تاريخ تقريبي
-        }
+        return {"status": status, "msg": msg, "hijri_str": date_str, "target_date": target_date_gregorian}
+    except:
+        return {"status": "counting", "msg": "", "hijri_str": "1447-09-01", "target_date": datetime(2026, 2, 18, 0, 0, 0)}
 
 @app.route('/time_data')
 def time_data():
     current_state = get_current_status()
-    
     if current_state['status'] in ['ramadan_live', 'eid_live']:
-        return jsonify({
-            "status": "finished",
-            "msg": current_state['msg'],
-            "hijri": current_state['hijri_str']
-        })
+        return jsonify({"status": "finished", "msg": current_state['msg'], "hijri": current_state['hijri_str']})
     
-    now = datetime.now()
-    if current_state['target_date']:
-        diff = current_state['target_date'] - now
-    else:
-        diff = timedelta(0)
-
+    diff = current_state['target_date'] - datetime.now()
     if diff.total_seconds() <= 0:
-         return jsonify({"status": "loading", "msg": "جاري التحديث...", "hijri": current_state['hijri_str']})
+        return jsonify({"status": "loading", "hijri": current_state['hijri_str']})
 
     days = diff.days
     hours, rem = divmod(diff.seconds, 3600)
     minutes, seconds = divmod(rem, 60)
-    
-    return jsonify({
-        "status": "counting",
-        "days": f"{days:02}",
-        "hours": f"{hours:02}",
-        "minutes": f"{minutes:02}",
-        "seconds": f"{seconds:02}",
-        "hijri": current_state['hijri_str']
-    })
+    return jsonify({"status": "counting", "days": f"{days:02}", "hours": f"{hours:02}", "minutes": f"{minutes:02}", "seconds": f"{seconds:02}", "hijri": current_state['hijri_str']})
 
-# ==========================================
-# صفحة الويب (HTML + CSS)
-# ==========================================
 @app.route('/')
 def home():
     html_content = """
@@ -137,8 +84,14 @@ def home():
             .hijri-badge { background: #4CAF50; padding: 5px 20px; border-radius: 50px; font-size: 20px; margin-bottom: 20px; display: inline-block; }
             .title { font-size: 40px; margin-bottom: 30px; text-shadow: 2px 2px 10px rgba(0,0,0,0.8); }
             
-            /* تعديل المحاذاة لتكون في المنتصف تماماً */
-            .countdown { display: flex; gap: 10px; justify-content: center; direction: ltr; align-items: center; }
+            /* الحاوية الأساسية للعد التنازلي */
+            .countdown { 
+                display: flex; 
+                gap: 15px; 
+                justify-content: center; 
+                direction: ltr; 
+                align-items: flex-start; /* محاذاة العناصر من الأعلى لضمان تناسق الوحدات */
+            }
             
             .card { 
                 background: linear-gradient(180deg, #4CAF50, #2E7D32); 
@@ -146,16 +99,22 @@ def home():
                 font-size: 70px; font-weight: 900; display: flex; 
                 justify-content: center; align-items: center; 
                 box-shadow: 0 8px 15px rgba(0,0,0,0.5);
+                line-height: 1; /* لضمان توسط الرقم داخل المربع */
             }
             .unit { display: flex; flex-direction: column; align-items: center; }
-            .label { margin-top: 8px; font-size: 18px; color: #4CAF50; font-weight: bold; }
+            .label { margin-top: 10px; font-size: 18px; color: #4CAF50; font-weight: bold; }
             
-            /* النقطتين: تم إزالة الوميض وضبط الارتفاع */
+            /* التعديل المطلوب: وضع النقاط في نصف ارتفاع المربع بالضبط */
             .colon {
-                font-size: 70px;
+                font-size: 60px;
                 color: #4CAF50;
                 font-weight: 900;
-                padding-bottom: 10px; /* تعديل طفيف لضبط المحاذاة البصرية مع الأرقام */
+                height: 140px; /* نفس ارتفاع الـ card */
+                display: flex;
+                align-items: center; /* يتوسط عمودياً بالنسبة للـ 140px */
+                justify-content: center;
+                line-height: 1;
+                margin-top: 0; 
             }
 
             #celebration { display: none; font-size: 60px; color: #FFD700; animation: pulse 2s infinite; }
@@ -193,10 +152,10 @@ def home():
                     } else {
                         document.getElementById('main-ui').style.display = 'block';
                         document.getElementById('celebration').style.display = 'none';
-                        document.getElementById('days').innerText = data.days;
-                        document.getElementById('hours').innerText = data.hours;
-                        document.getElementById('minutes').innerText = data.minutes;
-                        document.getElementById('seconds').innerText = data.seconds;
+                        document.getElementById('days').innerText = data.days || "00";
+                        document.getElementById('hours').innerText = data.hours || "00";
+                        document.getElementById('minutes').innerText = data.minutes || "00";
+                        document.getElementById('seconds').innerText = data.seconds || "00";
                     }
                 });
             }
@@ -208,51 +167,22 @@ def home():
     """
     return html_content
 
-# ==========================================
-# دالة البث المباشر (FFmpeg)
-# ==========================================
 def start_stream():
-    if not STREAM_KEY: 
-        print("Error: STREAM_KEY not found.")
-        return
-
+    if not STREAM_KEY: return
     while True:
         current_state = get_current_status()
-        
-        # إعدادات النصوص والألوان
         if current_state['status'] == 'ramadan_live':
-            display_text = "Ramadan Mubarak - Mubarak Alaykum Al-Shahr"
-            box_color = "0xD4AF37"
-            title_text = "RAMADAN KAREEM"
-            font_size = "65"
-            
+            display_text, box_color, title_text, font_size = "Ramadan Mubarak", "0xD4AF37", "RAMADAN KAREEM", "65"
         elif current_state['status'] == 'eid_live':
-            display_text = "Eid Mubarak"
-            box_color = "0x9C27B0"
-            title_text = "EID AL-FITR"
-            font_size = "90"
-            
+            display_text, box_color, title_text, font_size = "Eid Mubarak", "0x9C27B0", "EID AL-FITR", "90"
         else:
-            if current_state['target_date']:
-                target_ts = int(current_state['target_date'].timestamp())
-            else:
-                target_ts = int(datetime.now().timestamp())
-
+            target_ts = int(current_state['target_date'].timestamp()) if current_state['target_date'] else int(time.time())
             display_text = f" %{{pts\\:localtime\\:{target_ts}\\:%d}} : %{{pts\\:localtime\\:{target_ts}\\:%H}} : %{{pts\\:localtime\\:{target_ts}\\:%M}} : %{{pts\\:localtime\\:{target_ts}\\:%S}} "
-            box_color = "0x4CAF50"
-            title_text = "RAMADAN COUNTDOWN"
-            font_size = "90"
+            box_color, title_text, font_size = "0x4CAF50", "RAMADAN COUNTDOWN", "90"
 
-        # أوامر FFmpeg
-        # استخدام الملف المحلي time.mp3
         ffmpeg_cmd = [
-            'ffmpeg', 
-            '-re', 
-            '-stream_loop', '-1', '-i', TICK_SOUND_FILE, # استخدام الملف المحلي
-            '-loop', '1', '-i', BG_IMAGE, 
-            '-map', '1:v', 
-            '-map', '0:a', 
-            '-f', 'lavfi', '-i', 'anullsrc', 
+            'ffmpeg', '-re', '-stream_loop', '-1', '-i', TICK_SOUND_FILE,
+            '-loop', '1', '-i', BG_IMAGE, '-map', '1:v', '-map', '0:a',
             '-vf', (
                 f"scale=1280:720,setsar=1,"
                 f"drawbox=y=ih/2-80:color=black@0.6:width=iw:height=200:t=fill,"
@@ -261,19 +191,13 @@ def start_stream():
                 f"drawtext=text='{display_text}':x=(w-text_w)/2:y=(h-text_h)/2+50:fontsize={font_size}:fontcolor=white:box=1:boxcolor={box_color}@1:boxborderw=25"
             ),
             '-vcodec', 'libx264', '-preset', 'veryfast', '-b:v', '3000k', '-maxrate', '3000k', '-bufsize', '6000k',
-            '-pix_fmt', 'yuv420p', '-g', '60', 
-            '-c:a', 'aac', '-b:a', '128k', 
-            '-shortest', 
-            '-f', 'flv', f"{STREAM_URL}{STREAM_KEY}"
+            '-pix_fmt', 'yuv420p', '-g', '60', '-c:a', 'aac', '-b:a', '128k', '-f', 'flv', f"{STREAM_URL}{STREAM_KEY}"
         ]
-        
         try:
             subprocess.run(ffmpeg_cmd, check=True)
-        except Exception as e:
-            print(f"Stream error/restart: {e}")
+        except:
             time.sleep(5)
 
 if __name__ == "__main__":
-    # تشغيل التطبيق والبث
     threading.Thread(target=lambda: app.run(host='0.0.0.0', port=7860, debug=False, use_reloader=False), daemon=True).start()
     start_stream()