GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-11-06 20:57:13 -05:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

fix media sync being logged to console

Browse source
This commit is contained in:
Damien Elmes 2020-03-14 10:06:22 +10:00
parent d7daa63dbd
commit 5f19048c93
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
rslib/src/backend/mod.rs
View file

@ -8,7 +8,7 @@ use crate::collection::{open_collection, Collection};
use crate::err::{AnkiError, NetworkErrorKind, Result, SyncErrorKind}; use crate::err::{AnkiError, NetworkErrorKind, Result, SyncErrorKind};
use crate::i18n::{tr_args, FString, I18n}; use crate::i18n::{tr_args, FString, I18n};
use crate::latex::{extract_latex, extract_latex_expanding_clozes, ExtractedLatex}; use crate::latex::{extract_latex, extract_latex_expanding_clozes, ExtractedLatex};
use crate::log::{default_logger, Logger}; use crate::log::default_logger;
use crate::media::check::MediaChecker; use crate::media::check::MediaChecker;
use crate::media::sync::MediaSyncProgress; use crate::media::sync::MediaSyncProgress;
use crate::media::MediaManager; use crate::media::MediaManager;
@ -34,7 +34,6 @@ pub struct Backend {
col: Arc<Mutex<Option<Collection>>>, col: Arc<Mutex<Option<Collection>>>,
progress_callback: Option<ProtoProgressCallback>, progress_callback: Option<ProtoProgressCallback>,
i18n: I18n, i18n: I18n,
log: Logger,
server: bool, server: bool,
} }
@ -113,16 +112,15 @@ pub fn init_backend(init_msg: &[u8]) -> std::result::Result<Backend, String> {
log::terminal(), log::terminal(),
); );
Ok(Backend::new(i18n, log::terminal(), input.server)) Ok(Backend::new(i18n, input.server))
} }
impl Backend { impl Backend {
pub fn new(i18n: I18n, log: Logger, server: bool) -> Backend { pub fn new(i18n: I18n, server: bool) -> Backend {
Backend { Backend {
col: Arc::new(Mutex::new(None)), col: Arc::new(Mutex::new(None)),
progress_callback: None, progress_callback: None,
i18n, i18n,
log,
server, server,
} }
} }
@ -454,7 +452,7 @@ impl Backend {
self.with_col(|col| { self.with_col(|col| {
let mgr = MediaManager::new(&col.media_folder, &col.media_db)?; let mgr = MediaManager::new(&col.media_folder, &col.media_db)?;
let mut rt = Runtime::new().unwrap(); let mut rt = Runtime::new().unwrap();
rt.block_on(mgr.sync_media(callback, &input.endpoint, &input.hkey, self.log.clone())) rt.block_on(mgr.sync_media(callback, &input.endpoint, &input.hkey, col.log.clone()))
}) })
} }