Fixed some commands to redirect stderr to stdout.

[omvzfs.git] / src / Dataset.php

diff --git a/src/Dataset.php b/src/Dataset.php
index 55358eae5630034ef24bfcebde265e7deba2ebce..e1611416a73d8fd00102d3f958881eeae2878118 100644 (file)
--- a/src/Dataset.php
+++ b/src/Dataset.php
@@ -1,6 +1,7 @@
 <?php
 require_once("Exception.php");
 require_once("openmediavault/util.inc");
+require_once("Snapshot.php");
 
 /**
  * XXX detailed description
@@ -35,26 +36,45 @@ class OMVModuleZFSDataset {
      */
     private $properties;
 
+       /**
+        * Array with Snapshots associated to the Dataset
+        *
+        * @var         array $snapshots
+        * @access private
+        */
+       private $snapshots;
+
        // Associations
        // Operations
 
        /**
-        * Constructor
+        * Constructor. If the Dataset already exists in the system the object will be updated with all
+        * associated properties from commandline.
         *
         * @param string $name Name of the new Dataset
-        * @param array $properties An associative array with properties to set when creating the Dataset
-        * @param bool $create Should the Dataset be created on commandline? Defaults to false.
-        *
+        * @return void
+        * @access public
         */
-       public function __construct($name, array $properties = null, $create = false) {
-               if ($create) {
-                       $cmd = "zfs create -p " . $name . " 2>&1";
-                       $this->exec($cmd,$out,$res);
-               }
+       public function __construct($name) {
                $this->name = $name;
-               $this->updateAllProperties();
-               $this->setProperties($properties);
-               $this->mountPoint = $this->properties["mountpoint"]["value"];
+               $qname = preg_quote($name, '/');
+               $cmd = "zfs list -H";
+               $this->exec($cmd, $out, $res);
+               foreach ($out as $line) {
+                       if (preg_match('/^' . $qname . '\t.*$/', $line)) {
+                               $this->updateAllProperties();
+                               $this->mountPoint = $this->properties["mountpoint"]["value"];
+                               continue;
+                       }
+               }
+               $qname = preg_quote($name . "@", '/');
+               $cmd = "zfs list -H -t snapshot";
+               $this->exec($cmd, $out, $res);
+               foreach ($out as $line) {
+                       if (preg_match('/^(' . $qname . '[^\s]+)\t.*$/', $line, $res)) {
+                               $this->snapshots[] = new OMVModuleZFSSnapshot($res[1]);
+                       }
+               }
        }
 
        /**
@@ -77,6 +97,16 @@ class OMVModuleZFSDataset {
                return $this->mountPoint;
        }
 
+       /**
+        * Get all Snapshots associated with the Dataset
+        *
+        * @return array $snapshots
+        * @access public
+        */
+       public function getSnapshots() {
+               return $this->snapshots;
+       }
+
        /**
         * Get a single property value associated with the Dataset
         *
@@ -145,6 +175,22 @@ class OMVModuleZFSDataset {
                $this->properties["$tmpary[1]"] = array("value" => $tmpary[2], "source" => $tmpary[3]);
        }
 
+       /**
+        * Craete a Dataset on commandline. Optionally provide a number of properties to set.
+        *
+        * @param array $properties Properties to set when creating the dataset.
+        * @return void
+        * @access public
+        */
+       public function create(array $properties = null) {
+               $cmd = "zfs create -p " . $this->name . " 2>&1";
+               $this->exec($cmd,$out,$res);
+               $this->updateAllProperties();
+               $this->setProperties($properties);
+               $this->mountPoint = $this->properties["mountpoint"]["value"];
+       }
+
+
        /**
         * Destroy the Dataset.
         *