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.

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

Fix merge conflict with development #551

Merged
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
c4bb7cb
resolve stream proxied streaming link when url has request headers
TheBeastLT Sep 27, 2023
6316e00
code review add comment regarding -1 fileIndex
TheBeastLT Oct 9, 2023
696c22d
Merge branch 'development' into feature/request-headers-stream-proxying
elpiel Oct 10, 2023
18955e8
detach video params from player selected
unclekingpin Oct 10, 2023
ade2335
fix lint
unclekingpin Oct 10, 2023
63f4cc8
reset video_params on Load
unclekingpin Oct 11, 2023
d41a820
chore: update url dependency
elpiel Oct 12, 2023
de72f36
feat: re-export semver::Version for manifest
elpiel Oct 12, 2023
b6d0590
chore: change CtxAuthResult event to Trace
elpiel Oct 12, 2023
aa43b09
Merge pull request #534 from Stremio/chore/update-deps-and-re-export-…
elpiel Oct 12, 2023
3f2f332
fix(ctx): remove related streams from bucket when uninstalling addon
tymmesyde Oct 12, 2023
ea24e51
test(ctx): add test for cleaning streams bucket
tymmesyde Oct 12, 2023
3837492
test(uninstall_addons): improve test for streams bucket
tymmesyde Oct 12, 2023
63b5aee
test(uninstall_addon): use basic function instead of implementing them
tymmesyde Oct 12, 2023
97bd700
Merge pull request #535 from Stremio/fix/remove-stream-addon-uninstall
elpiel Oct 12, 2023
b6cc8c8
Merge pull request #528 from Stremio/feature/request-headers-stream-p…
elpiel Oct 12, 2023
35fa792
feat(player): implement next_stream based on selected binge group
tymmesyde Oct 12, 2023
380a168
test(player): add next_stream test
tymmesyde Oct 12, 2023
a59348f
test(player): remove unnecessary println
tymmesyde Oct 13, 2023
dbf4bbc
Merge pull request #533 from Stremio/detach-video-params-from-selected
elpiel Oct 13, 2023
27e9bf4
refacto(player): update next_video streams with next_stream
tymmesyde Oct 13, 2023
af89e89
fix: do not request lastVideos resource if there are no ids
elpiel Oct 17, 2023
0bb2207
Merge pull request #538 from Stremio/fix/empty-ids-sent-to-lastVideos…
elpiel Oct 18, 2023
cc2d25b
feat: MetaDetails - override streams only when a flag is present
elpiel Oct 20, 2023
369febc
fix: on guess the stream when stream_path is None
elpiel Oct 20, 2023
c01ee05
migrate to storage schema 8
unclekingpin Oct 20, 2023
6409b15
fix: update latest migration version
elpiel Oct 20, 2023
b93b3cb
Merge pull request #541 from Stremio/storage-schema-migration-v8
elpiel Oct 20, 2023
b84b7d0
update official addons
unclekingpin Oct 22, 2023
34a0a9b
Merge pull request #543 from Stremio/update-official-addons
unclekingpin Oct 22, 2023
22bf4bf
use unix epoch as default time for NotificationsBucket created
unclekingpin Oct 22, 2023
ce3b956
remove Default from Ctx
unclekingpin Oct 22, 2023
0859574
Merge pull request #544 from Stremio/notifications_bucket_created_def…
elpiel Oct 22, 2023
3ee8b34
docs: update `guess_stream` field name in comments
elpiel Oct 23, 2023
a8a24d0
Merge pull request #540 from Stremio/feat/streams-loading-in-meta-det…
elpiel Oct 23, 2023
8c7ad2e
Merge branch 'development' into feat/player-next-stream
elpiel Oct 23, 2023
4113716
test(next_stream): fix after merge
tymmesyde Oct 23, 2023
6189624
Merge pull request #536 from Stremio/feat/player-next-stream
elpiel Oct 24, 2023
dc7f1f7
chore: add test for migration to v8
elpiel Oct 24, 2023
ce0fe8a
Merge pull request #545 from Stremio/chore/migration-v8-test
elpiel Oct 24, 2023
139bc18
feat: Settings - seek shift time duration
elpiel Oct 24, 2023
a7e0458
feat: Settings - Escape key exits fullscreen
elpiel Oct 24, 2023
2e51288
feat: Settings - add pause on minimize setting
elpiel Oct 24, 2023
e19fe25
chore: Update settings based on feedback and PR review
elpiel Oct 24, 2023
75164cd
fix: typo for esc exit fullscreen
elpiel Oct 24, 2023
8c6fcd0
Merge pull request #546 from Stremio/feat/profile-settings-for-contro…
elpiel Oct 24, 2023
fd3fb3e
fix(local_search): was loading upon instantiation
tymmesyde Oct 26, 2023
6c50cd8
Merge pull request #548 from Stremio/fix/local-search-load-instantiation
elpiel Oct 27, 2023
7704441
Merge branch 'development' into feature/suggested-stream-for-meta-det…
elpiel Nov 1, 2023
cdfa9ef
chore: rustfmt
elpiel Nov 1, 2023
9de7e13
fix(MetaDetails): missing line from merge conflict
elpiel Nov 1, 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
Prev Previous commit
Next Next commit
feat: Settings - add pause on minimize setting
Signed-off-by: Lachezar Lechev <[email protected]>
elpiel committed Oct 24, 2023

Verified

This commit was signed with the committer’s verified signature.
elpiel Lachezar Lechev
commit 2e51288a0548b6645f170fc5e876bf5392c660d4
3 changes: 3 additions & 0 deletions src/runtime/env.rs
Original file line number Diff line number Diff line change
@@ -490,6 +490,8 @@ fn migrate_storage_schema_to_v9<E: Env>() -> TryEnvFuture<()> {

// add the new setting for Escape key exiting full screen
settings.insert("escExistsFullscreen".to_owned(), true.into());
// add the new setting for pause on minimize, which is disabled by default
settings.insert("pauseOnMinimize".to_owned(), false.into());
E::set_storage(PROFILE_STORAGE_KEY, Some(&profile))
}
_ => E::set_storage::<()>(PROFILE_STORAGE_KEY, None),
@@ -845,6 +847,7 @@ mod test {
"escExistsFullscreen": true,
"seekTimeDuration": 20000,
"seekShiftTimeDuration": 10000,
"pauseOnMinimize": false,
}
});

3 changes: 3 additions & 0 deletions src/types/profile/settings.rs
Original file line number Diff line number Diff line change
@@ -32,6 +32,8 @@ pub struct Settings {
pub seek_time_duration: u32,
/// The Seek shift time duration (in milliseconds) is when using the Arrow keys + Shift
pub seek_shift_time_duration: u32,
/// Whether we should pause the playback when the application get's minimized
pub pause_on_minimize: bool,
pub streaming_server_warning_dismissed: Option<DateTime<Utc>>,
}

@@ -68,6 +70,7 @@ impl Default for Settings {
esc_exists_fullscreen: true,
seek_time_duration: 20000,
seek_shift_time_duration: 10000,
pause_on_minimize: false,
streaming_server_warning_dismissed: None,
}
}
4 changes: 3 additions & 1 deletion src/unit_tests/serde/default_tokens_ext.rs
Original file line number Diff line number Diff line change
@@ -371,7 +371,7 @@ impl DefaultTokens for Settings {
vec![
Token::Struct {
name: "Settings",
len: 24,
len: 25,
},
Token::Str("interfaceLanguage"),
Token::Str("eng"),
@@ -422,6 +422,8 @@ impl DefaultTokens for Settings {
Token::U32(20000),
Token::Str("seekShiftTimeDuration"),
Token::U32(10000),
Token::Str("pauseOnMinimize"),
Token::Bool(false),
Token::Str("streamingServerWarningDismissed"),
Token::None,
Token::StructEnd,
9 changes: 7 additions & 2 deletions src/unit_tests/serde/settings.rs
Original file line number Diff line number Diff line change
@@ -30,14 +30,15 @@ fn settings() {
esc_exists_fullscreen: true,
seek_time_duration: 1,
seek_shift_time_duration: 2,
pause_on_minimize: true,
streaming_server_warning_dismissed: Some(
Utc.with_ymd_and_hms(2021, 1, 1, 0, 0, 0).unwrap(),
),
},
&[
Token::Struct {
name: "Settings",
len: 24,
len: 25,
},
Token::Str("interfaceLanguage"),
Token::Str("interface_language"),
@@ -91,6 +92,8 @@ fn settings() {
Token::U32(1),
Token::Str("seekShiftTimeDuration"),
Token::U32(2),
Token::Str("pauseOnMinimize"),
Token::Bool(true),
Token::Str("streamingServerWarningDismissed"),
Token::Some,
Token::Str("2021-01-01T00:00:00Z"),
@@ -106,7 +109,7 @@ fn settings_de() {
&[
Token::Struct {
name: "Settings",
len: 19,
len: 20,
},
Token::Str("interfaceLanguage"),
Token::Str("eng"),
@@ -153,6 +156,8 @@ fn settings_de() {
Token::U32(20000),
Token::Str("seekShiftTimeDuration"),
Token::U32(10000),
Token::Str("pauseOnMinimize"),
Token::Bool(false),
Token::Str("streamingServerWarningDismissed"),
Token::None,
Token::StructEnd,