Skip to content

fix(player): add filename, size, and hash for subtitles #912

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

Open
elpiel wants to merge 1 commit into
base: development
Choose a base branch
from
+53 −20
Open

fix(player): add filename, size, and hash for subtitles #912

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
73 changes: 53 additions & 20 deletions src/models/player.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ impl<E: Env + 'static> UpdateWithCtx<E> for Player {
&mut self.subtitles,
&self.selected,
&self.video_params,
self.stream.as_ref(),
&ctx.profile.addons,
);
let next_video_effects = next_video_update(
Expand Down Expand Up @@ -376,6 +377,7 @@ impl<E: Env + 'static> UpdateWithCtx<E> for Player {
&mut self.subtitles,
&self.selected,
&self.video_params,
self.stream.as_ref(),
&ctx.profile.addons,
);
let skip_gaps_effects = skip_gaps_update::<E>(
Expand Down Expand Up @@ -1233,33 +1235,64 @@ fn subtitles_update<E: Env + 'static>(
subtitles: &mut Vec<ResourceLoadable<Vec<Subtitles>>>,
selected: &Option<Selected>,
video_params: &Option<VideoParams>,
stream: Option<&Loadable<(StreamUrls, Stream<ConvertedStreamSource>), EnvError>>,
addons: &[Descriptor],
) -> Effects {
match (selected, video_params) {
match (selected, stream) {
(
Some(Selected {
subtitles_path: Some(subtitles_path),
..
}),
Some(video_params),
) => resources_update_with_vector_content::<E, _>(
subtitles,
ResourcesAction::force_request(
&AggrRequest::AllOfResource(ResourcePath {
extra: subtitles_path
.extra
.to_owned()
.extend_one(&VIDEO_HASH_EXTRA_PROP, video_params.hash.to_owned())
.extend_one(
&VIDEO_SIZE_EXTRA_PROP,
video_params.size.as_ref().map(|size| size.to_string()),
)
.extend_one(&VIDEO_FILENAME_EXTRA_PROP, video_params.filename.to_owned()),
..subtitles_path.to_owned()
}),
addons,
),
),
Some(Loadable::Ready((_stream_urls, converted_stream))),
) => {
resources_update_with_vector_content::<E, _>(
subtitles,
ResourcesAction::force_request(
&AggrRequest::AllOfResource(ResourcePath {
extra: {
// Always prefer the Stream field if such is set by the addon
// otherwise we can use the VideoParams as a fallback.
subtitles_path
.extra
.to_owned()
.extend_one(
&VIDEO_HASH_EXTRA_PROP,
converted_stream.behavior_hints.video_hash.clone().or(
video_params
.as_ref()
.and_then(|video_params| video_params.hash.to_owned())
.to_owned(),
),
)
.extend_one(
&VIDEO_SIZE_EXTRA_PROP,
converted_stream
.behavior_hints
.video_size
.or(video_params
.as_ref()
.and_then(|video_params| video_params.size))
.map(|size| size.to_string()),
)
.extend_one(
&VIDEO_FILENAME_EXTRA_PROP,
converted_stream
.behavior_hints
.filename
.to_owned()
.or(video_params
.as_ref()
.and_then(|video_params| video_params.filename.clone()))
.to_owned(),
)
},
..subtitles_path.to_owned()
}),
addons,
),
)
}
_ => eq_update(subtitles, vec![]),
}
}
Expand Down