[Slim-Checkins] r11760 - in /branches/6.5/server: Changelog6.html Slim/Buttons/BrowseTree.pm Slim/Music/Info.pm Slim/Web/Pages/BrowseTree.pm

[mherger at svn.slimdevices.com]

Author: mherger
Date: Thu Apr 12 23:55:17 2007
New Revision: 11760

URL: http://svn.slimdevices.com?rev=11760&view=rev
Log:
Bug: 4902
Description: 
- correctly display and follow Windows shortcuts pointing to another drive
- fix an issue with the BMF path display on the player

Modified:
    branches/6.5/server/Changelog6.html
    branches/6.5/server/Slim/Buttons/BrowseTree.pm
    branches/6.5/server/Slim/Music/Info.pm
    branches/6.5/server/Slim/Web/Pages/BrowseTree.pm

Modified: branches/6.5/server/Changelog6.html
URL: http://svn.slimdevices.com/branches/6.5/server/Changelog6.html?rev=11760&r1=11759&r2=11760&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Thu Apr 12 23:55:17 2007
@@ -46,6 +46,7 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4852">#4852</a> - down arrow moves song to 2nd position in playlist</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4872">#4872</a> - Installer: Error creating INI entry in Logitech.url</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4891">#4891</a> - "Play this song" and "Add this song to playlist" links are not always visible.</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4902">#4902</a> - BMF: correctly display and follow Windows shortcuts pointing to a drive; fix an issue with the path display on the player interface</li>
 	</ul>
 	<br />
 	<li>Other:

Modified: branches/6.5/server/Slim/Buttons/BrowseTree.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Buttons/BrowseTree.pm?rev=11760&r1=11759&r2=11760&view=diff
==============================================================================
--- branches/6.5/server/Slim/Buttons/BrowseTree.pm (original)
+++ branches/6.5/server/Slim/Buttons/BrowseTree.pm Thu Apr 12 23:55:17 2007
@@ -386,12 +386,14 @@
 	} else {
 
 		# one level down we show the folder name, below that we show two levels
-		my $level = (scalar @levels > 2) ? $levels[-2] : $levels[-1];
-		my $obj   = Slim::Schema->find('Track', $level);
-
-		if (blessed($obj) && $obj->can('title')) {
-
-			push @headers, $obj->title;
+		for (my $x = (scalar @levels > 2 ? -2 : -1); $x <= -1; $x++) {
+
+			my $obj   = Slim::Schema->find('Track', $levels[$x]);
+	
+			if (blessed($obj) && $obj->can('title')) {
+	
+				push @headers, ($obj->title ? $obj->title : Slim::Music::Info::fileName($obj->url));
+			}
 		}
 	}
 	

Modified: branches/6.5/server/Slim/Music/Info.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Music/Info.pm?rev=11760&r1=11759&r2=11760&view=diff
==============================================================================
--- branches/6.5/server/Slim/Music/Info.pm (original)
+++ branches/6.5/server/Slim/Music/Info.pm Thu Apr 12 23:55:17 2007
@@ -640,7 +640,7 @@
 
 		$j = Slim::Utils::Misc::pathFromFileURL($j);
 
-		if ($j) {
+		if ($j && (splitdir($j))[1]) {
 			$j = (splitdir($j))[-1];
 		}
 

Modified: branches/6.5/server/Slim/Web/Pages/BrowseTree.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Web/Pages/BrowseTree.pm?rev=11760&r1=11759&r2=11760&view=diff
==============================================================================
--- branches/6.5/server/Slim/Web/Pages/BrowseTree.pm (original)
+++ branches/6.5/server/Slim/Web/Pages/BrowseTree.pm Thu Apr 12 23:55:17 2007
@@ -52,9 +52,11 @@
 
 			push @{$params->{'pwd_list'}}, {
 				'hreftype'     => 'browseTree',
-				'title'        => $i == 0 ? string('MUSIC') : $obj->title,
+				'title'        => $i == 0 ? string('MUSIC') : 
+						($obj->title ? $obj->title : Slim::Music::Info::fileName($obj->url)),
 				'hierarchy'    => join('/', @levels[0..$i]),
 			};
+
 		}
 	}
 
@@ -76,7 +78,7 @@
 	if ($count) {
 		my %form = %$params;
 
-		$form{'hierarchy'}	  = undef;
+		$form{'hierarchy'}   = undef;
 		$form{'descend'}     = 1;
 		$form{'text'}        = string('ALL_SONGS');
 		$form{'itemobj'}     = $topLevelObj;