Temporary Upload feature

FileStream/Database/database.py

@@ -162,15 +162,27 @@ class Database:
 
 
   # ---------------------[ FIND FILE IN DB for Bot and APIs]---------------------#
-  async def get_file(self, _id):
-    try:
-      file_info = await self.files.find_one({"_id": ObjectId(_id)})
-      if not file_info:
-        print('file not found')
-        #raise FileNotFound
-      return file_info
-    except InvalidId:
-      raise FileNotFound
+  async def get_file(self, _id, privacy_type:str ):
+    if privacy_type == "PUBLIC":
+      try:
+        file_info = await self.files.find_one({"_id": ObjectId(_id)})
+        if not file_info:
+          print('file not found')
+          #raise FileNotFound
+        return file_info
+      except InvalidId:
+        raise FileNotFound
+    elif privacy_type == "TEMPORARY":
+      try:
+        file_info = await self.tfiles.find_one({"_id": ObjectId(_id)})
+        if not file_info:
+          print('file not found')
+          #raise FileNotFound
+        return file_info
+      except InvalidId:
+        raise FileNotFound
+    else:
+      return None
 
   async def get_all_files_api(self,range=None):
     #files = self.files.find({})
@@ -227,8 +239,11 @@ class Database:
         {"file.tagged_users." + str(user_id): "PRIVATE"})
     return user_files, total_files
 
-  async def get_file_by_fileuniqueid_only(self, file_unique_id):
-    return await self.files.find_one({"file.file_unique_id": file_unique_id})
+  async def get_file_by_fileuniqueid_only(self, file_unique_id, privacy_type:str):
+    if privacy_type=="TEMPORARY":
+      return await self.files.find_one({"file.file_unique_id": file_unique_id})
+    else:
+      return await self.files.find_one({"file.file_unique_id": file_unique_id})
 
   async def get_file_by_fileuniqueid(self, id, file_unique_id):
     count = await self.files.count_documents({"user_id":id,"file.file_unique_id":file_unique_id})
@@ -242,36 +257,67 @@ class Database:
   # ---------------------[ UPDATE FILE IN DB ]---------------------#
 
   async def update_privacy(self, file_details: dict):
-    file = await self.get_file_by_fileuniqueid_only(file_details['file']['file_unique_id'])
+    file = await self.get_file_by_fileuniqueid_only(file_details['file']['file_unique_id'],file_details['privacy_type'])
     # Merge the tagged_user dictionaries
     updated_tagged_users = file['file']['tagged_users'].copy()
     updated_tagged_users.update(file_details['file']['tagged_users'])
     #for value in updated_tagged_users.values():
     #  if value == "PRIVATE":
     #    file_details['privacy_type']=="PRIVATE"
-    file_details['privacy_type'] = "PRIVATE" if any(value == "PRIVATE" for value in updated_tagged_users.values()) else file_details['privacy_type']
-    await self.files.update_one({"_id": file['_id']}, {
-        "$set": {
-            "privacy_type": file_details['privacy_type'],
-            "file.tagged_users": updated_tagged_users
-        }
-    })
-    return await self.get_file_by_fileuniqueid_only(file_details['file']['file_unique_id'])
+    if file_details['privacy_type']=="TEMPORARY":
+      #file_details['privacy_type'] = "PRIVATE" if any(value == "PRIVATE" for value in updated_tagged_users.values()) else file_details['privacy_type']
+      await self.tfiles.update_one({"_id": file['_id']}, {
+          "$set": {
+              "privacy_type": file_details['privacy_type'],
+              "file.tagged_users": updated_tagged_users
+          }
+      })
+      return await self.get_file_by_fileuniqueid_only(file_details['file']['file_unique_id'],file_details['privacy_type'])
+    else:  
+      file_details['privacy_type'] = "PRIVATE" if any(value == "PRIVATE" for value in updated_tagged_users.values()) else file_details['privacy_type']
+
+      await self.files.update_one({"_id": file['_id']}, {
+          "$set": {
+              "privacy_type": file_details['privacy_type'],
+              "file.tagged_users": updated_tagged_users
+          }
+      })
+      return await self.get_file_by_fileuniqueid_only(file_details['file']['file_unique_id'],file_details['privacy_type'])
+
+  async def update_file_ids(self, _id, file_ids: dict, privacy_type:str):
+    if privacy_type=="PUBLIC":
+      await self.files.update_one({"_id": ObjectId(_id)},
+                                  {"$set": {
+                                      "file_ids": file_ids
+                                  }})
+    elif privacy_type=="TEMPORARY":
+      await self.tfiles.update_one({"_id": ObjectId(_id)},
+                                  {"$set": {
+                                      "file_ids": file_ids
+                                  }})
+    else:
+      return None
 
-  async def update_file_ids(self, _id, file_ids: dict):
-    await self.files.update_one({"_id": ObjectId(_id)},
-                                {"$set": {
-                                    "file_ids": file_ids
-                                }})
+  async def update_file_info(self, _id, file_info: dict, privacy_type:str):
+    if privacy_type=="PUBLIC":
+      await self.files.update_one({"_id": ObjectId(_id)}, {
+          "$set": {
+              "message_id": file_info['message_id'],
+              "location": file_info['location'],
+              "file": file_info['file']
+          }
+      })
+    elif privacy_type=="TEMPORARY":
+      await self.tfiles.update_one({"_id": ObjectId(_id)}, {
+          "$set": {
+              "message_id": file_info['message_id'],
+              "location": file_info['location'],
+              "file": file_info['file']
+          }
+      })
+    else:
+      return None
 
-  async def update_file_info(self, _id, file_info: dict):
-    await self.files.update_one({"_id": ObjectId(_id)}, {
-        "$set": {
-            "message_id": file_info['message_id'],
-            "location": file_info['location'],
-            "file": file_info['file']
-        }
-    })
 
 
   #--------------------------PrivateFiles-------------------
@@ -301,7 +347,7 @@ class Database:
                                 }})
 
   async def update_private_privacy(self, file_details: dict, instruction: dict):
-    file = await self.get_file_by_fileuniqueid_only(file_details['file']['file_unique_id'])
+    file = await self.get_file_by_fileuniqueid_only(file_details['file']['file_unique_id'],file_details['privacy_type'])
     await self.pfile.insert_one(file_details)
 
 #####################-------search for inline query ------------###############

FileStream/Tools/cleanup.py

@@ -1,6 +1,29 @@
 import re
 
 # words_to_remove = ["FC","HEVC","ɴᴀᴍᴇ:","-","BuLMoviee" ,"𝗝𝗼𝗶𝗻 𝗨𝘀 𝗢𝗻 𝗧𝗲𝗹𝗲𝗴𝗿𝗮�","SIDHUU 591","𝑱𝒐𝒊𝒏 𝑼𝒔 𝑶ɴ 𝑻ᴇʟᴇɢʀᴀᴍ","Tɪᴛʟᴇ :"]
+words_to_remove = [
+        "Fɪʟᴇ",
+        "Fɪʟᴇ ɴᴀᴍᴇ :",
+        "FC",
+        "HEVC",
+        "ɴᴀᴍᴇ",
+        "Tɪᴛʟᴇ :",
+        "-",
+        "BuLMoviee",
+        "𝗝𝗼𝗶𝗻 𝗨𝘀 𝗢𝗻 𝗧𝗲𝗹𝗲𝗴𝗿𝗮�",
+        "𝗝𝗼𝗶𝗻 𝗨𝘀 𝗢𝗻 𝗧𝗲𝗹𝗲𝗴𝗿𝗮𝗺",
+        "SIDHUU 591",
+        "𝑱𝒐𝒊𝒏 𝑼𝒔 𝑶ɴ 𝑻ᴇʟᴇɢʀᴀᴍ",
+        "Tɪᴛʟᴇ :",
+        "Bollywood",
+        "mkv",
+        "Mᴏᴠɪᴇ",
+        "ɢʀᴏᴜᴘ",
+        "TGxMALLU_MOVIE",
+        "[Tg-@New_Movies_OnTG]",
+        "[@ClipmateEmpire]",
+        "@Horek_Rokom2020"
+    ]
 
 def remove_words(text, words_to_remove):
     # Join the words to remove into a single regex pattern

FileStream/utils/FileProcessors/bot_utils.py

@@ -98,7 +98,7 @@ async def upload_type_func(file_info,replied_message):
   user_id = file_info['user_id']
   message_id = file_info['message_id']
   """
-  existing_file = await db.get_file_by_fileuniqueid_only(file_info['file']['file_unique_id'])
+  existing_file = await db.get_file_by_fileuniqueid_only(file_info['file']['file_unique_id'],file_info['privacy_type'])
   if existing_file :
 
     reply_markup, stream_text = await gen_link(existing_file['_id'])

FileStream/utils/FileProcessors/file_properties.py

@@ -18,9 +18,9 @@ from FileStream.Tools.cleanup import clean_text,clean_string_special
 db = Database(Telegram.DATABASE_URL, Telegram.SESSION_NAME)
 
 
-async def send_file(client: Client, db_id, file_id: str, message, send_to):
+async def send_file(client: Client, db_id, file_info , message, send_to):
   file_caption = getattr(message, 'caption', None) or get_name(message)
-  log_msg = await client.send_cached_media(chat_id=send_to, file_id=file_id, caption=f"**{file_caption}**")
+  log_msg = await client.send_cached_media(chat_id=send_to, file_id= file_info['file']['file_id'] , caption=f"**{file_caption}**")
 
   if message.chat.type == ChatType.PRIVATE:
     await log_msg.reply_text(
@@ -30,9 +30,9 @@ async def send_file(client: Client, db_id, file_id: str, message, send_to):
         parse_mode=ParseMode.MARKDOWN,
         quote=True)
   else:
-    await log_msg.reply_text(
+    await log_msg.edit_text(
         text=
-        f"**RᴇQᴜᴇꜱᴛᴇᴅ ʙʏ :** {message.chat.title} \n**Cʜᴀɴɴᴇʟ ɪᴅ :** `{message.chat.id}`\n**Fɪʟᴇ ɪᴅ :** `{db_id}`",
+        f"**{file_info['type']} :{file_info['title']} ReleaseDate {file_info['release_date']} \n Description{file_info['description']} \n Genre {file_info['genre']}\n\nRᴇQᴜᴇꜱᴛᴇᴅ ʙʏ :** {message.chat.title} \n**Cʜᴀɴɴᴇʟ ɪᴅ :** `{message.chat.id}`\n**Fɪʟᴇ ɪᴅ :** `{db_id}`",
         disable_web_page_preview=True,
         parse_mode=ParseMode.MARKDOWN,
         quote=True)
@@ -80,10 +80,10 @@ async def get_file_ids(client: Client | bool, db_id: str, message) -> Optional[F
         print("Already Present in Data Sources ", Telegram.DATA_SOURCES)
       else:
         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)
+        log_msg = await send_file(FileStream, db_id, file_info, 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))
+        await db.update_file_info(db_id, update_file_info(log_msg), file_info['privacy_type'])
+        await db.update_file_ids(db_id, await update_file_id(await db.get_file(db_id,file_info['privacy_type']),MULTI_CLIENTS), file_info['privacy_type'])
 
       logging.debug("Stored file_id of all clients in DB")
       if not client: