added quesiton callback support

alpm-rs/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "alpm-rs"
-version = "0.1.13"
+version = "0.1.14"
 authors = ["Sam <sam.mackenzie@live.com>"]
 edition = "2018"
 license="MIT"

alpm-rs/src/callbacks.rs

@@ -1,22 +1,38 @@
-use std::os::raw::c_char;
+use std::os::raw::{c_char};
+use crate::clib;
+use crate::question::{alpm_question_t,QuestionArgs};
 
 use super::{Handle,alpm_handle_t};
-use crate::clib;
+
 
 #[link(name="alpm")]
 extern{
     fn alpm_option_set_logcb(handle : *mut alpm_handle_t, f: extern fn(i32, *mut c_char, clib::VaList)) -> i32;
-
     fn alpm_option_set_dlcb(handle : *mut alpm_handle_t,f: extern fn(filename: *mut c_char, xfered: i64, total: i64)) -> i32;
-
+    fn alpm_option_set_questioncb(handle : *mut alpm_handle_t,f: extern fn(question: *mut alpm_question_t)) -> i32;
 }
 
+
+/*
+type LogCallback = Option<Fn(i32,String)>;
+type DownloadCallback<T: Fn(&str,i64,i64)> = T;
+type QuestionCallback<T: Fn(QuestionArgs)> = T;
+
+
+static mut LOG_CALLBACK : Option<Box<LogCallback>> = None;
+static mut DOWNLOAD_CALLBACK : Option<DownloadCallback> = None;
+static mut QUESTION_CALLBACK : Option<QuestionCallback> = None;
+*/
+
+
 type LogCallback = fn(i32,String);
 type DownloadCallback = fn(filename: &str, downloaded: i64, total: i64);
+type QuestionCallback = fn(question: QuestionArgs);
 
 
 static mut LOG_CALLBACK : Option<LogCallback> = None;
 static mut DOWNLOAD_CALLBACK : Option<DownloadCallback> = None;
+static mut QUESTION_CALLBACK : Option<QuestionCallback> = None;
 
 
 extern "C" fn alpm_log_cb_handler(level: i32, fmt: *mut c_char, args: clib::VaList){
@@ -58,4 +74,24 @@ pub fn set_download_callback(h: &Handle, cb: DownloadCallback){
         }
         DOWNLOAD_CALLBACK = Some(cb);
     }
+}
+
+extern "C" fn alpm_question_handler(q_raw: *mut alpm_question_t){
+    unsafe{
+        if let Some(f) = QUESTION_CALLBACK{
+            f(q_raw.into());
+        }
+    }
+}
+
+pub fn set_question_callback(h: &Handle, cb: QuestionCallback){
+    unsafe{
+        match QUESTION_CALLBACK{
+            None => {
+                alpm_option_set_questioncb(h.alpm_handle, alpm_question_handler);
+            },
+            _ => {},
+        }
+        QUESTION_CALLBACK = Some(cb);
+    }
 }

alpm-rs/src/db.rs

@@ -3,7 +3,7 @@ extern crate libc;
 use std::os::raw::{c_char,c_void};
 
 use crate::package::{PackageList,alpm_pkg_t,Package};
-use crate::types::{alpm_list_t, List, AlpmList, AlpmListItem, StringList };
+use crate::list::{alpm_list_t, List, AlpmList, AlpmListItem, StringList };
 
 #[link(name="alpm")]
 extern {

alpm-rs/src/enums.rs

@@ -1,6 +1,6 @@
 #![allow(dead_code)]
-
 #[allow(non_camel_case_types)]
+
 pub const ALPM_LOG_ERROR: i32  = 1;
 pub const ALPM_LOG_WARNING : i32 =  (1 << 1);
 pub const ALPM_LOG_DEBUG :  i32 = (1 << 2);
@@ -21,6 +21,28 @@ pub enum PkgFrom {
 	ALPM_PKG_FROM_SYNCDB
 }
 
+
+#[derive(Copy, Clone)]
+#[allow(non_camel_case_types)]
+#[repr(C)]
+pub enum alpm_depmod {
+	_invalid,
+	ALPM_DEP_MOD_ANY,
+	ALPM_DEP_MOD_EQ,
+	ALPM_DEP_MOD_GE,
+	ALPM_DEP_MOD_LE,
+	ALPM_DEP_MOD_GT,
+	ALPM_DEP_MOD_LT
+}
+
+pub const ALPM_QUESTION_INSTALL_IGNOREPKG : i32 = (1 << 0);
+pub const ALPM_QUESTION_REPLACE_PKG : i32 = (1 << 1);
+pub const ALPM_QUESTION_CONFLICT_PKG : i32 = (1 << 2);
+pub const ALPM_QUESTION_CORRUPTED_PKG : i32 = (1 << 3);
+pub const ALPM_QUESTION_REMOVE_PKGS : i32 = (1 << 4);
+pub const ALPM_QUESTION_SELECT_PROVIDER : i32 = (1 << 5);
+pub const ALPM_QUESTION_IMPORT_KEY : i32 = (1 << 6);
+
 pub const ALPM_TRANS_FLAG_NODEPS : i32 = 1;
 /** Ignore file conflicts and overwrite files. */
 pub const ALPM_TRANS_FLAG_FORCE : i32 = (1 << 1);

alpm-rs/src/lib.rs

@@ -6,10 +6,11 @@ pub mod error;
 pub mod enums;
 pub mod db;
 pub mod package;
-pub mod types;
+pub mod list;
 pub mod callbacks;
+pub mod question;
 
-pub use crate::types::{List, AlpmListItem};
+pub use crate::list::{List, AlpmListItem};
 
 
 extern crate libc;
@@ -18,7 +19,7 @@ use std::error::Error;
 use std::os::raw::c_char;
 
 use crate::package::{Package,alpm_pkg_t};
-use crate::types::{alpm_list_t};
+use crate::list::{alpm_list_t};
 use crate::db::{AlpmDB,alpm_db_t, DBList};
 use crate::enums::ErrorNo;
 

alpm-rs/src/types.rs → alpm-rs/src/list.rs

@@ -4,7 +4,7 @@ use std::marker::PhantomData;
 
 #[link(name="alpm")]
 extern {
-    fn alpm_list_free(list: *mut alpm_list_t);
+    //fn alpm_list_free(list: *mut alpm_list_t);
     fn alpm_list_add(list: *mut alpm_list_t, data: *mut c_void) -> *mut alpm_list_t;
 }
 
@@ -106,12 +106,12 @@ pub struct AlpmListIterator<T> {
 
 impl<T> Drop for AlpmList<T> {
     fn drop(&mut self) {
-        unsafe{
+       /* unsafe{
             if self.list != std::ptr::null_mut(){
-                //causing undefined behaviours
-               // alpm_list_free(self.list);
+                causing undefined behaviours
+                alpm_list_free(self.list);
             }
-        }
+        }*/
     }
 }
 
@@ -161,7 +161,7 @@ pub struct StringList {
     alpm_list: AlpmList<StringItem>,
 }
 
-impl crate::types::List<StringItem> for StringList {
+impl crate::list::List<StringItem> for StringList {
     fn empty() -> Self {
         StringList{
             alpm_list: AlpmList::empty(),

alpm-rs/src/macros.rs

@@ -59,6 +59,17 @@ macro_rules! cstr {
     };
 }
 
+macro_rules! cstring {
+    ($e:expr) => {
+        if $e == std::ptr::null_mut() {
+                "".to_string()
+            }else{
+                unsafe { std::ffi::CStr::from_ptr($e).to_str().unwrap().to_string() }
+            }
+    };
+}
+
+
 macro_rules! to_bool {
     ($e:expr) => {
         if $e == -1 { false } else { true }

alpm-rs/src/package.rs

@@ -1,7 +1,7 @@
 use std::os::raw::{c_char, c_void};
 
 use crate::enums::PkgFrom;
-use crate::types::{alpm_list_t, AlpmList,AlpmListItem};
+use crate::list::{alpm_list_t, AlpmList,AlpmListItem};
 use crate::db::{alpm_db_t, AlpmDB,DBList};
 
 #[link(name="alpm")]