Merge pull request #7 from genkgo/remove_log_futures

remove log and futures crates

Author: frederikbosch

Cargo.lock

@@ -7,10 +7,8 @@ authors = ["Frederik Bosch <f.bosch@genkgo.nl>"]
 
 [dependencies]
 notify = "6.1.1"
-futures = "0.3"
-log = "0.4.17"
-env_logger = "0.10.0"
 phper = "0.13.1"
+thiserror = "1.0.43"
 
 [dev-dependencies]
 phper-test = "0.13.1"

Cargo.toml

@@ -51,6 +51,7 @@ class RecommendedWatcher
 
     /**
      * @param callable(Event): void $handle
+     * @throws WatchException
      */
     public function watch(callable $handle): void;
 }
@@ -66,6 +67,10 @@ class Event
      */
     public function getPaths(): array;
 }
+
+class WatchException extends \Exception
+{
+}
 ```
 
 ## Why?

README.md

@@ -1,7 +1,9 @@
 use notify::{Config, RecommendedWatcher, RecursiveMode, Watcher, EventKind, event::*};
 use phper::{functions::Argument, modules::Module, php_get_module, values::ZVal, classes::{ClassEntity, ClassEntry, Visibility}};
 use phper::arrays::{ZArray, InsertKey, IterKey};
+use phper::errors::{exception_class, Throwable};
 use phper::objects::{StateObj};
+use std::error::Error;
 use std::convert::Infallible;
 use std::path::PathBuf;
 
@@ -13,7 +15,27 @@ pub fn get_module() -> Module {
         env!("CARGO_PKG_AUTHORS"),
     );
 
-    env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info")).init();
+    #[derive(Debug, thiserror::Error)]
+    #[error(transparent)]
+    pub struct NotifyError(pub Box<dyn Error>);
+
+    impl NotifyError {
+        pub fn new(e: impl Into<Box<dyn Error>>) -> Self {
+            Self(e.into())
+        }
+    }
+
+    impl Throwable for NotifyError {
+        fn get_class(&self) -> &ClassEntry {
+            ClassEntry::from_globals("FsNotify\\WatchException").unwrap_or_else(|_| exception_class())
+        }
+    }
+
+    impl From<NotifyError> for phper::Error {
+        fn from(e: NotifyError) -> Self {
+            phper::Error::throw(e)
+        }
+    }
 
     let mut event = ClassEntity::new("FsNotify\\Event");
     event.add_property("kind", Visibility::Private, ());
@@ -80,8 +102,8 @@ pub fn get_module() -> Module {
                 false => RecursiveMode::NonRecursive,
             };
 
-            watcher.watch(&path, recursive).unwrap();
-            log::info!("Watching: {path:?}")
+            watcher.watch(&path, recursive)
+                .map_err(NotifyError::new)?;
         }
 
         for res in rx {
@@ -150,16 +172,20 @@ pub fn get_module() -> Module {
 
                     handler.call([ZVal::from(php_event)])?;
                 },
-                Err(error) => log::error!("Error: {error:?}"),
+                Err(error) => return Err(NotifyError::new(error).into()),
             }
         }
 
         Ok::<_, phper::Error>(())
     })
         .argument(Argument::by_val("handle"));
 
+    let mut watch_exception = ClassEntity::new("FsNotify\\WatchException");
+    watch_exception.extends(exception_class);
+
     module.add_class(watcher);
     module.add_class(event);
+    module.add_class(watch_exception);
 
     module
 }

src/lib.rs

@@ -1,4 +1,4 @@
-use phper_test::{cli::test_long_term_php_script_with_condition, utils::get_lib_path};
+use phper_test::{cli::test_long_term_php_script_with_condition, cli::test_php_scripts_with_condition, utils::get_lib_path};
 use std::{
     env,
     path::{Path, PathBuf},
@@ -35,4 +35,31 @@ fn test_recommended_watcher() {
     let mut buf = String::new();
     tmpfile.read_to_string(&mut buf).unwrap();
     assert_eq!("notice", buf);
+}
+
+#[test]
+fn test_watch_exception() {
+    test_php_scripts_with_condition(
+        get_lib_path(
+            PathBuf::from(env!("CARGO_MANIFEST_DIR"))
+                .join("target"),
+            "php_ext_fs_notify",
+        ),
+        &[
+            (&Path::new(env!("CARGO_MANIFEST_DIR"))
+                .join("tests")
+                .join("php")
+                .join("test_exception.php"),
+            &|output| {
+                println!("{:?}", output.status.code());
+                match output.status.code() {
+                    Some(0) => {
+                        assert_eq!("caught exception", String::from_utf8(output.stdout.clone()).unwrap());
+                        true
+                    },
+                    _ => false,
+                }
+            }),
+        ],
+    );
 }

tests/integration.rs

@@ -0,0 +1,13 @@
+<?php
+
+ini_set("display_errors", "On");
+ini_set("display_startup_errors", "On");
+error_reporting(-1);
+
+try {
+    $watcher = new FsNotify\RecommendedWatcher();
+    $watcher->add(__DIR__ . '/unknown');
+    $watcher->watch(fn () => null);
+} catch (FsNotify\WatchException) {
+    echo "caught exception";
+}