data/index.html

@@ -203,10 +203,12 @@ update_playlist = function(data) {
 		$('#button_track_prev').removeClass('btn-primary').addClass('btn-secondary', 'btn-disabled');
 	}
 	
-	$('#album').html(data.title);
 	var file = data.files[data.current_track];
 	if (file) {
-		$('#track').html(file.title); 
+		file = file.substr(1);
+		$('#album').html(file.substr(0, file.indexOf('/')));
+		file = file.substr(file.indexOf('/')+1);
+		$('#track').html(file.substr(0, file.lastIndexOf('.'))); 
 	}
 }
 

include/playlist.h

@@ -18,13 +18,13 @@ private:
 	bool _started = false;
 	bool _shuffled = false;
 	std::vector<PlaylistEntry> _files;
-	String _title = "";
 	void _add_path(String path);
 	void _examine_http_url(String url);
 	void _parse_rss(HTTPClientWrapper* http);
 	void _parse_m3u(HTTPClientWrapper* http);
 	void _parse_pls(HTTPClientWrapper* http);
 public:
+	String title;
 	Playlist(String path);
 	void start();
 	uint16_t get_file_count();

src/playlist.cpp

@@ -12,7 +12,6 @@ Playlist::Playlist(String path) {
 	} else if (path.startsWith("http")) {
 		_examine_http_url(path);
 	}
-	if (_title.length()==0) _title=path;
 }
 
 void Playlist::_add_path(String path) {
@@ -24,11 +23,6 @@ void Playlist::_add_path(String path) {
 		SPIMaster::select_sd(false);
 		return;
 	}
-	_title = path.substring(1);
-	int idx = _title.indexOf('/');
-	if (idx>0) {
-		_title.remove(idx);
-	}
 	File dir = SD.open(path);
 	File entry;
 	while (entry = dir.openNextFile()) {
@@ -44,7 +38,7 @@ void Playlist::_add_path(String path) {
 			  ext.equals(".mpa"))) {
 			TRACE("    Adding entry %s\n", entry.name());
 			String title = filename.substring(0, filename.length() - 4);
-			_files.push_back({.filename=entry.name(), .title=title});
+			_files.push_back({entry.name(), title});
 			bool non_ascii_chars = false;
 			for(int i=0; i<filename.length(); i++) {
 				char c = filename.charAt(i);
@@ -77,7 +71,7 @@ void Playlist::_examine_http_url(String url) {
 	if (ct.startsWith("audio/x-mpegurl")) {
 		_parse_m3u(http);
 	} else if (ct.startsWith("audio/")) {
-		_files.push_back({.filename=url, .title=url});
+		_files.push_back({url, url});
 	} else if (ct.startsWith("application/rss+xml")) {
 		_parse_rss(http);
 	} else if (ct.startsWith("application/pls+xml")) {
@@ -150,7 +144,7 @@ void Playlist::_parse_rss(HTTPClientWrapper* http) {
 	}
 	xml_files_ptr = NULL;
 	if (xml_album_title.length()>0) {
-		_title = xml_album_title;
+		title = xml_album_title;
 	}
 	xml_album_title = "";
 	delete buffer;		
@@ -176,11 +170,10 @@ void Playlist::_parse_m3u(HTTPClientWrapper* http) {
 				if (idx>4) {
 					// Get the title
 					title = line.substring(idx+1);
-					if (_title.length()==0) _title=title;
 				}
 			} else if (line.startsWith("http")) {
 				if (title.length()==0) title = line;
-				_files.push_back({.filename=line, .title=title});
+				_files.push_back({line, title});
 				title = "";
 			}
 			line = "";
@@ -222,7 +215,7 @@ void Playlist::_parse_pls(HTTPClientWrapper* http) {
 		}
 
 		if (title.length()>0 && url.length()>0) {
-			_files.push_back({.filename=url, .title=title});
+			_files.push_back({url, title});
 			last_index = -1;
 			title = "";
 			url = "";
@@ -334,7 +327,6 @@ void Playlist::dump() {
 
 void Playlist::json(JsonObject json) {
 	json["_type"] = "playlist";
-	json["title"] = _title;
 	JsonArray files = json.createNestedArray("files");
 	for (PlaylistEntry entry: _files) {
 		JsonObject o = files.createNestedObject();

src/playlist_manager.cpp

@@ -39,19 +39,17 @@ void PlaylistManager::scan_files() {
 				String folder = data.substring(eq + 1);
 				TRACE("  Adding mapping: %s=>%s\n", rfid_id.c_str(), folder.c_str());
 				_map[rfid_id] = folder;
-				
-				if (folder.charAt(0)=='/') {
-					bool found=false;
-					for (String f: folders) {
-						if (f.equals(folder)) {
-							found = true;
-							break;
-						}
-					}
-					if (!found) {
-						INFO("WARNING: Found mapping for RFID id %s which maps to non-existing folder %s!\n", rfid_id.c_str(), folder.c_str());
+
+				bool found=false;
+				for (String f: folders) {
+					if (f.equals(folder)) {
+						found = true;
+						break;
 					}
 				}
+				if (!found) {
+					INFO("WARNING: Found mapping for RFID id %s which maps to non-existing folder %s!\n", rfid_id.c_str(), folder.c_str());
+				}
 			}
 		}
 		f.close();