Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

output.hls: ensure temp file deletion. #3493

Merged
merged 2 commits into from
Oct 26, 2023
Merged

output.hls: ensure temp file deletion. #3493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
88346ef
output.hls: ensure temp file deletion.
toots Oct 26, 2023
339cde8
Revert "Revert this for now."
toots Oct 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,10 @@ jobs:
GH_PAT: ${{ secrets.WEBSITE_TOKEN }}

run_tests:
runs-on: ubuntu-latest
runs-on: [self-hosted, citest]
needs: build_details
container:
image: savonet/liquidsoap-ci:debian_bookworm_amd64
image: savonet/liquidsoap-ci:debian_bookworm_arm64
options: --user root --privileged --ulimit core=-1 --security-opt seccomp=unconfined -v ${{ github.workspace }}/${{ github.run_number }}:/tmp/${{ github.run_number }}
strategy:
fail-fast: false
Expand Down
90 changes: 47 additions & 43 deletions src/core/outputs/hls_output.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,8 @@ class hls_output p =
on a different file system. Please set it to the same one \
using `temp_dir` argument to guarantee atomic file \
operations!";
Utils.copy ~mode ~perms tmp_file filename);
Utils.copy ~mode ~perms tmp_file filename;
Sys.remove tmp_file);
on_file_change ~state filename)
end

Expand Down Expand Up @@ -712,7 +713,7 @@ class hls_output p =
ignore
(Option.map
(fun segment ->
(Option.get segment.out_channel)#close;
(try (Option.get segment.out_channel)#close with _ -> ());
ignore
(Option.map
(fun filename ->
Expand Down Expand Up @@ -741,50 +742,52 @@ class hls_output p =
let filename = self#playlist_name s in
self#log#debug "Writing playlist %s.." s.name;
let oc = self#open_out filename in
oc#output_string "#EXTM3U\r\n";
oc#output_string
(Printf.sprintf "#EXT-X-TARGETDURATION:%d\r\n"
(int_of_float (ceil segment_duration)));
oc#output_string
(Printf.sprintf "#EXT-X-VERSION:%d\r\n" (Lazy.force x_version));
oc#output_string
(Printf.sprintf "#EXT-X-MEDIA-SEQUENCE:%d\r\n" media_sequence);
oc#output_string
(Printf.sprintf "#EXT-X-DISCONTINUITY-SEQUENCE:%d\r\n"
discontinuity_sequence);
List.iter
(fun tag ->
oc#output_string tag;
oc#output_string "\r\n")
s.stream_extra_tags;
List.iteri
(fun pos segment ->
if segment.discontinuous then
oc#output_string "#EXT-X-DISCONTINUITY\r\n";
if pos = 0 || segment.discontinuous then (
match segment.init_filename with
| Some filename ->
let filename =
Printf.sprintf "%s%s" prefix (Filename.basename filename)
in
oc#output_string
(Printf.sprintf "#EXT-X-MAP:URI=%s\r\n"
(Lang_string.quote_string filename))
| _ -> ());
Fun.protect
~finally:(fun () -> oc#close)
(fun () ->
oc#output_string "#EXTM3U\r\n";
oc#output_string
(Printf.sprintf "#EXT-X-TARGETDURATION:%d\r\n"
(int_of_float (ceil segment_duration)));
oc#output_string
(Printf.sprintf "#EXT-X-VERSION:%d\r\n" (Lazy.force x_version));
oc#output_string
(Printf.sprintf "#EXT-X-MEDIA-SEQUENCE:%d\r\n" media_sequence);
oc#output_string
(Printf.sprintf "#EXTINF:%.03f,\r\n"
(Frame.seconds_of_main segment.len));
(Printf.sprintf "#EXT-X-DISCONTINUITY-SEQUENCE:%d\r\n"
discontinuity_sequence);
List.iter
(fun tag ->
oc#output_string tag;
oc#output_string "\r\n")
segment.segment_extra_tags;
oc#output_string
(Printf.sprintf "%s%s\r\n" prefix
(Filename.basename segment.filename)))
segments;

oc#close
s.stream_extra_tags;
List.iteri
(fun pos segment ->
if segment.discontinuous then
oc#output_string "#EXT-X-DISCONTINUITY\r\n";
if pos = 0 || segment.discontinuous then (
match segment.init_filename with
| Some filename ->
let filename =
Printf.sprintf "%s%s" prefix
(Filename.basename filename)
in
oc#output_string
(Printf.sprintf "#EXT-X-MAP:URI=%s\r\n"
(Lang_string.quote_string filename))
| _ -> ());
oc#output_string
(Printf.sprintf "#EXTINF:%.03f,\r\n"
(Frame.seconds_of_main segment.len));
List.iter
(fun tag ->
oc#output_string tag;
oc#output_string "\r\n")
segment.segment_extra_tags;
oc#output_string
(Printf.sprintf "%s%s\r\n" prefix
(Filename.basename segment.filename)))
segments)

val mutable main_playlist_written = false

Expand Down Expand Up @@ -941,8 +944,9 @@ class hls_output p =
segment_name ~position:init_position ~extname name
in
let oc = self#open_out init_filename in
Strings.iter oc#output_substring data;
oc#close;
Fun.protect
~finally:(fun () -> oc#close)
(fun () -> Strings.iter oc#output_substring data);
segment.init_filename <- Some init_filename;
s.init_state <- `Has_init init_filename
| Some _ -> raise Encoder.Not_enough_data
Expand Down