X-Git-Url: http://git.datanom.net/omvzfs.git/blobdiff_plain/a50e3caf1d538eb4bb0cd5eb8f634cb18e0065ab..HEAD:/src/Dataset.php?ds=inline

diff --git a/src/Dataset.php b/src/Dataset.php
index 28bd4d1..65cca31 100644
--- a/src/Dataset.php
+++ b/src/Dataset.php
@@ -56,21 +56,25 @@ class OMVModuleZFSDataset {
 	 * @access public
 	 */
 	public function __construct($name) {
+		$ds_exists = true;
 		$this->name = $name;
-		$qname = preg_quote($name, '/');
-		$cmd = "zfs list -H 2>&1";
-		$this->exec($cmd, $out, $res);
-		foreach ($out as $line) {
-			if (preg_match('/^' . $qname . '\t.*$/', $line)) {
-				$this->updateAllProperties();
-				$this->mountPoint = $this->properties["mountpoint"]["value"];
-				continue;
-			}
+		$cmd = "zfs list -H -t filesystem " . $name . " 2>&1";
+		try {
+			$this->exec($cmd, $out, $res);
+			$this->updateAllProperties();
+			$this->mountPoint = $this->properties["mountpoint"]["value"];
 		}
-		$cmd = "zfs list -r -o name -H -t snapshot " . $name . " 2>&1";
-		$this->exec($cmd, $out2, $res2);
-		foreach ($out2 as $line2) {
-			$this->snapshots[$line2] = new OMVModuleZFSSnapshot($line2);
+		catch (OMVModuleZFSException $e) {
+			$ds_exists = false;
+		}
+		if ($ds_exists) {
+			$cmd = "zfs list -r -d 1 -o name -H -t snapshot " . $name . " 2>&1";
+			$this->exec($cmd, $out2, $res2);
+			foreach ($out2 as $line2) {
+					$this->snapshots[$line2] = new OMVModuleZFSSnapshot($line2);
+			}
+		} else {
+			$this->create();
 		}
 	}
 
@@ -101,7 +105,11 @@ class OMVModuleZFSDataset {
 	 * @access public
 	 */
 	public function getSnapshots() {
-		return $this->snapshots;
+		if (isset($this->snapshots)) {
+			return $this->snapshots;
+		} else {
+			return array();
+		}
 	}
 
 	/**
@@ -173,17 +181,15 @@ class OMVModuleZFSDataset {
 	}
 
 	/**
-	 * Craete a Dataset on commandline. Optionally provide a number of properties to set.
+	 * Craete a Dataset on commandline.
 	 *
-	 * @param array $properties Properties to set when creating the dataset.
 	 * @return void
-	 * @access public
+	 * @access private
 	 */
-	public function create(array $properties = null) {
+	private function create() {
 		$cmd = "zfs create -p " . $this->name . " 2>&1";
 		$this->exec($cmd,$out,$res);
 		$this->updateAllProperties();
-		$this->setProperties($properties);
 		$this->mountPoint = $this->properties["mountpoint"]["value"];
 	}
 
@@ -287,6 +293,49 @@ class OMVModuleZFSDataset {
 		unset($this->snapshots[$snap_name]);
 	}
 
+	/**
+	* Check if the Dataset is a clone or not.
+	*
+	* @return bool
+	* @access public
+	*/
+	public function isClone() {
+		$origin = $this->getProperty("origin");
+		if (strlen($origin["value"]) > 0) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+
+	/**
+	* Get the origin of the Dataset if it's a clone.
+	*
+	* @return string The name of the origin if it exists. Otherwise an empty string.
+	* @access public
+	*/
+	public function getOrigin() {
+		if ($this->isClone()) {
+			$origin = $this->getProperty("origin");
+			return $origin['value'];
+		} else {
+			return "";
+		}
+	}
+
+	/**
+	* Promotes the Dataset if it's a clone.
+	*
+	* @return void
+	* @access public
+	*/
+	public function promote() {
+		if ($this->isClone()) {
+			$cmd = "zfs promote " . $this->name . " 2>&1";
+			$this->exec($cmd,$out,$res);
+		}
+	}
+
 	/**
 	 * Helper function to execute a command and throw an exception on error
 	 * (requires stderr redirected to stdout for proper exception message).