1
Fork 0

Compare commits

...

4 commits

Author SHA1 Message Date
Ashley ////
b6dda9ac2d Merge pull request 'merger: Fix f string bug' (#96) from nin0dev/poke:main into main
Reviewed-on: https://codeberg.org/ashley/poke/pulls/96
2024-06-26 11:04:59 +00:00
nin0dev
75a6333f96 Update videobundler/README.md 2024-06-26 10:21:53 +00:00
nin0dev
ccd1eab93c Merge branch 'main' into main 2024-06-26 10:20:30 +00:00
nin0dev
dd517abe97 Fix f string bug 2024-06-26 06:17:04 -04:00
2 changed files with 4 additions and 9 deletions

View file

@ -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

View file

@ -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"