@@ -3803,13 +3881,9 @@ async function addMonitor() {{
channel_username: document.getElementById('selChannelUsername').value,
media_types: document.getElementById('mediaTypes').value,
keywords: document.getElementById('mediaKeywords').value,
- max_file_size_mb: document.getElementById('maxFileSize').value,
- download_dir: document.getElementById('downloadDir').value,
proxy: document.getElementById('mediaProxy').value,
- date_from: document.getElementById('dateFrom').value,
- date_to: document.getElementById('dateTo').value,
- max_concurrent: document.getElementById('maxConcurrent').value,
- notify_telegram: document.getElementById('notifyTg').checked ? 'on' : '',
+ forward_mode: document.getElementById('forwardMode').checked ? 'on' : '',
+ forward_to: document.getElementById('forwardTo').value,
}});
try {{
const resp = await fetch('/api/monitors/create', {{ method: 'POST', headers: {{'Content-Type':'application/x-www-form-urlencoded'}}, body: body.toString() }});
@@ -3850,6 +3924,8 @@ document.getElementById('addModal').addEventListener('click', function(e) {{ if
date_from: str = Form(""),
date_to: str = Form(""),
max_concurrent: int = Form(3),
+ forward_mode: str | None = Form(None),
+ forward_to: str = Form("admin"),
) -> RedirectResponse:
try:
cid = int(channel_id.strip())
@@ -3868,6 +3944,8 @@ document.getElementById('addModal').addEventListener('click', function(e) {{ if
date_from.strip(),
date_to.strip(),
max(1, min(10, max_concurrent)),
+ bool(forward_mode),
+ forward_to.strip() or "admin",
)
return RedirectResponse("/channel-media", status_code=303)
@@ -3960,7 +4038,6 @@ async def main_async(run_once: bool = False, panel_only: bool = False) -> None:
while True:
await asyncio.sleep(3600)
if run_once:
- # If .env is filled, send notifications during manual test; otherwise just log.
try:
token, admin_chat_id = validate_env()
admin_chat_ids = parse_admin_chat_ids(os.getenv("ADMIN_CHAT_ID", ""))
@@ -3999,9 +4076,10 @@ async def main_async(run_once: bool = False, panel_only: bool = False) -> None:
else:
user_session_listener_task = asyncio.create_task(run_user_session_group_listener())
if TelegramClient is not None and user_session_ready():
- asyncio.create_task(channel_media_monitor_loop())
+ asyncio.create_task(channel_media_forward_listener())
+ logger.info("channel media forward listener started")
else:
- logger.info("channel media monitor loop skipped: telethon not installed or user session not configured")
+ logger.info("channel media forward listener skipped: telethon not installed or user session not configured")
await admin_send(f"tg-watchbot 已启动\n时间：{now_iso()}")
logger.info("bot polling start")
await dp.start_polling(bot, allowed_updates=dp.resolve_used_update_types())
diff --git a/patch_main.txt b/patch_main.txt
new file mode 100644
index 0000000..77dec8b
--- /dev/null
+++ b/patch_main.txt
@@ -0,0 +1,119 @@
+ total = monitor.get("total_downloaded", 0)
+ size_mb = (monitor.get("total_size_bytes", 0) or 0) // 1024 // 1024
+ body = f"""
下载记录 - {html_escape(monitor.get('channel_title',''))}
+
累计：{total} 个文件，{size_mb} MB
+
+
"""
+ return layout("下载记录", body)
+
+ return app
+
+
+async def start_panel_server() -> uvicorn.Server | None:
+ if not panel_enabled():
+ logger.info("web panel disabled")
+ return None
+ host = os.getenv("WEB_PANEL_HOST", "127.0.0.1")
+ port = int(os.getenv("WEB_PANEL_PORT", "8765"))
+ server = uvicorn.Server(uvicorn.Config(create_panel_app(), host=host, port=port, log_level="info"))
+ asyncio.create_task(server.serve())
+ logger.info("web panel listening on http://%s:%s", host, port)
+ return server
+
+def validate_env() -> tuple[str, int]:
+ load_dotenv(ENV_PATH)
+ token = os.getenv("TELEGRAM_BOT_TOKEN", "").strip()
+ admin = os.getenv("ADMIN_CHAT_ID", "").strip()
+ if not token:
+ raise RuntimeError(f"TELEGRAM_BOT_TOKEN is missing in {ENV_PATH}")
+ if not admin:
+ raise RuntimeError(f"ADMIN_CHAT_ID is missing in {ENV_PATH}")
+ ids = parse_admin_chat_ids(admin)
+ if not ids:
+ raise RuntimeError(f"ADMIN_CHAT_ID is invalid in {ENV_PATH}")
+ return token, ids[0]
+
+
+def bot_env_configured() -> bool:
+ load_dotenv(ENV_PATH, override=True)
+ return bool(os.getenv("TELEGRAM_BOT_TOKEN", "").strip() and os.getenv("ADMIN_CHAT_ID", "").strip())
+
+
+async def main_async(run_once: bool = False, panel_only: bool = False) -> None:
+ global bot, admin_chat_id, admin_chat_ids, config, scheduler_ref, user_session_listener_task
+ load_dotenv(ENV_PATH, override=True)
+ config = load_config()
+ setup_logging(os.getenv("LOG_LEVEL", "INFO"))
+ init_db()
+ if panel_only:
+ await start_panel_server()
+ logger.info("panel-only mode start")
+ while True:
+ await asyncio.sleep(3600)
+ if run_once:
+ try:
+ token, admin_chat_id = validate_env()
+ admin_chat_ids = parse_admin_chat_ids(os.getenv("ADMIN_CHAT_ID", ""))
+ bot = Bot(token=token, default=DefaultBotProperties(parse_mode=ParseMode.HTML))
+ except Exception as e:
+ logger.warning("run-once without Telegram notification: %s", e)
+ await run_all_monitors_once()
+ if bot:
+ await bot.session.close()
+ return
+ await start_panel_server()
+ if not bot_env_configured():
+ logger.warning(
+ "Telegram bot is not configured. Web panel is available, but Telegram polling, monitor notifications, and admin/user messaging will not work until TELEGRAM_BOT_TOKEN and ADMIN_CHAT_ID are saved, then the service is restarted."
+ )
+ while True:
+ await asyncio.sleep(3600)
+ token, admin_chat_id = validate_env()
+ admin_chat_ids = parse_admin_chat_ids(os.getenv("ADMIN_CHAT_ID", ""))
+ bot = Bot(token=token, default=DefaultBotProperties(parse_mode=ParseMode.HTML))
+ dp = Dispatcher()
+ dp.include_router(router)
+ scheduler = AsyncIOScheduler(timezone="Asia/Shanghai")
+ scheduler_ref = scheduler
+ schedule_monitors(scheduler)
+ scheduler.start()
+ asyncio.create_task(flush_pending_loop())
+ asyncio.create_task(cleanup_monitor_loop())
+ if group_monitors_need_user_session():
+ if TelegramClient is None:
+ logger.warning("group monitor with listen_source=user_session detected, but telethon is not installed")
+ elif not user_session_ready():
+ logger.warning(
+ "group monitor with listen_source=user_session detected, but TG_API_ID/TG_API_HASH/TG_API_SESSION is not complete"
+ )
+ else:
+ user_session_listener_task = asyncio.create_task(run_user_session_group_listener())
+ if TelegramClient is not None and user_session_ready():
+ asyncio.create_task(channel_media_monitor_loop())
+ asyncio.create_task(channel_media_forward_listener())
+ logger.info("channel media download + forward listeners started")
+ else:
+ logger.info("channel media listeners skipped: telethon not installed or user session not configured")
+ await admin_send(f"tg-watchbot 已启动\n时间：{now_iso()}")
+ logger.info("bot polling start")
+ await dp.start_polling(bot, allowed_updates=dp.resolve_used_update_types())
+
+
+def main() -> None:
+ parser = argparse.ArgumentParser()
+ parser.add_argument("--run-once", action="store_true", help="run all monitors once and exit; does not need Telegram token unless notification is sent")
+ parser.add_argument("--panel-only", action="store_true", help="start only the web admin panel, useful before Telegram token is configured")
+ args = parser.parse_args()
+ try:
+ asyncio.run(main_async(run_once=args.run_once, panel_only=args.panel_only))
+ except KeyboardInterrupt:
+ pass
+ except Exception:
+ logger.exception("fatal error")
+ raise
+
+
+if __name__ == "__main__":
+ main()
diff --git a/patch_tail.txt b/patch_tail.txt
new file mode 100644
index 0000000..3657466
--- /dev/null
+++ b/patch_tail.txt
@@ -0,0 +1,103 @@
+document.getElementById('addModal').addEventListener('click', function(e) { if (e.target === this) this.style.display='none'; });
+"""
+
+ @app.get("/channel-media", response_class=HTMLResponse)
+ async def channel_media_page(_: str = Depends(panel_auth)) -> str:
+ return layout("频道媒体", channel_media_page_html())
+
+ @app.get("/api/groups")
+ async def api_groups(_: str = Depends(panel_auth), q: str = "", limit: int = 500) -> dict[str, Any]:
+ if not user_session_ready():
+ return {"groups": [], "error": "TG user session not configured"}
+ if q.strip():
+ groups = await telethon_search_dialogs(q.strip(), limit=min(limit, 200))
+ else:
+ groups = await telethon_list_dialogs(limit=min(limit, 500))
+ groups = [g for g in groups if g.get("type") in ("group", "channel")]
+ return {"groups": groups}
+
+ @app.post("/api/monitors/create")
+ async def api_monitor_create(
+ _: str = Depends(panel_auth),
+ channel_id: str = Form(...),
+ channel_title: str = Form(""),
+ channel_username: str = Form(""),
+ media_types: str = Form("video,document"),
+ keywords: str = Form(""),
+ max_file_size_mb: int = Form(2000),
+ download_dir: str = Form(""),
+ notify_telegram: str | None = Form(None),
+ proxy: str = Form(""),
+ date_from: str = Form(""),
+ date_to: str = Form(""),
+ max_concurrent: int = Form(3),
+ forward_mode: str | None = Form(None),
+ forward_to: str = Form("admin"),
+ ) -> RedirectResponse:
+ try:
+ cid = int(channel_id.strip())
+ except (ValueError, TypeError):
+ raise HTTPException(400, "invalid channel_id")
+ channel_media_monitor_create(
+ cid,
+ channel_title.strip() or str(cid),
+ channel_username.strip(),
+ media_types.strip() or "video,document",
+ keywords.strip(),
+ max(1, max_file_size_mb),
+ download_dir.strip(),
+ bool(notify_telegram),
+ proxy.strip(),
+ date_from.strip(),
+ date_to.strip(),
+ max(1, min(10, max_concurrent)),
+ bool(forward_mode),
+ forward_to.strip() or "admin",
+ )
+ return RedirectResponse("/channel-media", status_code=303)
+
+ @app.get("/channel-media/{monitor_id}/pause")
+ async def channel_media_pause(monitor_id: int, _: str = Depends(panel_auth)) -> RedirectResponse:
+ channel_media_monitor_update(monitor_id, status="paused")
+ return RedirectResponse("/channel-media", status_code=303)
+
+ @app.get("/channel-media/{monitor_id}/resume")
+ async def channel_media_resume(monitor_id: int, _: str = Depends(panel_auth)) -> RedirectResponse:
+ channel_media_monitor_update(monitor_id, status="active")
+ return RedirectResponse("/channel-media", status_code=303)
+
+ @app.get("/channel-media/{monitor_id}/delete")
+ async def channel_media_delete_route(monitor_id: int, _: str = Depends(panel_auth)) -> RedirectResponse:
+ channel_media_monitor_delete(monitor_id)
+ return RedirectResponse("/channel-media", status_code=303)
+
+ @app.get("/channel-media/{monitor_id}/check", response_class=HTMLResponse)
+ async def channel_media_check(monitor_id: int, _: str = Depends(panel_auth)) -> str:
+ count = await telethon_download_from_channel(monitor_id)
+ monitor = channel_media_monitor_get(monitor_id)
+ name = monitor.get("channel_title", "") if monitor else ""
+ return layout("检查完成", f"
已检查频道 {html_escape(name)}，新增 {count} 个文件。
返回
")
+
+ @app.get("/channel-media/{monitor_id}/download", response_class=HTMLResponse)
+ async def channel_media_download_history(monitor_id: int, _: str = Depends(panel_auth)) -> str:
+ monitor = channel_media_monitor_get(monitor_id)
+ if not monitor:
+ raise HTTPException(404)
+ downloads = channel_media_downloads_list(monitor_id, limit=200)
+ rows = ""
+ for d in downloads:
+ size_mb = f"{(d.get('file_size', 0) or 0) / 1024 / 1024:.1f} MB"
+ rows += f"
| {d.get('id')} | {html_escape(d.get('media_type',''))} | "
+ rows += f"{html_escape(d.get('file_name',''))}
{html_escape(d.get('caption','')[:100])} | "
+ rows += f"{size_mb} | {html_escape(d.get('created_at',''))} |
"
+ total = monitor.get("total_downloaded", 0)
+ size_mb = (monitor.get("total_size_bytes", 0) or 0) // 1024 // 1024
+ body = f"""
下载记录 - {html_escape(monitor.get('channel_title',''))}
+
累计：{total} 个文件，{size_mb} MB
+
+
"""
+ return layout("下载记录", body)
+
+ return app