From d73fec3280307e33fc2a431cbb09acebeee1934b Mon Sep 17 00:00:00 2001
From: Damien Elmes <gpg@ankiweb.net>
Date: Tue, 11 Feb 2020 18:08:34 +1000
Subject: [PATCH] shorten add_file_to_media_folder

---
 proto/backend.proto     | 6 +++---
 pylib/anki/rsbackend.py | 6 ++----
 rslib/src/backend.rs    | 6 ++----
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/proto/backend.proto b/proto/backend.proto
index 6b9a4016b..b7d7aa582 100644
--- a/proto/backend.proto
+++ b/proto/backend.proto
@@ -25,7 +25,7 @@ message BackendInput {
         string strip_av_tags = 23;
         ExtractAVTagsIn extract_av_tags = 24;
         ExtractLatexIn extract_latex = 25;
-        AddFileToMediaFolderIn add_file_to_media_folder = 26;
+        AddMediaFileIn add_media_file = 26;
         SyncMediaIn sync_media = 27;
         Empty check_media = 28;
         TrashMediaFilesIn trash_media_files = 29;
@@ -44,7 +44,7 @@ message BackendOutput {
         string strip_av_tags = 23;
         ExtractAVTagsOut extract_av_tags = 24;
         ExtractLatexOut extract_latex = 25;
-        string add_file_to_media_folder = 26;
+        string add_media_file = 26;
         Empty sync_media = 27;
         MediaCheckOut check_media = 28;
         Empty trash_media_files = 29;
@@ -256,7 +256,7 @@ message ExtractedLatex {
     string latex_body = 2;
 }
 
-message AddFileToMediaFolderIn {
+message AddMediaFileIn {
     string desired_name = 1;
     bytes data = 2;
 }
diff --git a/pylib/anki/rsbackend.py b/pylib/anki/rsbackend.py
index 53a11dbda..0c9a55200 100644
--- a/pylib/anki/rsbackend.py
+++ b/pylib/anki/rsbackend.py
@@ -296,11 +296,9 @@ class RustBackend:
     def add_file_to_media_folder(self, desired_name: str, data: bytes) -> str:
         return self._run_command(
             pb.BackendInput(
-                add_file_to_media_folder=pb.AddFileToMediaFolderIn(
-                    desired_name=desired_name, data=data
-                )
+                add_media_file=pb.AddMediaFileIn(desired_name=desired_name, data=data)
             )
-        ).add_file_to_media_folder
+        ).add_media_file
 
     def sync_media(self, hkey: str, endpoint: str) -> None:
         self._run_command(
diff --git a/rslib/src/backend.rs b/rslib/src/backend.rs
index 203d7227f..10d8da38b 100644
--- a/rslib/src/backend.rs
+++ b/rslib/src/backend.rs
@@ -180,9 +180,7 @@ impl Backend {
             Value::StripAvTags(text) => OValue::StripAvTags(strip_av_tags(&text).into()),
             Value::ExtractAvTags(input) => OValue::ExtractAvTags(self.extract_av_tags(input)),
             Value::ExtractLatex(input) => OValue::ExtractLatex(self.extract_latex(input)),
-            Value::AddFileToMediaFolder(input) => {
-                OValue::AddFileToMediaFolder(self.add_file_to_media_folder(input)?)
-            }
+            Value::AddMediaFile(input) => OValue::AddMediaFile(self.add_media_file(input)?),
             Value::SyncMedia(input) => {
                 self.sync_media(input)?;
                 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 mut ctx = mgr.dbctx();
         Ok(mgr