Fix playlist dir issue (bug #416923)

(Portage version: 2.1.10.56/cvs/Linux x86_64)

4 files changed, 47 insertions, 7 deletions

diff --git a/media-sound/logitechmediaserver-bin/ChangeLog b/media-sound/logitechmediaserver-bin/ChangeLog
index b33aef5dfb3e..e40087d3e27b 100644
--- a/media-sound/logitechmediaserver-bin/ChangeLog
+++ b/media-sound/logitechmediaserver-bin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/logitechmediaserver-bin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/logitechmediaserver-bin/ChangeLog,v 1.3 2012/04/28 23:47:34 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/logitechmediaserver-bin/ChangeLog,v 1.4 2012/05/30 18:45:33 lavajoe Exp $
+
+*logitechmediaserver-bin-7.7.2-r1 (30 May 2012)
+
+  30 May 2012; Joe Peterson <lavajoe@gentoo.org>
+  -logitechmediaserver-bin-7.7.2.ebuild,
+  +logitechmediaserver-bin-7.7.2-r1.ebuild,
+  +files/logitechmediaserver-bin-7.7.2-client-playlists-gentoo.patch,
+  files/gentoo-filepaths.pm:
+  Fix playlist dir issue (bug #416923)
 
   28 Apr 2012; Joe Peterson <lavajoe@gentoo.org>
   files/logitechmediaserver.init.d:
diff --git a/media-sound/logitechmediaserver-bin/files/gentoo-filepaths.pm b/media-sound/logitechmediaserver-bin/files/gentoo-filepaths.pm
index 67054f1207f1..5e94c14758c5 100644
--- a/media-sound/logitechmediaserver-bin/files/gentoo-filepaths.pm
+++ b/media-sound/logitechmediaserver-bin/files/gentoo-filepaths.pm
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/logitechmediaserver-bin/files/gentoo-filepaths.pm,v 1.1 2012/04/12 05:56:03 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/logitechmediaserver-bin/files/gentoo-filepaths.pm,v 1.2 2012/05/30 18:45:33 lavajoe Exp $
 
 # This file contains a custom OS package to provide information on the
 # installation structure on Gentoo.
@@ -38,21 +38,34 @@ sub dirsFor {
 	my ($class, $dir) = @_;
 
 	my @dirs = ();
-	
-	# Use the default behaviour to locate the directory.
-	push @dirs, $class->SUPER::dirsFor($dir);
 
 	# Overrides for specific directories.
 	if ($dir eq 'Plugins') {
 
-		# User-installed plugins are in a different place.
+		# Look in the normal places.
+		push @dirs, $class->SUPER::dirsFor($dir);
+
+		# User-installed plugins are in a different place, so add it.
 		push @dirs, '/var/lib/logitechmediaserver/Plugins';
 
+	} elsif ($dir eq 'ClientPlaylists') {
+
+		# LMS would normally try to put client playlists in the prefs
+		# directory, but they aren't really prefs since they're dynamic
+		# state of the clients. Effectively, they're the same as the
+		# database cache, so we move these under /var/lib.
+		push @dirs, '/var/lib/logitechmediaserver/ClientPlaylists';
+
 	} elsif ($dir =~ /^(?:prefs)$/) {
 
 		# Server and plugin preferences are in a different place.
 		push @dirs, $::prefsdir || '/etc/logitechmediaserver';
 
+	} else {
+
+		# Use the default behaviour to locate the directory.
+		push @dirs, $class->SUPER::dirsFor($dir);
+
 	}
 
 	return wantarray() ? @dirs : $dirs[0];
diff --git a/media-sound/logitechmediaserver-bin/files/logitechmediaserver-bin-7.7.2-client-playlists-gentoo.patch b/media-sound/logitechmediaserver-bin/files/logitechmediaserver-bin-7.7.2-client-playlists-gentoo.patch
new file mode 100644
index 000000000000..ecd614509fa2
--- /dev/null
+++ b/media-sound/logitechmediaserver-bin/files/logitechmediaserver-bin-7.7.2-client-playlists-gentoo.patch
@@ -0,0 +1,11 @@
+--- Slim/Player/Playlist.pm.orig	2012-05-29 12:52:03.351548099 +0100
++++ Slim/Player/Playlist.pm	2012-05-29 12:52:32.676570561 +0100
+@@ -1042,7 +1042,7 @@
+ 	$id =~ s/://g;
+ 
+ 	return Slim::Utils::Misc::fileURLFromPath(
+-		catfile(Slim::Utils::OSDetect::dirsFor('prefs'), "clientplaylist_$id.m3u")
++		catfile(Slim::Utils::OSDetect::dirsFor('ClientPlaylists'), "clientplaylist_$id.m3u")
+ 	);
+ }
+ 
diff --git a/media-sound/logitechmediaserver-bin/logitechmediaserver-bin-7.7.2.ebuild b/media-sound/logitechmediaserver-bin/logitechmediaserver-bin-7.7.2-r1.ebuild
index 5be98fae7a96..ca9ded1cc470 100644
--- a/media-sound/logitechmediaserver-bin/logitechmediaserver-bin-7.7.2.ebuild
+++ b/media-sound/logitechmediaserver-bin/logitechmediaserver-bin-7.7.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/logitechmediaserver-bin/logitechmediaserver-bin-7.7.2.ebuild,v 1.2 2012/04/12 14:25:32 lavajoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/logitechmediaserver-bin/logitechmediaserver-bin-7.7.2-r1.ebuild,v 1.1 2012/05/30 18:45:33 lavajoe Exp $
 
 EAPI="3"
 
@@ -530,6 +530,7 @@ VARDIR="/var/lib/${MY_PN}"
 CACHEDIR="${VARDIR}/cache"
 USRPLUGINSDIR="${VARDIR}/Plugins"
 SVRPLUGINSDIR="${CACHEDIR}/InstalledPlugins"
+CLIENTPLAYLISTSDIR="${VARDIR}/ClientPlaylists"
 PREFSDIR="/etc/${MY_PN}"
 LOGDIR="/var/log/${MY_PN}"
 SVRPREFS="${PREFSDIR}/server.prefs"
@@ -550,6 +551,7 @@ pkg_setup() {
 src_prepare() {
 	# Apply patches
 	epatch "${FILESDIR}/${P}-uuid-gentoo.patch"
+	epatch "${FILESDIR}/${P}-client-playlists-gentoo.patch"
 }
 
 src_install() {
@@ -603,6 +605,11 @@ src_install() {
 	fowners ${RUN_UID}:${RUN_GID} "${USRPLUGINSDIR}"
 	fperms 770 "${USRPLUGINSDIR}"
 
+	# Initialise the client playlists directory
+	dodir "${CLIENTPLAYLISTSDIR}"
+	fowners ${RUN_UID}:${RUN_GID} "${CLIENTPLAYLISTSDIR}"
+	fperms 770 "${CLIENTPLAYLISTSDIR}"
+
 	# Install logrotate support
 	insinto /etc/logrotate.d
 	newins "${FILESDIR}/logitechmediaserver.logrotate.d" "${MY_PN}"