Extracted code from constructor to new method called create.

[omvzfs.git] / src / Dataset.php

diff --git a/src/Dataset.php b/src/Dataset.php
index 57e8eddb5e2c77a1d3bf2044ca137fbcf75f3c23..8560f7495b25b8445c0b2faa0218505b8d195508 100644 (file)
--- a/src/Dataset.php
+++ b/src/Dataset.php
@@ -39,19 +39,25 @@ class OMVModuleZFSDataset {
        // 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
-        *
+        * @return void
+        * @access public
         */
-       public function __construct($name, array $properties = null) {
-               $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"][0];
+               $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;
+                       }
+               }
        }
 
        /**
@@ -124,7 +130,7 @@ class OMVModuleZFSDataset {
                unset($this->properties);
                foreach ($out as $line) {
                        $tmpary = preg_split('/\t+/', $line);
-                       $this->properties["$tmpary[1]"] = array($tmpary[2], $tmpary[3]);
+                       $this->properties["$tmpary[1]"] = array("value" => $tmpary[2], "source" => $tmpary[3]);
                }
        }
 
@@ -139,9 +145,25 @@ class OMVModuleZFSDataset {
                $cmd = "zfs get -H " . $property . " " . $this->name;
                $this->exec($cmd,$out,$res);
                $tmpary = preg_split('/\t+/', $out[0]);
-               $this->properties["$tmpary[1]"] = array($tmpary[2], $tmpary[3]);
+               $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.
         *