From dd517abe977b4d694e6d9a46e2f553019c13c996 Mon Sep 17 00:00:00 2001 From: nin0dev Date: Wed, 26 Jun 2024 06:17:04 -0400 Subject: [PATCH 1/2] Fix f string bug --- videobundler/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/videobundler/main.py b/videobundler/main.py index 9293008..b2312bb 100644 --- a/videobundler/main.py +++ b/videobundler/main.py @@ -75,7 +75,7 @@ async def merge(request: aiohttp.web.Request): #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"]}" + 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" From 75a6333f9633df2b221a16abe78b5f7ee52fcfbf Mon Sep 17 00:00:00 2001 From: nin0dev Date: Wed, 26 Jun 2024 10:21:53 +0000 Subject: [PATCH 2/2] Update videobundler/README.md --- videobundler/README.md | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/videobundler/README.md b/videobundler/README.md index 54d24ca..65a71a4 100644 --- a/videobundler/README.md +++ b/videobundler/README.md @@ -4,20 +4,15 @@ Takes 2 input streams, downloads them, and spits out a combined file. ## Installation -1. Make sure `ffmpeg`, `wget`, and Python 3 are all installed. +1. Make sure `ffmpeg` and Python 3 are all installed. 2. Download the program files to your computer - `main.py` and `.env.example`. -3. Run `python3 -m pip install flask python-dotenv waitress`. - -## Configuration - -1. Run `mv .env.example .env`, **even if you don't want to configure anything**. -2. Edit and fill in the values if needed. +3. Run `python3 -m pip install aiohttp`. ## Usage 1. `python3 main.py`. 2. If everything went well, you shouldn't see any output at launch. -3. You will now be able to call the server at the configured port. +3. You will now be able to call the server at :3030. ## Endpoints