Compare commits
No commits in common. "b6dda9ac2dbe6650a0555ef81dd14cd0b4ccd69a" and "f875214bee9caea3ae5db5e39ec3a23772e0bf0f" have entirely different histories.
b6dda9ac2d
...
f875214bee
2 changed files with 9 additions and 4 deletions
|
@ -4,15 +4,20 @@ Takes 2 input streams, downloads them, and spits out a combined file.
|
|||
|
||||
## Installation
|
||||
|
||||
1. Make sure `ffmpeg` and Python 3 are all installed.
|
||||
1. Make sure `ffmpeg`, `wget`, 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 aiohttp`.
|
||||
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.
|
||||
|
||||
## 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 :3030.
|
||||
3. You will now be able to call the server at the configured port.
|
||||
|
||||
## Endpoints
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in a new issue