g0ldyy/comet
1
0
Fork 0
mirror of https://github.com/g0ldyy/comet.git synced 2026-01-12 01:16:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: little opti

Browse Source
This commit is contained in:
g0ldyy
2026-01-09 02:01:57 +01:00
parent 4af9addd7b
commit c7214f213d
2 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
comet/api/endpoints/stream.py
+6 -3
View File
@@ -329,10 +329,13 @@ async def stream(
from_episode = kitsu_mapping.get("from_episode") from_episode = kitsu_mapping.get("from_episode")
from_season = kitsu_mapping.get("from_season") from_season = kitsu_mapping.get("from_season")
if from_episode: if from_episode:
search_episode = from_episode + episode - 1 new_episode = from_episode + episode - 1
if from_season: if new_episode != episode:
search_episode = new_episode
if from_season and from_season != season:
search_season = from_season search_season = from_season
if from_episode or from_season: if search_season != season or search_episode != episode:
logger.log( logger.log(
"SCRAPER", "SCRAPER",
f"📺 Multi-part anime detected (kitsu:{id}): searching for S{search_season:02d}E{search_episode:02d} instead of S{season:02d}E{episode:02d}", f"📺 Multi-part anime detected (kitsu:{id}): searching for S{search_season:02d}E{search_episode:02d} instead of S{season:02d}E{episode:02d}",
comet/services/anime.py
+15 -20
View File
@@ -45,7 +45,7 @@ class AnimeMapper:
self._refresh_task = None self._refresh_task = None
self.anime_imdb_ids = set() self.anime_imdb_ids = set()
self._kitsu_episode_cache = {} self._kitsu_mapping_cache = {}
self._aod_url = "https://github.com/manami-project/anime-offline-database/releases/latest/download/anime-offline-database-minified.json" self._aod_url = "https://github.com/manami-project/anime-offline-database/releases/latest/download/anime-offline-database-minified.json"
self._fribb_url = "https://raw.githubusercontent.com/Fribb/anime-lists/refs/heads/master/anime-list-full.json" self._fribb_url = "https://raw.githubusercontent.com/Fribb/anime-lists/refs/heads/master/anime-list-full.json"
@@ -61,13 +61,13 @@ class AnimeMapper:
count = await database.fetch_val("SELECT COUNT(*) FROM anime_entries") count = await database.fetch_val("SELECT COUNT(*) FROM anime_entries")
if count and count > 0: if count and count > 0:
await self._load_provider_ids() await self._load_provider_ids()
await self._load_kitsu_episode_cache() await self._load_kitsu_mapping_cache()
kitsu_count = await database.fetch_val( kitsu_count = await database.fetch_val(
"SELECT COUNT(*) FROM kitsu_imdb_mapping" "SELECT COUNT(*) FROM kitsu_imdb_mapping"
) )
needs_kitsu_refresh = ( needs_kitsu_refresh = (
kitsu_count == 0 or len(self._kitsu_episode_cache) == 0 kitsu_count == 0 or len(self._kitsu_mapping_cache) == 0
) )
if await self._is_cache_stale() or needs_kitsu_refresh: if await self._is_cache_stale() or needs_kitsu_refresh:
@@ -78,7 +78,7 @@ class AnimeMapper:
self.loaded = True self.loaded = True
logger.log( logger.log(
"COMET", "COMET",
f"✅ Anime mapping loaded from database: {count} entries, {len(self._kitsu_episode_cache)} Kitsu episode offsets", f"✅ Anime mapping loaded from database: {count} entries, {len(self._kitsu_mapping_cache)} Kitsu-IMDB mappings",
) )
return True return True
@@ -164,7 +164,7 @@ class AnimeMapper:
if not self.loaded: if not self.loaded:
return None return None
return self._kitsu_episode_cache.get(str(kitsu_id)) return self._kitsu_mapping_cache.get(str(kitsu_id))
def is_loaded(self): def is_loaded(self):
return self.loaded return self.loaded
@@ -205,7 +205,7 @@ class AnimeMapper:
except Exception as e: except Exception as e:
logger.error(f"Failed to load anime provider IDs: {e}") logger.error(f"Failed to load anime provider IDs: {e}")
async def _load_kitsu_episode_cache(self): async def _load_kitsu_mapping_cache(self):
try: try:
rows = await database.fetch_all( rows = await database.fetch_all(
""" """
@@ -216,17 +216,17 @@ class AnimeMapper:
""" """
) )
self._kitsu_episode_cache.clear() self._kitsu_mapping_cache.clear()
for row in rows: for row in rows:
kitsu_id = row["kitsu_id"] kitsu_id = row["kitsu_id"]
self._kitsu_episode_cache[str(kitsu_id)] = { self._kitsu_mapping_cache[str(kitsu_id)] = {
"imdb_id": row["imdb_id"], "imdb_id": row["imdb_id"],
"from_season": row["from_season"], "from_season": row["from_season"],
"from_episode": row["from_episode"], "from_episode": row["from_episode"],
} }
except Exception as e: except Exception as e:
logger.warning(f"Failed to load Kitsu episode cache: {e}") logger.warning(f"Failed to load Kitsu-IMDB mapping cache: {e}")
async def _refresh_from_remote( async def _refresh_from_remote(
self, self,
@@ -268,7 +268,7 @@ class AnimeMapper:
logger.log( logger.log(
"COMET", "COMET",
"Downloading anime mapping (Source 3/3: Kitsu-IMDB Episode Offsets)...", "Downloading anime mapping (Source 3/3: Kitsu-IMDB Mapping)...",
) )
async with session.get(self._kitsu_imdb_url) as response_kitsu: async with session.get(self._kitsu_imdb_url) as response_kitsu:
if response_kitsu.status != 200: if response_kitsu.status != 200:
@@ -279,9 +279,7 @@ class AnimeMapper:
data_kitsu_imdb = orjson.loads(await response_kitsu.read()) data_kitsu_imdb = orjson.loads(await response_kitsu.read())
anime_list = data_aod.get("data", []) anime_list = data_aod.get("data", [])
total_entries, total_fribb = await self._persist_mapping( total_entries = await self._persist_mapping(anime_list, data_fribb)
anime_list, data_fribb
)
await self._persist_kitsu_imdb_mapping(data_kitsu_imdb) await self._persist_kitsu_imdb_mapping(data_kitsu_imdb)
@@ -305,12 +303,12 @@ class AnimeMapper:
pass pass
await self._load_provider_ids() await self._load_provider_ids()
await self._load_kitsu_episode_cache() await self._load_kitsu_mapping_cache()
self.loaded = True self.loaded = True
logger.log( logger.log(
"COMET", "COMET",
f"✅ Anime mapping loaded: {total_entries} entries, {len(self._kitsu_episode_cache)} Kitsu episode offsets cached", f"✅ Anime mapping loaded: {total_entries} entries, {len(self._kitsu_mapping_cache)} Kitsu-IMDB mappings cached",
) )
return True return True
@@ -329,7 +327,6 @@ class AnimeMapper:
ids_batch = [] ids_batch = []
lookup_map = {} lookup_map = {}
total_entries = 0 total_entries = 0
total_fribb = 0
entries_query = "INSERT INTO anime_entries (id, data) VALUES (:id, :data)" entries_query = "INSERT INTO anime_entries (id, data) VALUES (:id, :data)"
ids_query = """ ids_query = """
@@ -421,12 +418,10 @@ class AnimeMapper:
if len(fribb_batch) >= _DB_CHUNK_SIZE: if len(fribb_batch) >= _DB_CHUNK_SIZE:
await database.execute_many(ids_query, fribb_batch) await database.execute_many(ids_query, fribb_batch)
total_fribb += len(fribb_batch)
fribb_batch.clear() fribb_batch.clear()
if fribb_batch: if fribb_batch:
await database.execute_many(ids_query, fribb_batch) await database.execute_many(ids_query, fribb_batch)
total_fribb += len(fribb_batch)
fribb_batch.clear() fribb_batch.clear()
del fribb_batch del fribb_batch
@@ -441,10 +436,10 @@ class AnimeMapper:
{"timestamp": timestamp}, {"timestamp": timestamp},
) )
return total_entries, total_fribb return total_entries
except Exception as exc: except Exception as exc:
logger.error(f"Failed to persist anime mapping cache: {exc}") logger.error(f"Failed to persist anime mapping cache: {exc}")
return 0, 0 return 0
async def _persist_kitsu_imdb_mapping(self, kitsu_imdb_data: dict): async def _persist_kitsu_imdb_mapping(self, kitsu_imdb_data: dict):
total_count = 0 total_count = 0