Changed properties attribute to an associative array to get cleaner code

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

diff --git a/src/Dataset.php b/src/Dataset.php
index 58106c0ea3418ffb14bb724e55370ca0f5df11fd..f053faec54e05ff33781b8dcf4efb2a7378a598c 100644 (file)
--- a/src/Dataset.php
+++ b/src/Dataset.php
@@ -27,7 +27,7 @@ class OMVModuleZFSDataset {
     private $mountPoint;
 
     /**
-     * List of properties assigned to the Dataset
+     * Array with properties assigned to the Dataset
      *
      * @var    array $properties
      * @access private
@@ -41,36 +41,19 @@ class OMVModuleZFSDataset {
         * Constructor
         *
         * @param string $name Name of the new Dataset
-        * @param array $properties An array of properties (strings) in the form <key>=<value> to set when creating the Dataset
+        * @param array $properties An associative array with properties to set when creating the Dataset
         * @throws OMVModuleZFSException
         *
         */
        public function __construct($name, array $properties = null) {
-               $cmd = "zfs create ";
-               if (isset($properties)) {
-                       foreach ($properties as $property) {
-                               $cmd .= "-o " . $property . " ";
-                       }
-               }
-               $cmd .= $name . " 2>&1";
+               $cmd = "zfs create " . $name . " 2>&1";
                OMVUtil::exec($cmd,$out,$res);
                if ($res) {
                        throw new OMVModuleZFSException(implode("\n", $out));
                }
-               unset($res);
                $this->name = $name;
-               if (isset($properties)) {
-                       $this->properties = $properties;
-                       foreach ($properties as $property) {
-                               if (preg_match('/^mountpoint\=(.*)$/', $property, $res)) {
-                                       $this->mountPoint = $res[1];
-                                       continue;
-                               }
-                       }
-               } else {
-                       $this->properties = array();
-                       $this->mountPoint = "/" . $name;
-               }
+               $this->setProperties($properties);
+               $this->mountPoint = $this->properties["mountpoint"];
        }
 
        /**
@@ -94,7 +77,18 @@ class OMVModuleZFSDataset {
        }
 
        /**
-        * Get an array of properties associated with the Dataset
+        * Get a single property value associated with the Dataset
+        *
+        * @param string $property Name of the property to fetch
+        * @return string
+        * @access public
+        */
+       public function getProperty($property) {
+               return $this->properties["$property"];
+       }
+
+       /**
+        * Get an array of all properties associated with the Dataset
         *
         * @return array $properties
         * @access public
@@ -106,43 +100,51 @@ class OMVModuleZFSDataset {
        /**
         * Sets a number of Dataset properties. If a property is already set it will be updated with the new value.
         *
-        * @param  array $properties An array of strings in format <key>=<value>
+        * @param  array $properties An associative array with properties to set
         * @return void
         * @access public
         */
        public function setProperties($properties) {
-               foreach ($properties as $newproperty) {
-                       $cmd = "zfs set " . $newproperty . " " . $this->name;
+               foreach ($properties as $newpropertyk => $newpropertyv) {
+                       $cmd = "zfs set " . $newpropertyk . "=" . $newpropertyv . " " . $this->name;
                        OMVUtil::exec($cmd,$out,$res);
                        if ($res) {
                                throw new OMVModuleZFSException(implode("\n", $out));
                        }
-                       $tmp = explode("=", $newproperty);
-                       $newpropertyk = $tmp[0];
-                       $found = false;
-                       for ($i=0; $i<count($this->properties); $i++) {
-                               $tmp = explode("=", $this->properties[$i]);
-                               $oldpropertyk = $tmp[0];
-                               if (strcmp($newpropertyk, $oldpropertyk) == 0) {
-                                       $this->properties[$i] = $newproperty;
-                                       $found = true;
-                                       continue;
-                               }
-                       }
-                       if (!$found) {
-                               array_push($this->properties, $newproperty);
-                       }
+                       $this->properties["$newpropertyk"] = $newpropertyv;
+               }
+               $this->updateAllProperties();
+       }
+
+       /**
+        * Get all Dataset properties from commandline and update object properties attribute
+        *
+        * @throws OMVModuleZFSException
+        * @access private
+        */ 
+       private function updateAllProperties() {
+               $cmd = "zfs get -H all " . $this->name;
+               OMVUtil::exec($cmd,$out,$res);
+               if ($res) {
+                       throw new OMVModuleZFSException(implode("\n", $out));
+               }
+               unset($this->properties);
+               foreach ($out as $line) {
+                       $tmpary = preg_split('/\t+/', $line);
+                       $this->properties["$tmpary[1]"] = $tmpary[2];
                }
        }
 
        /**
         * Destroy the Dataset.
         *
+        * @throws OMVModuleZFSException
+        * @access public
         */
        public function destroy() {
                $cmd = "zfs destroy " . $this->name;
                OMVUtil::exec($cmd,$out,$res);
-               if ($res == 1) {
+               if ($res) {
                        throw new OMVModuleZFSException(implode("\n", $out));
                }
        }