From 8ed781e0e3cd85b08ca32cac3641e384070b736c Mon Sep 17 00:00:00 2001 From: Stefan Pluecken Date: Thu, 22 Jun 2006 17:02:08 +0000 Subject: [PATCH 1/1] make file extensions case insensitive in mediaplayer and servicefs --- lib/python/Screens/MediaPlayer.py | 2 +- lib/service/servicefs.cpp | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/lib/python/Screens/MediaPlayer.py b/lib/python/Screens/MediaPlayer.py index 835bfd4d..3e238e08 100644 --- a/lib/python/Screens/MediaPlayer.py +++ b/lib/python/Screens/MediaPlayer.py @@ -32,7 +32,7 @@ class MediaPlayer(Screen, InfoBarSeek): self.addPlaylistParser(PlaylistIOPLS, "pls") self.addPlaylistParser(PlaylistIOInternal, "e2pls") - self.filelist = FileList(resolveFilename(SCOPE_MEDIA), matchingPattern = "^.*\.(mp3|ogg|ts|wav|wave|m3u|pls|e2pls|mpg|vob)", useServiceRef = True) + self.filelist = FileList(resolveFilename(SCOPE_MEDIA), matchingPattern = "(?i)^.*\.(mp3|ogg|ts|wav|wave|m3u|pls|e2pls|mpg|vob)", useServiceRef = True) self["filelist"] = self.filelist self.playlist = PlayList() diff --git a/lib/service/servicefs.cpp b/lib/service/servicefs.cpp index 8e5b729b..1f65ae17 100644 --- a/lib/service/servicefs.cpp +++ b/lib/service/servicefs.cpp @@ -96,6 +96,11 @@ eServiceFS::~eServiceFS() { } +int lower(char c) +{ + return std::tolower(static_cast(c)); +} + RESULT eServiceFS::getContent(std::list &list, bool sorted) { DIR *d=opendir(path.c_str()); @@ -131,6 +136,7 @@ RESULT eServiceFS::getContent(std::list &list, bool sorted) { size_t e = filename.rfind('.'); std::string extension = (e != std::string::npos) ? filename.substr(e) : ""; + std::transform(extension.begin(), extension.end(), extension.begin(), lower); int type = -1; if (extension == ".ts") -- 2.30.2