From a3bd8ec9574e46ed5c54827d59ed04cb845ab01c Mon Sep 17 00:00:00 2001 From: nin0dev Date: Sun, 23 Jun 2024 14:34:36 -0400 Subject: [PATCH 1/7] Fixed bug where video would get corrupted over not correctly getting id --- videobundler/.gitignore | 170 ++++++++++++++++++++++++++++++++++++++++ videobundler/main.py | 21 ++--- 2 files changed, 175 insertions(+), 16 deletions(-) create mode 100644 videobundler/.gitignore diff --git a/videobundler/.gitignore b/videobundler/.gitignore new file mode 100644 index 00000000..c0e4a829 --- /dev/null +++ b/videobundler/.gitignore @@ -0,0 +1,170 @@ +# Byte-compiled / optimized / DLL files +__pycache__/ +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +share/python-wheels/ +*.egg-info/ +.installed.cfg +*.egg +MANIFEST + +# PyInstaller +# Usually these files are written by a python script from a template +# before PyInstaller builds the exe, so as to inject date/other infos into it. +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +*.py,cover +.hypothesis/ +.pytest_cache/ +cover/ + +# Translations +*.mo +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +.pybuilder/ +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +# For a library or package, you might want to ignore these files since the code is +# intended to run in multiple environments; otherwise, check them in: +# .python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# poetry +# Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control. +# This is especially recommended for binary packages to ensure reproducibility, and is more +# commonly ignored for libraries. +# https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control +#poetry.lock + +# pdm +# Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control. +#pdm.lock +# pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it +# in version control. +# https://pdm.fming.dev/latest/usage/project/#working-with-version-control +.pdm.toml +.pdm-python +.pdm-build/ + +# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm +__pypackages__/ + +# Celery stuff +celerybeat-schedule +celerybeat.pid + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# Spyder project settings +.spyderproject +.spyproject + +# Rope project settings +.ropeproject + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +# pytype static type analyzer +.pytype/ + +# Cython debug symbols +cython_debug/ + +# PyCharm +# JetBrains specific template is maintained in a separate JetBrains.gitignore that can +# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore +# and can be added to the global gitignore or merged into this file. For a more nuclear +# option (not recommended) you can uncomment the following to ignore the entire idea folder. +#.idea/ +bin/ +include/ +lib64/ +pyvenv.cfg +*.m4a +*.mp4 +.env +done.* \ No newline at end of file diff --git a/videobundler/main.py b/videobundler/main.py index 236c1c1b..de128868 100644 --- a/videobundler/main.py +++ b/videobundler/main.py @@ -17,14 +17,10 @@ def get_random_string(length): async def merge(request): # register params - try: - job_id = request.rel_url.query["id"] - video_id: str = request.rel_url.query["id"] - audio_itag: str = request.rel_url.query["audio_itag"] - video_itag: str = request.rel_url.query["video_itag"] - except: - # no one gives a fuck - _ = 0 + job_id = request.rel_url.query["id"] + video_id: str = request.rel_url.query["id"] + audio_itag: str = request.rel_url.query["audio_itag"] + video_itag: str = request.rel_url.query["video_itag"] # validate if " " in video_id or len(video_id) > 11: print(f"Video {video_id} flagged as invalid, dropping request") @@ -39,15 +35,8 @@ async def merge(request): return web.FileResponse( path=f"output.{job_id}.mp4" ) - proc_audio = await asyncio.create_subprocess_shell( - f"wget -O{job_id}.m4a \"https://eu-proxy.poketube.fun/latest_version?id={video_id}&itag={audio_itag}&local=true\"", - ) - proc_video = await asyncio.create_subprocess_shell( - f"wget -O{job_id}.mp4 \"https://eu-proxy.poketube.fun/latest_version?id={video_id}&itag={video_itag}&local=true\"" - ) - await asyncio.gather(proc_audio.wait(), proc_video.wait()) proc_ffmpeg = await asyncio.create_subprocess_shell( - f"ffmpeg -i {job_id}.m4a -i {job_id}.mp4 -c copy output.{job_id}.mp4" + 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 output.{job_id}.mp4" ) await proc_ffmpeg.wait() f = open(f"done.{job_id}", "a") From 08271eb2b4e797f04f0c2611cfcff04daefa7150 Mon Sep 17 00:00:00 2001 From: nin0dev Date: Sun, 23 Jun 2024 16:11:12 -0400 Subject: [PATCH 2/7] nothing more --- videobundler/main.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/videobundler/main.py b/videobundler/main.py index de128868..173193a4 100644 --- a/videobundler/main.py +++ b/videobundler/main.py @@ -5,6 +5,7 @@ import string import os import random import subprocess +from aiohttp.web import Response, FileResponse app = web.Application() app.router._frozen = False @@ -31,20 +32,20 @@ async def merge(request): if not video_itag.isdigit(): print(f"Video itag {video_itag} flagged as invalid, dropping request") return - if os.path.isfile(f"done.{job_id}"): + if os.path.isfile(f"{job_id}.mp4"): return web.FileResponse( - path=f"output.{job_id}.mp4" + 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 {video_id}.mp4" proc_ffmpeg = await asyncio.create_subprocess_shell( - 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 output.{job_id}.mp4" - ) - await proc_ffmpeg.wait() - f = open(f"done.{job_id}", "a") - f.write(":3") - f.close() - return web.FileResponse( - path=f"output.{job_id}.mp4" + cmdline, + stdout=asyncio.subprocess.PIPE, + stderr=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, stderr = await proc_ffmpeg.communicate() + response = FileResponse(f"{video_id}.mp4") + return response async def ping(request): return web.Response(body='{"success": true}', content_type="application/json") From 6dafa572a4a3d3682ea817d77a6cfb1f8626fde5 Mon Sep 17 00:00:00 2001 From: nin0dev Date: Sun, 23 Jun 2024 23:28:08 -0400 Subject: [PATCH 3/7] stop writing bundler output to disk --- videobundler/main.py | 96 ++++++++++++++++++++++++++------------------ 1 file changed, 56 insertions(+), 40 deletions(-) diff --git a/videobundler/main.py b/videobundler/main.py index 173193a4..339734c8 100644 --- a/videobundler/main.py +++ b/videobundler/main.py @@ -11,51 +11,67 @@ app = web.Application() app.router._frozen = False def get_random_string(length): - # choose from all lowercase letter - letters = string.ascii_lowercase - result_str = "".join(random.choice(letters) for i in range(length)) - return result_str + # choose from all lowercase letter + letters = string.ascii_lowercase + result_str = "".join(random.choice(letters) for i in range(length)) + return result_str + +async def run_command(cmd): + # Create subprocess + process = await asyncio.create_subprocess_shell( + cmd, + stdout=asyncio.subprocess.PIPE, + ) + # Wait for the subprocess to finish + stdout, stderr = await process.communicate() + # 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 async def merge(request): - # register params - job_id = request.rel_url.query["id"] - video_id: str = request.rel_url.query["id"] - audio_itag: str = request.rel_url.query["audio_itag"] - video_itag: str = request.rel_url.query["video_itag"] - # validate - if " " in video_id or len(video_id) > 11: - print(f"Video {video_id} flagged as invalid, dropping request") - return - if not audio_itag.isdigit(): - print(f"Audio itag {audio_itag} flagged as invalid, dropping request") - return - if not video_itag.isdigit(): - print(f"Video itag {video_itag} flagged as invalid, dropping request") - return - 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 {video_id}.mp4" - proc_ffmpeg = await asyncio.create_subprocess_shell( - cmdline, - stdout=asyncio.subprocess.PIPE, - stderr=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, stderr = await proc_ffmpeg.communicate() - response = FileResponse(f"{video_id}.mp4") - return response + # register params + job_id = request.rel_url.query["id"] + video_id: str = request.rel_url.query["id"] + audio_itag: str = request.rel_url.query["audio_itag"] + video_itag: str = request.rel_url.query["video_itag"] + # validate + if " " in video_id or len(video_id) > 11: + print(f"Video {video_id} flagged as invalid, dropping request") + return + if not audio_itag.isdigit(): + print(f"Audio itag {audio_itag} flagged as invalid, dropping request") + return + if not video_itag.isdigit(): + print(f"Video itag {video_itag} flagged as invalid, dropping request") + return + 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 -" + #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) + response = Response(body=iwannakillmyself, content_type="video/mp4", headers="") + return response async def ping(request): - return web.Response(body='{"success": true}', content_type="application/json") + return web.Response(body='{"success": true}', content_type="application/json") async def init_app(): - app.router.add_get("/{id:.+}", merge) - app.router.add_get("/", ping) - return app + app.router.add_get("/{id:.+}", merge) + app.router.add_get("/", ping) + return app if __name__ == '__main__': - loop = asyncio.get_event_loop() - app = loop.run_until_complete(init_app()) - web.run_app(app, port=3030) \ No newline at end of file + loop = asyncio.get_event_loop() + app = loop.run_until_complete(init_app()) + web.run_app(app, port=3030) From 113fbd91f884511560397828d0e90794e9abe979 Mon Sep 17 00:00:00 2001 From: nin0dev Date: Mon, 24 Jun 2024 00:26:57 -0400 Subject: [PATCH 4/7] Added video streaming --- videobundler/main.py | 36 +++++++++++++++++++++++++++++++++--- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/videobundler/main.py b/videobundler/main.py index 339734c8..2728f3b2 100644 --- a/videobundler/main.py +++ b/videobundler/main.py @@ -59,9 +59,39 @@ async def merge(request): #) #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) - response = Response(body=iwannakillmyself, content_type="video/mp4", headers="") - return response + #iwannakillmyself = await run_command(cmdline) + process = await asyncio.create_subprocess_shell( + cmdline, + stdout=asyncio.subprocess.PIPE, + ) + # Wait for the subprocess to finish + #stdout, stderr = await process.communicate() + response = web.StreamResponse(status=200, reason='OK', headers={ + 'Content-Type': 'video/mp4', + 'Transfer-Encoding': 'chunked', + }) + await response.prepare(request) + try: + while True: + # Read data from stdout + chunk = await process.stdout.readline() + if not chunk: + break + # Write the chunk to the response + await response.write(chunk) + except Exception as e: + print(f"Error streaming FFmpeg output: {e}") + finally: + # Close the response + await response.write_eof() + 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): return web.Response(body='{"success": true}', content_type="application/json") From ac1cf91adcca0f2005739b140a3bb8b4d94e280b Mon Sep 17 00:00:00 2001 From: nin0dev Date: Mon, 24 Jun 2024 03:54:37 -0400 Subject: [PATCH 5/7] Added separate browser handling Chromium shits itself if i give it a streamed output from ffmpeg, so i just do old behavior of downloading file if its not a firefox browser --- videobundler/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/videobundler/main.py b/videobundler/main.py index 2728f3b2..d3be5d54 100644 --- a/videobundler/main.py +++ b/videobundler/main.py @@ -52,7 +52,7 @@ async def merge(request): 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 -" + 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 From 174e0564a70d70b1349174ef04126dccf4773ff8 Mon Sep 17 00:00:00 2001 From: nin0dev Date: Mon, 24 Jun 2024 03:55:25 -0400 Subject: [PATCH 6/7] apparently there are things to commit --- videobundler/main.py | 168 +++++++++++++++++++++---------------------- 1 file changed, 83 insertions(+), 85 deletions(-) diff --git a/videobundler/main.py b/videobundler/main.py index d3be5d54..566e701e 100644 --- a/videobundler/main.py +++ b/videobundler/main.py @@ -11,97 +11,95 @@ app = web.Application() app.router._frozen = False def get_random_string(length): - # choose from all lowercase letter - letters = string.ascii_lowercase - result_str = "".join(random.choice(letters) for i in range(length)) - return result_str + # choose from all lowercase letter + letters = string.ascii_lowercase + result_str = "".join(random.choice(letters) for i in range(length)) + return result_str async def run_command(cmd): - # Create subprocess - process = await asyncio.create_subprocess_shell( - cmd, - stdout=asyncio.subprocess.PIPE, - ) - # Wait for the subprocess to finish - stdout, stderr = await process.communicate() - # 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 + # Create subprocess + process = await asyncio.create_subprocess_shell( + cmd, + stdout=asyncio.subprocess.PIPE, + ) + # Wait for the subprocess to finish + stdout, stderr = await process.communicate() + # 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 -async def merge(request): - # register params - job_id = request.rel_url.query["id"] - video_id: str = request.rel_url.query["id"] - audio_itag: str = request.rel_url.query["audio_itag"] - video_itag: str = request.rel_url.query["video_itag"] - # validate - if " " in video_id or len(video_id) > 11: - print(f"Video {video_id} flagged as invalid, dropping request") - return - if not audio_itag.isdigit(): - print(f"Audio itag {audio_itag} flagged as invalid, dropping request") - return - if not video_itag.isdigit(): - print(f"Video itag {video_itag} flagged as invalid, dropping request") - return - 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 --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( - cmdline, - stdout=asyncio.subprocess.PIPE, - ) - # Wait for the subprocess to finish - #stdout, stderr = await process.communicate() - response = web.StreamResponse(status=200, reason='OK', headers={ - 'Content-Type': 'video/mp4', - 'Transfer-Encoding': 'chunked', - }) - await response.prepare(request) - try: - while True: - # Read data from stdout - chunk = await process.stdout.readline() - if not chunk: - break - # Write the chunk to the response - await response.write(chunk) - except Exception as e: - print(f"Error streaming FFmpeg output: {e}") - finally: - # Close the response - await response.write_eof() - 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 merge(request: aiohttp.web.Request): + # register params + video_id: str = request.rel_url.query["id"] + audio_itag: str = request.rel_url.query["audio_itag"] + video_itag: str = request.rel_url.query["video_itag"] + # validate + if " " in video_id or len(video_id) > 11: + print(f"Video {video_id} flagged as invalid, dropping request") + return + if not audio_itag.isdigit(): + print(f"Audio itag {audio_itag} flagged as invalid, dropping request") + return + if not video_itag.isdigit(): + print(f"Video itag {video_itag} flagged as invalid, dropping request") + return + if "Firefox" in request.headers["User-Agent"]: + # Sane browser that supports streaming + + 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 -" + process = await asyncio.create_subprocess_shell( + cmdline, + stdout=asyncio.subprocess.PIPE, + stderr=asyncio.subprocess.PIPE + ) + response = web.StreamResponse(status=206, reason='OK', headers={ + 'Content-Type': 'video/mp4', + 'Transfer-Encoding': 'chunked', + 'Accept-Ranges': 'bytes' + }) + await response.prepare(request) + try: + while True: + chunk = await process.stdout.readline() + if not chunk: + break + await response.write(chunk) + except Exception as e: + print(f"Error streaming FFmpeg output: {e}") + finally: + 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 async def ping(request): - return web.Response(body='{"success": true}', content_type="application/json") + return web.Response(body='{"success": true}', content_type="application/json") async def init_app(): - app.router.add_get("/{id:.+}", merge) - app.router.add_get("/", ping) - return app + app.router.add_get("/{id:.+}", merge) + app.router.add_get("/", ping) + return app if __name__ == '__main__': - loop = asyncio.get_event_loop() - app = loop.run_until_complete(init_app()) - web.run_app(app, port=3030) + loop = asyncio.get_event_loop() + app = loop.run_until_complete(init_app()) + web.run_app(app, port=3030) From e21718181e5baf9442ccbf5e9ad7e8efdda69bca Mon Sep 17 00:00:00 2001 From: nin0dev Date: Tue, 25 Jun 2024 14:34:41 -0400 Subject: [PATCH 7/7] edited cmdline --- videobundler/main.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/videobundler/main.py b/videobundler/main.py index 566e701e..92930087 100644 --- a/videobundler/main.py +++ b/videobundler/main.py @@ -57,9 +57,9 @@ async def merge(request: aiohttp.web.Request): stderr=asyncio.subprocess.PIPE ) response = web.StreamResponse(status=206, reason='OK', headers={ - 'Content-Type': 'video/mp4', - 'Transfer-Encoding': 'chunked', - 'Accept-Ranges': 'bytes' + 'Content-Type': 'application/octet-stream', + 'Transfer-Encoding': 'chunked', + 'Content-Disposition': 'inline' }) await response.prepare(request) try: @@ -69,9 +69,10 @@ async def merge(request: aiohttp.web.Request): break await response.write(chunk) except Exception as e: + print(f"Error streaming FFmpeg output: {e}") - finally: - await response.write_eof() + #finally: + #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"]}" @@ -79,11 +80,9 @@ async def merge(request: aiohttp.web.Request): 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" + 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:v 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 + cmdline ) await process.wait() if process.returncode != 0: # Log or handle the error