Minor change to clarify shared folder creation.

[omvzfs.git] / src / Dataset.php

diff --git a/src/Dataset.php b/src/Dataset.php
index c766f4e699ce2619a982d2df22a4bfc60e9b75b1..65cca318d0af348f3eedb45b4458e4d84355ad1a 100644 (file)
--- a/src/Dataset.php
+++ b/src/Dataset.php
@@ -56,24 +56,25 @@ class OMVModuleZFSDataset {
         * @access public
         */
        public function __construct($name) {
+               $ds_exists = true;
                $this->name = $name;
-               $qname = preg_quote($name, '/');
-               $cmd = "zfs list -H";
-               $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"];
                }
-               $qname = preg_quote($name . "@", '/');
-               $cmd = "zfs list -H -t snapshot";
-               $this->exec($cmd, $out, $res);
-               foreach ($out as $line) {
-                       if (preg_match('/^(' . $qname . '[^\s]+)\t.*$/', $line, $res)) {
-                               $this->snapshots[$res[1]] = new OMVModuleZFSSnapshot($res[1]);
+               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();
                }
        }
 
@@ -104,14 +105,19 @@ class OMVModuleZFSDataset {
         * @access public
         */
        public function getSnapshots() {
-               return $this->snapshots;
+               if (isset($this->snapshots)) {
+                       return $this->snapshots;
+               } else {
+                       return array();
+               }
        }
 
        /**
         * Get a single property value associated with the Dataset
-        *
+        * 
         * @param string $property Name of the property to fetch
-        * @return array The returned array key 0=property value and key 1=property source.
+        * @return array The returned array with the property. The property is an associative array with
+        * two elements, <value> and <source>.
         * @access public
         */
        public function getProperty($property) {
@@ -119,11 +125,10 @@ class OMVModuleZFSDataset {
        }
 
        /**
-        * Get an associative array of all properties associated with the Dataset.
-        *
-        * @return array $properties Each entry is an array where key 0=property value and key
-        * 1=property source.
-        *
+        * Get an associative array of all properties associated with the Snapshot
+        * 
+        * @return array $properties Each entry is an associative array with two elements
+        * <value> and <source>
         * @access public
         */
        public function getProperties() {
@@ -139,7 +144,7 @@ class OMVModuleZFSDataset {
         */
        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);
                }
@@ -152,7 +157,7 @@ class OMVModuleZFSDataset {
         * @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) {
@@ -169,24 +174,22 @@ class OMVModuleZFSDataset {
         * @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]);
        }
 
        /**
-        * 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"];
        }
 
@@ -197,7 +200,7 @@ class OMVModuleZFSDataset {
         * @access public
         */
        public function destroy() {
-               $cmd = "zfs destroy " . $this->name;
+               $cmd = "zfs destroy " . $this->name . " 2>&1";
                $this->exec($cmd,$out,$res);
        }
 
@@ -290,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).