hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added support for space as stream separator character

Browse source
This commit is contained in:
Thulinma 2015-03-11 17:27:05 +01:00
parent fe08c8f5c7
commit 3c8d4e1186
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lib/stream.cpp
View file

@ -45,15 +45,15 @@ std::string Util::getTmpFolder() {
/// Filters the streamname, removing invalid characters and converting all /// Filters the streamname, removing invalid characters and converting all
/// letters to lowercase. If a '?' character is found, everything following /// letters to lowercase. If a '?' character is found, everything following
/// that character is deleted. The original string is modified. If a '+' /// that character is deleted. The original string is modified. If a '+' or space
/// exists, then only the part before the + is sanitized. /// exists, then only the part before that is sanitized.
void Util::sanitizeName(std::string & streamname) { void Util::sanitizeName(std::string & streamname) {
//strip anything that isn't numbers, digits or underscores //strip anything that isn't numbers, digits or underscores
size_t index = streamname.find('+'); size_t index = streamname.find_first_of("+ ");
if(index != std::string::npos){ if(index != std::string::npos){
std::string preplus = streamname.substr(0,index); std::string preplus = streamname.substr(0,index);
sanitizeName(preplus); sanitizeName(preplus);
streamname = preplus +"+"+streamname.substr(index+1); streamname = preplus+"+"+streamname.substr(index+1);
return; return;
} }
for (std::string::iterator i = streamname.end() - 1; i >= streamname.begin(); --i) { for (std::string::iterator i = streamname.end() - 1; i >= streamname.begin(); --i) {
@ -61,7 +61,7 @@ void Util::sanitizeName(std::string & streamname) {
streamname.erase(i, streamname.end()); streamname.erase(i, streamname.end());
break; break;
} }
if ( !isalpha( *i) && !isdigit( *i) && *i != '_' && *i != '+' && *i != '.'){ if ( !isalpha( *i) && !isdigit( *i) && *i != '_' && *i != '.'){
streamname.erase(i); streamname.erase(i);
} else { } else {
*i = tolower(*i); *i = tolower(*i);
@ -81,8 +81,8 @@ bool Util::startInput(std::string streamname, std::string filename, bool forkFir
DTSC::Scan config = DTSC::Scan(mistConfOut.mapped, mistConfOut.len); DTSC::Scan config = DTSC::Scan(mistConfOut.mapped, mistConfOut.len);
sanitizeName(streamname); sanitizeName(streamname);
std::string smp = streamname.substr(0, streamname.find('+')); std::string smp = streamname.substr(0, streamname.find_first_of("+ "));
//check if smp (everything before +) exists //check if smp (everything before + or space) exists
DTSC::Scan stream_cfg = config.getMember("streams").getMember(smp); DTSC::Scan stream_cfg = config.getMember("streams").getMember(smp);
if (!stream_cfg){ if (!stream_cfg){
DEBUG_MSG(DLVL_MEDIUM, "Stream %s not configured", streamname.c_str()); DEBUG_MSG(DLVL_MEDIUM, "Stream %s not configured", streamname.c_str());