[Slim-Checkins] r10036 - in /branches/6.5/server: Changelog6.html Slim/Utils/PluginManager.pm

[dsully at svn.slimdevices.com]

Author: dsully
Date: Mon Sep 25 14:23:00 2006
New Revision: 10036

URL: http://svn.slimdevices.com?rev=10036&view=rev
Log:
Bug: 4169
Description: Merge from trunk -r 10034:10035

Modified:
    branches/6.5/server/Changelog6.html
    branches/6.5/server/Slim/Utils/PluginManager.pm

Modified: branches/6.5/server/Changelog6.html
URL: http://svn.slimdevices.com/branches/6.5/server/Changelog6.html?rev=10036&r1=10035&r2=10036&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Mon Sep 25 14:23:00 2006
@@ -10,6 +10,7 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4156">#4156</a> - slimtray should install the service if it's not already installed when starting</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4159">#4159</a> - second screen needs to be blank when prompting for software update on transporter</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4168">#4168</a> - Live365 plugin fails in 6.5.0</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4169">#4169</a> - Core Plugins need all non EN HTML paths removed when upgrading from pre-6.5</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4171">#4171</a> - Default2 redirect to Default.</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4173">#4173</a> - press right to add to favorites option disappears once you've used it, until you restart server</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4173">#4178</a> - Live365 stations don't have a note symbol</li>

Modified: branches/6.5/server/Slim/Utils/PluginManager.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Utils/PluginManager.pm?rev=10036&r1=10035&r2=10036&view=diff
==============================================================================
--- branches/6.5/server/Slim/Utils/PluginManager.pm (original)
+++ branches/6.5/server/Slim/Utils/PluginManager.pm Mon Sep 25 14:23:00 2006
@@ -18,6 +18,7 @@
 use File::Basename qw(dirname);
 use File::Spec::Functions qw(:ALL);
 use File::Spec::Functions qw(updir);
+use Path::Class;
 
 use Slim::Utils::Misc;
 use Slim::Utils::OSDetect;
@@ -53,6 +54,35 @@
 	# directory. @INC needs the path one level up. IE:
 	# /usr/share/slimserver, so that modules can be loaded properly
 	unshift @INC, (map { dirname($_) } @pluginDirs);
+
+	# Bug 4169
+	# Remove non-EN HTML paths for core plugins
+	my @corePlugins = qw(Live365 MoodLogic MusicMagic RandomPlay);
+
+	for my $path (@pluginDirs) {
+
+		for my $plugin (@corePlugins) {
+
+			my $htmlDir = catdir($path, $plugin, 'HTML');
+			my $okDir   = catdir($path, $plugin, 'HTML', 'EN');
+
+			if (!-d $htmlDir) {
+				next;
+			}
+
+			my $dir = dir($htmlDir);
+
+			for my $subDir ($dir->children) {
+
+				if ($subDir ne $okDir && $subDir->is_dir) {
+
+					$::d_plugin && msg("Removing old non-EN HTML files from core Plugins: [$subDir]\n");
+
+					$subDir->rmtree;				
+				}
+			}
+		}
+	}
 }
 
 sub pluginDirs {