Make lbry.getMediaType() reliably handle malformed and absent input

This commit is contained in:
Alex Liebowitz 2016-09-08 04:35:41 -04:00
parent 3be312736b
commit 9a9bed2966

View file

@ -286,13 +286,13 @@ lbry.imagePath = function(file)
lbry.getMediaType = function(contentType, fileName) { lbry.getMediaType = function(contentType, fileName) {
if (contentType) { if (contentType) {
return /^[^/]+/.exec(contentType); return /^[^/]+/.exec(contentType);
} else { } else if (fileName) {
var dotIndex = filename.lastIndexOf('.'); var dotIndex = fileName.lastIndexOf('.');
if (dotIndex == -1) { if (dotIndex == -1) {
return 'unknown'; return 'unknown';
} }
var ext = filename.substr(dotIndex + 1); var ext = fileName.substr(dotIndex + 1);
if (/^mp4|mov|m4v|flv|f4v$/i.test(ext)) { if (/^mp4|mov|m4v|flv|f4v$/i.test(ext)) {
return 'video'; return 'video';
} else if (/^mp3|m4a|aac|wav|flac|ogg$/i.test(ext)) { } else if (/^mp3|m4a|aac|wav|flac|ogg$/i.test(ext)) {
@ -302,6 +302,8 @@ lbry.getMediaType = function(contentType, fileName) {
} else { } else {
return 'unknown'; return 'unknown';
} }
} else {
return 'unknown';
} }
} }