Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-05-03 05:16:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

add Context::get_id

Browse Source
This commit is contained in:
dignifiedquire
2020-08-10 10:51:04 +02:00
parent dd27929adf
commit b97c334e0c
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
deltachat-ffi/src/lib.rs
View File

@@ -306,6 +306,16 @@ pub unsafe extern "C" fn dc_is_io_running(context: *mut dc_context_t) -> libc::c
block_on(ctx.is_io_running()) as libc::c_int block_on(ctx.is_io_running()) as libc::c_int
} }
#[no_mangle]
pub unsafe extern "C" fn dc_get_id(context: *mut dc_context_t) -> libc::c_int {
if context.is_null() {
return 0;
}
let ctx = &*context;
ctx.get_id() as libc::c_int
}
#[no_mangle] #[no_mangle]
pub type dc_event_t = Event; pub type dc_event_t = Event;

17
src/context.rs
View File

@@ -205,6 +205,11 @@ impl Context {
self.events.get_emitter() self.events.get_emitter()
} }
/// Get the ID of this context.
pub fn get_id(&self) -> u32 {
self.id
}
// Ongoing process allocation/free/check // Ongoing process allocation/free/check
pub async fn alloc_ongoing(&self) -> Result<Receiver<()>> { pub async fn alloc_ongoing(&self) -> Result<Receiver<()>> {
@@ -525,7 +530,7 @@ mod tests {
let tmp = tempfile::tempdir().unwrap(); let tmp = tempfile::tempdir().unwrap();
let dbfile = tmp.path().join("db.sqlite"); let dbfile = tmp.path().join("db.sqlite");
std::fs::write(&dbfile, b"123").unwrap(); std::fs::write(&dbfile, b"123").unwrap();
let res = Context::new("FakeOs".into(), dbfile.into(), 0).await; let res = Context::new("FakeOs".into(), dbfile.into(), 1).await;
assert!(res.is_err()); assert!(res.is_err());
} }
@@ -540,7 +545,7 @@ mod tests {
async fn test_blobdir_exists() { async fn test_blobdir_exists() {
let tmp = tempfile::tempdir().unwrap(); let tmp = tempfile::tempdir().unwrap();
let dbfile = tmp.path().join("db.sqlite"); let dbfile = tmp.path().join("db.sqlite");
Context::new("FakeOS".into(), dbfile.into(), 0) Context::new("FakeOS".into(), dbfile.into(), 1)
.await .await
.unwrap(); .unwrap();
let blobdir = tmp.path().join("db.sqlite-blobs"); let blobdir = tmp.path().join("db.sqlite-blobs");
@@ -553,7 +558,7 @@ mod tests {
let dbfile = tmp.path().join("db.sqlite"); let dbfile = tmp.path().join("db.sqlite");
let blobdir = tmp.path().join("db.sqlite-blobs"); let blobdir = tmp.path().join("db.sqlite-blobs");
std::fs::write(&blobdir, b"123").unwrap(); std::fs::write(&blobdir, b"123").unwrap();
let res = Context::new("FakeOS".into(), dbfile.into(), 0).await; let res = Context::new("FakeOS".into(), dbfile.into(), 1).await;
assert!(res.is_err()); assert!(res.is_err());
} }
@@ -563,7 +568,7 @@ mod tests {
let subdir = tmp.path().join("subdir"); let subdir = tmp.path().join("subdir");
let dbfile = subdir.join("db.sqlite"); let dbfile = subdir.join("db.sqlite");
let dbfile2 = dbfile.clone(); let dbfile2 = dbfile.clone();
Context::new("FakeOS".into(), dbfile.into(), 0) Context::new("FakeOS".into(), dbfile.into(), 1)
.await .await
.unwrap(); .unwrap();
assert!(subdir.is_dir()); assert!(subdir.is_dir());
@@ -575,7 +580,7 @@ mod tests {
let tmp = tempfile::tempdir().unwrap(); let tmp = tempfile::tempdir().unwrap();
let dbfile = tmp.path().join("db.sqlite"); let dbfile = tmp.path().join("db.sqlite");
let blobdir = PathBuf::new(); let blobdir = PathBuf::new();
let res = Context::with_blobdir("FakeOS".into(), dbfile.into(), blobdir.into(), 0).await; let res = Context::with_blobdir("FakeOS".into(), dbfile.into(), blobdir.into(), 1).await;
assert!(res.is_err()); assert!(res.is_err());
} }
@@ -584,7 +589,7 @@ mod tests {
let tmp = tempfile::tempdir().unwrap(); let tmp = tempfile::tempdir().unwrap();
let dbfile = tmp.path().join("db.sqlite"); let dbfile = tmp.path().join("db.sqlite");
let blobdir = tmp.path().join("blobs"); let blobdir = tmp.path().join("blobs");
let res = Context::with_blobdir("FakeOS".into(), dbfile.into(), blobdir.into(), 0).await; let res = Context::with_blobdir("FakeOS".into(), dbfile.into(), blobdir.into(), 1).await;
assert!(res.is_err()); assert!(res.is_err());
} }