From 7e3fecc44a3a732952fd3027c7dd0d5e1369abe3 Mon Sep 17 00:00:00 2001
From: Jordan Petridis <jpetridis@gnome.org>
Date: Thu, 4 Oct 2018 16:45:15 +0300
Subject: [PATCH] Source: Refactor the clear_etags method api

---
 podcasts-data/src/models/source.rs | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/podcasts-data/src/models/source.rs b/podcasts-data/src/models/source.rs
index c7fc4e4..db48441 100644
--- a/podcasts-data/src/models/source.rs
+++ b/podcasts-data/src/models/source.rs
@@ -109,17 +109,12 @@ impl Source {
     }
 
     /// Clear the `HTTP` `Etag` and `Last-modified` headers.
-    fn clear_etags(mut self) -> Result<Self, DataError> {
-        if self.http_etag().is_some() || self.last_modified().is_some() {
-            debug!("Source etags before clear: {:#?}", &self);
-            self.http_etag = None;
-            self.last_modified = None;
-            self = self.save()?;
-            debug!("Source etags after clear: {:#?}", &self);
-            info!("Etag fields cleared succesfully for Source: {}", self.uri);
-        }
-
-        Ok(self)
+    /// This method does not sync the state of self in the database, call
+    /// .save() method explicitly
+    fn clear_etags(&mut self) {
+        debug!("Source etags before clear: {:#?}", &self);
+        self.http_etag = None;
+        self.last_modified = None;
     }
 
     fn make_err(self, context: &str, code: StatusCode) -> DataError {
@@ -147,7 +142,10 @@ impl Source {
                 // Save etags if it returns NotModified
                 304 => self = self.update_etag(&res)?,
                 // Clear the Etag/lmod else
-                _ => self = self.clear_etags()?,
+                _ => {
+                    self.clear_etags();
+                    self = self.save()?;
+                }
             };
         };
 
@@ -187,7 +185,8 @@ impl Source {
             debug!("Previous Source: {:#?}", &self);
 
             self.set_uri(url.to_str()?.into());
-            self = self.clear_etags()?;
+            self.clear_etags();
+            self = self.save()?;
 
             debug!("Updated Source: {:#?}", &self);
             info!("Feed url of Source {}, was updated succesfully.", self.id());