Callback Update

FileStream/Database/database.py

@@ -17,10 +17,11 @@ class Database:
     self._client = motor.motor_asyncio.AsyncIOMotorClient(uri)
     self.db = self._client[database_name]
     self.users = self.db.Users
+    self.tfiles = self.db.Temp_Files
     self.files = self.db.Public_Files
     self.pfile = self.db.Private_Files
     self.web_upload = self.db.Web_Files
-    self.web_upload = self.db.Temp_Files
+    
 
 #---------------------[ SCHEMAS ]------------------------------#
 #---------------------[ NEW USER ]---------------------#
@@ -154,6 +155,12 @@ class Database:
     await self.count_links(file_info["user_id"], "+")
     return (await self.files.insert_one(file_info)).inserted_id
 
+  # ---------------------[ ADD FILE TO Temp DB ]---------------------#
+  async def add_temp_file(self, file_info):
+    file_info["time"] = Time_ISTKolNow()
+    return (await self.tfiles.insert_one(file_info)).inserted_id
+
+
   # ---------------------[ FIND FILE IN DB for Bot and APIs]---------------------#
   async def get_file(self, _id):
     try:

FileStream/bot/plugins/FileHandlers/callback.py

@@ -186,21 +186,18 @@ async def cb_data(bot: Client, update: CallbackQuery):
       title, year = Get_Title_Year(name)
       print(f"** ANY SEARCH :{name} YEAR :{year}")
       get_imdb_id = json.loads(imdb.search(title, year=int(year)))
-      #print(f"ANY SEARCH :{title} YEAR :{year} IMDB Response :{res}")
-      #print("TMDB",search_tmdb_any(title, year))
-      #print(f"IMDB ID :{get_imdb_id['results'][0]['id']}")
       print(f"\n** GET_ID {get_imdb_id}")
       res=json.loads(imdb.get_by_id(get_imdb_id['results'][0]['id']))
       print(f"\n** IMDB Response :{res}")
       instruction = {
-        "privacy_type": "PUBLIC",
+        "privacy_type": "TEMPORARY",
         "user_id": user_id,
         "user_type": "TELEGRAM",
-        "IMDB_id": get_imdb_id['results'][0]['id'],
-        "poster": res['poster'],   
-        "title": res['name'],
-        "release_date": res["datePublished"],
-        "type": res['type'],
+        "IMDB_id":get_imdb_id['results'][0]['id'] if get_imdb_id['results'][0]['id']else "None",
+        "poster": res['poster'] if res['poster'] else "None",   
+        "title": res['name'] if res['name'] else "None",
+        "release_date": res["datePublished"] if res['datePublished'] else "None",
+        "type": res['type'] if res['type'] else "None",
         "description":res["description"],
         "keywords":res["keywords"].split(",") if res.get("keywords") else [],
         "genre": res.get("genre", []) ,
@@ -208,7 +205,7 @@ async def cb_data(bot: Client, update: CallbackQuery):
       
       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)
+      inserted_id = await db.add_temp_file(file_info)
       await get_file_ids(False, inserted_id, message)
       #All the Time Get_file_ids should be called before update privacy or else tagged_users will be {}
       await db.update_privacy(file_info)

FileStream/config.py

@@ -21,14 +21,14 @@ class Telegram:
     START_PIC = env.get('START_PIC',"https://graph.org/file/290af25276fa34fa8f0aa.jpg")
     VERIFY_PIC = env.get('VERIFY_PIC',"https://graph.org/file/736e21cc0efa4d8c2a0e4.jpg")
     MULTI_CLIENT = False
-    FLOG_CHANNEL = int(env.get("FLOG_CHANNEL", None))  # Logs channel for file logs
-    PFLOG_CHANNEL = int(env.get("PFLOG_CHANNEL"))
-    TFLOG_CHANNEL = int(env.get("TFLOG_CHANNEL", None))
+    FLOG_CHANNEL = int(env.get("FLOG_CHANNEL", None))  # Logs channel for file logs/Temporary Files
+    PFLOG_CHANNEL = int(env.get("PFLOG_CHANNEL", None)) #Private File Logs
+    DFLOG_CHANNEL = int(env.get("TFLOG_CHANNEL", None)) # Database File log All Public Files
     ULOG_GROUP = int(env.get("ULOG_GROUP", None))  # Logs channel for user logs
     MODE = env.get("MODE", "primary")
     SECONDARY = True if MODE.lower() == "secondary" else False
     AUTH_USERS = list(set(int(x)for x in str(env.get("AUTH_USERS", "")).split()))
-    DATA_SOURCES = [FLOG_CHANNEL, PFLOG_CHANNEL, ULOG_GROUP]
+    DATA_SOURCES = [FLOG_CHANNEL, PFLOG_CHANNEL, DFLOG_CHANNEL, ULOG_GROUP]
 
 class TMDB:
   API = str(env.get("TMDB_API", ""))

FileStream/utils/FileProcessors/bot_utils.py

@@ -157,8 +157,8 @@ async def gen_priv_file_link(_id):
     reply_markup = InlineKeyboardMarkup(
         [[InlineKeyboardButton("ᴅᴏᴡɴʟᴏᴀᴅ", url=stream_link)],
          [
-             InlineKeyboardButton("ɢᴇᴛ ғɪʟᴇ", url=file_link),
-             InlineKeyboardButton("ʀᴇᴠᴏᴋᴇ ғɪʟᴇ",callback_data=f"msgdelpvt_{_id}")
+          InlineKeyboardButton("ɢᴇᴛ ғɪʟᴇ", url=file_link),
+          InlineKeyboardButton("ʀᴇᴠᴏᴋᴇ ғɪʟᴇ",callback_data=f"msgdelpvt_{_id}")
          ], [InlineKeyboardButton("ᴄʟᴏsᴇ", callback_data="close")]])
   return reply_markup, stream_text
 
@@ -177,24 +177,23 @@ async def gen_link(_id):
   file_link = f"https://t.me/{FileStream.username}?start=file_{_id}"
 
   if "video" in mime_type:
-    stream_text = LANG.STREAM_TEXT.format(file_name, file_size, stream_link,page_link, file_link)
+    stream_text = LANG.STREAM_TEXT.format(file_name, file_size, stream_link, page_link, file_link)
     reply_markup = InlineKeyboardMarkup(
         [[
-            InlineKeyboardButton("sᴛʀᴇᴀᴍ", url=page_link),
-            InlineKeyboardButton("ᴅᴏᴡɴʟᴏᴀᴅ", url=stream_link)
+          InlineKeyboardButton("sᴛʀᴇᴀᴍ", url=page_link),
+          InlineKeyboardButton("ᴅᴏᴡɴʟᴏᴀᴅ", url=stream_link)
         ],
          [
-             InlineKeyboardButton("ɢᴇᴛ ғɪʟᴇ", url=file_link),
-             InlineKeyboardButton("ʀᴇᴠᴏᴋᴇ ғɪʟᴇ",callback_data=f"msgdelpvt_{_id}")
+          InlineKeyboardButton("ɢᴇᴛ ғɪʟᴇ", url=file_link),
+          InlineKeyboardButton("ʀᴇᴠᴏᴋᴇ ғɪʟᴇ",callback_data=f"msgdelpvt_{_id}")
          ], [InlineKeyboardButton("ᴄʟᴏsᴇ", callback_data="close")]])
   else:
     stream_text = LANG.STREAM_TEXT_X.format(file_name, file_size, stream_link,file_link)
     reply_markup = InlineKeyboardMarkup(
         [[InlineKeyboardButton("ᴅᴏᴡɴʟᴏᴀᴅ", url=stream_link)],
          [
-             InlineKeyboardButton("ɢᴇᴛ ғɪʟᴇ", url=file_link),
-             InlineKeyboardButton("ʀᴇᴠᴏᴋᴇ ғɪʟᴇ",
-                                  callback_data=f"msgdelpvt_{_id}")
+          InlineKeyboardButton("ɢᴇᴛ ғɪʟᴇ", url=file_link),
+          InlineKeyboardButton("ʀᴇᴠᴏᴋᴇ ғɪʟᴇ",callback_data=f"msgdelpvt_{_id}")
          ], [InlineKeyboardButton("ᴄʟᴏsᴇ", callback_data="close")]])
   return reply_markup, stream_text
 

FileStream/utils/FileProcessors/file_properties.py

@@ -79,7 +79,8 @@ async def get_file_ids(client: Client | bool, db_id: str, message) -> Optional[F
       if file_info['location'] in Telegram.DATA_SOURCES:
         print("Already Present in Data Sources ", Telegram.DATA_SOURCES)
       else:
-        log_msg = await send_file(FileStream, db_id,file_info['file']['file_id'], message,Telegram.FLOG_CHANNEL)
+        source = Telegram.DFLOG_CHANNEL if file_info['privacy_type']=="PUBLIC" else Telegram.FLOG_CHANNEL
+        log_msg = await send_file(FileStream, db_id, file_info['file']['file_id'], message, source)
         #updated_info = update_file_info(log_msg)
         await db.update_file_info(db_id, update_file_info(log_msg))
         await db.update_file_ids(db_id, await update_file_id(await db.get_file(db_id),MULTI_CLIENTS))