Added a new Utils class with support methods.

[omvzfs.git] / src / Snapshot.php

diff --git a/src/Snapshot.php b/src/Snapshot.php
index c25dc9c62c497769a52cbe739f34a1b5251252a0..b30def21c05864a622e5ddb6aa6031c1ee3e68c6 100644 (file)
--- 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,40 @@ 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);
        }
 
        /**