Skip to content

Improve Content-Range logic to support video streaming better #198

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

Merged
fredrikekre merged 2 commits into from
May 7, 2025
Merged

Improve Content-Range logic to support video streaming better #198

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
581e246
Improve `Content-Range` logic to support
fonsp May 6, 2025
8c6a15f
require start range for simpler code
fonsp May 6, 2025
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
12 changes: 8 additions & 4 deletions src/server.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,19 +461,23 @@
end
end

range_match = match(r"bytes=(\d+)-(\d+)" , HTTP.header(req, "Range", ""))
range_match = match(r"^bytes=(\d+)-(\d*)$" , HTTP.header(req, "Range", ""))
is_ranged = !isnothing(range_match)

headers = [
"Content-Type" => content_type,
]
if is_ranged
range = parse.(Int, range_match.captures)
p(s) = isempty(s) ? nothing : parse(Int64, s)
start, stop = p.(range_match.captures)
@assert start isa Int64 # because the regex requires at least one digit
stop = something(stop, binary_length(content) - 1)

Check warning on line 474 in src/server.jl

View check run for this annotation

Codecov / codecov/patch

src/server.jl#L471-L474 

Added lines #L471 - L474 were not covered by tests

push!(headers,
"Content-Range" =>
"bytes $(range[1])-$(range[2])/$(binary_length(content))"
"bytes $(start)-$(stop)/$(binary_length(content))"
)
content = @view content[1+range[1]:1+range[2]]
content = @view content[1+start:1+stop]

Check warning on line 480 in src/server.jl

View check run for this annotation

Codecov / codecov/patch

src/server.jl#L480 

Added line #L480 was not covered by tests
ret_code = 206
end
if allow_cors
Expand Down
Loading