APP-API-Endpoints Modifications -sparkdrive

FileStream/TMDB/Endpoint.py

@@ -5,11 +5,51 @@ from FileStream.Tools.cleanup import Get_Title_Year
 
 def get_tvshows(tv_show_id):
     return tv.details(tv_show_id).__dict__
+
+def search_tmdb_movies(name):
+    # Search for the title in TMDb
+    title, year = Get_Title_Year(name)
+    #print("*", title, year,"\n Name :", name)
+    if title is None :
+        return None
+    search_results = search.multi(title)
+    # Filter results by year
+    try:
+        for result in search_results:
+            if result.media_type  == "movie":
+                release_date=result.release_date or result.get("release_date") or result.get("first_air_date") 
+                if release_date and int(release_date.split('-')[0]) == year:
+                    return result
+
+    except Exception as e :
+        print("* Error at Endpoint", e, result)
+        return None
+
+    return None
+
+def search_tmdb_tv(name):
+    # Search for the title in TMDb
+    title, year = Get_Title_Year(name)
+    #print("*", title, year,"\n Name :", name)
+    if title is None :
+        return None
+    search_results = search.multi(title)
+    # Filter results by year
+    try:
+        for result in search_results:
+            if result.media_type  == "tv":
+                release_date=result.release_date or result.first_air_date or result.get("release_date") or result.get("first_air_date") 
+                if release_date and int(release_date.split('-')[0]) == year:
+                    return get_tvshows( result.id or result.get("id") ) 
+    except Exception as e :
+        print("* Error at Endpoint", e, result)
+        return None
+    return None    
     
-def search_tmdb(name):
+def search_tmdb_any(name):
     # Search for the title in TMDb
     title, year = Get_Title_Year(name)
-    print("*", title, year,"\n Name :", name)
+    #print("*", title, year,"\n Name :", name)
     if title is None :
         return None
     search_results = search.multi(title)
@@ -31,7 +71,7 @@ def search_tmdb(name):
                     return result
 
     except Exception as e :
-        #print("* Error at Endpoint", e, result)
+        print("* Error at Endpoint", e, result)
         return None
 
     return None

FileStream/Tools/cleanup.py

@@ -20,6 +20,14 @@ def convert_special_to_normal(text):
     text = re.sub(r'[^A-Za-z0-9 ]+', '', text)
     return text
 
+
+
+def clean_string_special(input_string):
+    # Define a regular expression pattern to remove special characters, including •, ▫️, etc.
+    # This pattern keeps only alphanumeric characters (A-Z, a-z, 0-9) and spaces.
+    cleaned_string = re.sub(r'[^\w\s]+', '', input_string)
+    return cleaned_string
+
 def clean_text(input_text):
     # Remove new line characters
     text = input_text.replace('\n', '').replace('@', '')
@@ -43,9 +51,10 @@ def clean_text(input_text):
 
 def Get_Title_Year(name):
     # Regex to match title and year
-    words_to_remove = ["FC", "HEVC","ɴᴀᴍᴇ:","-","BuLMoviee" ,"𝗝𝗼𝗶𝗻 𝗨𝘀 𝗢𝗻 𝗧𝗲𝗹𝗲𝗴𝗿𝗮�","𝗝𝗼𝗶𝗻 𝗨𝘀 𝗢𝗻 𝗧𝗲𝗹𝗲𝗴𝗿𝗮𝗺","SIDHUU 591","𝑱𝒐𝒊𝒏 𝑼𝒔 𝑶ɴ 𝑻ᴇʟᴇɢʀᴀᴍ","Tɪᴛʟᴇ :"]
+    words_to_remove = ["Fɪʟᴇ ɴᴀᴍᴇ :","FC", "HEVC","ɴᴀᴍᴇ:","-","BuLMoviee" ,"𝗝𝗼𝗶𝗻 𝗨𝘀 𝗢𝗻 𝗧𝗲𝗹𝗲𝗴𝗿𝗮�","𝗝𝗼𝗶𝗻 𝗨𝘀 𝗢𝗻 𝗧𝗲𝗹𝗲𝗴𝗿𝗮𝗺","SIDHUU 591","𝑱𝒐𝒊𝒏 𝑼𝒔 𝑶ɴ 𝑻ᴇʟᴇɢʀᴀᴍ","Tɪᴛʟᴇ :","Bollywood","mkv","Mᴏᴠɪᴇ", "ɢʀᴏᴜᴘ" , "TGxMALLU_MOVIE"]
     name=remove_words(name, words_to_remove)
     match = re.search(r'(?P<title>.+?)[\s\.\(\)]*(?P<year>\d{4})',name )
+
     if match:
-        return match.group('title').strip(), int(match.group('year'))
+        return clean_string_special(match.group('title').strip()), int(match.group('year'))
     return None, None

FileStream/server/routes_api.py

@@ -15,7 +15,7 @@ from aiohttp.http_exceptions import BadStatusLine
 from FileStream.bot import req_client
 from FileStream.config import Telegram,Server
 from FileStream.Database import Database
-from FileStream.TMDB.Endpoint import search_tmdb
+from FileStream.TMDB.Endpoint import search_tmdb_any,search_tmdb_tv,search_tmdb_movies
 from FileStream.server.exceptions import FIleNotFound, InvalidHash
 
 from .Functions.downloader import media_streamer
@@ -29,6 +29,61 @@ async def list_all_files_db(request):
   #print(files, type(files))
   return web.json_response(json.loads(dumps(files)))
 
+async def list_all_tmdb_movies_from_db(request):
+  db = Database(Telegram.DATABASE_URL, Telegram.SESSION_NAME)
+  files= await db.get_all_files()
+  #print(files)
+  response=[]
+  async for row in files:
+    #print(row['file']['caption'])
+    try :
+      #print("* Response",search_tmdb(row['file']['caption'] if row['file']['caption'] else row['file']['file_name']))
+      resp = search_tmdb_movies( str(row['file']['caption']) if str(row['file']['caption']) else str(row['file']['file_name']))
+      if resp != None :
+        #resp= dict(resp)
+        #print("TMDB Response :",resp)
+        response.append(resp)
+      else:
+        print("\n * Skipped:",row['file']['caption'],str(row['file']['file_name']))
+        continue
+    except Exception as e:
+      print("Error ",e)
+      break
+    
+  #print(response)
+  # Convert Python data to JSON
+  #json_response = json.dumps(response).encode('utf-8')
+  # Return as aiohttp response using web.json_response
+  #return web.json_response(response)
+  return web.json_response(json.loads(dumps(response)))
+
+async def list_all_tmdb_tv_from_db(request):
+  db = Database(Telegram.DATABASE_URL, Telegram.SESSION_NAME)
+  files= await db.get_all_files()
+  #print(files)
+  response=[]
+  async for row in files:
+    #print(row['file']['caption'])
+    try :
+      #print("* Response",search_tmdb(row['file']['caption'] if row['file']['caption'] else row['file']['file_name']))
+      resp = search_tmdb_tv( str(row['file']['caption']) if str(row['file']['caption']) else str(row['file']['file_name']))
+      if resp != None :
+        #resp= dict(resp)
+        #print("TMDB Response :",resp)
+        response.append(resp)
+      else:
+        print("\n * Skipped:",row['file']['caption'],str(row['file']['file_name']))
+        continue
+    except Exception as e:
+      print("Error ",e)
+      break
+    
+  #print(response)
+  # Convert Python data to JSON
+  #json_response = json.dumps(response).encode('utf-8')
+  # Return as aiohttp response using web.json_response
+  #return web.json_response(response)
+  return web.json_response(json.loads(dumps(response)))
 
 #api.router.add_get('/tmdb/list', list_all_files_tmdb)
 async def list_all_files_tmdb(request):
@@ -40,10 +95,10 @@ async def list_all_files_tmdb(request):
     #print(row['file']['caption'])
     try :
       #print("* Response",search_tmdb(row['file']['caption'] if row['file']['caption'] else row['file']['file_name']))
-      resp = search_tmdb( str(row['file']['caption']) if str(row['file']['caption']) else str(row['file']['file_name']))
+      resp = search_tmdb_any( str(row['file']['caption']) if str(row['file']['caption']) else str(row['file']['file_name']))
       if resp != None :
         #resp= dict(resp)
-        print("TMDB Response :",resp)
+        #print("TMDB Response :",resp)
         response.append(resp)
       else:
         print("\n * Skipped:",row['file']['caption'],str(row['file']['file_name']))
@@ -174,7 +229,11 @@ async def stream_handler(request: web.Request):
 api = web.Application()
 api.router.add_get('/', handle_v2)
 api.router.add_get('/files', list_all_files_db)
-api.router.add_get('/tmdb/files', list_all_files)
-api.router.add_get('/tmdb/list', list_all_files_tmdb)
+api.router.add_get('/files/mix', list_all_files)
+
+api.router.add_get('/tmdb/mix', list_all_files_tmdb)
+api.router.add_get('/tmdb/tv', list_all_tmdb_tv_from_db)
+api.router.add_get('/tmdb/movies', list_all_tmdb_movies_from_db)
+
 api.router.add_get('/upload', upload_file)
 api.router.add_get('/dl/{path}', stream_handler)