X-Git-Url: http://git.datanom.net/omvzfs.git/blobdiff_plain/ff78c9eb1a79585ec8a78c4bc4c9c3e8eecf9f78..2d44d88394aa1d612c8324ceaab7b8fb0fbe8357:/src/Snapshot.php

diff --git a/src/Snapshot.php b/src/Snapshot.php
index c25dc9c..fa51be0 100644
--- a/src/Snapshot.php
+++ b/src/Snapshot.php
@@ -39,15 +39,18 @@ class OMVModuleZFSSnapshot {
 	 * @access public
 	 */
 	public function __construct($name) {
+		$snap_exists = true;
 		$this->name = $name;
-		$qname = preg_quote($name, '/');
-		$cmd = "zfs list -H -t snapshot";
-		$this->exec($cmd, $out, $res);
-		foreach ($out as $line) {
-			if (preg_match('/^' . $qname . '\t.*$/', $line)) {
-				$this->updateAllProperties();
-				continue;
-			}
+		$cmd = "zfs list -H -t snapshot " .$name . " 2>&1";
+		try {
+			$this->exec($cmd, $out, $res);
+			$this->updateAllProperties();
+		}
+		catch (OMVModuleZFSException $e) {
+			$snap_exists = false;
+		}
+		if (!$snap_exists) {
+			$this->create();
 		}
 	}
 
@@ -93,7 +96,7 @@ class OMVModuleZFSSnapshot {
 	 */
 	public function setProperties($properties) {
 		foreach ($properties as $newpropertyk => $newpropertyv) {
-			$cmd = "zfs set " . $newpropertyk . "=" . $newpropertyv . " " . $this->name;
+			$cmd = "zfs set " . $newpropertyk . "=" . $newpropertyv . " " . $this->name . " 2>&1";
 			$this->exec($cmd,$out,$res);
 			$this->updateProperty($newpropertyk);
 		}
@@ -107,7 +110,7 @@ class OMVModuleZFSSnapshot {
 	 * @access private
 	 */
 	private function updateProperty($property) {
-		$cmd = "zfs get -H " . $property . " " . $this->name;
+		$cmd = "zfs get -H " . $property . " " . $this->name . " 2>&1";
 		$this->exec($cmd,$out,$res);
 		$tmpary = preg_split('/\t+/', $out[0]);
 		$this->properties["$tmpary[1]"] = array("value" => $tmpary[2], "source" => $tmpary[3]);
@@ -120,27 +123,63 @@ class OMVModuleZFSSnapshot {
 	 * @access private
 	 */
 	private function updateAllProperties() {
-		$cmd = "zfs get -H all " . $this->name;
+		$cmd = "zfs get -H all " . $this->name . " 2>&1";
 		$this->exec($cmd,$out,$res);
 		unset($this->properties);
 		foreach ($out as $line) {
-			$tmpary = preg_split('/\t+/', $line);
-			$this->properties["$tmpary[1]"] = array("value" => $tmpary[2], "source" => $tmpary[3]);
+			$tmpary = preg_split('/\t/', $line);
+			if (strlen($tmpary[2] == 0)) {
+				$this->properties["$tmpary[1]"] = array("value" => "-", "source" => $tmpary[3]);
+			} else {
+				$this->properties["$tmpary[1]"] = array("value" => $tmpary[2], "source" => $tmpary[3]);
+			}
 		}
 	}
 
 	/**
-	 * Craete a Snapshot on commandline. Optionally provide a number of properties to set.
+	 * Create a Snapshot 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 snapshot " . $this->name . " 2>&1";
 		$this->exec($cmd,$out,$res);
 		$this->updateAllProperties();
-		$this->setProperties($properties);
+	}
+
+	/**
+	 * Destroy a Snapshot on commandline.
+	 *
+	 * @return void
+	 * @access public
+	 */
+	public function destroy() {
+		$cmd = "zfs destroy " . $this->name . " 2>&1";
+		$this->exec($cmd,$out,$res);
+	}
+
+	/**
+	 * Rollback a Snapshot on commandline.
+	 *
+	 * @return void
+	 * @access public
+	 */
+	public function rollback() {
+		$cmd = "zfs rollback " . $this->name . " 2>&1";
+		$this->exec($cmd,$out,$res);
+	}
+
+	/**
+	 * Clones a Snapshot on commandline.
+	 *
+	 * @param string $newname
+	 * @return void
+	 * @access public
+	 */
+	public function clonesnap($newname) {
+		$cmd = "zfs clone -p " . $this->name . " " . $newname . " 2>&1";
+		$this->exec($cmd,$out,$res);
 	}
 
 	/**