1.3.0

Rello · Sep 23, 2021 · 3fe9264 · 3fe9264
1 parent 85ae86c
commit 3fe9264
Show file tree

Hide file tree

Showing 18 changed files with 27 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,7 @@
 # Changelog
 All notable changes to the Audio Player SONOS project will be documented in this file.
 
-## 1.3.0 - 2021-09-21
+## 1.3.0 - 2021-09-23
 ### Changed
 - more NC compatibility
 - updated event listener

diff --git a/README.md b/README.md
@@ -2,14 +2,13 @@
 
 [![Version](https://img.shields.io/github/release/rello/audioplayer_sonos.svg)](https://github.com/rello/audioplayer_sonos/blob/master/CHANGELOG.md)&#160;[![License: AGPLv3](https://img.shields.io/badge/license-AGPLv3-blue.svg)](http://www.gnu.org/licenses/agpl-3.0)&#160;&#160;&#160;[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/rello/audioplayer_sonos/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/rello/audioplayer_sonos/?branch=master)&#160;&#160;&#160;[![Bitcoin](https://img.shields.io/badge/donate-Bitcoin-blue.svg)](https://github.com/rello/audioplayer/wiki/donate)&#160;[![PayPal](https://img.shields.io/badge/donate-PayPal-blue.svg)](https://github.com/rello/audioplayer/wiki/donate)
 
-SONOS Playback add-on for the Audio Player in Nextcloud and ownCloud.
+SONOS Playback add-on for the Audio Player in Nextcloud.
 
 ## Features
 - Play your local library on your SONOS speaker
 
 ## Installation
 - [Nextcloud App Store](https://apps.nextcloud.com/apps/audioplayer_sonos)
-- [ownCloud Marketplace](https://marketplace.owncloud.com/apps/audioplayer_sonos)
 
 This is not an independent app! 
 You have to install the [Audio Player](https://github.com/rello/audioplayer "Audio Player for Nextcloud and ownCloud") app (as of v2.8) to use this add-on.

diff --git a/_config.yml b/_config.yml
@@ -4,6 +4,6 @@ theme: jekyll-theme-cayman
 timezone: Europe/Berlin
 name: "Audio Player - SONOS"
 title: "Audio Player SONOS"
-description: "Audio Player SONOS for Nextcloud and ownCloud"
+description: "Audio Player SONOS for Nextcloud"
 url: "https://github.com/rello/audioplayer_sonos"
 author: "Marcel Scherello"
diff --git a/appinfo/routes.php b/appinfo/routes.php
@@ -6,7 +6,7 @@
  * later. See the LICENSE.md file.
  *
  * @author Marcel Scherello <audioplayer@scherello.de>
- * @copyright 2019 Marcel Scherello
+ * @copyright 2016-2021 Marcel Scherello
  */
 
 return [

diff --git a/css/sonos.css b/css/sonos.css
@@ -5,7 +5,7 @@
  * later. See the LICENSE.md file.
  *
  * @author Marcel Scherello <audioplayer@scherello.de>
- * @copyright 2016-2019 Marcel Scherello
+ * @copyright 2016-2021 Marcel Scherello
  */
 
 .sm2-inline-button.volume-shade {

diff --git a/js/settings/admin.js b/js/settings/admin.js
@@ -5,7 +5,7 @@
  * later. See the LICENSE.md file.
  *
  * @author Marcel Scherello <audioplayer@scherello.de>
- * @copyright 2016-2019 Marcel Scherello
+ * @copyright 2016-2021 Marcel Scherello
  */
 
 'use strict';

diff --git a/js/settings/personal.js b/js/settings/personal.js
@@ -5,7 +5,7 @@
  * later. See the LICENSE.md file.
  *
  * @author Marcel Scherello <audioplayer@scherello.de>
- * @copyright 2016-2019 Marcel Scherello
+ * @copyright 2016-2021 Marcel Scherello
  */
 
 'use strict';

diff --git a/js/sonos.js b/js/sonos.js
@@ -5,7 +5,7 @@
  * later. See the LICENSE.md file.
  *
  * @author Marcel Scherello <audioplayer@scherello.de>
- * @copyright 2016-2019 Marcel Scherello
+ * @copyright 2016-2021 Marcel Scherello
  */
 
 /* global Audios */

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -6,7 +6,7 @@
  * later. See the LICENSE.md file.
  *
  * @author Marcel Scherello <audioplayer@scherello.de>
- * @copyright 2019 Marcel Scherello
+ * @copyright 2016-2021 Marcel Scherello
  */
 
 namespace OCA\audioplayer_sonos\AppInfo;

diff --git a/lib/Controller/DbController.php b/lib/Controller/DbController.php
@@ -6,7 +6,7 @@
  * later. See the LICENSE.md file.
  *
  * @author Marcel Scherello <audioplayer@scherello.de>
- * @copyright 2019 Marcel Scherello
+ * @copyright 2016-2021 Marcel Scherello
  */
 
 namespace OCA\audioplayer_sonos\Controller;

diff --git a/lib/Controller/SettingController.php b/lib/Controller/SettingController.php
@@ -6,7 +6,7 @@
  * later. See the LICENSE.md file.
  *
  * @author Marcel Scherello <audioplayer@scherello.de>
- * @copyright 2016-2019 Marcel Scherello
+ * @copyright 2016-2021 Marcel Scherello
  */
 
 namespace OCA\audioplayer_sonos\Controller;

diff --git a/lib/Controller/SonosController.php b/lib/Controller/SonosController.php
@@ -6,7 +6,7 @@
  * later. See the LICENSE.md file.
  *
  * @author Marcel Scherello <audioplayer@scherello.de>
- * @copyright 2016-2019 Marcel Scherello
+ * @copyright 2016-2021 Marcel Scherello
  */
 
 namespace OCA\audioplayer_sonos\Controller;
@@ -76,6 +76,7 @@ public function setQueue($trackArray, $fileIndex)
  $nodes = $this->rootFolder->getUserFolder($this->userId)->getById($fileId);
  $file = array_shift($nodes);
  $link = $this->smbFilePath($file);
+ //$this->logger->error($link);
  $sonos->AddToQueue($link);
  }
 
@@ -147,16 +148,15 @@ private function getDeviceByIp($ip)
  private function smbFilePath($file)
  {
 
+ $link = $file->getInternalPath();
  $segments = explode(':', $file->getMountPoint()->getStorageId());
  $type = $segments[0];
 
- $path = $file->getPath();
- $path_segments = explode('/', trim($path, '/'), 3);
- $link = '';
- $this->logger->debug($file->getMountPoint().' '.$path.' '.$type, array('app' => 'audioplayer_sonos'));
-
- if ($type === 'smb') $link = $file->getInternalPath();
- if ($type === 'shared') $link = $path_segments[2];
+ if ($type === 'shared') {
+ $path = $file->getPath();
+ $path_segments = explode('/', trim($path, '/'), 3);
+ $link = $path_segments[2];
+ }
 
  return 'x-file-cifs://' . $this->smb_path . rawurlencode($link);
  }
@@ -281,15 +281,15 @@ public function getStatus()
  */
  public function getDebugInfo($trackid)
  {
- $smb_path = $this->configManager->getUserValue($this->userId, $this->appName, 'sonos_smb_path');
+ $this->smb_path = $this->configManager->getUserValue($this->userId, $this->appName, 'sonos_smb_path');
  $fileId = $this->DBController->getFileId($trackid);
  $nodes = $this->rootFolder->getUserFolder($this->userId)->getById($fileId);
  $file = array_shift($nodes);
 
  if ($file) $link = $this->smbFilePath($file);
 
  $result = [
- 'smb' => $smb_path,
+ 'smb' => $this->smb_path,
  'sonos' => $link
  ];
 

diff --git a/lib/Listener/LoadAdditionalScripts.php b/lib/Listener/LoadAdditionalScripts.php
@@ -9,7 +9,7 @@
  * later. See the LICENSE.md file.
  *
  * @author Marcel Scherello <audioplayer@scherello.de>
- * @copyright 2019 Marcel Scherello
+ * @copyright 2016-2021 Marcel Scherello
  */
 
 namespace OCA\audioplayer_sonos\Listener;

diff --git a/lib/Settings/Admin.php b/lib/Settings/Admin.php
@@ -6,7 +6,7 @@
  * later. See the LICENSE.md file.
  *
  * @author Marcel Scherello <audioplayer@scherello.de>
- * @copyright 2016-2019 Marcel Scherello
+ * @copyright 2016-2021 Marcel Scherello
  */
 
 namespace OCA\audioplayer_sonos\Settings;

diff --git a/lib/Settings/Personal.php b/lib/Settings/Personal.php
@@ -6,7 +6,7 @@
  * later. See the LICENSE.md file.
  *
  * @author Marcel Scherello <audioplayer@scherello.de>
- * @copyright 2016-2019 Marcel Scherello
+ * @copyright 2016-2021 Marcel Scherello
  */
 
 namespace OCA\audioplayer_sonos\Settings;

diff --git a/templates/part.sonos-bar.php b/templates/part.sonos-bar.php
@@ -6,7 +6,7 @@
  * later. See the LICENSE.md file.
  *
  * @author Marcel Scherello <audioplayer@scherello.de>
- * @copyright 2016-2019 Marcel Scherello
+ * @copyright 2016-2021 Marcel Scherello
  */
 ?>
 <div class="sm2-bar-ui full-width">

diff --git a/templates/settings/admin.php b/templates/settings/admin.php
@@ -6,7 +6,7 @@
  * later. See the LICENSE.md file.
  *
  * @author Marcel Scherello <audioplayer@scherello.de>
- * @copyright 2016-2019 Marcel Scherello
+ * @copyright 2016-2021 Marcel Scherello
  */
 
 script('audioplayer_sonos', 'settings/admin');

diff --git a/templates/settings/personal.php b/templates/settings/personal.php
@@ -6,7 +6,7 @@
  * later. See the LICENSE.md file.
  *
  * @author Marcel Scherello <audioplayer@scherello.de>
- * @copyright 2016-2019 Marcel Scherello
+ * @copyright 2016-2021 Marcel Scherello
  */
 
 script('audioplayer_sonos', 'settings/personal');