TikTok UX: localized slideshow status (25 langs), audio duration probe, status lives through music fetch

bot.py

@@ -692,6 +692,7 @@ __all__ = [
     "_tiktok_music_page_id",
     "_write_mp3_tags",
     "_download_url_bin",
+    "_probe_audio_duration",
     "_probe_video_dimensions",
     "_generate_video_thumbnail",
     "_probe_and_thumbnail_from_bytes",
@@ -968,6 +969,7 @@ from lumen_tiktok import (
     _tiktok_music_page_id,
     _write_mp3_tags,
     _download_url_bin,
+    _probe_audio_duration,
     _probe_video_dimensions,
     _generate_video_thumbnail,
     _communicate_process,

lumen_lang.py

@@ -591,6 +591,14 @@ STRINGS: dict[str, dict[str, str]] = {
         "ru": "Музыка из TikTok",
         "uk": "Музика з TikTok",
     },
+    "tiktok_dl_slideshow": {
+        "be": "Слайдшоў TikTok: {shown}/{total}",
+        "en": "TikTok slideshow: {shown}/{total}",
+        "es": "Presentación de TikTok: {shown}/{total}",
+        "kk": "TikTok слайдшоуы: {shown}/{total}",
+        "ru": "Слайдшоу TikTok: {shown}/{total}",
+        "uk": "Слайдшоу TikTok: {shown}/{total}",
+    },
     # ── Статусы ──
     "status_generating_image": {
         "be": "Генерую малюнак",
@@ -739,6 +747,7 @@ PACK_PT: dict[str, str] = {
     "tiktok_generic_fail": "Não consegui baixar este vídeo ou apresentação do TikTok. Tente outro link ou repita um pouco mais tarde.",
     "tiktok_author": "Autor do TikTok",
     "tiktok_music": "Música do TikTok",
+    "tiktok_dl_slideshow": "Apresentação de slides do TikTok: {shown}/{total}",
     "status_generating_image": "Gerando imagem",
     "status_voicing": "Convertendo texto em voz",
     "status_taking_longer": "Isso vai demorar um pouco mais…",
@@ -819,6 +828,7 @@ PACK_AR: dict[str, str] = {
     "tiktok_generic_fail": "تعذر تنزيل هذا الفيديو أو عرض الشرائح من TikTok. جرب رابطًا آخر أو أعد المحاولة بعد قليل.",
     "tiktok_author": "مؤلف TikTok",
     "tiktok_music": "موسيقى من TikTok",
+    "tiktok_dl_slideshow": "عرض شرائح TikTok: {shown}/{total}",
     "status_generating_image": "جارٍ توليد الصورة",
     "status_voicing": "جارٍ تحويل النص إلى صوت",
     "status_taking_longer": "سيستغرق هذا وقتًا أطول قليلًا…",
@@ -899,6 +909,7 @@ PACK_TR: dict[str, str] = {
     "tiktok_generic_fail": "Bu video veya slayt TikTok'tan indirilemedi. Başka bağlantı dene veya biraz sonra tekrarla.",
     "tiktok_author": "TikTok yazarı",
     "tiktok_music": "TikTok müziği",
+    "tiktok_dl_slideshow": "TikTok slayt gösterisi: {shown}/{total}",
     "status_generating_image": "Görsel oluşturuluyor",
     "status_voicing": "Metin seslendiriliyor",
     "status_taking_longer": "Bu biraz daha uzun sürecek…",
@@ -979,6 +990,7 @@ PACK_DE: dict[str, str] = {
     "tiktok_generic_fail": "Dieses Video bzw. diese Slideshow ließ sich nicht von TikTok laden. Anderen Link versuchen oder etwas später wiederholen.",
     "tiktok_author": "TikTok-Autor",
     "tiktok_music": "Musik von TikTok",
+    "tiktok_dl_slideshow": "TikTok-Diashow: {shown}/{total}",
     "status_generating_image": "Bild wird erzeugt",
     "status_voicing": "Text wird vertont",
     "status_taking_longer": "Das dauert etwas länger…",
@@ -1059,6 +1071,7 @@ PACK_FR: dict[str, str] = {
     "tiktok_generic_fail": "Impossible de télécharger cette vidéo ou ce diaporama depuis TikTok. Essaie un autre lien ou réessaie un peu plus tard.",
     "tiktok_author": "Auteur TikTok",
     "tiktok_music": "Musique de TikTok",
+    "tiktok_dl_slideshow": "Diaporama TikTok : {shown}/{total}",
     "status_generating_image": "Génération de l'image",
     "status_voicing": "Conversion du texte en voix",
     "status_taking_longer": "Ça va prendre un peu plus de temps…",
@@ -1139,6 +1152,7 @@ PACK_IT: dict[str, str] = {
     "tiktok_generic_fail": "Impossibile scaricare questo video o slideshow da TikTok. Prova un altro link o ripeti tra poco.",
     "tiktok_author": "Autore TikTok",
     "tiktok_music": "Musica di TikTok",
+    "tiktok_dl_slideshow": "Presentazione TikTok: {shown}/{total}",
     "status_generating_image": "Generazione dell'immagine",
     "status_voicing": "Conversione del testo in voce",
     "status_taking_longer": "Ci vorrà un po' più di tempo…",
@@ -1219,6 +1233,7 @@ PACK_HI: dict[str, str] = {
     "tiktok_generic_fail": "यह वीडियो या स्लाइडशो TikTok से डाउनलोड नहीं हो सका। दूसरा लिंक आज़माओ या थोड़ी देर बाद दोहराओ।",
     "tiktok_author": "TikTok लेखक",
     "tiktok_music": "TikTok संगीत",
+    "tiktok_dl_slideshow": "TikTok स्लाइडशो: {shown}/{total}",
     "status_generating_image": "चित्र बनाया जा रहा है",
     "status_voicing": "टेक्स्ट को आवाज़ दी जा रही है",
     "status_taking_longer": "इसमें थोड़ा और समय लगेगा…",
@@ -1299,6 +1314,7 @@ PACK_ID: dict[str, str] = {
     "tiktok_generic_fail": "Tidak bisa mengunduh video atau slideshow ini dari TikTok. Coba tautan lain atau ulangi sedikit lagi.",
     "tiktok_author": "Penulis TikTok",
     "tiktok_music": "Musik dari TikTok",
+    "tiktok_dl_slideshow": "Tayangan slide TikTok: {shown}/{total}",
     "status_generating_image": "Membuat gambar",
     "status_voicing": "Mengucapkan teks",
     "status_taking_longer": "Ini akan memakan waktu sedikit lebih lama…",
@@ -1379,6 +1395,7 @@ PACK_MS: dict[str, str] = {
     "tiktok_generic_fail": "Tidak dapat memuat turun video atau slaid ini dari TikTok. Cuba pautan lain atau ulangi sedikit lagi.",
     "tiktok_author": "Pengarang TikTok",
     "tiktok_music": "Muzik dari TikTok",
+    "tiktok_dl_slideshow": "Tayangan slaid TikTok: {shown}/{total}",
     "status_generating_image": "Menjana gambar",
     "status_voicing": "Mengucapkan teks",
     "status_taking_longer": "Ini akan mengambil masa sedikit lebih lama…",
@@ -1459,6 +1476,7 @@ PACK_VI: dict[str, str] = {
     "tiktok_generic_fail": "Không tải được video hay slideshow này từ TikTok. Thử liên kết khác hoặc lặp lại sau một lúc.",
     "tiktok_author": "Tác giả TikTok",
     "tiktok_music": "Nhạc từ TikTok",
+    "tiktok_dl_slideshow": "Trình chiếu TikTok: {shown}/{total}",
     "status_generating_image": "Đang tạo ảnh",
     "status_voicing": "Đang đọc văn bản",
     "status_taking_longer": "Việc này sẽ mất lâu hơn một chút…",
@@ -1539,6 +1557,7 @@ PACK_TH: dict[str, str] = {
     "tiktok_generic_fail": "ดาวน์โหลดวิดีโอหรือสไลด์โชว์นี้จาก TikTok ไม่ได้ ลองลิงก์อื่นหรือทำซ้ำอีกสักครู่",
     "tiktok_author": "ผู้เขียน TikTok",
     "tiktok_music": "เพลงจาก TikTok",
+    "tiktok_dl_slideshow": "สไลด์โชว์ TikTok: {shown}/{total}",
     "status_generating_image": "กำลังสร้างรูปภาพ",
     "status_voicing": "กำลังอ่านข้อความ",
     "status_taking_longer": "อันนี้จะใช้เวลานานกว่านิดหน่อย…",
@@ -1619,6 +1638,7 @@ PACK_FA: dict[str, str] = {
     "tiktok_generic_fail": "نتوانستم این ویدیو یا اسلایدشو را از TikTok دانلود کنم. لینک دیگری امتحان کن یا کمی بعد تکرار کن.",
     "tiktok_author": "نویسنده TikTok",
     "tiktok_music": "موسیقی از TikTok",
+    "tiktok_dl_slideshow": "اسلایدشوی TikTok: {shown}/{total}",
     "status_generating_image": "در حال تولید تصویر",
     "status_voicing": "در حال تبدیل متن به گفتار",
     "status_taking_longer": "این کمی بیشتر طول می‌کشد…",
@@ -1699,6 +1719,7 @@ PACK_UR: dict[str, str] = {
     "tiktok_generic_fail": "یہ ویڈیو یا سلائیڈشو TikTok سے ڈاؤن لوڈ نہ ہو سکا۔ دوسرا لنک آزماؤ یا تھوڑی دیر بعد دہراؤ۔",
     "tiktok_author": "TikTok مصنف",
     "tiktok_music": "TikTok موسیقی",
+    "tiktok_dl_slideshow": "TikTok سلائیڈ شو: {shown}/{total}",
     "status_generating_image": "تصویر بنائی جا رہی ہے",
     "status_voicing": "متن کو آواز دی جا رہی ہے",
     "status_taking_longer": "اس میں تھوڑا اور وقت لگے گا…",
@@ -1779,6 +1800,7 @@ PACK_UZ: dict[str, str] = {
     "tiktok_generic_fail": "Bu video yoki slaydshouni TikTok'dan yuklab bo'lmadi. Boshqa havola urin yoki birozdan keyin takrorla.",
     "tiktok_author": "TikTok muallifi",
     "tiktok_music": "TikTok musiqasi",
+    "tiktok_dl_slideshow": "TikTok slayd-shousi: {shown}/{total}",
     "status_generating_image": "Rasm yaratilmoqda",
     "status_voicing": "Matn ovozlanmoqda",
     "status_taking_longer": "Bu biroz ko'proq vaqt oladi…",
@@ -1859,6 +1881,7 @@ PACK_BN: dict[str, str] = {
     "tiktok_generic_fail": "TikTok থেকে এই ভিডিও বা স্লাইডশো ডাউনলোড করা যায়নি। অন্য লিংক চেষ্টা করো বা একটু পরে পুনরাবৃত্তি করো।",
     "tiktok_author": "TikTok লেখক",
     "tiktok_music": "TikTok সঙ্গীত",
+    "tiktok_dl_slideshow": "TikTok স্লাইডশো: {shown}/{total}",
     "status_generating_image": "ছবি তৈরি হচ্ছে",
     "status_voicing": "টেক্সটে কণ্ঠ দেওয়া হচ্ছে",
     "status_taking_longer": "এতে আরও একটু সময় লাগবে…",
@@ -1939,6 +1962,7 @@ PACK_FIL: dict[str, str] = {
     "tiktok_generic_fail": "Hindi mada-download ang video o slideshow na ito mula sa TikTok. Subukan ang ibang link o ulitin mamaya.",
     "tiktok_author": "May-akda ng TikTok",
     "tiktok_music": "Musika mula sa TikTok",
+    "tiktok_dl_slideshow": "Slideshow ng TikTok: {shown}/{total}",
     "status_generating_image": "Gumuguhit ng larawan",
     "status_voicing": "Binabasa ang text",
     "status_taking_longer": "Medyo matatagalan ito…",
@@ -2019,6 +2043,7 @@ PACK_PL: dict[str, str] = {
     "tiktok_generic_fail": "Nie udało się pobrać tego filmu ani pokazu z TikToka. Spróbuj inny link albo powtórz nieco później.",
     "tiktok_author": "Autor TikToka",
     "tiktok_music": "Muzyka z TikToka",
+    "tiktok_dl_slideshow": "Pokaz slajdów TikTok: {shown}/{total}",
     "status_generating_image": "Generuję obraz",
     "status_voicing": "Odczytuję tekst",
     "status_taking_longer": "To zajmie trochę więcej czasu…",
@@ -2099,6 +2124,7 @@ PACK_NL: dict[str, str] = {
     "tiktok_generic_fail": "Deze video of slideshow kon niet van TikTok worden gedownload. Probeer een andere link of herhaal later.",
     "tiktok_author": "TikTok-auteur",
     "tiktok_music": "Muziek van TikTok",
+    "tiktok_dl_slideshow": "Diavoorstelling TikTok: {shown}/{total}",
     "status_generating_image": "Afbeelding genereren",
     "status_voicing": "Tekst uitspreken",
     "status_taking_longer": "Dit duurt iets langer…",
@@ -2179,6 +2205,7 @@ PACK_ZU: dict[str, str] = {
     "tiktok_generic_fail": "Ayikwazanga ukulandwa le vidiyo noma i-slideshow ku-TikTok. Zama esinye isixhumanisi noma phinda maduzane.",
     "tiktok_author": "Umbhali we-TikTok",
     "tiktok_music": "Umculo ovela ku-TikTok",
+    "tiktok_dl_slideshow": "Isilayidi se-TikTok: {shown}/{total}",
     "status_generating_image": "Kudweba isithombe",
     "status_voicing": "Kufundwa umbiko",
     "status_taking_longer": "Lokhu kuzothatha isikhathi eside…",

lumen_tiktok.py

@@ -315,6 +315,26 @@ async def _communicate_process(proc: asyncio.subprocess.Process, *, timeout: flo
         raise
 
 
+async def _probe_audio_duration(path: str) -> int:
+    """Длительность аудиофайла в секундах (для send_audio — без неё Telegram показывает 0:00). 0 при любой неудаче."""
+    try:
+        proc = await asyncio.create_subprocess_exec(
+            "ffprobe", "-v", "error",
+            "-show_entries", "format=duration",
+            "-of", "default=noprint_wrappers=1:nokey=1",
+            path,
+            stdout=asyncio.subprocess.PIPE,
+            stderr=asyncio.subprocess.PIPE,
+        )
+        stdout, _ = await _communicate_process(proc, timeout=15)
+        raw = stdout.decode(errors="replace").strip().splitlines()
+        if raw and raw[0] and raw[0] != "N/A":
+            return max(1, round(float(raw[0])))
+    except Exception as e:
+        log.warning("[ffmpeg] Audio probe failed: %s", e)
+    return 0
+
+
 async def _probe_video_dimensions(path: str) -> tuple[int, int, int]:
     """Возвращает (duration, width, height): без них Telegram показывает видео "сырым файлом" 0:00 (TikTok не всегда ставит faststart)."""
     try:

lumen_tiktok_flow.py

@@ -101,6 +101,7 @@ async def _send_tiktok_music(session, media_data: dict, message: Message, author
 
          # вшиваем метаданные и обложку в MP3 перед отправкой — чтобы теги видели и другие плееры
          tagged_music_bytes = music_bytes
+         music_duration = 0
          try:
               with tempfile.TemporaryDirectory() as tmp_dir:
                    tmp_mp3_path = os.path.join(tmp_dir, "music.mp3")
@@ -110,6 +111,8 @@ async def _send_tiktok_music(session, media_data: dict, message: Message, author
                    if os.path.exists(tmp_mp3_path) and os.path.getsize(tmp_mp3_path) > 0:
                         with open(tmp_mp3_path, "rb") as f:
                              tagged_music_bytes = f.read()
+                        # Длительность — явно: без неё Telegram показывает 0:00 (та же история, что была с видео).
+                        music_duration = await bot._probe_audio_duration(tmp_mp3_path)
          except Exception as tag_err:
               log.warning("[tiktok] failed to write embedded tags to MP3: %s", tag_err)
 
@@ -117,10 +120,11 @@ async def _send_tiktok_music(session, media_data: dict, message: Message, author
          # иначе multipart-имя файла битое.
          safe_title = re.sub(r'[\\/:*?"<>|\x00-\x1f]', "_", cleaned_title[:60]).strip() or "track"
          await bot.bot.send_audio(
-               chat_id=message.chat.id,
-               audio=BufferedInputFile(tagged_music_bytes, filename=f"{safe_title}.mp3"),
+              chat_id=message.chat.id,
+              audio=BufferedInputFile(tagged_music_bytes, filename=f"{safe_title}.mp3"),
               title=cleaned_title,
               performer=performer_name,
+              duration=music_duration if music_duration > 0 else None,
               thumbnail=thumbnail_file,
               reply_to_message_id=message.message_id
          )
@@ -166,10 +170,11 @@ async def _try_send_tiktok_slideshow(
     if images and isinstance(images, list):
           # TikTok разрешает до 35 слайдов, Telegram — 10 за вызов: берём весь пост и шлём несколькими группами.
          images_to_fetch = images[:bot.TIKTOK_SLIDESHOW_MAX_ITEMS]
-         status_text = f"Скачиваю слайдшоу TikTok ({len(images_to_fetch)} слайдов)"
-         if len(images) > len(images_to_fetch):
-              status_text += f" — показаны первые {len(images_to_fetch)} из {len(images)}"
-         await bot._edit_message_quietly(status, status_text)
+         # Статус слайдшоу — через переводы (был захардкожен по-русски).
+         await bot._edit_message_quietly(status, bot._t(
+             message.chat.id, "tiktok_dl_slideshow",
+             shown=len(images_to_fetch), total=len(images),
+         ))
           # Качаем слайды параллельно gather; конкурентность режем семафором, чтобы не занимать весь пул сессии.
          fetch_urls = _slideshow_slide_urls(media_data, images_to_fetch)
 
@@ -217,7 +222,7 @@ async def _try_send_tiktok_slideshow(
               else:
                    media_items.append(InputMediaPhoto(media=BufferedInputFile(item_bytes, filename=f"photo_{idx}.jpg")))
          if media_items:
-              await bot._delete_message_quietly(status)
+              # Статус держим до конца (включая музыку ниже) — иначе человек висит в тишине, пока качается трек.
               if len(media_items) == 1:
                     # Один уцелевший слайд — обычным send_photo/send_video: media group требует минимум 2.
                    only_item = media_items[0]
@@ -243,6 +248,7 @@ async def _try_send_tiktok_slideshow(
                               # Пауза между группами — против анти-флуда.
                              await asyncio.sleep(0.3)
               await _send_tiktok_music(session, media_data, message, author, headers)
+              await bot._delete_message_quietly(status)
               return True
     return False
 
@@ -315,8 +321,8 @@ async def _send_tiktok_single_video(
                    )
                    continue
 
-              await bot._delete_message_quietly(status)
               await _send_tiktok_music(session, media_data, message, author, headers)
+              await bot._delete_message_quietly(status)
               return
 
          if hit_size_limit:

tests/test_bot_tiktok.py

@@ -1087,3 +1087,131 @@ def test_communicate_process_propagates_communicate_failure():
 
     asyncio.run(run())
 
+
+def test_slideshow_status_uses_localized_key():
+    # Статус слайдшоу был захардкожен по-русски — теперь ключ tiktok_dl_slideshow с плейсхолдерами.
+    text = bot._t(999451, "tiktok_dl_slideshow", shown=35, total=40)
+    assert "35/40" in text
+    try:
+        assert "слайдов" in text or "slideshow" in text.lower() or "Слайдшоу" in text
+    finally:
+        bot.chat_state.pop(999451, None)
+
+
+def test_send_tiktok_music_passes_audio_duration():
+    # Без явной длительности Telegram показывает 0:00 — пробинг обязан доезжать до send_audio.
+    import lumen_tiktok_flow
+
+    incoming = _FakeIncomingMessage(999452)
+    incoming.message_id = 1
+    incoming.from_user = SimpleNamespace(language_code="ru")
+    sent = {}
+
+    class _AudioBot:
+        async def send_audio(self, **kwargs):
+            sent.update(kwargs)
+            return SimpleNamespace()
+
+    async def fake_download(session, url, headers=None):
+        return b"fake-bytes"
+
+    async def fake_probe(path):
+        return 42
+
+    def fake_write_tags(path, title, artist, cover):
+        pass
+
+    media_data = {
+        "music": "https://tikwm.com/song.mp3",
+        "music_info": {"title": "Song", "author": "Auth"},
+        "author": {"nickname": "Nick", "unique_id": "@nick"},
+    }
+    original_download = bot._download_url_bin
+    original_write_tags = bot._write_mp3_tags
+    original_probe = bot._probe_audio_duration
+    original_bot = bot.bot
+    bot._download_url_bin = fake_download
+    bot._write_mp3_tags = fake_write_tags
+    bot._probe_audio_duration = fake_probe
+    bot.bot = _AudioBot()
+    try:
+        asyncio.run(lumen_tiktok_flow._send_tiktok_music(None, media_data, incoming, "Nick", {}))
+        assert sent.get("duration") == 42
+        assert sent.get("title") == "Song"
+    finally:
+        bot._download_url_bin = original_download
+        bot._write_mp3_tags = original_write_tags
+        bot._probe_audio_duration = original_probe
+        bot.bot = original_bot
+        bot.chat_state.pop(999452, None)
+
+
+def test_single_video_status_deleted_after_music():
+    # Статус живёт и во время скачивания музыки тоже — сносится только после неё, а не до.
+    import lumen_tiktok_flow
+
+    tikwm_json = {
+        "code": 0,
+        "data": {
+            "play": "https://tikwm.com/sd.mp4", "size": 1000,
+            "author": {"nickname": "TestAuthor"},
+        },
+    }
+    incoming = _FakeIncomingMessage(999453)
+    incoming.message_id = 1
+    fake_bot = _FakeTikTokBot()
+    events = []
+
+    async def fake_get_http_session():
+        return _FakeTikTokSession(tikwm_json)
+
+    async def fake_resolve(session, url):
+        return url
+
+    async def fake_download_url_bin(session, url, headers=None):
+        return b"\x00" * 100
+
+    async def fake_probe_dims(path):
+        return 0, 0, 0
+
+    async def fake_thumb(path, duration):
+        return None
+
+    async def rec_music(*args, **kwargs):
+        events.append("music")
+        return None
+
+    async def rec_delete(message):
+        events.append("delete")
+        return True
+
+    original_get_session = bot._get_http_session
+    original_resolve = bot._resolve_tiktok_short
+    original_download = bot._download_url_bin
+    original_probe = bot._probe_video_dimensions
+    original_thumb = bot._generate_video_thumbnail
+    original_bot = bot.bot
+    original_delete = bot._delete_message_quietly
+    original_music = lumen_tiktok_flow._send_tiktok_music
+    bot._get_http_session = fake_get_http_session
+    bot._resolve_tiktok_short = fake_resolve
+    bot._download_url_bin = fake_download_url_bin
+    bot._probe_video_dimensions = fake_probe_dims
+    bot._generate_video_thumbnail = fake_thumb
+    bot.bot = fake_bot
+    bot._delete_message_quietly = rec_delete
+    lumen_tiktok_flow._send_tiktok_music = rec_music
+    try:
+        asyncio.run(bot.handle_tiktok(incoming, "https://www.tiktok.com/@test/video/123"))
+        assert events == ["music", "delete"]
+        assert len(fake_bot.sent_videos) == 1
+    finally:
+        bot._get_http_session = original_get_session
+        bot._resolve_tiktok_short = original_resolve
+        bot._download_url_bin = original_download
+        bot._probe_video_dimensions = original_probe
+        bot._generate_video_thumbnail = original_thumb
+        bot.bot = original_bot
+        bot._delete_message_quietly = original_delete
+        lumen_tiktok_flow._send_tiktok_music = original_music
+