Spaces:
Running
Running
BinaryONe
commited on
Commit
·
4a17347
1
Parent(s):
a2907cc
Enabled Debugging - APi Changes
Browse files
FileStream/TMDB/Endpoint.py
CHANGED
@@ -9,7 +9,7 @@ def get_tvshows(tv_show_id):
|
|
9 |
def search_tmdb_movies(name):
|
10 |
# Search for the title in TMDb
|
11 |
title, year = Get_Title_Year(name)
|
12 |
-
|
13 |
if title is None :
|
14 |
return None
|
15 |
search_results = search.multi(title)
|
|
|
9 |
def search_tmdb_movies(name):
|
10 |
# Search for the title in TMDb
|
11 |
title, year = Get_Title_Year(name)
|
12 |
+
print("*", title, year,"\n Name :", name)
|
13 |
if title is None :
|
14 |
return None
|
15 |
search_results = search.multi(title)
|
FileStream/Tools/cleanup.py
CHANGED
@@ -20,8 +20,6 @@ def convert_special_to_normal(text):
|
|
20 |
text = re.sub(r'[^A-Za-z0-9 ]+', '', text)
|
21 |
return text
|
22 |
|
23 |
-
|
24 |
-
|
25 |
def clean_string_special(input_string):
|
26 |
# Define a regular expression pattern to remove special characters, including •, ▫️, etc.
|
27 |
# This pattern keeps only alphanumeric characters (A-Z, a-z, 0-9) and spaces.
|
|
|
20 |
text = re.sub(r'[^A-Za-z0-9 ]+', '', text)
|
21 |
return text
|
22 |
|
|
|
|
|
23 |
def clean_string_special(input_string):
|
24 |
# Define a regular expression pattern to remove special characters, including •, ▫️, etc.
|
25 |
# This pattern keeps only alphanumeric characters (A-Z, a-z, 0-9) and spaces.
|
FileStream/bot/plugins/FileHandlers/files.py
CHANGED
@@ -119,8 +119,7 @@ async def my_filebank(bot: Client, message: Message, response):
|
|
119 |
if total_files > 10:
|
120 |
file_list.append([
|
121 |
InlineKeyboardButton("◄", callback_data="N/A"),
|
122 |
-
InlineKeyboardButton(f"1/{math.ceil(total_files / 10)}",
|
123 |
-
callback_data="N/A"),
|
124 |
InlineKeyboardButton("►", callback_data="userallfiles_2")
|
125 |
], )
|
126 |
if not file_list:
|
|
|
119 |
if total_files > 10:
|
120 |
file_list.append([
|
121 |
InlineKeyboardButton("◄", callback_data="N/A"),
|
122 |
+
InlineKeyboardButton(f"1/{math.ceil(total_files / 10)}",callback_data="N/A"),
|
|
|
123 |
InlineKeyboardButton("►", callback_data="userallfiles_2")
|
124 |
], )
|
125 |
if not file_list:
|
FileStream/server/routes_api.py
CHANGED
@@ -20,6 +20,7 @@ from FileStream.TMDB.Endpoint import search_tmdb_any,search_tmdb_tv,search_tmdb_
|
|
20 |
from FileStream.server.exceptions import FIleNotFound, InvalidHash
|
21 |
|
22 |
from .Functions.downloader import media_streamer
|
|
|
23 |
CORS_HEADERS = {
|
24 |
"Access-Control-Allow-Origin": "*",
|
25 |
"Access-Control-Allow-Headers": "*"
|
@@ -28,14 +29,21 @@ CORS_HEADERS = {
|
|
28 |
async def handle_v2(request):
|
29 |
return web.Response(text="Hello from app api!")
|
30 |
|
|
|
|
|
|
|
|
|
|
|
|
|
31 |
|
|
|
32 |
async def list_all_files_db(request):
|
33 |
db = Database(Telegram.DATABASE_URL, Telegram.SESSION_NAME)
|
34 |
files= await db.get_all_files_api()
|
35 |
#print(files, type(files))
|
36 |
return web.json_response(json.loads(dumps(files)), headers=CORS_HEADERS)
|
37 |
|
38 |
-
|
39 |
async def list_all_tmdb_movies_from_db(request):
|
40 |
db = Database(Telegram.DATABASE_URL, Telegram.SESSION_NAME)
|
41 |
files= await db.get_all_files()
|
@@ -58,6 +66,8 @@ async def list_all_tmdb_movies_from_db(request):
|
|
58 |
break
|
59 |
return web.json_response(json.loads(dumps(response)),headers=CORS_HEADERS)
|
60 |
|
|
|
|
|
61 |
async def list_all_tmdb_tv_from_db(request):
|
62 |
db = Database(Telegram.DATABASE_URL, Telegram.SESSION_NAME)
|
63 |
files= await db.get_all_files()
|
@@ -215,6 +225,7 @@ cors.add(api.router.add_get('/', handle_v2))
|
|
215 |
api.router.add_get('/files', list_all_files_db)
|
216 |
api.router.add_get('/files/mix', list_all_files)
|
217 |
api.router.add_get('/tmdb/mix', list_all_files_tmdb)
|
|
|
218 |
api.router.add_get('/tmdb/movies', list_all_tmdb_movies_from_db)
|
219 |
|
220 |
api.router.add_get('/upload', upload_file)
|
|
|
20 |
from FileStream.server.exceptions import FIleNotFound, InvalidHash
|
21 |
|
22 |
from .Functions.downloader import media_streamer
|
23 |
+
|
24 |
CORS_HEADERS = {
|
25 |
"Access-Control-Allow-Origin": "*",
|
26 |
"Access-Control-Allow-Headers": "*"
|
|
|
29 |
async def handle_v2(request):
|
30 |
return web.Response(text="Hello from app api!")
|
31 |
|
32 |
+
#api.router.add_get('/10/files', list_10_all_files_db)
|
33 |
+
async def list_10_all_files_db():
|
34 |
+
file_range = [file_list_no * 10 - 10 + 1, file_list_no * 10]
|
35 |
+
user_files, total_files = await db.find_all_files([1, 10])
|
36 |
+
return file_list, total_files
|
37 |
+
|
38 |
|
39 |
+
#api.router.add_get('/files', list_all_files_db)
|
40 |
async def list_all_files_db(request):
|
41 |
db = Database(Telegram.DATABASE_URL, Telegram.SESSION_NAME)
|
42 |
files= await db.get_all_files_api()
|
43 |
#print(files, type(files))
|
44 |
return web.json_response(json.loads(dumps(files)), headers=CORS_HEADERS)
|
45 |
|
46 |
+
#api.router.add_get('/tmdb/mix', list_all_files_tmdb)
|
47 |
async def list_all_tmdb_movies_from_db(request):
|
48 |
db = Database(Telegram.DATABASE_URL, Telegram.SESSION_NAME)
|
49 |
files= await db.get_all_files()
|
|
|
66 |
break
|
67 |
return web.json_response(json.loads(dumps(response)),headers=CORS_HEADERS)
|
68 |
|
69 |
+
|
70 |
+
#api.router.add_get('/tmdb/movies', list_all_tmdb_movies_from_db)
|
71 |
async def list_all_tmdb_tv_from_db(request):
|
72 |
db = Database(Telegram.DATABASE_URL, Telegram.SESSION_NAME)
|
73 |
files= await db.get_all_files()
|
|
|
225 |
api.router.add_get('/files', list_all_files_db)
|
226 |
api.router.add_get('/files/mix', list_all_files)
|
227 |
api.router.add_get('/tmdb/mix', list_all_files_tmdb)
|
228 |
+
api.router.add_get('/10/files', list_10_all_files_db)
|
229 |
api.router.add_get('/tmdb/movies', list_all_tmdb_movies_from_db)
|
230 |
|
231 |
api.router.add_get('/upload', upload_file)
|