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

shorten add_file_to_media_folder

Browse source
This commit is contained in:
Damien Elmes 2020-02-11 18:08:34 +10:00
parent 4c0f216df2
commit d73fec3280
3 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
proto/backend.proto
View file

@ -25,7 +25,7 @@ message BackendInput {
string strip_av_tags = 23; string strip_av_tags = 23;
ExtractAVTagsIn extract_av_tags = 24; ExtractAVTagsIn extract_av_tags = 24;
ExtractLatexIn extract_latex = 25; ExtractLatexIn extract_latex = 25;
AddFileToMediaFolderIn add_file_to_media_folder = 26; AddMediaFileIn add_media_file = 26;
SyncMediaIn sync_media = 27; SyncMediaIn sync_media = 27;
Empty check_media = 28; Empty check_media = 28;
TrashMediaFilesIn trash_media_files = 29; TrashMediaFilesIn trash_media_files = 29;
@ -44,7 +44,7 @@ message BackendOutput {
string strip_av_tags = 23; string strip_av_tags = 23;
ExtractAVTagsOut extract_av_tags = 24; ExtractAVTagsOut extract_av_tags = 24;
ExtractLatexOut extract_latex = 25; ExtractLatexOut extract_latex = 25;
string add_file_to_media_folder = 26; string add_media_file = 26;
Empty sync_media = 27; Empty sync_media = 27;
MediaCheckOut check_media = 28; MediaCheckOut check_media = 28;
Empty trash_media_files = 29; Empty trash_media_files = 29;
@ -256,7 +256,7 @@ message ExtractedLatex {
string latex_body = 2; string latex_body = 2;
} }
message AddFileToMediaFolderIn { message AddMediaFileIn {
string desired_name = 1; string desired_name = 1;
bytes data = 2; bytes data = 2;
} }

6
pylib/anki/rsbackend.py
View file

@ -296,11 +296,9 @@ class RustBackend:
def add_file_to_media_folder(self, desired_name: str, data: bytes) -> str: def add_file_to_media_folder(self, desired_name: str, data: bytes) -> str:
return self._run_command( return self._run_command(
pb.BackendInput( pb.BackendInput(
add_file_to_media_folder=pb.AddFileToMediaFolderIn( add_media_file=pb.AddMediaFileIn(desired_name=desired_name, data=data)
desired_name=desired_name, data=data
)
) )
).add_file_to_media_folder ).add_media_file
def sync_media(self, hkey: str, endpoint: str) -> None: def sync_media(self, hkey: str, endpoint: str) -> None:
self._run_command( self._run_command(

6
rslib/src/backend.rs
View file

@ -180,9 +180,7 @@ impl Backend {
Value::StripAvTags(text) => OValue::StripAvTags(strip_av_tags(&text).into()), Value::StripAvTags(text) => OValue::StripAvTags(strip_av_tags(&text).into()),
Value::ExtractAvTags(input) => OValue::ExtractAvTags(self.extract_av_tags(input)), Value::ExtractAvTags(input) => OValue::ExtractAvTags(self.extract_av_tags(input)),
Value::ExtractLatex(input) => OValue::ExtractLatex(self.extract_latex(input)), Value::ExtractLatex(input) => OValue::ExtractLatex(self.extract_latex(input)),
Value::AddFileToMediaFolder(input) => { Value::AddMediaFile(input) => OValue::AddMediaFile(self.add_media_file(input)?),
OValue::AddFileToMediaFolder(self.add_file_to_media_folder(input)?)
}
Value::SyncMedia(input) => { Value::SyncMedia(input) => {
self.sync_media(input)?; self.sync_media(input)?;
OValue::SyncMedia(Empty {}) OValue::SyncMedia(Empty {})
@ -333,7 +331,7 @@ impl Backend {
} }
} }
fn add_file_to_media_folder(&mut self, input: pt::AddFileToMediaFolderIn) -> Result<String> { fn add_media_file(&mut self, input: pt::AddMediaFileIn) -> Result<String> {
let mgr = MediaManager::new(&self.media_folder, &self.media_db)?; let mgr = MediaManager::new(&self.media_folder, &self.media_db)?;
let mut ctx = mgr.dbctx(); let mut ctx = mgr.dbctx();
Ok(mgr Ok(mgr