mirror of
https://gitea.invidious.io/iv-org/invidious.git
synced 2024-08-15 00:53:41 +00:00
Use videojs-markers for start end end times
This commit is contained in:
Omar Roth
parent
4acc09f30d
commit
e1391f4ac7
4 changed files with 101 additions and 31 deletions
|
|
@ -287,7 +287,7 @@ get "/watch" do |env|
|
|||
subscriptions ||= [] of String
|
||||
|
||||
autoplay = env.params.query["autoplay"]?.try &.to_i
|
||||
video_loop = env.params.query["video_loop"]?.try &.to_i
|
||||
video_loop = env.params.query["loop"]?.try &.to_i
|
||||
|
||||
if preferences
|
||||
autoplay ||= preferences.autoplay.to_unsafe
|
||||
|
|
@ -1287,6 +1287,10 @@ get "/embed/:id" do |env|
|
|||
video_loop = env.params.query["loop"]?.try &.to_i
|
||||
video_loop ||= 0
|
||||
|
||||
autoplay = autoplay == 1
|
||||
video_loop = video_loop == 1
|
||||
controls = controls == 1
|
||||
|
||||
begin
|
||||
video = get_video(id, PG_DB)
|
||||
rescue ex
|
||||
|
|
@ -1294,6 +1298,20 @@ get "/embed/:id" do |env|
|
|||
next templated "error"
|
||||
end
|
||||
|
||||
if video.info["hlsvp"]?
|
||||
hlsvp = video.info["hlsvp"]
|
||||
|
||||
if Kemal.config.ssl || CONFIG.https_only
|
||||
scheme = "https://"
|
||||
else
|
||||
scheme = "http://"
|
||||
end
|
||||
host = env.request.headers["Host"]
|
||||
url = "#{scheme}#{host}"
|
||||
|
||||
hlsvp = hlsvp.gsub("https://manifest.googlevideo.com", url)
|
||||
end
|
||||
|
||||
fmt_stream = [] of HTTP::Params
|
||||
video.info["url_encoded_fmt_stream_map"].split(",") do |string|
|
||||
if !string.empty?
|
||||
|
|
|
|||
|
|
@ -891,16 +891,16 @@ def decode_time(string)
|
|||
time = string.try &.to_f?
|
||||
|
||||
if !time
|
||||
hours = /(?<hours>\d+)h/.match(string).try &.["hours"].try &.to_i
|
||||
hours = /(?<hours>\d+)h/.match(string).try &.["hours"].try &.to_f
|
||||
hours ||= 0
|
||||
|
||||
minutes = /(?<minutes>\d+)m(?!s)/.match(string).try &.["minutes"].try &.to_i
|
||||
minutes = /(?<minutes>\d+)m(?!s)/.match(string).try &.["minutes"].try &.to_f
|
||||
minutes ||= 0
|
||||
|
||||
seconds = /(?<seconds>\d+)s/.match(string).try &.["seconds"].try &.to_i
|
||||
seconds = /(?<seconds>\d+)s/.match(string).try &.["seconds"].try &.to_f
|
||||
seconds ||= 0
|
||||
|
||||
millis = /(?<millis>\d+)ms/.match(string).try &.["millis"].try &.to_i
|
||||
millis = /(?<millis>\d+)ms/.match(string).try &.["millis"].try &.to_f
|
||||
millis ||= 0
|
||||
|
||||
time = hours * 3600 + minutes * 60 + seconds + millis / 1000
|
||||
|
|
@ -909,10 +909,12 @@ def decode_time(string)
|
|||
return time
|
||||
end
|
||||
|
||||
def decode_date(date : String)
|
||||
def decode_date(string : String)
|
||||
# Time matches format "20 hours ago", "40 minutes ago"...
|
||||
delta = date.split(" ")[0].to_i
|
||||
case date
|
||||
date = string.split(" ")[-3, 3]
|
||||
delta = date[0].to_i
|
||||
|
||||
case date[1]
|
||||
when .includes? "minute"
|
||||
delta = delta.minutes
|
||||
when .includes? "hour"
|
||||
|
|
@ -926,7 +928,7 @@ def decode_date(date : String)
|
|||
when .includes? "year"
|
||||
delta = delta.years
|
||||
else
|
||||
raise "Could not parse #{date}"
|
||||
raise "Could not parse #{string}"
|
||||
end
|
||||
|
||||
return Time.now - delta
|
||||
|
|
|
|||
|
|
@ -7,10 +7,11 @@
|
|||
<meta name="thumbnail" content="<%= thumbnail %>">
|
||||
<link rel="stylesheet" href="https://unpkg.com/video.js@6.10.3/dist/video-js.min.css">
|
||||
<link rel="stylesheet" href="https://unpkg.com/silvermine-videojs-quality-selector@1.1.2/dist/css/quality-selector.css">
|
||||
<link rel="stylesheet" href="https://unpkg.com/videojs-markers@1.0.1/dist/videojs.markers.min.css">
|
||||
<script src="https://unpkg.com/video.js@6.10.3/dist/video.min.js"></script>
|
||||
<script src="https://unpkg.com/videojs-hotkeys@0.2.21/videojs.hotkeys.min.js"></script>
|
||||
<script src="https://unpkg.com/silvermine-videojs-quality-selector@1.1.2/dist/js/silvermine-videojs-quality-selector.min.js"></script>
|
||||
<script src="https://unpkg.com/videojs-offset@2.0.0-beta.2/dist/videojs-offset.min.js"></script>
|
||||
<script src="https://unpkg.com/videojs-markers@1.0.1/dist/videojs-markers.min.js"></script>
|
||||
<title><%= video.title %> - Invidious</title>
|
||||
</head>
|
||||
|
||||
|
|
@ -29,11 +30,18 @@ video, #my_video, .video-js, .vjs-default-skin
|
|||
}
|
||||
</style>
|
||||
|
||||
<% if hlsvp %>
|
||||
<script src="https://unpkg.com/videojs-contrib-hls@5.14.1/dist/videojs-contrib-hls.min.js"></script>
|
||||
<% end %>
|
||||
|
||||
<video playsinline poster="<%= thumbnail %>" title="<%= HTML.escape(video.title) %>" id="player"
|
||||
<% if autoplay == 1 %>autoplay<% end %>
|
||||
<% if controls == 1 %>controls<% end %>
|
||||
<% if video_loop == 1 %>loop<% end %>
|
||||
<% if autoplay %>autoplay<% end %>
|
||||
<% if controls %>controls<% end %>
|
||||
<% if video_loop %>loop<% end %>
|
||||
class="video-js vjs-default-skin">
|
||||
<% if hlsvp %>
|
||||
<source src="<%= hlsvp %>" type="application/x-mpegURL">
|
||||
<% else %>
|
||||
<% if listen %>
|
||||
<% audio_streams.each_with_index do |fmt, i| %>
|
||||
<source src="<%= fmt["url"] %>" type='<%= fmt["type"] %>' label="<%= fmt["bitrate"] %>k" selected="<%= i == 0 ? true : false %>">
|
||||
|
|
@ -47,6 +55,7 @@ video, #my_video, .video-js, .vjs-default-skin
|
|||
<% end %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
<% end %>
|
||||
</video>
|
||||
|
||||
<script>
|
||||
|
|
@ -59,18 +68,19 @@ var options = {
|
|||
'volumePanel',
|
||||
'progressControl',
|
||||
'remainingTimeDisplay',
|
||||
'captionsButton',
|
||||
'qualitySelector',
|
||||
'playbackRateMenuButton',
|
||||
'fullscreenToggle',
|
||||
],
|
||||
},
|
||||
};
|
||||
|
||||
var player = videojs('player', options, function() {
|
||||
this.hotkeys({
|
||||
volumeStep: 0.1,
|
||||
seekStep: 5,
|
||||
enableModifiersForNumbers: false,
|
||||
enableVolumeScroll: false,
|
||||
customKeys: {
|
||||
play: {
|
||||
key: function(e) {
|
||||
|
|
@ -107,11 +117,30 @@ var player = videojs('player', options, function() {
|
|||
});
|
||||
});
|
||||
|
||||
player.offset({
|
||||
start: <%= video_start %>,
|
||||
end: <%= video_end %>
|
||||
<% if video_start > 0 || video_end > 0 %>
|
||||
player.markers({
|
||||
onMarkerReached: function(marker) {
|
||||
if (marker.text === 'End') {
|
||||
if (player.loop()) {
|
||||
player.markers.prev('Start');
|
||||
} else {
|
||||
player.pause();
|
||||
}
|
||||
}
|
||||
},
|
||||
markers: [
|
||||
{time: <%= video_start %>, text: 'Start'},
|
||||
<% if video_end < 0 %>
|
||||
{time: <%= video.info["length_seconds"].to_f - 0.5 %>, text: 'End'}
|
||||
<% else %>
|
||||
{time: <%= video_end %>, text: 'End'}
|
||||
<% end %>
|
||||
]
|
||||
});
|
||||
|
||||
player.currentTime(<%= video_start %>);
|
||||
<% end %>
|
||||
|
||||
<% if !listen %>
|
||||
var currentSources = player.currentSources();
|
||||
for ( var i = 0; i < currentSources.length; i++ ) {
|
||||
|
|
|
|||
|
|
@ -24,10 +24,11 @@
|
|||
<meta name="twitter:player:height" content="720">
|
||||
<link rel="stylesheet" href="https://unpkg.com/video.js@6.10.3/dist/video-js.min.css">
|
||||
<link rel="stylesheet" href="https://unpkg.com/silvermine-videojs-quality-selector@1.1.2/dist/css/quality-selector.css">
|
||||
<link rel="stylesheet" href="https://unpkg.com/videojs-markers@1.0.1/dist/videojs.markers.min.css">
|
||||
<script src="https://unpkg.com/video.js@6.10.3/dist/video.min.js"></script>
|
||||
<script src="https://unpkg.com/videojs-hotkeys@0.2.21/videojs.hotkeys.min.js"></script>
|
||||
<script src="https://unpkg.com/silvermine-videojs-quality-selector@1.1.2/dist/js/silvermine-videojs-quality-selector.min.js"></script>
|
||||
<script src="https://unpkg.com/videojs-offset@2.0.0-beta.2/dist/videojs-offset.min.js"></script>
|
||||
<script src="https://unpkg.com/videojs-markers@1.0.1/dist/videojs-markers.min.js"></script>
|
||||
<title><%= video.title %> - Invidious</title>
|
||||
<% end %>
|
||||
|
||||
|
|
@ -130,11 +131,31 @@ var player = videojs('player', options, function() {
|
|||
player.volume(<%= preferences.volume.to_f / 100 %>);
|
||||
player.playbackRate(<%= preferences.speed %>);
|
||||
<% end %>
|
||||
player.offset({
|
||||
start: <%= video_start %>,
|
||||
end: <%= video_end %>
|
||||
|
||||
<% if video_start > 0 || video_end > 0 %>
|
||||
player.markers({
|
||||
onMarkerReached: function(marker) {
|
||||
if (marker.text === 'End') {
|
||||
if (player.loop()) {
|
||||
player.markers.prev('Start');
|
||||
} else {
|
||||
player.pause();
|
||||
}
|
||||
}
|
||||
},
|
||||
markers: [
|
||||
{time: <%= video_start %>, text: 'Start'},
|
||||
<% if video_end < 0 %>
|
||||
{time: <%= video.info["length_seconds"].to_f - 0.5 %>, text: 'End'}
|
||||
<% else %>
|
||||
{time: <%= video_end %>, text: 'End'}
|
||||
<% end %>
|
||||
]
|
||||
});
|
||||
|
||||
player.currentTime(<%= video_start %>);
|
||||
<% end %>
|
||||
|
||||
<% if !listen %>
|
||||
var currentSources = player.currentSources();
|
||||
for ( var i = 0; i < currentSources.length; i++ ) {
|
||||
|
|
|
|||
Loading…
Reference in a new issue