From 6ed033a41e7a9d60352c818bc753ade3fc463fc9 Mon Sep 17 00:00:00 2001
From: Niclas Berglind <nb@kjam.se>
Date: Wed, 12 Mar 2014 09:04:50 +0100
Subject: [PATCH] Extracted code from constructor to new method called create.

Signed-off-by: Niclas Berglind <nb@kjam.se>
---
 src/Dataset.php | 43 +++++++++++++++++++++++++++++++------------
 1 file changed, 31 insertions(+), 12 deletions(-)

diff --git a/src/Dataset.php b/src/Dataset.php
index 55358ea..8560f74 100644
--- a/src/Dataset.php
+++ b/src/Dataset.php
@@ -39,22 +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
-	 * @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;
+			}
+		}
 	}
 
 	/**
@@ -145,6 +148,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.
 	 *
-- 
2.39.2