Modified constructors in Zvol, Dataset and Snapshot classes.

[omvzfs.git] / src / Snapshot.php

diff --git a/src/Snapshot.php b/src/Snapshot.php
index 23231fe5bf5084294fb678135eed6806e0e89853..afd189c2f082055ddfd31fa72b473d304494c1ed 100644 (file)
--- 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) {
                }
        }
 
@@ -124,8 +122,12 @@ class OMVModuleZFSSnapshot {
                $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]);
+                       }
                }
        }
 
@@ -143,6 +145,17 @@ class OMVModuleZFSSnapshot {
                $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);
+       }
+
        /**
         * Helper function to execute a command and throw an exception on error
         * (requires stderr redirected to stdout for proper exception message).