added getter to initial data of playlist and instance

Author: mxschmitt

src/API.class.php

@@ -85,7 +85,7 @@ public function getPlaylists()
         $playlists = $this->request('/bot/playlists');
         $out = [];
         foreach ($playlists as $playlist) {
-            array_push($out, new Playlist($this->token, $this->url, $this->timeout, $playlist["uuid"]));
+            array_push($out, new Playlist($this->token, $this->url, $this->timeout, $playlist));
         }
         return $out;
     }
@@ -101,7 +101,7 @@ public function createPlaylist($playlistName)
         $resp = $this->request('/bot/playlists', 'POST', [
         "name" => $playlistName,
         ]);
-        return new Playlist($this->token, $this->url, $this->timeout, $resp["uuid"]);
+        return new Playlist($this->token, $this->url, $this->timeout, $resp);
     }
 
   /**
@@ -398,7 +398,7 @@ public function getInstances()
         $instances =  $this->request('/bot/instances');
         $out = [];
         foreach ($instances as $instance) {
-            array_push($out, new Instance($this->token, $this->url, $this->timeout, $instance["uuid"]));
+            array_push($out, new Instance($this->token, $this->url, $this->timeout, $instance));
         }
         return $out;
     }

src/Instance.class.php

@@ -23,6 +23,11 @@ class Instance extends RestClient
   */
     public $uuid = null;
   /**
+  * Instance stores the initial received instance data
+  * @var array
+  */
+  private $instance = null;
+  /**
   * __construct
   *
   * @param  string  $token    SinusBot auth token
@@ -31,35 +36,78 @@ class Instance extends RestClient
   * @param  array   $instance SinusBot Instance array.
   * @return void
   */
-    public function __construct($token, $url, $timeout, $uuid)
+    public function __construct($token, $url, $timeout, $instance)
     {
         $this->token = $token;
         $this->url = $url;
         $this->timeout = $timeout;
-        $this->uuid = $uuid;
+        $this->uuid = $instance['uuid'];
+        $this->instance = $instance;
     }
   /**
   * isPlaying returns true when the instance is playing something
   *
-  * @param  string  $instanceUUID  UUID of the SinusBot instance
   * @return boolean
   */
     public function isPlaying()
     {
-        return $this->getStatus()['playing'];
+        return $this->instance['playing'];
     }
 
   /**
   * isRunning returns true when the instance is running
   *
-  * @param  string  $instanceUUID  UUID of the SinusBot instance
   * @return boolean
   */
     public function isRunning()
     {
-        return $this->getStatus()['running'];
+        return $this->instance['running'];
     }
-
+  /**
+  * getBackend returns the SinusBot backend (Discord, TS³)
+  *
+  * @return string instance backend
+  */
+  public function getBackend()
+  {
+      return $this->instance['backend'];
+  }
+  /**
+  * getNick returns the Bot's nickname
+  *
+  * @return string nick
+  */
+  public function getNick()
+  {
+      return $this->instance['nick'];
+  }
+  /**
+  * getName returns the Bot's name
+  *
+  * @return string name
+  */
+  public function getName()
+  {
+      return $this->instance['name'];
+  }
+  /**
+  * getServerHost returns the Bot's server host
+  *
+  * @return string host
+  */
+  public function getServerHost()
+  {
+      return $this->instance['serverHost'];
+  }
+  /**
+  * getServerPort returns the Bot's server port
+  *
+  * @return string port
+  */
+  public function getServerPort()
+  {
+      return $this->instance['serverPort'];
+  }
   /**
   * delete deletes the instance
   *

src/Playlist.class.php

@@ -23,6 +23,11 @@ class Playlist extends RestClient
   */
     public $uuid = null;
   /**
+  * Playlist stores the initial received playlist data
+  * @var array
+  */
+  private $playlist = null;
+  /**
   * __construct
   *
   * @param  string  $token    SinusBot auth token
@@ -31,12 +36,13 @@ class Playlist extends RestClient
   * @param  array   $playlist SinusBot Playlist array.
   * @return void
   */
-    public function __construct($token, $url, $timeout, $uuid)
+    public function __construct($token, $url, $timeout, $playlist)
     {
         $this->token = $token;
         $this->url = $url;
         $this->timeout = $timeout;
-        $this->uuid = $uuid;
+        $this->uuid = $playlist['uuid'];
+        $this->playlist = $playlist;
     }
 
   /**
@@ -60,8 +66,35 @@ public function getPlaylistTracks()
     {
         return $this->request('/bot/playlists/'.$this->uuid);
     }
+  /**
+  * getName returns the name of the playlist
+  *
+  * @return string name
+  */
+  public function getName()
+  {
+      return array_key_exists('name', $this->playlist)?$this->playlist['name']:'';
+  }
+  /**
+  * getEntries returns the track entries
+  *
+  * @return array track entries
+  */
+  public function getEntries()
+  {
+      return array_key_exists('entries', $this->playlist)?$this->playlist['entries']:'';
+  }
+  /**
+  * getSource returns the source of the playlist
+  *
+  * @return string source
+  */
+  public function getSource()
+  {
+      return array_key_exists('source', $this->playlist)?$this->playlist['source']:'';
+  }
 
-/**
+ /**
   * addPlaylistTrack adds a track to the playlist
   *
   * @param string $trackUUID uuid of the track