Compare commits

...

4 Commits

4 changed files with 27 additions and 19 deletions

View File

@ -203,12 +203,10 @@ 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) {
file = file.substr(1);
$('#album').html(file.substr(0, file.indexOf('/')));
file = file.substr(file.indexOf('/')+1);
$('#track').html(file.substr(0, file.lastIndexOf('.')));
$('#track').html(file.title);
}
}

View File

@ -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();

View File

@ -12,6 +12,7 @@ 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) {
@ -23,6 +24,11 @@ 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()) {
@ -38,7 +44,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({entry.name(), title});
_files.push_back({.filename=entry.name(), .title=title});
bool non_ascii_chars = false;
for(int i=0; i<filename.length(); i++) {
char c = filename.charAt(i);
@ -71,7 +77,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({url, url});
_files.push_back({.filename=url, .title=url});
} else if (ct.startsWith("application/rss+xml")) {
_parse_rss(http);
} else if (ct.startsWith("application/pls+xml")) {
@ -144,7 +150,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;
@ -170,10 +176,11 @@ 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({line, title});
_files.push_back({.filename=line, .title=title});
title = "";
}
line = "";
@ -215,7 +222,7 @@ void Playlist::_parse_pls(HTTPClientWrapper* http) {
}
if (title.length()>0 && url.length()>0) {
_files.push_back({url, title});
_files.push_back({.filename=url, .title=title});
last_index = -1;
title = "";
url = "";
@ -327,6 +334,7 @@ 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();

View File

@ -40,15 +40,17 @@ void PlaylistManager::scan_files() {
TRACE(" Adding mapping: %s=>%s\n", rfid_id.c_str(), folder.c_str());
_map[rfid_id] = folder;
bool found=false;
for (String f: folders) {
if (f.equals(folder)) {
found = true;
break;
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());
}
}
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());
}
}
}