Callback Update

FileStream/Database/database.py

@@ -56,10 +56,12 @@ class Database:
         "user_type": details['user_type'] if details['user_type'] else None,
         "message_id": details['message_id'] if details['message_id'] else None,
         "location":details['location'] if details['location'] else None,
-        "TMDB_id": int(),    
+        "IMDB_id": "Unknown",
+        "poster": "Unknown",   
         "title": "Unknown",
-        "type":"Unknown",
-        "subtype":"Unknown",
+        "type": "Unknown",
+        "description":"Unknown",
+        "genre":"Unknown",
         "quality":"Unknown",
         "time": details['time'] if details['time'] else None,
         "privacy_type": details['privacy_type'] if details['privacy_type'] else None,

FileStream/bot/plugins/FileHandlers/callback.py

@@ -111,47 +111,11 @@ async def cb_data(bot: Client, update: CallbackQuery):
         disable_web_page_preview=True,
         reply_markup=reply_markup,
     )
-  elif usr_cmd[0] == "initialize":
-    try:
-      upload_type=str(usr_cmd[1])
-      user_id = str(usr_cmd[2])
-      message_id = int(usr_cmd[3])
-
-      await update.message.edit_text(
-          text=f"Please Choose The File Type",
-          parse_mode=ParseMode.HTML,
-          disable_web_page_preview=True,
-          reply_markup=InlineKeyboardMarkup([
-                [InlineKeyboardButton("Movie", callback_data=f"{'privup' if upload_type =='PRIVATE' else 'pubup'}_{user_id}_{message_id}_MOVIE")],
-                [InlineKeyboardButton("WebSeries", callback_data=f"{'privup' if upload_type =='PRIVATE' else 'pubup'}_{user_id}_{message_id}_WEBSERIES")],
-                [InlineKeyboardButton("Anime", callback_data=f"{'privup' if upload_type =='PRIVATE' else 'pubup'}_{user_id}_{message_id}_ANIME")],
-                [InlineKeyboardButton("Documentary", callback_data=f"{'privup' if upload_type =='PRIVATE' else 'pubup'}_{user_id}_{message_id}_DOCUMENTARY")],
-                [InlineKeyboardButton("Regular", callback_data=f"{'privup' if upload_type =='PRIVATE' else 'pubup'}_{user_id}_{message_id}_REGULAR")],
-                [ InlineKeyboardButton("ᴄʟᴏsᴇ", callback_data="close")]
-            ]),
-        )   
-    except FloodWait as e:
-      print(f"Sleeping for {str(e.value)}s")
-      await asyncio.sleep(e.value)
-      await FileStream.send_message(
-          chat_id=Telegram.ULOG_GROUP,
-          text=
-          f"Gᴏᴛ FʟᴏᴏᴅWᴀɪᴛ ᴏғ {str(e.value)}s ғʀᴏᴍ [{message.from_user.first_name}](tg://user?id={message.from_user.id})\n\n**ᴜsᴇʀ ɪᴅ :** `{str(message.from_user.id)}`",
-          disable_web_page_preview=True,
-          parse_mode=ParseMode.MARKDOWN)
-    except Exception as e:
-      print(f"An error occurred: {str(e)}")
-      await FileStream.send_message(
-          chat_id=Telegram.ULOG_GROUP,
-          text=f"An error occurred: {str(e)}"
-      )
   elif usr_cmd[0] == "pubup":
     try:
       print("Public Upload :",usr_cmd)
       user_id = str(usr_cmd[1])
       message_id = int(usr_cmd[2])
-      msg_type = usr_cmd[3]
-      #response_id = int(usr_cmd[3])
       message = await FileStream.get_messages(user_id, message_id)
       #response = await FileStream.get_messages(user_id, response_id)
       print(f"Message:{message}")      
@@ -161,42 +125,24 @@ async def cb_data(bot: Client, update: CallbackQuery):
       from FileStream.Tools.cleanup import Get_Title_Year
       title, year = Get_Title_Year(name)
       year = int(year)
-      res = json.loads(imdb.search(title, year=year))
-      print(f"ANY SEARCH :{title} YEAR :{year} IMDB Response :{res}")
-      print("TMDB",search_tmdb_any(title, year))
-      print(f"IMDB ID :{res['results'][0]['id']}")
-      print(f"IMDB Response :{imdb.get_by_id(res['results'][0]['id'])}")
-      if msg_type == 'MOVIE':
-        resp=search_tmdb_movies(name)
-        print("TMDB Movie Response:",resp,"\n IMDB",res)
-        result={
-          'title': resp['title'],
-          'id': resp['id'],
-          'media_type': resp['media_type'],
-          'overview':resp['overview']
-        }
-      elif msg_type == "WEBSERIES":
-        resp=search_tmdb_any(title, year)
-        result={
-          'title': resp['title'],
-          'id': resp['id'],
-          'media_type': resp['media_type'],
-          'overview':resp['overview']
-        }
-      else:
-        print("Please choose correct answer")
-
+      get_imdb_id = json.loads(imdb.search(title, year=year))
+      #print(f"ANY SEARCH :{title} YEAR :{year} IMDB Response :{res}")
+      #print("TMDB",search_tmdb_any(title, year))
+      #print(f"IMDB ID :{res['results'][0]['id']}")
+      res=json.loads(imdb.get_by_id(get_imdb_id['results'][0]['id']))
       instruction = {
           "privacy_type": "PUBLIC",
           "user_id": user_id,
           "user_type": "TELEGRAM",
           "IMDB_id": res['results'][0]['id'],
-          "TMDB_id": result['id'],    
-          "title": result['title'],
-          "type": result['media_type'],
-          "subtype":"Unknown",
+          "poster": res['poster'],   
+          "title": res['name'],
+          "type": res['type'],
+          "description":res["description"],
+          "genre":[res["genre"],res["keywords"]],
           "quality":"Unknown",
       }
+      
       file_info = get_file_info(message, instruction)
       # Here we are Adding the File Into the database First
       inserted_id = await db.add_file(file_info)

FileStream/bot/plugins/FileHandlers/stream.py

@@ -62,10 +62,11 @@ async def private_receive_handler(bot: Client, message: Message):
             "user_id":message.from_user.id if (message.chat.type == ChatType.PRIVATE) else message.chat.id,
             "user_type": "TELEGRAM",
             "IMDB_id": "Unknown",
-            "TMDB_id": "Unknown",    
-            "title":"Unknown",
+            "poster": "Unknown",   
+            "title": "Unknown",
             "type": "Unknown",
-            "subtype":"Unknown",
+            "description":"Unknown",
+            "genre":"Unknown",
             "quality":"Unknown",
         }
 

FileStream/utils/FileProcessors/bot_utils.py

@@ -110,11 +110,11 @@ async def upload_type_func(file_info,replied_message):
     reply_markup = InlineKeyboardMarkup([[
         InlineKeyboardButton(
             "PUBLIC UPLOAD",
-            callback_data=f"initialize_PUBLIC_{file_info['user_id']}_{file_info['message_id']}"),
+            callback_data=f"pubup_{file_info['user_id']}_{file_info['message_id']}"),
         InlineKeyboardButton(
             "PRIVATE UPLOAD",
             callback_data=
-            f"initialize_PRIVATE_{file_info['user_id']}_{file_info['message_id']}")
+            f"privup_{file_info['user_id']}_{file_info['message_id']}")
     ], [InlineKeyboardButton("ᴄʟᴏsᴇ", callback_data="close")]])
 
     return reply_markup, stream_text

FileStream/utils/FileProcessors/file_properties.py

@@ -189,11 +189,12 @@ def get_file_info(message, instruction):
       "user_id": instruction['user_id'],
       "user_type": instruction['user_type'],
       "message_id": message.id,
-      "IMDB_id": instruction['IMDB_id'],
-      "TMDB_id": instruction['TMDB_id'],    
-      "title": instruction['title'],
-      "type": instruction['type'],
-      "subtype":"Unknown",
+      "IMDB_id": instruction["IMDB_id"],
+      "poster": instruction["poster"],   
+      "title": instruction["title"],
+      "type": instruction["type"],
+      "description":instruction["description"],
+      "genre":instruction["genre"],
       "quality":"Unknown",
       "location": message.from_user.id if (message.chat.type == ChatType.PRIVATE) else message.chat.id,
       "file": {