Merge branch 'master' into coolreader18/wasm-cleanup1

coolreader18 · coolreader18 · commit 1568637d2602 · 2019-04-08T21:41:45.000-05:00
diff --git a/vm/src/dictdatatype.rs b/vm/src/dictdatatype.rs
@@ -9,20 +9,29 @@ use num_traits::ToPrimitive;
 /// And: http://code.activestate.com/recipes/578375/
 use std::collections::HashMap;
 
-#[derive(Default)]
-pub struct Dict {
+pub struct Dict<T = PyObjectRef> {
     size: usize,
     indices: HashMap<usize, usize>,
-    entries: Vec<Option<DictEntry>>,
+    entries: Vec<Option<DictEntry<T>>>,
 }
 
-struct DictEntry {
+impl<T> Default for Dict<T> {
+    fn default() -> Self {
+        Dict {
+            size: 0,
+            indices: HashMap::new(),
+            entries: Vec::new(),
+        }
+    }
+}
+
+struct DictEntry<T> {
     hash: usize,
     key: PyObjectRef,
-    value: PyObjectRef,
+    value: T,
 }
 
-impl Dict {
+impl<T: Clone> Dict<T> {
     pub fn new() -> Self {
         Dict {
             size: 0,
@@ -32,12 +41,7 @@ impl Dict {
     }
 
     /// Store a key
-    pub fn insert(
-        &mut self,
-        vm: &VirtualMachine,
-        key: &PyObjectRef,
-        value: PyObjectRef,
-    ) -> PyResult<()> {
+    pub fn insert(&mut self, vm: &VirtualMachine, key: &PyObjectRef, value: T) -> PyResult<()> {
         match self.lookup(vm, key)? {
             LookupResult::Existing(index) => {
                 // Update existing key
@@ -76,7 +80,7 @@ impl Dict {
     }
 
     /// Retrieve a key
-    pub fn get(&self, vm: &VirtualMachine, key: &PyObjectRef) -> PyResult<Option<PyObjectRef>> {
+    pub fn get(&self, vm: &VirtualMachine, key: &PyObjectRef) -> PyResult<Option<T>> {
         if let LookupResult::Existing(index) = self.lookup(vm, key)? {
             if let Some(entry) = &self.entries[index] {
                 Ok(Some(entry.value.clone()))
@@ -114,7 +118,7 @@ impl Dict {
         self.len() == 0
     }
 
-    pub fn get_items(&self) -> Vec<(PyObjectRef, PyObjectRef)> {
+    pub fn get_items(&self) -> Vec<(PyObjectRef, T)> {
         self.entries
             .iter()
             .filter(|e| e.is_some())
diff --git a/vm/src/stdlib/os.rs b/vm/src/stdlib/os.rs
@@ -142,13 +142,35 @@ fn os_write(fd: PyIntRef, data: PyBytesRef, vm: &VirtualMachine) -> PyResult {
     Ok(vm.ctx.new_int(written))
 }
 
-fn os_remove(path: PyStringRef, vm: &VirtualMachine) -> PyResult {
-    match fs::remove_file(&path.value) {
-        Ok(_) => (),
-        Err(s) => return Err(vm.new_os_error(s.to_string())),
-    }
+fn os_remove(path: PyStringRef, vm: &VirtualMachine) -> PyResult<()> {
+    fs::remove_file(&path.value).map_err(|s| vm.new_os_error(s.to_string()))
+}
 
-    Ok(vm.get_none())
+fn os_mkdir(path: PyStringRef, vm: &VirtualMachine) -> PyResult<()> {
+    fs::create_dir(&path.value).map_err(|s| vm.new_os_error(s.to_string()))
+}
+
+fn os_mkdirs(path: PyStringRef, vm: &VirtualMachine) -> PyResult<()> {
+    fs::create_dir_all(&path.value).map_err(|s| vm.new_os_error(s.to_string()))
+}
+
+fn os_rmdir(path: PyStringRef, vm: &VirtualMachine) -> PyResult<()> {
+    fs::remove_dir(&path.value).map_err(|s| vm.new_os_error(s.to_string()))
+}
+
+fn os_listdir(path: PyStringRef, vm: &VirtualMachine) -> PyResult {
+    match fs::read_dir(&path.value) {
+        Ok(iter) => {
+            let res: PyResult<Vec<PyObjectRef>> = iter
+                .map(|entry| match entry {
+                    Ok(path) => Ok(vm.ctx.new_str(path.file_name().into_string().unwrap())),
+                    Err(s) => Err(vm.new_os_error(s.to_string())),
+                })
+                .collect();
+            Ok(vm.ctx.new_list(res?))
+        }
+        Err(s) => Err(vm.new_os_error(s.to_string())),
+    }
 }
 
 pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {
@@ -168,6 +190,10 @@ pub fn make_module(vm: &VirtualMachine) -> PyObjectRef {
         "write" => ctx.new_rustfunc(os_write),
         "remove" => ctx.new_rustfunc(os_remove),
         "unlink" => ctx.new_rustfunc(os_remove),
+        "mkdir" => ctx.new_rustfunc(os_mkdir),
+        "mkdirs" => ctx.new_rustfunc(os_mkdirs),
+        "rmdir" => ctx.new_rustfunc(os_rmdir),
+        "listdir" => ctx.new_rustfunc(os_listdir),
         "name" => ctx.new_str(os_name),
         "O_RDONLY" => ctx.new_int(0),
         "O_WRONLY" => ctx.new_int(1),
