From 99e3507507e114fb4d1d27de6a7dcf1f8caaa73d Mon Sep 17 00:00:00 2001 From: "C. Morgan Hamill" Date: Fri, 20 Mar 2015 13:56:28 -0400 Subject: Add `Database::upgrade()` and related methods. Not so simple wrapper around notmuch API's `notmuch_database_upgrade()` function. Variants with and without a callback parameter are provided. --- src/database.rs | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'src') diff --git a/src/database.rs b/src/database.rs index b3812eb..20c2a24 100644 --- a/src/database.rs +++ b/src/database.rs @@ -117,6 +117,39 @@ impl Database { ffi::notmuch_database_needs_upgrade(self.0) == 1 } } + + pub fn upgrade(&self) -> Result<()> { + let status: Option = None; + self._upgrade(status) + } + + pub fn upgrade_with_status(&self, status: F) -> Result<()> { + self._upgrade(Some(status)) + } + + fn _upgrade(&self, status: Option) -> Result<()> { + + extern fn wrapper( + closure: *mut libc::c_void, progress: libc::c_double, + ) { + let closure = closure as *mut F; + unsafe { + (*closure)(progress as f64) + } + } + + try!(unsafe { + ffi::notmuch_database_upgrade( + self.0, + if status.is_some() { Some(wrapper::) } else { None }, + status.map_or(ptr::null_mut(), |f| { + &f as *const _ as *mut libc::c_void + }), + ) + }.as_result()); + + Ok(()) + } } impl ops::Drop for Database { -- cgit v1.2.1