API Updates

FileStream/DBFiles/___init__.py

@@ -0,0 +1,7 @@
+
+from .database import PUBLICFilesDB
+from FileStream.config import Telegram
+
+DB_Controller = PUBLICFilesDB(Telegram.DATABASE_URL, Telegram.SESSION_NAME)
+
+

FileStream/DBFiles/database.py

@@ -0,0 +1,37 @@
+import re
+import time
+import pymongo
+import motor.motor_asyncio
+from bson.objectid import ObjectId
+from bson.errors import InvalidId
+from bson.json_util import dumps
+
+from pymongo.errors import PyMongoError
+
+class PUBLICFilesDB:
+    def __init__(self, uri, database_name):
+        self._client = motor.motor_asyncio.AsyncIOMotorClient(uri)
+        self.db = self._client[database_name]
+        self.files = self.db.Public_Files
+
+    async def GetMoviesAllBy10(self, offset=None):
+        try:
+            filter = {"type": "Movie"}  # Define the filter for movies
+            total_results = await self.files.count_documents(filter)
+            offset=int( offset if offset else 0)
+            next_offset = offset + 10
+            if next_offset >= total_results:  # Changed > to >= to handle the last page correctly
+                next_offset = ''
+            cursor = self.files.find(filter)  # Apply the filter
+            cursor.sort('$natural', pymongo.DESCENDING)  # Use pymongo.DESCENDING
+            cursor.skip(offset).limit(10)
+            files = await cursor.to_list(length=10)
+            return files, next_offset
+
+        except PyMongoError as e:
+            print(f"MongoDB error: {e}")
+            return [], ''  # Return empty list and '' on error
+        except Exception as e:
+            print(f"An unexpected error occurred: {e}")
+            return [], ''
+

FileStream/server/API/__init__.py

@@ -2,17 +2,10 @@ import aiohttp_cors
 from aiohttp import web
 
 #---------------------- Local Imports --------------------#
-#from .listings import (
-#    list_all_files_db,
-#    list_all_files,
-#    list_all_files_tmdb,
-#    list_10_all_files_db,
-#    list_all_tmdb_tv_from_db,
-#    list_all_tmdb_movies_from_db,
-#)
 from .downloads import stream_handler
 from .uploads import upload_file
-from .search import searchAll
+from .search import SearchAll
+from .listings import AllMovies10
 
 
 #-----------------------------Functions------------------------#
@@ -32,22 +25,21 @@ cors = aiohttp_cors.setup(api, defaults={"*": aiohttp_cors.ResourceOptions(
     allow_methods="*"
 )})
 
-cors.add(api.router.add_get('/', handle_v2))
-
-
-#serch PI
-api.router.add_get('/search', searchAll)
-#Movies
-#Webseries
-#trending
-#detils
+cors.add(api.router.add_get('/', handle_v2))  #Basic Reponse
+api.router.add_get('/search', SearchAll)      #serch API
+api.router.add_get('/movies', AllMovies10)    #Movies
+#api.router.add_get('/series', AllSeries10)    #Webseries
+#api.router.add_get('/trending', Leatest10)    #trending
+#api.router.add_get('/details', Details)       #details
 
+#----------------------------------------------------------------
 #api.router.add_get('/files', list_all_files_db)
 #api.router.add_get('/files/mix', list_all_files)
 #api.router.add_get('/tmdb/mix', list_all_files_tmdb)
 #api.router.add_get('/10/files', list_10_all_files_db)
 #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)

FileStream/server/API/listings.py

@@ -0,0 +1,41 @@
+import os
+import json
+import logging
+import asyncio
+import traceback
+from aiohttp import web
+from pyrogram import raw
+from aiohttp.http_exceptions import BadStatusLine
+
+from FileStream.utils.FileProcessors.human_readable import humanbytes
+from FileStream.config import Telegram, Server
+
+from FileStream.DBFiles import PUBLICFilesDB
+
+db = PUBLICFilesDB(Telegram.DATABASE_URL, Telegram.SESSION_NAME)
+
+async def AllMovies10(request: web.Request):
+    offset = request.rel_url.query.get('offset', 0)
+    results=[]
+    files, next_offset = await db.get_search_results(offset=offset)
+    for file in files:
+        results.append({
+        "poster":file['poster'],
+        "title":file['title'],
+        "release_date":file['release_date'],
+        "genre":file['genre'],
+        "imdb_id":file['IMDB_id'],
+        "type":file['type'],
+        "file_name": file['file']['file_name'],
+        "document_file_id": file['file']['file_id'],
+        "caption": file['file']['file_name'] or "",
+        "description": f"Size: {humanbytes(file['file']['file_size'])}\nType: {file['file']['mime_type']}",
+        })
+    return web.json_response({"count": len(results), "results": results, "next_offset": next_offset})  # Correct JSON response format
+
+
+
+
+
+
+

FileStream/server/API/search.py

@@ -15,24 +15,25 @@ from FileStream.Database import Database
 from FileStream.config import Telegram, Server
 db = Database(Telegram.DATABASE_URL, Telegram.SESSION_NAME)
 
-async def searchAll(request: web.Request):
-  query = request.rel_url.query.get('query', '')  # Extract 'query' from URL params
-  offset = request.rel_url.query.get('offset', '0')  # Extract 'offset' (default 0)
-  
-  print(query, offset)  # Debugging print
-  
+async def SearchAll(request: web.Request):
+  query = request.rel_url.query.get('query', '')  # Extract 'query' from URL params  
+  #print(query, offset)  # Debugging print 
   results = []
-  offset = int(offset)  # Convert offset to integer
-  
+  offset = int(request.rel_url.query.get('offset') if request.rel_url.query.get('offset') else 0 )  # Convert offset to integer
   # Simulating a database function call (replace with actual implementation)
   files, next_offset = await db.get_search_results(query, file_type=None, max_results=10, offset=offset)
-  
   for file in files:
       results.append({
-          "title": file['file']['file_name'],
-          "document_file_id": file['file']['file_id'],
-          "caption": file['file']['file_name'] or "",
-          "description": f"Size: {humanbytes(file['file']['file_size'])}\nType: {file['file']['mime_type']}",
+        "poster":file['poster'],
+        "title":file['title'],
+        "release_date":file['release_date'],
+        "genre":file['genre'],
+        "imdb_id":file['IMDB_id'],
+        "type":file['type'],
+        "file_name": file['file']['file_name'],
+        "document_file_id": file['file']['file_id'],
+        "caption": file['file']['file_name'] or "",
+        "description": f"Size: {humanbytes(file['file']['file_size'])}\nType: {file['file']['mime_type']}",
       })
   
-  return web.json_response({"results": results, "next_offset": next_offset})  # Correct JSON response format
+  return web.json_response({"count": len(results), "results": results, "next_offset": next_offset})  # Correct JSON response format