grabbing extra sync data from incoming/outgoing sync and passing along to the ui

Author: orthecreedence

src/sync/incoming.rs

@@ -25,6 +25,14 @@ use ::util;
 
 const SYNC_IGNORE_KEY: &'static str = "sync:incoming:ignore";
 
+#[derive(Serialize, Deserialize, Debug)]
+pub struct SyncResponseExtra {
+    #[serde(default)]
+    current_size: Option<i64>,
+    #[serde(default)]
+    max_size: Option<i64>,
+}
+
 /// Defines a struct for deserializing our incoming sync response
 #[derive(Deserialize, Debug)]
 struct SyncResponse {
@@ -33,6 +41,9 @@ struct SyncResponse {
     #[serde(default)]
     #[serde(deserialize_with = "::util::ser::str_i64_converter::deserialize")]
     sync_id: i64,
+    /// extra data returned from the sync system
+    #[serde(default)]
+    extra: Option<SyncResponseExtra>,
 }
 
 struct Handlers {
@@ -232,7 +243,7 @@ impl SyncIncoming {
         if !self.is_enabled() && !force { return Ok(()); }
 
         // destructure our response
-        let SyncResponse { sync_id, records } = syncdata;
+        let SyncResponse { sync_id, records, extra } = syncdata;
 
         // grab sync ids we're ignoring
         let ignored = self.get_ignored()?;
@@ -284,6 +295,11 @@ impl SyncIncoming {
         // syncs and process them
         messaging::app_event("sync:incoming", &())?;
 
+        // if we have extra sync data, send it off to the ui
+        if let Some(extra) = extra.as_ref() {
+            messaging::ui_event("sync:incoming:extra", extra)?;
+        }
+
         // clear out the sync ignore list
         match self.clear_ignored() {
             Ok(_) => {},

src/sync/outgoing.rs

@@ -1,7 +1,7 @@
 use ::std::sync::{Arc, RwLock, Mutex};
 use ::error::TResult;
 use ::sync::{SyncConfig, Syncer};
-use ::sync::incoming::SyncIncoming;
+use ::sync::incoming::{SyncIncoming, SyncResponseExtra};
 use ::storage::Storage;
 use ::api::{Api, ApiReq};
 use ::messaging;
@@ -18,6 +18,9 @@ struct SyncResponse {
     /// records that weren't run because they were blocked by a failure
     #[serde(default)]
     blocked: Vec<SyncRecord>,
+    /// extra data returned from the sync system
+    #[serde(default)]
+    extra: Option<SyncResponseExtra>,
 }
 
 /// Holds the state for data going from turtl -> API (outgoing sync data).
@@ -154,6 +157,11 @@ impl Syncer for SyncOutgoing {
         // will want to know this happened.
         messaging::ui_event("sync:outgoing:complete", &())?;
 
+        // if we have extra sync data, send it off to the ui
+        if let Some(extra) = sync_result.extra.as_ref() {
+            messaging::ui_event("sync:outgoing:extra", extra)?;
+        }
+
         // if we did indeed get an error while deleting our sync records,
         // send the first error we got back. obviously there may be more
         // than one, but we can only do so much here to maintain resilience.