purge all local-recording remnants: files endpoints/UI, smart_cleanup/janitor, recordings dir, mkvmerge dep — broadcast-only

Dockerfile

@@ -1,5 +1,5 @@
 FROM python:3.11-slim-trixie
-RUN apt-get update && apt-get install -y --no-install-recommends ffmpeg mkvtoolnix ca-certificates tzdata && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y --no-install-recommends ffmpeg ca-certificates tzdata && rm -rf /var/lib/apt/lists/*
 RUN ffmpeg -hide_banner -h protocol=rtmps 2>&1 | grep -q rtmp_enhanced_codecs
 WORKDIR /app
 COPY requirements.txt .

app.py

@@ -1,38 +1,27 @@
-import os, re, json, time, threading, subprocess, shutil, secrets, logging
+import os, re, json, time, threading, shutil, secrets, logging
 from pathlib import Path
 from urllib.parse import urlparse
 from concurrent.futures import ThreadPoolExecutor
 from fastapi import FastAPI, Depends, HTTPException
 from fastapi.security import HTTPBasic, HTTPBasicCredentials
-from fastapi.responses import HTMLResponse, FileResponse
+from fastapi.responses import HTMLResponse
 from pydantic import BaseModel
 from curl_cffi import requests
 import tiktok_auth
 
 ROOT=Path(os.getenv('DATA_DIR','/data/tiktok-recorder' if Path('/data').is_dir() else './storage')).resolve()
 ROOT.mkdir(parents=True,exist_ok=True)
-FILES=ROOT/'recordings'; FILES.mkdir(exist_ok=True)
 TOKENS=ROOT/'tokens.json'
 tiktok_auth.configure(ROOT/'tiktok-tokens.json')
 PASSWORD=os.getenv('PASSWORD','')
 if not PASSWORD: raise RuntimeError('Set PASSWORD before starting the app')
 FFMPEG=os.getenv('FFMPEG_PATH') or shutil.which('ffmpeg')
 if not FFMPEG: raise RuntimeError('ffmpeg is required')
-MKVMERGE=os.getenv('MKVMERGE_PATH') or shutil.which('mkvmerge')
-FFPROBE=os.getenv('FFPROBE_PATH') or shutil.which('ffprobe')
-if not MKVMERGE or not FFPROBE: raise RuntimeError('mkvmerge and ffprobe are required')
-FINALIZE_LOCK=threading.Lock()
 INTERVAL=max(30,int(os.getenv('CHECK_INTERVAL','60')))
-SEGMENT=max(0,int(os.getenv('SEGMENT_SECONDS','0'))) # 0 = no scheduled split
 # MAX_ACCOUNTS=0 means unlimited. The old default of 3 blocked adding
 # legitimate accounts even though the rest of the app can handle them.
 _MAX_ACCOUNTS=int(os.getenv('MAX_ACCOUNTS','0'))
 MAX_ACCOUNTS=_MAX_ACCOUNTS if _MAX_ACCOUNTS>0 else None
-MIN_FREE_MB=int(os.getenv('MIN_FREE_MB','1024'))
-# SMART CLEANUP: guarantee free space for continuous broadcast
-KEEP_LAST_FILES=max(1,int(os.getenv('KEEP_LAST_FILES','2')))  # keep newest N files always
-ENSURE_FREE_MB=max(MIN_FREE_MB*2,int(os.getenv('ENSURE_FREE_MB','2048')))  # target free before/after finalize
-AUTO_DELETE_MKV=True  # never keep .mkv if .mp4 succeeded (user request)
 lock=threading.RLock(); tasks={}; events=[]; handles={}
 security=HTTPBasic()
 def auth(c:HTTPBasicCredentials=Depends(security)):
@@ -50,68 +39,6 @@ def save():
         slim={u:{'enabled':bool(t.get('enabled')),'rtmp':t.get('rtmp') or ''} for u,t in tasks.items()}
         tmp=ROOT/'tasks.tmp';tmp.write_text(json.dumps(slim));tmp.replace(ROOT/'tasks.json')
 
-def smart_cleanup(reason="periodic"):
-    """Intelligent deletion: always keep KEEP_LAST_FILES newest, delete oldest until ENSURE_FREE_MB is free.
-    Never touches .partial. files (currently recording/finalizing). Deletes .mkv first if MP4 exists."""
-    try:
-        # Never delete partial files
-        all_completed = [p for p in FILES.iterdir() if p.is_file() and '.partial.' not in p.name and p.suffix in ('.mp4','.ts','.mkv','.flv') and p.name != '.gitkeep']
-        if not all_completed:
-            return 0
-        # Sort by mtime: newest first
-        all_completed.sort(key=lambda p: p.stat().st_mtime, reverse=True)
-        # Always keep newest KEEP_LAST_FILES
-        keep = set(all_completed[:KEEP_LAST_FILES])
-        candidates = all_completed[KEEP_LAST_FILES:]  # oldest first will be at end, but we iterate oldest first for deletion
-        candidates.sort(key=lambda p: p.stat().st_mtime)  # oldest first
-        freed=0
-        deleted=[]
-        # Phase 1: delete .mkv files that have a corresponding .mp4 (redundant) - user requested no mkv
-        if AUTO_DELETE_MKV:
-            for p in list(candidates):
-                if p.suffix == '.mkv':
-                    # if same stem has mp4, it's redundant
-                    stem = p.stem
-                    # stem may be like user_20260917_... - check if any mp4 with similar prefix exists in keep or candidates
-                    # simpler: just delete all mkv older than keep
-                    try:
-                        sz=p.stat().st_size
-                        p.unlink()
-                        freed+=sz
-                        deleted.append(p.name)
-                        candidates.remove(p)
-                    except OSError:
-                        pass
-            # also check keep set for mkv that have mp4 equivalent? Keep as is if user wants to keep 2 newest mkv? but user said no need mkv
-            for p in list(keep):
-                if p.suffix == '.mkv':
-                    # if there's an mp4 with same date prefix, delete mkv even from keep? But respect KEEP_LAST_FILES: keep mp4 instead
-                    # Find if there's a newer mp4 that covers same period - just keep it for now, but log
-                    pass
-
-        # Phase 2: ensure free space
-        free_mb = shutil.disk_usage(FILES).free / (1024*1024)
-        # Also consider if total size of completed files > 80% of disk, proactively clean
-        for p in candidates:
-            if free_mb >= ENSURE_FREE_MB:
-                break
-            try:
-                sz=p.stat().st_size
-                p.unlink()
-                freed+=sz
-                free_mb += sz/(1024*1024)
-                deleted.append(p.name)
-            except OSError:
-                continue
-        if deleted:
-            log('system', f'تنظيف ذكي ({reason}): حذف {len(deleted)} ملف قديم لتوفير {round(freed/1048576,1)}MB — ضمنا {int(free_mb)}MB فراغ للبث المستمر (احتفظنا بآخر {KEEP_LAST_FILES})')
-        return len(deleted)
-    except Exception as e:
-        log('system', f'تعذر التنظيف الذكي: {type(e).__name__}')
-        return 0
-# TikTok session tokens (sessionid) — required for age-restricted (18+) lives.
-# Stored per account; a global fallback can be set via the TIKTOK_SESSIONID secret.
-_tokens={}
 def load_tokens():
     global _tokens
     try:_tokens=json.loads(TOKENS.read_text())
@@ -342,16 +269,14 @@ def youtube_stop():
 @app.get('/api/state')
 def state():
     with lock:
-        disk=shutil.disk_usage(FILES)
-        # trigger smart view but don't delete here - just report
-        files=[{'name':p.name,'mb':round(p.stat().st_size/1048576,1)} for p in sorted(FILES.iterdir(),reverse=True) if p.suffix in ('.mp4','.ts','.mkv','.flv') and '.partial.' not in p.name]
+        disk=shutil.disk_usage(ROOT)
         # Never leak the RTMP destination; expose presence only.
         task_list=[{'username':u,'enabled':t.get('enabled'),'status':t.get('status'),
                     'quality':t.get('quality'),'has_token':bool(get_token(u)),
                     'has_rtmp':bool(t.get('rtmp'))} for u,t in tasks.items()]
         tiktok_state=tiktok_auth.describe([t['username'] for t in task_list])
         free_mb = round(disk.free/1048576,1)
-        return {'tasks':task_list,'logs':events[-60:],'files':files,'version':'V9-smart','free_gb':round(disk.free/1073741824,2),'free_mb':free_mb,'max_accounts':MAX_ACCOUNTS if MAX_ACCOUNTS is not None else 'مفتوح','tiktok':tiktok_state, 'keep_last':KEEP_LAST_FILES, 'ensure_free_mb':ENSURE_FREE_MB}
+        return {'tasks':task_list,'logs':events[-60:],'free_gb':round(disk.free/1073741824,2),'free_mb':free_mb,'max_accounts':MAX_ACCOUNTS if MAX_ACCOUNTS is not None else 'مفتوح','tiktok':tiktok_state}
 @app.post('/api/accounts')
 def add(a:Account):
     try:u=clean_user(a.username)
@@ -426,22 +351,9 @@ def action(user:str,action:str):
         else:raise HTTPException(400)
         save()
     return {'ok':True}
-def safe_file(name):
-    p=(FILES/name).resolve()
-    if p.parent!=FILES or '.partial.' in p.name or p.suffix not in ('.ts','.mp4','.mkv','.flv') or not p.is_file():raise HTTPException(404)
-    return p
-@app.get('/api/files/{name}')
-def download(name:str):return FileResponse(safe_file(name),filename=name)
-@app.delete('/api/files/{name}')
-def delete(name:str):safe_file(name).unlink();return {'ok':True}
 @app.on_event('startup')
 def startup():
     load_tokens()
-    # smart cleanup on startup to guarantee space
-    try:
-        smart_cleanup(reason="بدء التشغيل")
-    except Exception:
-        pass
     try:saved=json.loads((ROOT/'tasks.json').read_text())
     except FileNotFoundError:saved={}
     except (OSError,ValueError):
@@ -470,12 +382,3 @@ def shutdown():
     deadline=time.monotonic()+50
     for h in list(handles.values()):h['thread'].join(timeout=max(0,deadline-time.monotonic()))
 
-# periodic smart janitor every 10 minutes
-def janitor_loop():
-    while True:
-        time.sleep(600)
-        try:
-            smart_cleanup(reason="دوري كل 10 دقايق")
-        except Exception:
-            pass
-threading.Thread(target=janitor_loop, daemon=True).start()

index.html

@@ -43,7 +43,6 @@ textarea,select{font:inherit;background:#0c1220;color:#e4eaf7;border:1px solid #
 <p>الاسم والعنوان والهاشتاكات تُجلب تلقائيًا من حساب تيك توك المبثوث عند بدء الجلسة: <code dir="ltr">{name}</code> اسم المذيع من حسابه، <code dir="ltr">{title}</code> عنوان بثه على تيك توك، <code dir="ltr">{hashtags}</code> هاشتاكات بثه. متغيرات إضافية: <code dir="ltr">{username} {date} {time} {room_id}</code>. يُضاف رابط حساب المذيع نفسه تلقائيًا لكل حدث. العنوان الناتج حتى 100 حرف. تعديل القوالب يتطلب تعطيل الإدارة وانتظار إغلاق الأحداث.</p>
 <button type="submit" id="savesettings">حفظ إعدادات الأحداث</button></form></details>
 </section>
-<section class="panel"><h2>التسجيلات المحفوظة</h2><small>تظهر بعد اكتمال تجهيز الملف. HEVC قد يحتاج VLC. لا تقسيم زمني افتراضيًا؛ قد تظهر ملفات منفصلة عند الانقطاع.</small><div id="files"></div></section>
 <section class="panel"><h2>سجل التشغيل</h2><div id="logs"></div></section>
 <footer>أسرار OAuth وتوكنات الجلسات تبقى في Secrets ومجلد البيانات فقط، ولا تظهر في الواجهة. راقب حصة التخزين من Hugging Face. تقدير API محلي وليس قراءة لحصة Google الفعلية. استخدمه للمحتوى الذي تملك حق إعادة نشره.</footer>
 </main><script>
@@ -65,7 +64,6 @@ $('ytstart').disabled=!!y.automatic;$('ytstop').disabled=!y.automatic&&!evs.leng
 $('savesettings').disabled=!!y.automatic||!!evs.length;
 if(!settingsLoaded&&y.settings)fillSettings(y.settings);
 $('tasks').innerHTML=s.tasks.length?s.tasks.map(t=>`<article class="card"><h3>@${esc(t.username)}</h3><p>${esc(t.status)}</p><small>${esc(t.quality||'الجودة لم تحدد بعد')} · ${t.received_mb||0} MB · ${Math.floor((t.elapsed_seconds||0)/60)} دقيقة</small><p>${t.enabled?'المراقبة مفعّلة':'المراقبة معطّلة'} · توكن الجلسة: ${t.has_token?'موجود ✓':'غير مضاف'} · مفتاح يوتيوب: ${t.has_rtmp?'موجود ✓ (بث فقط)':'غير مضاف'}</p><div class="row"><button data-user="${esc(t.username)}" data-action="start">تشغيل</button><button class="secondary" data-user="${esc(t.username)}" data-action="stop">إيقاف</button><button class="secondary" data-user="${esc(t.username)}" data-action="token">توكن</button><button class="danger" data-user="${esc(t.username)}" data-action="delete">حذف</button></div></article>`).join(''):'<p>أضف حسابات المذيع المطلوبة فقط.</p>';
-$('files').innerHTML=s.files.length?s.files.map(f=>`<div class="file"><div><code>${esc(f.name)}</code><br><small>${f.mb} MB</small></div><div class="row"><a href="/api/files/${encodeURIComponent(f.name)}">تنزيل</a><button class="danger" data-file="${esc(f.name)}">حذف الملف</button></div></div>`).join(''):'<p>لا توجد ملفات مكتملة بعد.</p>';
 $('logs').innerHTML=s.logs.slice().reverse().map(l=>`<div>${esc(l.time)} · @${esc(l.user)} · ${esc(l.message)}</div>`).join('');
 renderTiktok(s.tiktok);
 }catch(e){error(e.message)}finally{polling=false}}
@@ -103,6 +101,6 @@ $('add').onsubmit=async e=>{e.preventDefault();try{error('');await api('/api/acc
 document.addEventListener('click',async e=>{const b=e.target.closest('button');if(!b)return;try{
 if(b.dataset.action==='token'){const t=prompt(`توكن جلسة تيك توك (sessionid) للحساب @${b.dataset.user} — يلزم للبثوث المقيدة بفئة عمرية.\nالصق قيمة sessionid أو كوكيز كاملة، أو اتركه فارغًا للحذف:`);if(t===null)return;await api(`/api/accounts/${encodeURIComponent(b.dataset.user)}/token`,'POST',{token:t});await refresh();return}
 if(b.dataset.action){if(b.dataset.action==='delete'&&!confirm('حذف الحساب من المراقبة؟'))return;await api(`/api/accounts/${encodeURIComponent(b.dataset.user)}/${b.dataset.action}`,'POST');await refresh()}
-if(b.dataset.file&&confirm('حذف التسجيل نهائيًا من التخزين؟')){await api('/api/files/'+encodeURIComponent(b.dataset.file),'DELETE');await refresh()}}catch(e){error(e.message)}});
+}catch(e){error(e.message)}});
 document.addEventListener('visibilitychange',()=>{if(!document.hidden)refresh()});window.addEventListener('online',refresh);window.addEventListener('pageshow',refresh);refresh();setInterval(refresh,5000);
 </script></body></html>