fabian/esmp3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Playlist: Album title now gets handled better.

Browse Source
This commit is contained in:
Fabian Schlenz 2019-11-28 06:20:57 +01:00
parent 651843fb06
commit 519ac0e3bd
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/index.html
View File

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

2
include/playlist.h
View File

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

10
src/playlist.cpp
View File

@ -12,6 +12,7 @@ Playlist::Playlist(String path) {
} else if (path.startsWith("http")) { } else if (path.startsWith("http")) {
_examine_http_url(path); _examine_http_url(path);
} }
if (_title.length()==0) _title=path;
} }
void Playlist::_add_path(String path) { void Playlist::_add_path(String path) {
@ -23,6 +24,11 @@ void Playlist::_add_path(String path) {
SPIMaster::select_sd(false); SPIMaster::select_sd(false);
return; return;
} }
_title = path.substring(1);
int idx = _title.indexOf('/');
if (idx>0) {
_title.remove(idx);
}
File dir = SD.open(path); File dir = SD.open(path);
File entry; File entry;
while (entry = dir.openNextFile()) { while (entry = dir.openNextFile()) {
@ -144,7 +150,7 @@ void Playlist::_parse_rss(HTTPClientWrapper* http) {
} }
xml_files_ptr = NULL; xml_files_ptr = NULL;
if (xml_album_title.length()>0) { if (xml_album_title.length()>0) {
title = xml_album_title; _title = xml_album_title;
} }
xml_album_title = ""; xml_album_title = "";
delete buffer; delete buffer;
@ -170,6 +176,7 @@ void Playlist::_parse_m3u(HTTPClientWrapper* http) {
if (idx>4) { if (idx>4) {
// Get the title // Get the title
title = line.substring(idx+1); title = line.substring(idx+1);
if (_title.length()==0) _title=title;
} }
} else if (line.startsWith("http")) { } else if (line.startsWith("http")) {
if (title.length()==0) title = line; if (title.length()==0) title = line;
@ -327,6 +334,7 @@ void Playlist::dump() {
void Playlist::json(JsonObject json) { void Playlist::json(JsonObject json) {
json["_type"] = "playlist"; json["_type"] = "playlist";
json["title"] = _title;
JsonArray files = json.createNestedArray("files"); JsonArray files = json.createNestedArray("files");
for (PlaylistEntry entry: _files) { for (PlaylistEntry entry: _files) {
JsonObject o = files.createNestedObject(); JsonObject o = files.createNestedObject();