From: Niclas Berglind <nb@kjam.se>
Date: Sun, 23 Mar 2014 14:23:50 +0000 (+0100)
Subject: Modified constructors in Zvol, Dataset and Snapshot classes.
X-Git-Url: http://git.datanom.net/omvzfs.git/commitdiff_plain/e419cf47cc59a0f8ea6b62a66138ea4336046dcb

Modified constructors in Zvol, Dataset and Snapshot classes.

Signed-off-by: Niclas Berglind <nb@kjam.se>
---

diff --git a/src/Dataset.php b/src/Dataset.php
index 28bd4d1..9abdb82 100644
--- a/src/Dataset.php
+++ b/src/Dataset.php
@@ -56,21 +56,23 @@ 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 -o name -H -t snapshot " . $name . " 2>&1";
+			$this->exec($cmd, $out2, $res2);
+			foreach ($out2 as $line2) {
+				$this->snapshots[$line2] = new OMVModuleZFSSnapshot($line2);
+			}
 		}
 	}
 
diff --git a/src/Snapshot.php b/src/Snapshot.php
index ef90283..afd189c 100644
--- a/src/Snapshot.php
+++ b/src/Snapshot.php
@@ -40,14 +40,12 @@ class OMVModuleZFSSnapshot {
 	 */
 	public function __construct($name) {
 		$this->name = $name;
-		$qname = preg_quote($name, '/');
-		$cmd = "zfs list -H -t snapshot 2>&1";
-		$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) {
 		}
 	}
 
diff --git a/src/Zvol.php b/src/Zvol.php
index 603188a..aea0ca2 100644
--- a/src/Zvol.php
+++ b/src/Zvol.php
@@ -57,21 +57,23 @@ class OMVModuleZFSZvol {
 	 * @access public
 	 */
 	public function __construct($name) {
+		$zvol_exists = true;
 		$this->name = $name;
-		$qname = preg_quote($name, '/');
-		$cmd = "zfs list -H -t volume 2>&1";
-		$this->exec($cmd, $out, $res);
-		foreach ($out as $line) {
-			if (preg_match('/^' . $qname . '\t.*$/', $line)) {
-				$this->updateAllProperties();
-				$this->size = $this->properties["volsize"]["value"];
-				continue;
-			}
+		$cmd = "zfs list -H -t volume " . $name . " 2>&1";
+		try {
+			$this->exec($cmd, $out, $res);
+			$this->updateAllProperties();
+			$this->size = $this->properties["volsize"]["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) {
+			$zvol_exists = false;
+		}
+		if ($zvol_exists) {
+			$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);
+			}
 		}
 
 	}