Merge pull request #5 from clue/add-remove

Add remove() method and automatically close handler once all events are removed

Author: mkraemer

src/MKraemer/ReactInotify/Inotify.php

@@ -56,8 +56,14 @@ public function __invoke()
  {
  if (false !== ($events = \inotify_read($this->inotifyHandler))) {
  foreach ($events as $event) {
- $path = $this->watchDescriptors[$event['wd']]['path'];
- $this->emit($event['mask'], array($path . $event['name']));
+ // make sure the watch descriptor assigned to this event is
+ // still valid. removing watch descriptors via 'remove()'
+ // implicitly sends a final event with mask IN_IGNORE set:
+ // http://php.net/manual/en/inotify.constants.php#constant.in-ignored
+ if (isset($this->watchDescriptors[$event['wd']])) {
+ $path = $this->watchDescriptors[$event['wd']]['path'];
+ $this->emit($event['mask'], array($path . $event['name']));
+ }
  }
  }
  }
@@ -67,6 +73,7 @@ public function __invoke()
  *
  * @param string $path Path to the watched file or directory
  * @param integer $mask Bitmask of inotify constants
+ * @return integer unique watch identifier, can be used to remove() watch later
  */
  public function add($path, $mask)
  {
@@ -79,6 +86,28 @@ public function add($path, $mask)
  }
  $descriptor = \inotify_add_watch($this->inotifyHandler, $path, $mask);
  $this->watchDescriptors[$descriptor] = array('path' => $path);
+ return $descriptor;
+ }
+ 
+ /**
+ * remove/cancel the given watch identifier previously aquired via add()
+ * i.e. stop watching the associated path
+ * 
+ * @param integer $descriptor watch identifier previously returned from add()
+ */
+ public function remove($descriptor)
+ {
+ if (isset($this->watchDescriptors[$descriptor])) {
+ unset($this->watchDescriptors[$descriptor]);
+ 
+ if ($this->watchDescriptors) {
+ // there are still watch paths remaining => only remove this descriptor
+ \inotify_rm_watch($this->inotifyHandler, $descriptor);
+ } else {
+ // no more paths watched => close whole handler
+ $this->close();
+ }
+ }
  }
 
  /**