mirror of
https://github.com/mediacms-io/mediacms.git
synced 2024-11-23 08:43:48 +01:00
fix: issue with create_hls
This commit is contained in:
parent
9fc7597e73
commit
5a1e4f25ed
6
Makefile
6
Makefile
@ -12,4 +12,8 @@ admin-shell:
|
||||
build-frontend:
|
||||
docker-compose -f docker-compose-dev.yaml exec frontend npm run dist
|
||||
cp -r frontend/dist/static/* static/
|
||||
docker-compose -f docker-compose-dev.yaml restart web
|
||||
docker-compose -f docker-compose-dev.yaml restart web
|
||||
|
||||
test:
|
||||
docker compose -f docker-compose-dev.yaml exec --env TESTING=True -T web pytest
|
||||
|
||||
|
@ -439,10 +439,15 @@ def create_hls(friendly_token):
|
||||
|
||||
if existing_output_dir:
|
||||
# override content with -T !
|
||||
cmd = "cp -rT {0} {1}".format(output_dir, existing_output_dir)
|
||||
cmd = ["cp", "-rT", output_dir, existing_output_dir]
|
||||
run_command(cmd)
|
||||
|
||||
shutil.rmtree(output_dir)
|
||||
try:
|
||||
shutil.rmtree(output_dir)
|
||||
except: # noqa
|
||||
# this was breaking in some cases where it was already deleted
|
||||
# because create_hls was running multiple times
|
||||
pass
|
||||
output_dir = existing_output_dir
|
||||
pp = os.path.join(output_dir, "master.m3u8")
|
||||
if os.path.exists(pp):
|
||||
|
Loading…
Reference in New Issue
Block a user