Merge pull request #627 from philippe44/8.2-misc

allow explodePlaylist to return an OPML object
LMS-Community · Jun 30, 2021 · 3d5fa12 · 3d5fa12
2 parents 7b89951 + 681d320
commit 3d5fa12
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/Slim/Control/Commands.pm b/Slim/Control/Commands.pm
@@ -1424,6 +1424,12 @@ sub playlistXitemCommand {
 	if ( $handler && $handler->can('explodePlaylist') ) {
 		$handler->explodePlaylist($client, $path, sub {
 			my $tracks = shift;
+			# transform opml list into url array if needed
+			if (ref $tracks eq 'HASH') {
+				$tracks = [ map { 
+					$_->{play} || $_->{url} 
+				} @{$tracks->{items}} ];
+			}	
 			$client->execute(['playlist', $cmd . 'tracks' , 'listRef', $tracks, $fadeIn]);
 			$request->setStatusDone();
 		});

diff --git a/Slim/Formats/XML.pm b/Slim/Formats/XML.pm
@@ -93,6 +93,10 @@ sub getFeedAsync {
 		$handler->explodePlaylist($params->{client}, $url, sub {
 			my ($tracks) = @_;
 
+			# explode playlist might return a full opml list	
+			return $cb->($tracks, $params) if ref $tracks eq 'HASH';
+
+			# if not, this is just an array of url
 			return $cb->({
 				'type'  => 'opml',
 				'title' => '',