for pb::SyncCollectionOut {
SyncActionRequired::NoChanges => {
pb::sync_collection_out::ChangesRequired::NoChanges as i32
}
- SyncActionRequired::FullSyncRequired => {
- pb::sync_collection_out::ChangesRequired::FullSync as i32
+ SyncActionRequired::FullSyncRequired {
+ upload_ok,
+ download_ok,
+ } => {
+ if !upload_ok {
+ pb::sync_collection_out::ChangesRequired::FullDownload as i32
+ } else if !download_ok {
+ pb::sync_collection_out::ChangesRequired::FullUpload as i32
+ } else {
+ pb::sync_collection_out::ChangesRequired::FullSync as i32
+ }
}
SyncActionRequired::NormalSyncRequired => {
pb::sync_collection_out::ChangesRequired::NormalSync as i32
diff --git a/rslib/src/media/mod.rs b/rslib/src/media/mod.rs
index a6274ecaf..11e15e906 100644
--- a/rslib/src/media/mod.rs
+++ b/rslib/src/media/mod.rs
@@ -130,14 +130,14 @@ impl MediaManager {
pub async fn sync_media<'a, F>(
&'a self,
progress: F,
- endpoint: &'a str,
+ host_number: u32,
hkey: &'a str,
log: Logger,
) -> Result<()>
where
F: FnMut(MediaSyncProgress) -> bool,
{
- let mut syncer = MediaSyncer::new(self, progress, endpoint, log);
+ let mut syncer = MediaSyncer::new(self, progress, host_number, log);
syncer.sync(hkey).await
}
diff --git a/rslib/src/media/sync.rs b/rslib/src/media/sync.rs
index 63a8b45ff..6bbb856fc 100644
--- a/rslib/src/media/sync.rs
+++ b/rslib/src/media/sync.rs
@@ -45,7 +45,7 @@ where
client: Client,
progress_cb: P,
progress: MediaSyncProgress,
- endpoint: &'a str,
+ endpoint: String,
log: Logger,
}
@@ -132,23 +132,36 @@ struct FinalizeResponse {
err: String,
}
+fn media_sync_endpoint(host_number: u32) -> String {
+ if let Ok(endpoint) = std::env::var("SYNC_ENDPOINT_MEDIA") {
+ endpoint
+ } else {
+ let suffix = if host_number > 0 {
+ format!("{}", host_number)
+ } else {
+ "".to_string()
+ };
+ format!("https://sync{}.ankiweb.net/msync/", suffix)
+ }
+}
+
impl MediaSyncer<'_, P>
where
P: FnMut(MediaSyncProgress) -> bool,
{
- pub fn new<'a>(
- mgr: &'a MediaManager,
+ pub fn new(
+ mgr: &MediaManager,
progress_cb: P,
- endpoint: &'a str,
+ host_number: u32,
log: Logger,
- ) -> MediaSyncer<'a, P> {
+ ) -> MediaSyncer<'_, P> {
let client = Client::builder()
.connect_timeout(Duration::from_secs(30))
.timeout(Duration::from_secs(60))
.build()
.unwrap();
+ let endpoint = media_sync_endpoint(host_number);
let ctx = mgr.dbctx();
-
MediaSyncer {
mgr,
ctx,
@@ -817,8 +830,7 @@ mod test {
let log = crate::log::terminal();
let mgr = MediaManager::new(&media_dir, &media_db)?;
- mgr.sync_media(progress, "https://sync.ankiweb.net/msync/", hkey, log)
- .await?;
+ mgr.sync_media(progress, 0, hkey, log).await?;
Ok(())
}
diff --git a/rslib/src/storage/card/mod.rs b/rslib/src/storage/card/mod.rs
index 378f1212a..31d1cdbfd 100644
--- a/rslib/src/storage/card/mod.rs
+++ b/rslib/src/storage/card/mod.rs
@@ -244,6 +244,15 @@ impl super::SqliteStorage {
Ok(entries)
}
+
+ pub(crate) fn have_at_least_one_card(&self) -> Result {
+ self.db
+ .prepare_cached("select null from cards")?
+ .query(NO_PARAMS)?
+ .next()
+ .map(|o| o.is_none())
+ .map_err(Into::into)
+ }
}
#[cfg(test)]
diff --git a/rslib/src/sync/mod.rs b/rslib/src/sync/mod.rs
index 3f43b73a5..b7dc988de 100644
--- a/rslib/src/sync/mod.rs
+++ b/rslib/src/sync/mod.rs
@@ -185,13 +185,13 @@ pub struct FullSyncProgress {
pub total_bytes: usize,
}
-#[derive(PartialEq)]
+#[derive(PartialEq, Debug)]
pub enum SyncActionRequired {
NoChanges,
- FullSyncRequired,
+ FullSyncRequired { upload_ok: bool, download_ok: bool },
NormalSyncRequired,
}
-
+#[derive(Debug)]
struct SyncState {
required: SyncActionRequired,
local_is_newer: bool,
@@ -227,13 +227,26 @@ impl NormalSyncer<'_> {
}
pub async fn sync(&mut self) -> Result {
+ debug!(self.col.log, "fetching meta...");
let state: SyncState = self.get_sync_state().await?;
+ debug!(self.col.log, "fetched"; "state"=>?&state);
match state.required {
SyncActionRequired::NoChanges => Ok(state.into()),
- SyncActionRequired::FullSyncRequired => Ok(state.into()),
+ SyncActionRequired::FullSyncRequired { .. } => Ok(state.into()),
SyncActionRequired::NormalSyncRequired => {
- // fixme: transaction
- self.normal_sync_inner(state).await
+ self.col.storage.begin_trx()?;
+ match self.normal_sync_inner(state).await {
+ Ok(success) => {
+ self.col.storage.commit_trx()?;
+ Ok(success)
+ }
+ Err(e) => {
+ // fixme: full sync on sanity check failure, etc
+ self.col.storage.rollback_trx()?;
+ let _ = self.remote.abort().await;
+ Err(e)
+ }
+ }
}
}
}
@@ -241,6 +254,7 @@ impl NormalSyncer<'_> {
async fn get_sync_state(&self) -> Result {
let remote: SyncMeta = self.remote.meta().await?;
if !remote.should_continue {
+ debug!(self.col.log, "server says abort"; "message"=>&remote.server_message);
return Err(AnkiError::SyncError {
info: remote.server_message,
kind: SyncErrorKind::ServerMessage,
@@ -248,7 +262,9 @@ impl NormalSyncer<'_> {
}
let local = self.col.sync_meta()?;
- if (remote.current_time.0 - local.current_time.0).abs() > 300 {
+ let delta = remote.current_time.0 - local.current_time.0;
+ if delta.abs() > 300 {
+ debug!(self.col.log, "clock off"; "delta"=>delta);
return Err(AnkiError::SyncError {
// fixme: need to rethink error handling; defer translation and pass in time difference
info: "".into(),
@@ -259,7 +275,12 @@ impl NormalSyncer<'_> {
let required = if remote.modified == local.modified {
SyncActionRequired::NoChanges
} else if remote.schema != local.schema {
- SyncActionRequired::FullSyncRequired
+ let upload_ok = !local.empty;
+ let download_ok = !remote.empty;
+ SyncActionRequired::FullSyncRequired {
+ upload_ok,
+ download_ok,
+ }
} else {
SyncActionRequired::NormalSyncRequired
};
@@ -407,7 +428,6 @@ pub async fn sync_login(username: &str, password: &str) -> Result {
}
impl Collection {
- // fixme: upload only, download only case
pub async fn get_sync_status(&mut self, auth: SyncAuth) -> Result {
NormalSyncer::new(self, auth)
.get_sync_state()
@@ -470,7 +490,7 @@ impl Collection {
server_message: "".into(),
should_continue: true,
host_number: 0,
- empty: false,
+ empty: self.storage.have_at_least_one_card()?,
})
}