mirror of
https://github.com/ankitects/anki.git
synced 2025-09-22 07:52:24 -04:00

* Automatically elide empty inputs and outputs to backend methods * Refactor service generation Despite the fact that the majority of our Protobuf service methods require an open collection, they were not accessible with just a Collection object. To access the methods (e.g. because we haven't gotten around to exposing the correct API in Collection yet), you had to wrap the collection in a Backend object, and pay a mutex-acquisition cost for each call, even if you have exclusive access to the object. This commit migrates the majority of service methods to the Collection, so they can now be used directly, and improves the ergonomics a bit at the same time. The approach taken: - The service generation now happens in rslib instead of anki_proto, which avoids the need for trait constraints and associated types. - Service methods are assumed to be collection-based by default. Instead of implementing the service on Backend, we now implement it on Collection, which means our methods no longer need to use self.with_col(...). - We automatically generate methods in Backend which use self.with_col() to delegate to the Collection method. - For methods that are only appropriate for the backend, we add a flag in the .proto file. The codegen uses this flag to write the method into a BackendFooService instead of FooService, which the backend implements. - The flag can also allows us to define separate implementations for collection and backend, so we can e.g. skip the collection mutex in the i18n service while also providing the service on a collection.
159 lines
4.5 KiB
Rust
159 lines
4.5 KiB
Rust
// Copyright: Ankitects Pty Ltd and contributors
|
|
// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
|
|
|
|
use std::collections::HashMap;
|
|
|
|
use crate::prelude::*;
|
|
|
|
mod parser;
|
|
pub(crate) mod service;
|
|
pub mod tts;
|
|
mod writer;
|
|
|
|
pub fn strip_av_tags<S: Into<String> + AsRef<str>>(txt: S) -> String {
|
|
nodes_or_text_only(txt.as_ref())
|
|
.map(|nodes| nodes.write_without_av_tags())
|
|
.unwrap_or_else(|| txt.into())
|
|
}
|
|
|
|
pub fn extract_av_tags<S: Into<String> + AsRef<str>>(
|
|
txt: S,
|
|
question_side: bool,
|
|
tr: &I18n,
|
|
) -> (String, Vec<anki_proto::card_rendering::AvTag>) {
|
|
nodes_or_text_only(txt.as_ref())
|
|
.map(|nodes| nodes.write_and_extract_av_tags(question_side, tr))
|
|
.unwrap_or_else(|| (txt.into(), vec![]))
|
|
}
|
|
|
|
pub fn prettify_av_tags<S: Into<String> + AsRef<str>>(txt: S) -> String {
|
|
nodes_or_text_only(txt.as_ref())
|
|
.map(|nodes| nodes.write_with_pretty_av_tags())
|
|
.unwrap_or_else(|| txt.into())
|
|
}
|
|
|
|
/// Parse `txt` into [CardNodes] and return the result,
|
|
/// or [None] if it is only a text node.
|
|
fn nodes_or_text_only(txt: &str) -> Option<CardNodes> {
|
|
let nodes = CardNodes::parse(txt);
|
|
match nodes.0[..] {
|
|
[Node::Text(_)] => None,
|
|
_ => Some(nodes),
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, PartialEq)]
|
|
struct CardNodes<'a>(Vec<Node<'a>>);
|
|
|
|
impl<'iter, 'nodes> IntoIterator for &'iter CardNodes<'nodes> {
|
|
type Item = &'iter Node<'nodes>;
|
|
type IntoIter = std::slice::Iter<'iter, Node<'nodes>>;
|
|
|
|
fn into_iter(self) -> Self::IntoIter {
|
|
self.0.iter()
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, PartialEq)]
|
|
enum Node<'a> {
|
|
Text(&'a str),
|
|
SoundOrVideo(&'a str),
|
|
Directive(Directive<'a>),
|
|
}
|
|
|
|
#[derive(Debug, PartialEq)]
|
|
enum Directive<'a> {
|
|
Tts(TtsDirective<'a>),
|
|
Other(OtherDirective<'a>),
|
|
}
|
|
|
|
#[derive(Debug, PartialEq)]
|
|
struct TtsDirective<'a> {
|
|
content: &'a str,
|
|
lang: &'a str,
|
|
voices: Vec<&'a str>,
|
|
speed: f32,
|
|
blank: Option<&'a str>,
|
|
options: HashMap<&'a str, &'a str>,
|
|
}
|
|
|
|
#[derive(Debug, PartialEq, Eq)]
|
|
struct OtherDirective<'a> {
|
|
name: &'a str,
|
|
content: &'a str,
|
|
options: HashMap<&'a str, &'a str>,
|
|
}
|
|
|
|
#[cfg(feature = "bench")]
|
|
#[inline]
|
|
pub fn anki_directive_benchmark() {
|
|
CardNodes::parse("[anki:foo bar=baz][/anki:foo][anki:tts lang=jp_JP voices=Alice,Bob speed=0.5 cloze_blank= bar=baz][/anki:tts]");
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::*;
|
|
|
|
/// Strip av tags and assert equality with input or separately passed
|
|
/// output.
|
|
macro_rules! assert_av_stripped {
|
|
($input:expr) => {
|
|
assert_eq!($input, strip_av_tags($input));
|
|
};
|
|
($input:expr, $output:expr) => {
|
|
assert_eq!(strip_av_tags($input), $output);
|
|
};
|
|
}
|
|
|
|
#[test]
|
|
fn av_stripping() {
|
|
assert_av_stripped!("foo [sound:bar] baz", "foo baz");
|
|
assert_av_stripped!("[anki:tts bar=baz]spam[/anki:tts]", "");
|
|
assert_av_stripped!("[anki:foo bar=baz]spam[/anki:foo]");
|
|
}
|
|
|
|
#[test]
|
|
fn av_extracting() {
|
|
let tr = I18n::template_only();
|
|
let (txt, tags) = extract_av_tags(
|
|
"foo [sound:bar.mp3] baz [anki:tts lang=en_US][...][/anki:tts]",
|
|
true,
|
|
&tr,
|
|
);
|
|
assert_eq!(
|
|
(txt.as_str(), tags),
|
|
(
|
|
"foo [anki:play:q:0] baz [anki:play:q:1]",
|
|
vec![
|
|
anki_proto::card_rendering::AvTag {
|
|
value: Some(anki_proto::card_rendering::av_tag::Value::SoundOrVideo(
|
|
"bar.mp3".to_string()
|
|
))
|
|
},
|
|
anki_proto::card_rendering::AvTag {
|
|
value: Some(anki_proto::card_rendering::av_tag::Value::Tts(
|
|
anki_proto::card_rendering::TtsTag {
|
|
field_text: tr.card_templates_blank().to_string(),
|
|
lang: "en_US".to_string(),
|
|
voices: vec![],
|
|
speed: 1.0,
|
|
other_args: vec![],
|
|
}
|
|
))
|
|
}
|
|
],
|
|
),
|
|
);
|
|
|
|
assert_eq!(
|
|
extract_av_tags("[anki:tts]foo[/anki:tts]", true, &tr),
|
|
(
|
|
format!(
|
|
"[{}]",
|
|
tr.errors_bad_directive("anki:tts", tr.errors_option_not_set("lang"))
|
|
),
|
|
vec![],
|
|
),
|
|
);
|
|
}
|
|
}
|