+ Button at the top now lights up to let you know what mode you're at.

+ 'Add' and 'Play' buttons now recurse down the file tree. Be careful about hitting this button at the top level if you've got a big library!

~ Playlist now highlights currently playing track.

config/config.inc.php

@@ -14,7 +14,7 @@
 	$_CONFIG['template'] = 'default';
 
 	/* Browse mode can be 'filesystem' or 'metadata' */
-	$_CONFIG['browse_mode'] = 'metadata';
+	$_CONFIG['browse_mode'] = 'filesystem';
 
 	$_CONFIG['sort_by_tracknumber'] = true;
 

lib/actions.php

@@ -1,65 +1,41 @@
 <?php
 	/* handle the actions for mpd */
-	
+
 	if ($_GET['skipto']) {
 		$mympd->SkipTo($_GET['skipto']);
 	}
-	
+
 	switch($_GET['action']) {
 		case "clear":
 			$mympd->PLClear();
 			break;
-			
+
 		case "remove":
 			$mympd->PLRemove($_GET['id']);
 			break;
-			
+
 		case "fileadd":
 			$mympd->PLAdd($_GET['file']);
 			break;
-			
+
 		case "addall":
-			/* create the array of files for the playlist add */
+			addall($_COOKIE['browse']);
-			if ($browse == '/') {
-				$browse = '';
-			}
-			
-			$browselist = $mympd->GetDir($browse);
-			
-			foreach($browselist as $browselist_item) {
-				if ($browselist_item['file']) {
-					$addlist[] = $browselist_item['file'];
-				}
-			}
-			
-			$mympd->PLAddBulk($addlist);
 			$page = 'playlist';
 			setcookie('page', $page);
 			header("Location: index.php");
 			break;
-			
+
 		case "playall":
 			$mympd->PLClear();
-			/* create the array of files for the playlist add */
+
-			if ($browse == '/') {
+			addall($_COOKIE['browse']);
-				$browse = '';
+
-			}
-			
-			$browselist = $mympd->GetDir($browse);
-			
-			foreach($browselist as $browselist_item) {
-				if ($browselist_item['file']) {
-					$addlist[] = $browselist_item['file'];
-				}
-			}
-			
-			$mympd->PLAddBulk($addlist);
 			$page = 'control';
 			setcookie('page', $page);
 			$mympd->Play();
 			header("Location: index.php");
 			break;
-			
+
 		case "fileplay":
 			$mympd->PLClear();
 			$mympd->PLAdd($_GET['file']);
@@ -68,30 +44,100 @@
 			$mympd->Play();
 			header("Location: index.php");
 			break;
-			
+
 		case "play":
 			$mympd->Play();
 			header("Location: index.php");
 			break;
-			
+
 		case "stop":
 			$mympd->Stop();
 			header("Location: index.php");
 			break;
-			
+
 		case "pause":
 			$mympd->Pause();
 			header("Location: index.php");
 			break;
-			
+
 		case "prev":
 			$mympd->Previous();
 			header("Location: index.php");
 			break;
-			
+
 		case "next":
 			$mympd->Next();
 			header("Location: index.php");
 			break;
 	}
-?>
+
+	function addall($browse) {
+
+		global $_CONFIG, $mympd;
+
+		if ($browse == '/') {
+			$browse = '';
+		}
+
+		switch ($_CONFIG['browse_mode']) {
+
+			case 'filesystem':
+
+				function get_browselist($path) {
+
+					global $mympd;
+
+					$browselist = $mympd->GetDir($path);
+
+					foreach ($browselist as $browseitem) {
+						if ($browseitem['directory']) {
+							//echo $browseitem.directory;
+							$browselist = array_merge($browselist, get_browselist($browseitem['directory']));
+						}
+					}
+
+					return $browselist;
+
+				}
+
+				/* create the array of files for the playlist add */
+				$browselist = get_browselist($browse);
+
+				break;
+
+			case 'metadata':
+
+				$browse_bits = split('/', $browse);
+
+				if (is_array($browse_bits)) {
+
+					if ($browse_bits[1]) {
+						$album = $browse_bits[1];
+						$browselist = $mympd->Find(MPD_SEARCH_ALBUM, $album);
+					}
+					elseif ($browse_bits[0]) {
+						$artist = $browse_bits[0];
+						$browselist = $mympd->Find(MPD_SEARCH_ARTIST, $artist);
+					}
+
+				}
+				else {
+					//$browselist = $mympd->Search(MPD_SEARCH_TITLE, '');
+				}
+
+				break;
+		}
+
+		if (is_array($browselist)) {
+
+			foreach($browselist as $browselist_item) {
+				if ($browselist_item['file']) {
+					$addlist[] = $browselist_item['file'];
+				}
+			}
+
+			$mympd->PLAddBulk($addlist);
+		}
+
+	}
+?>

lib/global.php

@@ -1,6 +1,8 @@
 <?php
-	/* Smarty stuff */
+	/* Smarty stuff */
-	
+
+	$version = 0.3;
+
 	require('config/config.inc.php');
 
 	define('SMARTY_DIR', 'lib/smarty/libs/');
@@ -10,51 +12,53 @@
 	$smarty->compile_dir = 'smarty/templates_c/';
 	$smarty->config_dir = 'smarty/configs/';
 	$smarty->cache_dir = 'smarty/cache/';
-	
+
+	$smarty->assign('version', $version);
+
 	include('lib/mpd.class.php');
 	$mympd = new mpd('localhost',6600);
-	
+
 	if (!$mympd->connected) {
 		echo "<p>Problem connecting to MPD!</p>";
 		exit;
-	}
-	
-	/* track number sorting function */
-	
-	function track_sort($a, $b) {
-		if ($a['directory'] && $b['directory']) {
-			if ($a['directory'] < $b['directory']) {
-				return -1;
-			}
-			elseif ($a['directory'] > $b['directory']) {
-				return 1;
-			}
-			else {
-				return 0;
-			}
-		}
-		elseif ($a['directory'] && !$b['directory']) {
-			return 1;
-		}
-		elseif (!$a['directory'] && $b['directory']) {
-			return -1;
-		}
-		else {
-			return $a['Track'] - $b['Track'];
-		}
 	}
-	
+
+	/* track number sorting function */
+
+	function track_sort($a, $b) {
+		if ($a['directory'] && $b['directory']) {
+			if ($a['directory'] < $b['directory']) {
+				return -1;
+			}
+			elseif ($a['directory'] > $b['directory']) {
+				return 1;
+			}
+			else {
+				return 0;
+			}
+		}
+		elseif ($a['directory'] && !$b['directory']) {
+			return 1;
+		}
+		elseif (!$a['directory'] && $b['directory']) {
+			return -1;
+		}
+		else {
+			return $a['Track'] - $b['Track'];
+		}
+	}
+
 	/* setup some global vars */
 	$smarty->assign('browse_link', 'index.php?page=browse');
 	$smarty->assign('playlist_link', 'index.php?page=playlist');
 	$smarty->assign('browselist_play_link', 'index.php?action=fileplay&file=');
 	$smarty->assign('browselist_add_link', 'index.php?action=fileadd&file=');
 	$smarty->assign('playlist_remove_link', 'index.php?action=remove&id=');
-	$smarty->assign('control_link', 'index.php?page=control');	
+	$smarty->assign('control_link', 'index.php?page=control');
-	$smarty->assign('playlist_play_link', 'index.php?page=control&action=play&skipto=');	
+	$smarty->assign('playlist_play_link', 'index.php?page=control&action=play&skipto=');
 	$smarty->assign('playlist_clear_link', 'index.php?action=clear');
 
-	/* first check for a page cookie, and default to displaying the playlist */	
+	/* first check for a page cookie, and default to displaying the playlist */
 	if ($_GET['page']) {
 		$page = $_GET['page'];
 		setcookie('page', $page);
@@ -62,9 +66,11 @@
 	else {
 		$page = $_COOKIE['page'];
 	}
-	
+
 	if (!$page) {
 		$page = 'playlist';
 	}
-	
+
-?>
+	$smarty->assign('page', $page);
+
+?>

lib/page.php

@@ -1,178 +1,209 @@
-<?php
+<?php
-
+
-	$smarty->assign('page', $page);
+	$smarty->assign('page', $page);
-	
+
-	/* print_r($mympd->playlist); */
+	/* print_r($mympd->playlist); */
-
+
-	switch ($page) {
+	switch ($page) {
-		case "playlist":
+		case "playlist":
-			$smarty->assign('playlist', $mympd->playlist);
+			/*
-			break;
+			echo '<pre>';
-		case "control":
+			print_r($mympd->playlist);
-			/* get the currently playing track */
+			echo '</pre>';
-			$current_track = $mympd->playlist[$mympd->current_track_id];
+			//*/
-			$smarty->assign('current_track_no', $current_track['Track']);
+
-			$smarty->assign('current_title', $current_track['Title']);
+			$smarty->assign('playlist', $mympd->playlist);
-			$smarty->assign('current_album', $current_track['Album']);
+			$smarty->assign('playing', $mympd->current_track_id);
-			$smarty->assign('current_artist', $current_track['Artist']);
+			break;
-			$smarty->assign('current_file', $current_track['file']);
+		case "control":
-			break;
+			/* get the currently playing track */
+			$current_track = $mympd->playlist[$mympd->current_track_id];
+			$smarty->assign('current_track_no', $current_track['Track']);
+			$smarty->assign('current_title', $current_track['Title']);
+			$smarty->assign('current_album', $current_track['Album']);
+			$smarty->assign('current_artist', $current_track['Artist']);
+			$smarty->assign('current_file', $current_track['file']);
+			break;
 		case "browse":
-		
+
 			switch ($_CONFIG['browse_mode']) {
-			
+
 				case 'metadata': /* metadata based browsing.  this will list artists->albums->tracks */
-				
+
 					/* split the browse get var if present */
 					if ($_GET['browse']) {
+						setcookie('browse', stripslashes($_GET['browse']));
 						if ($_GET['browse'] == '/') {
-							$browse_bits[0] = 'artists';
+							$meta_level = 'artists';
 						}
 						else {
-							$browse_bits = split('::', $_GET['browse']);
+							$browse_bits = split('/', $_GET['browse']);
-						}						
+							if ($browse_bits[0]) {
+								$artist = $browse_bits[0];
+								$meta_level = 'albums';
+							}
+							if ($browse_bits[1]) {
+								$album = $browse_bits[1];
+								$meta_level = 'tracks';
+							}
+						}
 					}
-					
+					elseif ($_COOKIE['browse']) {
-					//print_r($browse_bits);
+						if ($_COOKIE['browse'] == '/') {
-			
+							$meta_level = 'artists';
-					/* set the meta_level */				
+						}
-					if ($browse_bits[0]) {
+						else {
-						$meta_level = $browse_bits[0];
+							$browse_bits = split('/', $_COOKIE['browse']);
-					}
+							if ($browse_bits[0]) {
-					elseif ($_COOKIE['meta_level']) {
+								$artist = $browse_bits[0];
-						$meta_level = $_COOKIE['meta_level'];
+								$meta_level = 'albums';
+							}
+							if ($browse_bits[1]) {
+								$album = $browse_bits[1];
+								$meta_level = 'tracks';
+							}
+						}
+
 					}
 					else {
 						$meta_level = 'artists';
 					}
-					
+
+					//print_r($browse_bits);
+
 					switch ($meta_level) { /* we need to get the information differently for different meta levels */
-						
+
 						case 'artists':
 							$artists = $mympd->GetArtists();
-							
+
-							foreach ($artists as $artist) {
+							foreach ($artists as $the_artist) {
-								$browselist[]['metaArtist'] = $artist;
+								$browselist[] = array('metaArtist' => $the_artist, 'path' => stripslashes($the_artist));
 							}
-							
+
 							break;
-							
+
 						case 'albums':
-							$albums = $mympd->GetAlbums($browse_bits[1]);
+							$albums = $mympd->GetAlbums($artist);
-							
+
-							foreach ($albums as $album) {
+							foreach ($albums as $the_album) {
-								$browselist[]['metaAlbum'] = $album;
+								$browselist[] = array('metaAlbum' => $the_album, 'path' => stripslashes($artist . '/' . $the_album));
 							}
-							
+
+							$dir_list = array(array('name' => stripslashes($artist), 'path' => urlencode(stripslashes($artist))));
+
 							break;
-						
+
 						case 'tracks':
-						
+
-							$tracks = $mympd->Find(MPD_SEARCH_ALBUM, $browse_bits[1]);
+							$tracks = $mympd->Find(MPD_SEARCH_ALBUM, $album);
-							
+
 							/*
 							echo '<pre>';
 							print_r($tracks);
 							echo '</pre>';
-							//*/							
+							//*/
-							
+
 							/* foreach ($albums as $album) {
 								$browselist[]['metaAlbum'] = $album;
 							} */
-							
+
 							$browselist = $tracks;
 
 							if ($_CONFIG['sort_by_tracknumber']) {
 								usort($browselist, "track_sort");
 							}
-									
+
+							$dir_list = array(array('name' => stripslashes($artist), 'path' => urlencode(stripslashes($artist))), array('name' => stripslashes($album), 'path' => urlencode(stripslashes($artist . '/' . $album))));
+
 							break;
 					}
-					
+
+					$smarty->assign('dir_list', $dir_list);
 					$smarty->assign('browselist', $browselist);
-				
+
 					break;
-			
+
-				case 'filesystem': /* filesystem based browsing.  this will follow the filesystem tree */
+				case 'filesystem': /* filesystem based browsing.  this will follow the filesystem tree */
-			
+
-					/* get the browse position from the cookie or from get */
+					/* get the browse position from the cookie or from get */
-					if ($_GET['browse']) {
+					if ($_GET['browse']) {
-						$browse = $_GET['browse'];
+						$browse = $_GET['browse'];
-						setcookie('browse', stripslashes($browse));
+						setcookie('browse', stripslashes($browse));
-					}
-					else {
-						$browse = $_COOKIE['browse'];
 					}
-					
+					else {
-					$browse = stripslashes($browse);
+						$browse = $_COOKIE['browse'];
-
+					}
-					/* make the path array */
+
-					
+					$browse = stripslashes($browse);
-					if ($browse == '/') {
+
-						$browse = '';
+					/* make the path array */
-					}
+
-					
+					if ($browse == '/') {
+						$browse = '';
+					}
+
 					$browse_list = explode('/', $browse);
-					
+
-					//print_r($browse);
+					//print_r($browse);
-					
+
-					if ($browse) {
+					if ($browse) {
-					
+
-						foreach ($browse_list as $browse_item) {
+						foreach ($browse_list as $browse_item) {
-							$path .= $browse_item . '/';
+							$path .= $browse_item . '/';
-							$dir_list[] = array('path' => trim($path, '/'), 'name' => $browse_item);
+							$dir_list[] = array('path' => urlencode(trim($path, '/')), 'name' => $browse_item);
-						}				
+						}
-						
+
-					}
-
-					$smarty->assign('dir_list', $dir_list);
-					
-					if (!$browselist) {
-						$browselist = $mympd->GetDir($browse);
 					}
-					
+
+					$smarty->assign('dir_list', $dir_list);
+
+					if (!$browselist) {
+						$browselist = $mympd->GetDir($browse);
+					}
+
 					if ($_CONFIG['sort_by_tracknumber']) {
 						usort($browselist, "track_sort");
 					}
-					
+
 					/*
 					echo '<pre>';
 					print_r($browselist);
 					echo '</pre>';
 					//*/
-					
+
-					foreach ($browselist as $key => $browselist_item) {
+					foreach ($browselist as $key => $browselist_item) {
-					
+
-
+
-						if ($browselist_item['directory']) {
+						if ($browselist_item['directory']) {
-							$lastpos = strrpos($browselist_item['directory'], '/');
+							$lastpos = strrpos($browselist_item['directory'], '/');
-							if ($lastpos !== false) {
+							if ($lastpos !== false) {
-								$browselist[$key]['directory_name'] = substr($browselist_item['directory'], $lastpos + 1);
+								$browselist[$key]['directory_name'] = substr($browselist_item['directory'], $lastpos + 1);
-							}
+							}
-							else {
+							else {
-								$browselist[$key]['directory_name'] = $browselist_item['directory'];
+								$browselist[$key]['directory_name'] = $browselist_item['directory'];
-							}
+							}
-						}
+						}
-						
+
-						
+
-						/* add a token for files currently on the playlist */
+						/* add a token for files currently on the playlist */
-						foreach($mympd->playlist as $playlist_item) {
+						foreach($mympd->playlist as $playlist_item) {
-							if ($browselist_item['file'] == $playlist_item['file']) {
+							if ($browselist_item['file'] == $playlist_item['file']) {
-								$browselist[$key]['in_playlist'] = "1";
+								$browselist[$key]['in_playlist'] = "1";
-							}
+							}
-						}
+						}
-					}
+					}
-
+
-					
+					//print_r($browselist);
+
 					$smarty->assign('browselist', $browselist);
-					
+
 					break;
-			}
+			}
-			
+
-			//echo '<pre style="text-align: left;">';			
+			//echo '<pre style="text-align: left;">';
-			//print_r($mympd->GetDir($browse));			
+			//print_r($mympd->GetDir($browse));
-			//echo '</pre>';
+			//echo '</pre>';
-			
+
-			break;
+			break;
-	}
+	}
 ?>

templates/default/browse.html

@@ -3,7 +3,7 @@
 				<li><a href="index.php?browse=/"><img src="images/home.gif" alt="Home" /></a></li>
 
 				{foreach from=$dir_list item=dir_list_item}
-					<li>&bull; <a href="index.php?browse={$dir_list_item.path|escape:'url'}">{$dir_list_item.name|escape:'html'}</a></li>
+					<li>&bull; <a href="index.php?browse={$dir_list_item.path}">{$dir_list_item.name|escape:'html'}</a></li>
 				{/foreach}
 
 			</ul>

templates/default/browselist_item.html

@@ -1,18 +1,18 @@
 
 				{if $browselist_item.directory}
 
-				<li><a href="index.php?browse={$browselist_item.directory|escape:'url'}"><img src="images/dir.gif" class="icon" /> {$browselist_item.directory_name|escape:'html'}</a></li>
+				<li><a href="index.php?browse={$browselist_item.directory}"><img src="images/dir.gif" class="icon" /> {$browselist_item.directory_name|escape:'html'}</a></li>
-				
+
 				{elseif $browselist_item.metaArtist}
 
-				<li><a href="index.php?browse=albums::{$browselist_item.metaArtist|escape:'url'}"><img src="images/artist.gif" class="icon" /> {$browselist_item.metaArtist|escape:'html'}</a></li>
+				<li><a href="index.php?browse={$browselist_item.path|escape:'url'}"><img src="images/artist.gif" class="icon" /> {$browselist_item.metaArtist|escape:'html'}</a></li>
-				
+
 				{elseif $browselist_item.metaAlbum}
 
-				<li><a href="index.php?browse=tracks::{$browselist_item.metaAlbum|escape:'url'}"><img src="images/album.gif" class="icon" /> {$browselist_item.metaAlbum|escape:'html'}</a></li>
+				<li><a href="index.php?browse={$browselist_item.path|escape:'url'}"><img src="images/album.gif" class="icon" /> {$browselist_item.metaAlbum|escape:'html'}</a></li>
-				
+
 				{elseif $browselist_item.Title}
 
-				{if $browselist_item.in_playlist}<li style="background: #555;">{else}<li>{/if}<a href="{$browselist_add_link}{$browselist_item.file|escape:'url'}"><img src="images/add.gif" alt="Add" class="button" /></a><a href="{$browselist_play_link}{$browselist_item.file|escape:'url'}"><img src="images/play.gif" alt="Play" class="button" /></a><img src="images/note.gif" class="icon" /> {if $browselist_item.Title|escape:'html'}<span class="title">{$browselist_item.Title|escape:'html'}</span><br /><span class="artist">{$browselist_item.Artist|escape:'html'}</span> <span class="album">({$browselist_item.Album|escape:'html'})</span>{else}{$browselist_item.file|escape:'html'}{/if}</li>
+				{if $browselist_item.in_playlist}<li class="playing">{else}<li>{/if}<a href="{$browselist_add_link}{$browselist_item.file|escape:'url'}"><img src="images/add.gif" alt="Add" class="button" /></a><a href="{$browselist_play_link}{$browselist_item.file|escape:'url'}"><img src="images/play.gif" alt="Play" class="button" /></a><img src="images/note.gif" class="icon" /> {if $browselist_item.Title|escape:'html'}<span class="title">{$browselist_item.Title|escape:'html'}</span><br /><span class="artist">{$browselist_item.Artist|escape:'html'}</span> <span class="album">({$browselist_item.Album|escape:'html'})</span>{else}{$browselist_item.file|escape:'html'}{/if}</li>
 
 				{/if}

templates/default/index.html

@@ -1,9 +1,9 @@
-<!doctype html>
+<!doctype html>
-
+
 <html>
 
 	<head>
-		<title>Neo MPC 0.2</title>
+		<title>Neo MPC {$version}</title>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
 
 		<style>
@@ -12,7 +12,7 @@
 	</head>
 
 	<body>
-		<div id="menu"><a href="{$browse_link}">Browse</a><a href="{$playlist_link}">Playlist</a><a href="{$control_link}">Control</a></div>
+		{include file="default/menu.html"}
 
 		<div id="page">
 
@@ -22,4 +22,4 @@
 
 	</body>
 
-</html>
+</html>

templates/default/menu.html

@@ -0,0 +1,6 @@
+		<div id="menu">
+			<a {if $page == 'browse'}class="selected" {/if}href="{$browse_link}">Browse</a>
+			<a {if $page == 'playlist'}class="selected" {/if}href="{$playlist_link}">Playlist</a>
+			<a {if $page == 'control'}class="selected" {/if}href="{$control_link}">Control</a>
+		</div>
+

templates/default/playlist_item.html

@@ -1 +1 @@
-				<li><a href="{$playlist_remove_link}{$playlist_item.Pos}"><img src="images/del.gif" alt="Remove from Playlist" class="button" /></a><a href="{$playlist_play_link}{$playlist_item.Pos}"><img src="images/play.gif" alt="Play" class="button" /></a><img src="images/note.gif" class="icon" /> <span class="pos">{$playlist_item.Pos+1|string_format:"%02d"}.</span> {if $playlist_item.Title}<span class="title">{$playlist_item.Title}</span><br /><span class="artist">{$playlist_item.Artist}</span> <span class="album">({$playlist_item.Album})</span>{else}{$playlist_item.file}{/if}</li>
+				{if $playlist_item.Pos == $playing}<li class="playing">{else}<li>{/if}<a href="{$playlist_remove_link}{$playlist_item.Pos}"><img src="images/del.gif" alt="Remove from Playlist" class="button" /></a><a href="{$playlist_play_link}{$playlist_item.Pos}"><img src="images/play.gif" alt="Play" class="button" /></a><img src="images/note.gif" class="icon" /> <span class="pos">{$playlist_item.Pos+1|string_format:"%02d"}.</span> {if $playlist_item.Title}<span class="title">{$playlist_item.Title}</span><br /><span class="artist">{$playlist_item.Artist}</span> <span class="album">({$playlist_item.Album})</span>{else}{$playlist_item.file}{/if}</li>

templates/default/styles.css

@@ -42,6 +42,24 @@ body {
 	background: #ccc;
 	color: #000;
 }
+#menu a.selected {
+	background: #ddd;
+	color: #333;
+	padding: 1px 0px 3px;
+	float: left;
+	margin-left: 2px;
+	display: block;
+	width: 32%;
+	text-align: center;
+	font-weight: bold;
+}
+#menu a.selected:hover {
+	background: #fff;
+}
+#menu a.selecteds:active {
+	background: #666;
+	color: #fff;
+}
 #page {
 	padding: 15px;
 	clear: left;
@@ -114,6 +132,8 @@ img.button {
 	margin-left: 3px;
 	border: 0px none !important;
 }
-
+li.playing {
+	background: #444;
+}
 
 {/literal}