Mirrors/chatmail-core
1
0
Fork 0
mirror of https://github.com/chatmail/core.git synced 2026-04-26 18:06:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactor: use reqwest to handle http-get requests

Browse Source 
Closes #82
This commit is contained in:
Friedel Ziegelmayer
2019-05-27 09:06:55 +02:00
committed by GitHub
parent a247e5b143
commit f0cfcef864
5 changed files with 21 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
examples/repl/main.rs
View File

@@ -73,7 +73,7 @@ use self::cmdline::*;
******************************************************************************/
unsafe extern "C" fn receive_event(
context: &dc_context_t,
_context: &dc_context_t,
event: Event,
data1: uintptr_t,
data2: uintptr_t,
@@ -132,58 +132,6 @@ unsafe extern "C" fn receive_event(
data2 as *mut libc::c_char,
);
}
2100 | 2110 => {
let url: *mut libc::c_char = dc_strdup(data1 as *mut libc::c_char);
let mut param: *mut libc::c_char = strchr(url, '?' as i32);
if !param.is_null() {
*param = 0i32 as libc::c_char;
param = param.offset(1isize)
} else {
param = b"\x00" as *const u8 as *const libc::c_char as *mut libc::c_char
}
let mut ret: *mut libc::c_char = 0 as *mut libc::c_char;
let tempFile: *mut libc::c_char = dc_get_fine_pathNfilename(
context,
context.get_blobdir(),
b"curl.result\x00" as *const u8 as *const libc::c_char,
);
let cmd: *mut libc::c_char = if event == Event::HTTP_GET {
dc_mprintf(
b"curl --silent --location --fail --insecure %s%s%s > %s\x00" as *const u8
as *const libc::c_char,
url,
if 0 != *param.offset(0isize) as libc::c_int {
b"?\x00" as *const u8 as *const libc::c_char
} else {
b"\x00" as *const u8 as *const libc::c_char
},
param,
tempFile,
)
} else {
dc_mprintf(
b"curl --silent -d \"%s\" %s > %s\x00" as *const u8 as *const libc::c_char,
param,
url,
tempFile,
)
};
let error: libc::c_int = system(cmd);
if error == 0i32 {
let mut bytes: size_t = 0i32 as size_t;
dc_read_file(
context,
tempFile,
&mut ret as *mut *mut libc::c_char as *mut *mut libc::c_void,
&mut bytes,
);
}
free(cmd as *mut libc::c_void);
free(tempFile as *mut libc::c_void);
free(url as *mut libc::c_void);
return ret as uintptr_t;
}
2081 => {
printf(
b"\x1b[33m{{Received DC_EVENT_IS_OFFLINE()}}\n\x1b[0m\x00" as *const u8

17
examples/simple.rs
View File

@@ -16,7 +16,6 @@ use deltachat::dc_job::{
dc_perform_smtp_jobs,
};
use deltachat::dc_lot::*;
use deltachat::x::strdup;
extern "C" fn cb(_ctx: &dc_context_t, event: Event, data1: usize, data2: usize) -> usize {
println!("[{:?}]", event);
@@ -26,22 +25,6 @@ extern "C" fn cb(_ctx: &dc_context_t, event: Event, data1: usize, data2: usize)
println!(" progress: {}", data1);
0
}
Event::HTTP_GET => {
let url = unsafe { CStr::from_ptr(data1 as *const _).to_str().unwrap() };
match reqwest::get(url) {
Ok(ref mut res) => {
let c_res = CString::new(res.text().unwrap()).unwrap();
// need to use strdup to allocate the result with malloc
// so it can be `free`d later.
unsafe { strdup(c_res.as_ptr()) as usize }
}
Err(err) => {
println!("failed to download: {}: {:?}", url, err);
0
}
}
}
Event::INFO | Event::WARNING | Event::ERROR | Event::ERROR_NETWORK => {
println!(
" {}",