GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-19 06:22:22 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Persist FSRS weights search in preset (#2827)

Browse source
This commit is contained in:
Abdo 2023-11-14 04:47:08 +03:00 committed by GitHub
parent 7bcb57b89e
commit 390935d4ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
proto/anki/deck_config.proto
View file

@ -154,6 +154,7 @@ message DeckConfig {
float desired_retention = 37; float desired_retention = 37;
bool reschedule_fsrs_cards = 39; bool reschedule_fsrs_cards = 39;
float sm2_retention = 40; float sm2_retention = 40;
string weight_search = 45;
bytes other = 255; bytes other = 255;
} }

1
rslib/src/deckconfig/mod.rs
View file

@ -77,6 +77,7 @@ const DEFAULT_DECK_CONFIG_INNER: DeckConfigInner = DeckConfigInner {
other: Vec::new(), other: Vec::new(),
reschedule_fsrs_cards: false, reschedule_fsrs_cards: false,
sm2_retention: 0.9, sm2_retention: 0.9,
weight_search: String::new(),
}; };
impl Default for DeckConfig { impl Default for DeckConfig {

6
rslib/src/deckconfig/schema11.rs
View file

@ -87,6 +87,8 @@ pub struct DeckConfSchema11 {
reschedule_fsrs_cards: bool, reschedule_fsrs_cards: bool,
#[serde(default)] #[serde(default)]
sm2_retention: f32, sm2_retention: f32,
#[serde(default)]
weight_search: String,
#[serde(flatten)] #[serde(flatten)]
other: HashMap<String, Value>, other: HashMap<String, Value>,
@ -294,6 +296,7 @@ impl Default for DeckConfSchema11 {
desired_retention: 0.9, desired_retention: 0.9,
reschedule_fsrs_cards: false, reschedule_fsrs_cards: false,
sm2_retention: 0.9, sm2_retention: 0.9,
weight_search: "".to_string(),
} }
} }
} }
@ -371,6 +374,7 @@ impl From<DeckConfSchema11> for DeckConfig {
desired_retention: c.desired_retention, desired_retention: c.desired_retention,
reschedule_fsrs_cards: c.reschedule_fsrs_cards, reschedule_fsrs_cards: c.reschedule_fsrs_cards,
sm2_retention: c.sm2_retention, sm2_retention: c.sm2_retention,
weight_search: c.weight_search,
other: other_bytes, other: other_bytes,
}, },
} }
@ -477,6 +481,7 @@ impl From<DeckConfig> for DeckConfSchema11 {
desired_retention: i.desired_retention, desired_retention: i.desired_retention,
reschedule_fsrs_cards: i.reschedule_fsrs_cards, reschedule_fsrs_cards: i.reschedule_fsrs_cards,
sm2_retention: i.sm2_retention, sm2_retention: i.sm2_retention,
weight_search: i.weight_search,
} }
} }
} }
@ -507,6 +512,7 @@ static RESERVED_DECKCONF_KEYS: Set<&'static str> = phf_set! {
"waitForAudio", "waitForAudio",
"rescheduleFsrsCards", "rescheduleFsrsCards",
"sm2Retention", "sm2Retention",
"weightSearch",
}; };
static RESERVED_DECKCONF_NEW_KEYS: Set<&'static str> = phf_set! { static RESERVED_DECKCONF_NEW_KEYS: Set<&'static str> = phf_set! {

15
ts/deck-options/FsrsOptions.svelte
View file

@ -42,7 +42,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
optimalRetention = 0; optimalRetention = 0;
} }
$: computing = computingWeights || checkingWeights || computingRetention; $: computing = computingWeights || checkingWeights || computingRetention;
$: customSearch = `preset:"${$presetName}"`; $: defaultWeightSearch = `preset:"${state.getCurrentName()}"`;
$: desiredRetentionWarning = getRetentionWarning($config.desiredRetention); $: desiredRetentionWarning = getRetentionWarning($config.desiredRetention);
$: retentionWarningClass = getRetentionWarningClass($config.desiredRetention); $: retentionWarningClass = getRetentionWarningClass($config.desiredRetention);
@ -93,7 +93,9 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
await runWithBackendProgress( await runWithBackendProgress(
async () => { async () => {
const resp = await computeFsrsWeights({ const resp = await computeFsrsWeights({
search: customSearch, search: $config.weightSearch
? $config.weightSearch
: defaultWeightSearch,
}); });
if (computeWeightsProgress) { if (computeWeightsProgress) {
computeWeightsProgress.current = computeWeightsProgress.total; computeWeightsProgress.current = computeWeightsProgress.total;
@ -130,7 +132,8 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
try { try {
await runWithBackendProgress( await runWithBackendProgress(
async () => { async () => {
const search = customSearch ?? `preset:"${state.getCurrentName()}"`; const search =
$config.weightSearch ?? `preset:"${state.getCurrentName()}"`;
const resp = await evaluateWeights({ const resp = await evaluateWeights({
weights: $config.fsrsWeights, weights: $config.fsrsWeights,
search, search,
@ -280,7 +283,11 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
<div class="m-2"> <div class="m-2">
<details> <details>
<summary>{tr.deckConfigComputeOptimalWeights()}</summary> <summary>{tr.deckConfigComputeOptimalWeights()}</summary>
<input bind:value={customSearch} class="w-100 mb-1" /> <input
bind:value={$config.weightSearch}
placeholder={defaultWeightSearch}
class="w-100 mb-1"
/>
<button <button
class="btn {computingWeights ? 'btn-warning' : 'btn-primary'}" class="btn {computingWeights ? 'btn-warning' : 'btn-primary'}"
disabled={!computingWeights && computing} disabled={!computingWeights && computing}