AbhiCalls 2.0.0__py3-none-any.whl → 2.9.8__py3-none-any.whl

AbhiCalls/_engine/__init__.py

@@ -0,0 +1 @@
+from .native import _NativeEngine

AbhiCalls/_engine/native.py

@@ -0,0 +1,44 @@
+from pytgcalls import PyTgCalls, filters
+from pytgcalls.types import MediaStream, AudioQuality, StreamEnded
+
+class _NativeEngine:
+    def __init__(self, app):
+        self._core = PyTgCalls(app)
+        self.on_end = None
+
+        @self._core.on_update(filters.stream_end())
+        async def _ended(_, update: StreamEnded):
+            if self.on_end:
+                await self.on_end(update.chat_id)
+
+    async def start(self):
+        await self._core.start()
+
+    async def play(self, chat_id, stream):
+        await self._core.play(
+            chat_id,
+            MediaStream(
+                media_path=stream,
+                audio_parameters=AudioQuality.STUDIO,
+                video_flags=MediaStream.Flags.IGNORE,
+            )
+        )
+
+    async def stop(self, chat_id):
+        await self._core.leave_call(chat_id)
+
+    async def pause(self, chat_id):
+        await self._core.pause(chat_id)
+
+    async def resume(self, chat_id):
+        await self._core.resume(chat_id)
+
+    async def mute(self, chat_id):
+        await self._core.mute(chat_id)
+
+    async def unmute(self, chat_id):
+        await self._core.unmute(chat_id)
+
+    async def change_volume(self, chat_id, volume: int = 200):
+        await self._core.change_volume(chat_id, volume)
+        

AbhiCalls/controller.py

@@ -2,6 +2,7 @@ from AbhiCalls.yt import resolve_query
 from AbhiCalls.models import Song
 from AbhiCalls.player import Player
 
+
 class VoiceController:
     def __init__(self, engine):
         self.engine = engine
@@ -19,8 +20,11 @@ class VoiceController:
                 try:
                     await fn(*args)
                 except Exception as e:
-                    print(f"[Plugin:{p.name}] {name} error:", e)
+                    print(f"[Plugin:{getattr(p, 'name', p)}] {name} error:", e)
 
+    # =========================
+    # PLAY
+    # =========================
     async def play(self, chat_id, query, requested_by):
         results = await resolve_query(query)
         if not results:
@@ -37,6 +41,8 @@ class VoiceController:
                 views=data["views"],
                 stream=data["stream"],
                 requested_by=requested_by,
+                video_id=data.get("video_id"),
+                thumb=data.get("thumb"),
             )
 
             pos = await self.player.play(chat_id, song)
@@ -46,11 +52,15 @@ class VoiceController:
                 first_pos = pos
             last_song = song
 
-        if first_pos == 1:
+        # 🔥 First song actually started
+        if first_pos == 1 and last_song:
             await self._hook("on_song_start", chat_id, last_song)
 
         return last_song, first_pos
 
+    # =========================
+    # CONTROLS
+    # =========================
     async def skip(self, chat_id):
         await self.player.skip(chat_id)
 
@@ -74,7 +84,6 @@ class VoiceController:
 
     async def volume(self, chat_id, volume: int):
         await self.player.volume(chat_id, volume)
-        
 
     def loop(self, chat_id, count=None):
         return self.player.set_loop(chat_id, count)
@@ -82,15 +91,22 @@ class VoiceController:
     def eta(self, chat_id):
         return self.player.eta(chat_id)
 
+    # =========================
+    # AUTO-SKIP (STREAM END)
+    # =========================
     async def _on_end(self, chat_id):
         q = self.player.queues.get(chat_id)
-        song = q.current() if q else None
-        if song:
-            await self._hook("on_song_end", chat_id, song)
 
+        # old song end hook
+        old_song = q.current() if q else None
+        if old_song:
+            await self._hook("on_song_end", chat_id, old_song)
+
+        # move to next song
         await self.player.skip(chat_id)
 
+        q = self.player.queues.get(chat_id)
         next_song = q.current() if q else None
+
         if next_song:
             await self._hook("on_song_start", chat_id, next_song)
-          

AbhiCalls/models.py

@@ -8,6 +8,8 @@ class Song:
         stream,
         requested_by,
         loop_left=0,
+        video_id=None,
+        thumb=None,
     ):
         self.title = title
         self.url = url
@@ -16,14 +18,17 @@ class Song:
         self.stream = stream
         self.requested_by = requested_by
         self.loop_left = loop_left
+
+        self.video_id = video_id
+        self.thumb = thumb
+
         self.duration_sec = self._to_seconds(duration)
 
     def _to_seconds(self, d):
         try:
-            if ":" in d:
+            if isinstance(d, str) and ":" in d:
                 m, s = map(int, d.split(":"))
                 return m * 60 + s
             return int(d)
         except Exception:
             return 0
-

AbhiCalls/yt.py

@@ -6,6 +6,7 @@ from YouTubeMusic.Playlist import get_playlist_songs
 PLAYLIST_REGEX = re.compile(r"(list=)")
 YOUTUBE_REGEX = re.compile(r"(youtube\.com|youtu\.be|music\.youtube\.com)")
 
+
 def sec_to_mmss(sec):
     try:
         sec = int(sec)
@@ -13,18 +14,23 @@ def sec_to_mmss(sec):
     except Exception:
         return "Unknown"
 
-def yt_thumbnail(url: str):
-    """Extract thumbnail from YouTube URL"""
+
+def extract_video_id(url: str):
     try:
         if "watch?v=" in url:
-            vid = url.split("watch?v=")[1].split("&")[0]
+            return url.split("watch?v=")[1].split("&")[0]
         elif "youtu.be/" in url:
-            vid = url.split("youtu.be/")[1].split("?")[0]
-        else:
-            return None
-        return f"https://i.ytimg.com/vi/{vid}/hqdefault.jpg"
+            return url.split("youtu.be/")[1].split("?")[0]
     except Exception:
+        pass
+    return None
+
+
+def yt_thumbnail(url: str):
+    vid = extract_video_id(url)
+    if not vid:
         return None
+    return f"https://i.ytimg.com/vi/{vid}/hqdefault.jpg"
 
 
 async def resolve_query(query: str):
@@ -33,37 +39,45 @@ async def resolve_query(query: str):
     # 🎵 PLAYLIST
     if PLAYLIST_REGEX.search(query):
         playlist = await get_playlist_songs(query)
+
         for item in playlist:
             stream = get_stream(item["url"])
             if not stream:
                 continue
 
+            vid = extract_video_id(item["url"])
+
             songs.append({
                 "title": item.get("title", "Unknown"),
                 "url": item["url"],
                 "duration": sec_to_mmss(item.get("duration", "0")),
-                "views": "Unknown",
-                "thumbnail": yt_thumbnail(item["url"]),
+                "views": item.get("views", "Unknown"),
+                "video_id": vid,
+                "thumb": yt_thumbnail(item["url"]),
                 "stream": stream,
             })
+
         return songs or None
 
-    # 🔗 DIRECT YT LINK
+    # 🔗 DIRECT YOUTUBE LINK
     if YOUTUBE_REGEX.search(query):
         stream = get_stream(query)
         if not stream:
             return None
 
+        vid = extract_video_id(query)
+
         return [{
             "title": "YouTube Audio",
             "url": query,
             "duration": "Unknown",
             "views": "Unknown",
-            "thumbnail": yt_thumbnail(query),
+            "video_id": vid,
+            "thumb": yt_thumbnail(query),
             "stream": stream,
         }]
 
-    # 🔍 SEARCH
+    # 🔍 SEARCH QUERY
     res = await Search(query, limit=1)
     if not res or not res.get("main_results"):
         return None
@@ -73,12 +87,14 @@ async def resolve_query(query: str):
     if not stream:
         return None
 
+    vid = extract_video_id(i["url"])
+
     return [{
         "title": i["title"],
         "url": i["url"],
         "duration": i.get("duration", "Unknown"),
         "views": i.get("views", "Unknown"),
-        # 🔥 thumbnail from search (fallback safe)
-        "thumbnail": i.get("thumbnail") or yt_thumbnail(i["url"]),
+        "video_id": vid,
+        "thumb": i.get("thumbnail") or yt_thumbnail(i["url"]),
         "stream": stream,
     }]

{abhicalls-2.0.0.dist-info → abhicalls-2.9.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: AbhiCalls
-Version: 2.0.0
+Version: 2.9.8
 Summary: Telegram Voice Chat Music Engine with Queue, Loop, ETA and Player controls
 Home-page: https://github.com/YouTubeMusicAPI/TgCall
 Author: Abhishek Thakur

abhicalls-2.9.8.dist-info/RECORD

@@ -0,0 +1,14 @@
+AbhiCalls/__init__.py,sha256=8Bgye84bSUJVFLhm2HPc2piO3YHZb67EihvJlGZxvDs,134
+AbhiCalls/controller.py,sha256=KYppQPpWhTpWj-gwmZqyGgX5liZHAaWRIMqksZPzXzU,3241
+AbhiCalls/models.py,sha256=fwMdHKE0z6qB98nHJ8E1uYU3JSk25LGxaaeAz1JkAH0,791
+AbhiCalls/player.py,sha256=UlAWmhZqHFjtAplA9-6lXFkVAu4pyEWDGbF8Wj9KYkM,2286
+AbhiCalls/queue.py,sha256=iRrTvt1rU-diarSBCfxjeY-4uJ97oUsvDqtPpbB4UQY,1212
+AbhiCalls/runtime.py,sha256=4_WmHirGwNOyn1Iuzbhecb_ao7qMDh1erFzp0ZaLze0,966
+AbhiCalls/vc.py,sha256=ld3C4-QNDrHBQPrNzIuNTcu7zk1pVOo9rvrQBUsTI8s,309
+AbhiCalls/yt.py,sha256=h0QRNK9sy-5wIDueiy-uMUxruV7z5m3xjUyRPoFT6_s,2594
+AbhiCalls/_engine/__init__.py,sha256=pTqDs11-vYr-wuwtd7h3EkspDquGu84jWfN54ajl0kM,34
+AbhiCalls/_engine/native.py,sha256=KJajnL9urwrx0PaOEJj4-pGGnhz4X9FDI6rTGrbCLoI,1272
+abhicalls-2.9.8.dist-info/METADATA,sha256=VzXnK3k_eeFbdczlR7RAFG8jmLrdA53aHFRUB1NQEvc,1209
+abhicalls-2.9.8.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+abhicalls-2.9.8.dist-info/top_level.txt,sha256=3_ZgJEaE0rS9jpmEMi6oIXEtMzIagrn70XtK7H6w2gA,10
+abhicalls-2.9.8.dist-info/RECORD,,

abhicalls-2.0.0.dist-info/RECORD

@@ -1,12 +0,0 @@
-AbhiCalls/__init__.py,sha256=8Bgye84bSUJVFLhm2HPc2piO3YHZb67EihvJlGZxvDs,134
-AbhiCalls/controller.py,sha256=mdowoTCc6jpDsdljuUWdgbsCMR5NObaw3Jh6LYb-O8I,2739
-AbhiCalls/models.py,sha256=ybRrFbVmlpLyfmmn7lG2DpDz_Z9qcq3g9AD5Krc-UP0,664
-AbhiCalls/player.py,sha256=UlAWmhZqHFjtAplA9-6lXFkVAu4pyEWDGbF8Wj9KYkM,2286
-AbhiCalls/queue.py,sha256=iRrTvt1rU-diarSBCfxjeY-4uJ97oUsvDqtPpbB4UQY,1212
-AbhiCalls/runtime.py,sha256=4_WmHirGwNOyn1Iuzbhecb_ao7qMDh1erFzp0ZaLze0,966
-AbhiCalls/vc.py,sha256=ld3C4-QNDrHBQPrNzIuNTcu7zk1pVOo9rvrQBUsTI8s,309
-AbhiCalls/yt.py,sha256=QnO2LdtgVbEi8XqKEY9ZSp6a6x1AjBYVCFNB2sXFcPU,2386
-abhicalls-2.0.0.dist-info/METADATA,sha256=fwxTMFzaxcSalzSGhILYJ5dinSo0qxx1KtHyVHsv8L4,1209
-abhicalls-2.0.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-abhicalls-2.0.0.dist-info/top_level.txt,sha256=3_ZgJEaE0rS9jpmEMi6oIXEtMzIagrn70XtK7H6w2gA,10
-abhicalls-2.0.0.dist-info/RECORD,,