apparently there are things to commit

This commit is contained in:
nin0dev 2024-06-24 03:55:25 -04:00
parent ac1cf91adc
commit 174e0564a7

View file

@ -32,9 +32,8 @@ async def run_command(cmd):
# Decode stdout and return # Decode stdout and return
return stdout return stdout
async def merge(request): async def merge(request: aiohttp.web.Request):
# register params # register params
job_id = request.rel_url.query["id"]
video_id: str = request.rel_url.query["id"] video_id: str = request.rel_url.query["id"]
audio_itag: str = request.rel_url.query["audio_itag"] audio_itag: str = request.rel_url.query["audio_itag"]
video_itag: str = request.rel_url.query["video_itag"] video_itag: str = request.rel_url.query["video_itag"]
@ -48,50 +47,49 @@ async def merge(request):
if not video_itag.isdigit(): if not video_itag.isdigit():
print(f"Video itag {video_itag} flagged as invalid, dropping request") print(f"Video itag {video_itag} flagged as invalid, dropping request")
return return
if os.path.isfile(f"{job_id}.mp4"): if "Firefox" in request.headers["User-Agent"]:
return web.FileResponse( # Sane browser that supports streaming
path=f"{job_id}.mp4"
) cmdline = f"ffmpeg -i \"https://eu-proxy.poketube.fun/latest_version?id={video_id}&itag={audio_itag}&local=true\" -i \"https://eu-proxy.poketube.fun/latest_version?id={video_id}&itag={video_itag}&local=true\" -c copy -f mp4 -movflags frag_keyframe+empty_moov -"
cmdline = f"ffmpeg -i \"https://eu-proxy.poketube.fun/latest_version?id={video_id}&itag={audio_itag}&local=true\" -i \"https://eu-proxy.poketube.fun/latest_version?id={video_id}&itag={video_itag}&local=true\" -c copy -f mp4 -movflags frag_keyframe+empty_moov --duration 300 -"
#proc_ffmpeg = await asyncio.create_subprocess_shell(
# cmdline,
# stdout=asyncio.subprocess.PIPE
#)
#print(f"ffmpeg -i \"https://eu-proxy.poketube.fun/latest_version?id={video_id}&itag={audio_itag}&local=true\" -i \"https://eu-proxy.poketube.fun/latest_version?id={video_id}&itag={video_itag}&local=true\" -c copy -f mp4 -movflags frag_keyframe+empty_moov -")
#stdout, _ = await proc_ffmpeg.communicate()
#iwannakillmyself = await run_command(cmdline)
process = await asyncio.create_subprocess_shell( process = await asyncio.create_subprocess_shell(
cmdline, cmdline,
stdout=asyncio.subprocess.PIPE, stdout=asyncio.subprocess.PIPE,
stderr=asyncio.subprocess.PIPE
) )
# Wait for the subprocess to finish response = web.StreamResponse(status=206, reason='OK', headers={
#stdout, stderr = await process.communicate()
response = web.StreamResponse(status=200, reason='OK', headers={
'Content-Type': 'video/mp4', 'Content-Type': 'video/mp4',
'Transfer-Encoding': 'chunked', 'Transfer-Encoding': 'chunked',
'Accept-Ranges': 'bytes'
}) })
await response.prepare(request) await response.prepare(request)
try: try:
while True: while True:
# Read data from stdout
chunk = await process.stdout.readline() chunk = await process.stdout.readline()
if not chunk: if not chunk:
break break
# Write the chunk to the response
await response.write(chunk) await response.write(chunk)
except Exception as e: except Exception as e:
print(f"Error streaming FFmpeg output: {e}") print(f"Error streaming FFmpeg output: {e}")
finally: finally:
# Close the response
await response.write_eof() await response.write_eof()
else:
# Likely to be chromium browser, so to avoid browser shitting itself we download file
job_id = f"{request.rel_url.query["id"]}_{request.rel_url.query["audio_itag"]}_{request.rel_url.query["video_itag"]}"
if os.path.isfile(f"{job_id}.mp4"):
return web.FileResponse(
path=f"{job_id}.mp4"
)
cmdline = f"ffmpeg -i \"https://eu-proxy.poketube.fun/latest_version?id={video_id}&itag={audio_itag}&local=true\" -i \"https://eu-proxy.poketube.fun/latest_version?id={video_id}&itag={video_itag}&local=true\" -c copy -f mp4 -movflags frag_keyframe+empty_moov {job_id}.mp4"
process = await asyncio.create_subprocess_shell(
cmdline,
stdout=asyncio.subprocess.PIPE,
stderr=asyncio.subprocess.PIPE
)
await process.wait()
if process.returncode != 0: # Log or handle the error
return None
response = FileResponse(path=f"{job_id}.mp4")
return response return response
# Check for errors
#if process.returncode != 0: # Log or handle the error
#print(f"Command '{args}' failed with return code {process.returncode}")
#return None
# Decode stdout and return return stdout
#response = Response(body=stdout, content_type="video/mp4", headers="")
#return response
async def ping(request): async def ping(request):
return web.Response(body='{"success": true}', content_type="application/json") return web.Response(body='{"success": true}', content_type="application/json")