BinaryONe commited on
Commit
4131df3
·
1 Parent(s): b12dfa5

Cors Response Fix

Browse files
Files changed (1) hide show
  1. FileStream/server/routes_api.py +9 -40
FileStream/server/routes_api.py CHANGED
@@ -24,15 +24,18 @@ CORS_HEADERS = {
24
  "Access-Control-Allow-Origin": "*",
25
  "Access-Control-Allow-Headers": "*"
26
  }
 
27
  async def handle_v2(request):
28
  return web.Response(text="Hello from app api!")
29
 
 
30
  async def list_all_files_db(request):
31
  db = Database(Telegram.DATABASE_URL, Telegram.SESSION_NAME)
32
  files= await db.get_all_files_api()
33
  #print(files, type(files))
34
  return web.json_response(json.loads(dumps(files)), headers=CORS_HEADERS)
35
 
 
36
  async def list_all_tmdb_movies_from_db(request):
37
  db = Database(Telegram.DATABASE_URL, Telegram.SESSION_NAME)
38
  files= await db.get_all_files()
@@ -53,12 +56,6 @@ async def list_all_tmdb_movies_from_db(request):
53
  except Exception as e:
54
  print("Error ",e)
55
  break
56
-
57
- #print(response)
58
- # Convert Python data to JSON
59
- #json_response = json.dumps(response).encode('utf-8')
60
- # Return as aiohttp response using web.json_response
61
- #return web.json_response(response)
62
  return web.json_response(json.loads(dumps(response)),headers=CORS_HEADERS)
63
 
64
  async def list_all_tmdb_tv_from_db(request):
@@ -81,20 +78,12 @@ async def list_all_tmdb_tv_from_db(request):
81
  except Exception as e:
82
  print("Error ",e)
83
  break
84
-
85
- #print(response)
86
- # Convert Python data to JSON
87
- #json_response = json.dumps(response).encode('utf-8')
88
- # Return as aiohttp response using web.json_response
89
- #return web.json_response(response)
90
  return web.json_response(json.loads(dumps(response)), headers=CORS_HEADERS)
91
 
92
  #api.router.add_get('/tmdb/list', list_all_files_tmdb)
93
  async def list_all_files_tmdb(request):
94
  db = Database(Telegram.DATABASE_URL, Telegram.SESSION_NAME)
95
  files= await db.get_all_files()
96
- #print(files)
97
- #response=[]
98
  async def data_generator():
99
  async for row in files:
100
  #print(row['file']['caption'])
@@ -116,31 +105,11 @@ async def list_all_files_tmdb(request):
116
  break
117
 
118
  return web.Response(body=data_generator(), content_type='application/json', headers=CORS_HEADERS)
119
- #return web.json_response(json.loads(dumps(response)))
120
 
121
  #api.router.add_get('/tmdb/files', list_all_files)
122
  async def list_all_files(request):
123
  db = Database(Telegram.DATABASE_URL, Telegram.SESSION_NAME)
124
  files=await db.get_all_files_api()
125
- #print(files[0])
126
- """{"_id":
127
- {"$oid":"664b9bee136af99d40f36ac4"},
128
- "user_id":"780583126",
129
- "user_type":"TELEGRAM",
130
- "message_id":{"$numberInt":"230"},
131
- "location":{"$numberLong":"-1001713565158"},
132
- "file":{
133
- "file_id":"BAACAgIAAx0EZiLt5gAD5mZLm_BFwLE0BtOz3x74uJVDMPyKAAIISAACVyEJSugUJlXYybnGHgQ",
134
- "caption":"Godzilla x Kong: The New Empire (2024)IMDB 6.5/10..Audio - Hindi + English",
135
- "file_unique_id":"AgADCEgAAlchCUo",
136
- "file_name":"[Tg- @New_Movies_OnTG] Godzilla x Kong: The New Empire (2024.mkv",
137
- "file_size":{"$numberInt":"1191876267"},
138
- "mime_type":"video/x-matroska",
139
- "tagged_users":{"780583126":"PUBLIC","908083534":"PUBLIC"}},
140
- "time":"Tue May 21 00:22:28 2024",
141
- "privacy_type":"PUBLIC",
142
- "file_ids":{"7143040931":"BAACAgIAAx0CZiLt5gAD5mZLm_JkEd4FIhfPJMNx4yrn_ku2AAIISAACVyEJStMWKGOMGmA8HgQ","7137723582":"BAACAgIAAx0CZiLt5gAD5mZLm_L1n-OtIh2xs9VTfPg9ng-jAAIISAACVyEJSgwG7RQMGjI4HgQ","7186717764":"BAACAgIAAx0CZiLt5gAD5mZLm_LHCB1_h5anoEEStvf4l_fyAAIISAACVyEJSpNn5Oa7x8LDHgQ","6589995279":"BAACAgIAAx0CZiLt5gAD5mZLm_JkQEwGvFwxwQXtfMk9FrBYAAIISAACVyEJSovis_Nx3os5HgQ","6539834495":"BAACAgIAAx0CZiLt5gAD5mZblPC_hDA4ZXq9Uw2NiHhRZakvAAIISAACVyEJSk4a1yBMKm1jHgQ","7142960273":"BAACAgIAAx0CZiLt5gAD5mZblU_WJD3j98Z_fwS4zkhZU16WAAIISAACVyEJStP84jRi0R9YHgQ"}}
143
- """
144
  resp=[{
145
  "adult": False,
146
  "backdrop_path": "/c1bz69r0v065TGFA5nqBiKzPDys.jpg",
@@ -212,6 +181,7 @@ async def upload_file(request: web.Request):
212
 
213
 
214
  #-------------Routes to Downloada File Witha Path-----------------#
 
215
  #@routes.get("/dl/{path}", allow_head=True)
216
  async def stream_handler(request: web.Request):
217
  try:
@@ -241,12 +211,11 @@ cors = aiohttp_cors.setup(api, defaults={
241
  )
242
  })
243
 
244
- api.router.add_get('/', handle_v2)
245
- cors.add(api.router.add_get('/files', list_all_files_db))
246
- cors.add(api.router.add_get('/files/mix', list_all_files))
247
- cors.add(api.router.add_get('/tmdb/mix', list_all_files_tmdb))
248
- cors.add(api.router.add_get('/tmdb/tv', list_all_tmdb_tv_from_db))
249
- cors.add(api.router.add_get('/tmdb/movies', list_all_tmdb_movies_from_db))
250
 
251
  api.router.add_get('/upload', upload_file)
252
  api.router.add_get('/dl/{path}', stream_handler)
 
24
  "Access-Control-Allow-Origin": "*",
25
  "Access-Control-Allow-Headers": "*"
26
  }
27
+
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()
 
56
  except Exception as e:
57
  print("Error ",e)
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):
 
78
  except Exception as e:
79
  print("Error ",e)
80
  break
 
 
 
 
 
 
81
  return web.json_response(json.loads(dumps(response)), headers=CORS_HEADERS)
82
 
83
  #api.router.add_get('/tmdb/list', list_all_files_tmdb)
84
  async def list_all_files_tmdb(request):
85
  db = Database(Telegram.DATABASE_URL, Telegram.SESSION_NAME)
86
  files= await db.get_all_files()
 
 
87
  async def data_generator():
88
  async for row in files:
89
  #print(row['file']['caption'])
 
105
  break
106
 
107
  return web.Response(body=data_generator(), content_type='application/json', headers=CORS_HEADERS)
 
108
 
109
  #api.router.add_get('/tmdb/files', list_all_files)
110
  async def list_all_files(request):
111
  db = Database(Telegram.DATABASE_URL, Telegram.SESSION_NAME)
112
  files=await db.get_all_files_api()
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
113
  resp=[{
114
  "adult": False,
115
  "backdrop_path": "/c1bz69r0v065TGFA5nqBiKzPDys.jpg",
 
181
 
182
 
183
  #-------------Routes to Downloada File Witha Path-----------------#
184
+
185
  #@routes.get("/dl/{path}", allow_head=True)
186
  async def stream_handler(request: web.Request):
187
  try:
 
211
  )
212
  })
213
 
214
+ 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)
221
  api.router.add_get('/dl/{path}', stream_handler)