libmist backport from new metadata branch with improved typing and styling
This commit is contained in:
Erik Zandvliet
Thulinma
parent
7a03d3e96c
commit
10fa4b7e7b
88 changed files with 5957 additions and 5757 deletions
284
lib/stream.cpp
284
lib/stream.cpp
|
|
@ -1,44 +1,45 @@
|
|||
/// \file stream.cpp
|
||||
/// Utilities for handling streams.
|
||||
|
||||
#include "stream.h"
|
||||
#include "config.h"
|
||||
#include "defines.h"
|
||||
#include "dtsc.h"
|
||||
#include "json.h"
|
||||
#include "procs.h"
|
||||
#include "shared_memory.h"
|
||||
#include "socket.h"
|
||||
#include "triggers.h" //LTS
|
||||
#include <semaphore.h>
|
||||
#include <stdlib.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
#include <semaphore.h>
|
||||
#include "json.h"
|
||||
#include "stream.h"
|
||||
#include "procs.h"
|
||||
#include "config.h"
|
||||
#include "socket.h"
|
||||
#include "defines.h"
|
||||
#include "shared_memory.h"
|
||||
#include "dtsc.h"
|
||||
#include "triggers.h"//LTS
|
||||
|
||||
/// Calls strftime using the current local time, returning empty string on any error.
|
||||
static std::string strftime_now(const std::string& format) {
|
||||
static std::string strftime_now(const std::string &format){
|
||||
time_t rawtime;
|
||||
char buffer[80];
|
||||
time(&rawtime);
|
||||
struct tm timebuf;
|
||||
struct tm* timeinfo = localtime_r(&rawtime, &timebuf);
|
||||
struct tm *timeinfo = localtime_r(&rawtime, &timebuf);
|
||||
if (!timeinfo || !strftime(buffer, 80, format.c_str(), timeinfo)){return "";}
|
||||
return buffer;
|
||||
}
|
||||
|
||||
///Replaces any occurrences of 'from' with 'to' in 'str'.
|
||||
static void replace(std::string& str, const std::string& from, const std::string& to) {
|
||||
/// Replaces any occurrences of 'from' with 'to' in 'str'.
|
||||
static void replace(std::string &str, const std::string &from, const std::string &to){
|
||||
if (from.empty()){return;}
|
||||
size_t start_pos = 0;
|
||||
while((start_pos = str.find(from, start_pos)) != std::string::npos) {
|
||||
while ((start_pos = str.find(from, start_pos)) != std::string::npos){
|
||||
str.replace(start_pos, from.length(), to);
|
||||
start_pos += to.length();
|
||||
}
|
||||
}
|
||||
|
||||
///Replaces all stream-related variables in the given 'str' with their values.
|
||||
void Util::streamVariables(std::string &str, const std::string & streamname, const std::string & source) {
|
||||
/// Replaces all stream-related variables in the given 'str' with their values.
|
||||
void Util::streamVariables(std::string &str, const std::string &streamname,
|
||||
const std::string &source){
|
||||
replace(str, "$source", source);
|
||||
replace(str, "$datetime", "$year.$month.$day.$hour.$minute.$second");
|
||||
replace(str, "$day", strftime_now("%d"));
|
||||
|
|
@ -50,11 +51,11 @@ void Util::streamVariables(std::string &str, const std::string & streamname, con
|
|||
replace(str, "$stream", streamname);
|
||||
if (streamname.find('+') != std::string::npos){
|
||||
std::string strbase = streamname.substr(0, streamname.find('+'));
|
||||
std::string strext = streamname.substr(streamname.find('+')+1);
|
||||
std::string strext = streamname.substr(streamname.find('+') + 1);
|
||||
replace(str, "$basename", strbase);
|
||||
replace(str, "$wildcard", strext);
|
||||
if (strext.size()){
|
||||
replace(str, "$pluswildcard", "+"+strext);
|
||||
replace(str, "$pluswildcard", "+" + strext);
|
||||
}else{
|
||||
replace(str, "$pluswildcard", "");
|
||||
}
|
||||
|
|
@ -65,30 +66,25 @@ void Util::streamVariables(std::string &str, const std::string & streamname, con
|
|||
}
|
||||
}
|
||||
|
||||
std::string Util::getTmpFolder() {
|
||||
std::string Util::getTmpFolder(){
|
||||
std::string dir;
|
||||
char * tmp_char = 0;
|
||||
if (!tmp_char) {
|
||||
tmp_char = getenv("TMP");
|
||||
}
|
||||
if (!tmp_char) {
|
||||
tmp_char = getenv("TEMP");
|
||||
}
|
||||
if (!tmp_char) {
|
||||
tmp_char = getenv("TMPDIR");
|
||||
}
|
||||
if (tmp_char) {
|
||||
char *tmp_char = 0;
|
||||
if (!tmp_char){tmp_char = getenv("TMP");}
|
||||
if (!tmp_char){tmp_char = getenv("TEMP");}
|
||||
if (!tmp_char){tmp_char = getenv("TMPDIR");}
|
||||
if (tmp_char){
|
||||
dir = tmp_char;
|
||||
dir += "/mist";
|
||||
} else {
|
||||
}else{
|
||||
#if defined(_WIN32) || defined(_CYGWIN_)
|
||||
dir = "C:/tmp/mist";
|
||||
#else
|
||||
dir = "/tmp/mist";
|
||||
#endif
|
||||
}
|
||||
if (access(dir.c_str(), 0) != 0) {
|
||||
mkdir(dir.c_str(), S_IRWXU | S_IRWXG | S_IRWXO); //attempt to create mist folder - ignore failures
|
||||
if (access(dir.c_str(), 0) != 0){
|
||||
mkdir(dir.c_str(),
|
||||
S_IRWXU | S_IRWXG | S_IRWXO); // attempt to create mist folder - ignore failures
|
||||
}
|
||||
return dir + "/";
|
||||
}
|
||||
|
|
@ -97,36 +93,37 @@ std::string Util::getTmpFolder() {
|
|||
/// letters to lowercase. If a '?' character is found, everything following
|
||||
/// that character is deleted. The original string is modified. If a '+' or space
|
||||
/// exists, then only the part before that is sanitized.
|
||||
void Util::sanitizeName(std::string & streamname) {
|
||||
//strip anything that isn't numbers, digits or underscores
|
||||
void Util::sanitizeName(std::string &streamname){
|
||||
// strip anything that isn't numbers, digits or underscores
|
||||
size_t index = streamname.find_first_of("+ ");
|
||||
if(index != std::string::npos){
|
||||
std::string preplus = streamname.substr(0,index);
|
||||
if (index != std::string::npos){
|
||||
std::string preplus = streamname.substr(0, index);
|
||||
sanitizeName(preplus);
|
||||
std::string postplus = streamname.substr(index+1);
|
||||
std::string postplus = streamname.substr(index + 1);
|
||||
if (postplus.find('?') != std::string::npos){
|
||||
postplus = postplus.substr(0, (postplus.find('?')));
|
||||
}
|
||||
streamname = preplus+"+"+postplus;
|
||||
streamname = preplus + "+" + postplus;
|
||||
return;
|
||||
}
|
||||
for (std::string::iterator i = streamname.end() - 1; i >= streamname.begin(); --i) {
|
||||
if (*i == '?') {
|
||||
for (std::string::iterator i = streamname.end() - 1; i >= streamname.begin(); --i){
|
||||
if (*i == '?'){
|
||||
streamname.erase(i, streamname.end());
|
||||
break;
|
||||
}
|
||||
if ( !isalpha( *i) && !isdigit( *i) && *i != '_' && *i != '.'){
|
||||
if (!isalpha(*i) && !isdigit(*i) && *i != '_' && *i != '.'){
|
||||
streamname.erase(i);
|
||||
} else {
|
||||
}else{
|
||||
*i = tolower(*i);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
JSON::Value Util::getStreamConfig(const std::string & streamname){
|
||||
JSON::Value Util::getStreamConfig(const std::string &streamname){
|
||||
JSON::Value result;
|
||||
if (streamname.size() > 100){
|
||||
FAIL_MSG("Stream opening denied: %s is longer than 100 characters (%lu).", streamname.c_str(), streamname.size());
|
||||
FAIL_MSG("Stream opening denied: %s is longer than 100 characters (%lu).", streamname.c_str(),
|
||||
streamname.size());
|
||||
return result;
|
||||
}
|
||||
std::string smp = streamname.substr(0, streamname.find_first_of("+ "));
|
||||
|
|
@ -142,7 +139,7 @@ JSON::Value Util::getStreamConfig(const std::string & streamname){
|
|||
return stream_cfg.asJSON();
|
||||
}
|
||||
|
||||
DTSC::Meta Util::getStreamMeta(const std::string & streamname){
|
||||
DTSC::Meta Util::getStreamMeta(const std::string &streamname){
|
||||
DTSC::Meta ret;
|
||||
char pageId[NAME_BUFFER_SIZE];
|
||||
snprintf(pageId, NAME_BUFFER_SIZE, SHM_STREAM_INDEX, streamname.c_str());
|
||||
|
|
@ -158,12 +155,12 @@ DTSC::Meta Util::getStreamMeta(const std::string & streamname){
|
|||
|
||||
/// Checks if the given streamname has an active input serving it. Returns true if this is the case.
|
||||
/// Assumes the streamname has already been through sanitizeName()!
|
||||
bool Util::streamAlive(std::string & streamname){
|
||||
bool Util::streamAlive(std::string &streamname){
|
||||
char semName[NAME_BUFFER_SIZE];
|
||||
snprintf(semName, NAME_BUFFER_SIZE, SEM_INPUT, streamname.c_str());
|
||||
IPC::semaphore playerLock(semName, O_RDWR, ACCESSPERMS, 1, true);
|
||||
if (!playerLock){return false;}
|
||||
if (!playerLock.tryWait()) {
|
||||
if (!playerLock.tryWait()){
|
||||
playerLock.close();
|
||||
return true;
|
||||
}else{
|
||||
|
|
@ -176,31 +173,32 @@ bool Util::streamAlive(std::string & streamname){
|
|||
/// Assures the input for the given stream name is active.
|
||||
/// Does stream name sanitation first, followed by a stream name length check (<= 100 chars).
|
||||
/// Then, checks if an input is already active by running streamAlive(). If yes, return true.
|
||||
/// If no, loads up the server configuration and attempts to start the given stream according to current configuration.
|
||||
/// At this point, fails and aborts if MistController isn't running.
|
||||
bool Util::startInput(std::string streamname, std::string filename, bool forkFirst, bool isProvider, const std::map<std::string, std::string> & overrides, pid_t * spawn_pid ) {
|
||||
/// If no, loads up the server configuration and attempts to start the given stream according to
|
||||
/// current configuration. At this point, fails and aborts if MistController isn't running.
|
||||
bool Util::startInput(std::string streamname, std::string filename, bool forkFirst, bool isProvider,
|
||||
const std::map<std::string, std::string> &overrides, pid_t *spawn_pid){
|
||||
sanitizeName(streamname);
|
||||
if (streamname.size() > 100){
|
||||
FAIL_MSG("Stream opening denied: %s is longer than 100 characters (%lu).", streamname.c_str(), streamname.size());
|
||||
FAIL_MSG("Stream opening denied: %s is longer than 100 characters (%lu).", streamname.c_str(),
|
||||
streamname.size());
|
||||
return false;
|
||||
}
|
||||
//Check if the stream is already active.
|
||||
//If yes, don't activate again to prevent duplicate inputs.
|
||||
//It's still possible a duplicate starts anyway, this is caught in the inputs initializer.
|
||||
//Note: this uses the _whole_ stream name, including + (if any).
|
||||
//This means "test+a" and "test+b" have separate locks and do not interact with each other.
|
||||
// Check if the stream is already active.
|
||||
// If yes, don't activate again to prevent duplicate inputs.
|
||||
// It's still possible a duplicate starts anyway, this is caught in the inputs initializer.
|
||||
// Note: this uses the _whole_ stream name, including + (if any).
|
||||
// This means "test+a" and "test+b" have separate locks and do not interact with each other.
|
||||
uint8_t streamStat = getStreamStatus(streamname);
|
||||
//Wait for a maximum of 240 x 250ms sleeps = 60 seconds
|
||||
// Wait for a maximum of 240 x 250ms sleeps = 60 seconds
|
||||
size_t sleeps = 0;
|
||||
while (++sleeps < 240 && streamStat != STRMSTAT_OFF && streamStat != STRMSTAT_READY && (!isProvider || streamStat != STRMSTAT_WAIT)){
|
||||
if (streamStat == STRMSTAT_BOOT && overrides.count("throughboot")){
|
||||
break;
|
||||
}
|
||||
while (++sleeps < 240 && streamStat != STRMSTAT_OFF && streamStat != STRMSTAT_READY &&
|
||||
(!isProvider || streamStat != STRMSTAT_WAIT)){
|
||||
if (streamStat == STRMSTAT_BOOT && overrides.count("throughboot")){break;}
|
||||
Util::sleep(250);
|
||||
streamStat = getStreamStatus(streamname);
|
||||
}
|
||||
if (streamAlive(streamname) && !overrides.count("alwaysStart")){
|
||||
DEBUG_MSG(DLVL_MEDIUM, "Stream %s already active; continuing", streamname.c_str());
|
||||
MEDIUM_MSG("Stream %s already active; continuing", streamname.c_str());
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -218,110 +216,102 @@ bool Util::startInput(std::string streamname, std::string filename, bool forkFir
|
|||
}
|
||||
}
|
||||
*/
|
||||
|
||||
//Find stream base name
|
||||
|
||||
// Find stream base name
|
||||
std::string smp = streamname.substr(0, streamname.find_first_of("+ "));
|
||||
//check if base name (everything before + or space) exists
|
||||
// check if base name (everything before + or space) exists
|
||||
const JSON::Value stream_cfg = getStreamConfig(streamname);
|
||||
if (!stream_cfg){
|
||||
DEBUG_MSG(DLVL_HIGH, "Stream %s not configured - attempting to ignore", streamname.c_str());
|
||||
HIGH_MSG("Stream %s not configured - attempting to ignore", streamname.c_str());
|
||||
}
|
||||
/*LTS-START*/
|
||||
if (!filename.size()){
|
||||
if (stream_cfg && stream_cfg.isMember("hardlimit_active")) {
|
||||
return false;
|
||||
if (stream_cfg && stream_cfg.isMember("hardlimit_active")){return false;}
|
||||
if (Triggers::shouldTrigger("STREAM_LOAD", smp)){
|
||||
if (!Triggers::doTrigger("STREAM_LOAD", streamname, smp)){return false;}
|
||||
}
|
||||
if(Triggers::shouldTrigger("STREAM_LOAD", smp)){
|
||||
if (!Triggers::doTrigger("STREAM_LOAD", streamname, smp)){
|
||||
return false;
|
||||
}
|
||||
}
|
||||
if(Triggers::shouldTrigger("STREAM_SOURCE", smp)){
|
||||
if (Triggers::shouldTrigger("STREAM_SOURCE", smp)){
|
||||
Triggers::doTrigger("STREAM_SOURCE", streamname, smp, false, filename);
|
||||
}
|
||||
}
|
||||
/*LTS-END*/
|
||||
|
||||
|
||||
//Only use configured source if not manually overridden. Abort if no config is available.
|
||||
// Only use configured source if not manually overridden. Abort if no config is available.
|
||||
if (!filename.size()){
|
||||
if (!stream_cfg){
|
||||
DEBUG_MSG(DLVL_MEDIUM, "Stream %s not configured, no source manually given, cannot start", streamname.c_str());
|
||||
MEDIUM_MSG("Stream %s not configured, no source manually given, cannot start", streamname.c_str());
|
||||
return false;
|
||||
}
|
||||
filename = stream_cfg["source"].asStringRef();
|
||||
}
|
||||
|
||||
|
||||
streamVariables(filename, streamname);
|
||||
const JSON::Value input = getInputBySource(filename, isProvider);
|
||||
if (!input){return false;}
|
||||
|
||||
//copy the necessary arguments to separate storage so we can unlock the config semaphore safely
|
||||
// copy the necessary arguments to separate storage so we can unlock the config semaphore safely
|
||||
std::map<std::string, std::string> str_args;
|
||||
//check required parameters
|
||||
// check required parameters
|
||||
if (input.isMember("required")){
|
||||
jsonForEachConst(input["required"], prm){
|
||||
const std::string opt = (*prm)["option"].asStringRef();
|
||||
//check for overrides
|
||||
// check for overrides
|
||||
if (overrides.count(opt)){
|
||||
str_args[opt] = overrides.at(opt);
|
||||
}else{
|
||||
if (!stream_cfg.isMember(prm.key())){
|
||||
FAIL_MSG("Required parameter %s for stream %s missing", prm.key().c_str(), streamname.c_str());
|
||||
FAIL_MSG("Required parameter %s for stream %s missing", prm.key().c_str(),
|
||||
streamname.c_str());
|
||||
return false;
|
||||
}
|
||||
str_args[opt] = stream_cfg[opt].asStringRef();
|
||||
}
|
||||
}
|
||||
}
|
||||
//check optional parameters
|
||||
// check optional parameters
|
||||
if (input.isMember("optional")){
|
||||
jsonForEachConst(input["optional"], prm){
|
||||
const std::string opt = (*prm)["option"].asStringRef();
|
||||
//check for overrides
|
||||
// check for overrides
|
||||
if (overrides.count(opt)){
|
||||
str_args[opt] = overrides.at(opt);
|
||||
}else{
|
||||
if (stream_cfg.isMember(prm.key())){
|
||||
str_args[opt] = stream_cfg[prm.key()].asStringRef();
|
||||
}
|
||||
}
|
||||
if (!prm->isMember("type") && str_args.count(opt)){
|
||||
str_args[opt] = "";
|
||||
if (stream_cfg.isMember(prm.key())){str_args[opt] = stream_cfg[prm.key()].asStringRef();}
|
||||
}
|
||||
if (!prm->isMember("type") && str_args.count(opt)){str_args[opt] = "";}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (isProvider){
|
||||
//Set environment variable so we can know if we have a provider when re-exec'ing.
|
||||
// Set environment variable so we can know if we have a provider when re-exec'ing.
|
||||
setenv("MISTPROVIDER", "1", 1);
|
||||
}
|
||||
|
||||
std::string player_bin = Util::getMyPath() + "MistIn" + input["name"].asStringRef();
|
||||
INFO_MSG("Starting %s -s %s %s", player_bin.c_str(), streamname.c_str(), filename.c_str());
|
||||
char * argv[30] = {(char *)player_bin.c_str(), (char *)"-s", (char *)streamname.c_str(), (char *)filename.c_str()};
|
||||
char *argv[30] ={(char *)player_bin.c_str(), (char *)"-s", (char *)streamname.c_str(),
|
||||
(char *)filename.c_str()};
|
||||
int argNum = 3;
|
||||
std::string debugLvl;
|
||||
if (Util::Config::printDebugLevel != DEBUG && !str_args.count("--debug")){
|
||||
debugLvl = JSON::Value((long long)Util::Config::printDebugLevel).asString();
|
||||
debugLvl = JSON::Value(Util::Config::printDebugLevel).asString();
|
||||
argv[++argNum] = (char *)"--debug";
|
||||
argv[++argNum] = (char *)debugLvl.c_str();
|
||||
}
|
||||
for (std::map<std::string, std::string>::iterator it = str_args.begin(); it != str_args.end(); ++it){
|
||||
for (std::map<std::string, std::string>::iterator it = str_args.begin(); it != str_args.end();
|
||||
++it){
|
||||
argv[++argNum] = (char *)it->first.c_str();
|
||||
if (it->second.size()){
|
||||
argv[++argNum] = (char *)it->second.c_str();
|
||||
}
|
||||
if (it->second.size()){argv[++argNum] = (char *)it->second.c_str();}
|
||||
}
|
||||
argv[++argNum] = (char *)0;
|
||||
|
||||
|
||||
Util::Procs::setHandler();
|
||||
|
||||
|
||||
int pid = 0;
|
||||
if (forkFirst){
|
||||
DEBUG_MSG(DLVL_DONTEVEN, "Forking");
|
||||
DONTEVEN_MSG("Forking");
|
||||
pid = fork();
|
||||
if (pid == -1) {
|
||||
if (pid == -1){
|
||||
FAIL_MSG("Forking process for stream %s failed: %s", streamname.c_str(), strerror(errno));
|
||||
return false;
|
||||
}
|
||||
|
|
@ -330,15 +320,16 @@ bool Util::startInput(std::string streamname, std::string filename, bool forkFir
|
|||
Util::Procs::remember(pid);
|
||||
}
|
||||
}else{
|
||||
DEBUG_MSG(DLVL_DONTEVEN, "Not forking");
|
||||
DONTEVEN_MSG("Not forking");
|
||||
}
|
||||
|
||||
|
||||
if (pid == 0){
|
||||
Socket::Connection io(0, 1);
|
||||
io.drop();
|
||||
DEBUG_MSG(DLVL_DONTEVEN, "execvp");
|
||||
DONTEVEN_MSG("execvp");
|
||||
execvp(argv[0], argv);
|
||||
FAIL_MSG("Starting process %s for stream %s failed: %s", argv[0], streamname.c_str(), strerror(errno));
|
||||
FAIL_MSG("Starting process %s for stream %s failed: %s", argv[0], streamname.c_str(),
|
||||
strerror(errno));
|
||||
_exit(42);
|
||||
}else if (spawn_pid != NULL){
|
||||
*spawn_pid = pid;
|
||||
|
|
@ -359,16 +350,16 @@ bool Util::startInput(std::string streamname, std::string filename, bool forkFir
|
|||
JSON::Value Util::getInputBySource(const std::string &filename, bool isProvider){
|
||||
JSON::Value ret;
|
||||
|
||||
//Attempt to load up configuration and find this stream
|
||||
// Attempt to load up configuration and find this stream
|
||||
Util::DTSCShmReader rCapa(SHM_CAPA);
|
||||
DTSC::Scan inputs = rCapa.getMember("inputs");
|
||||
//Abort if not available
|
||||
// Abort if not available
|
||||
if (!inputs){
|
||||
FAIL_MSG("Capabilities not available, aborting! Is MistController running?");
|
||||
return false;
|
||||
}
|
||||
|
||||
//check in curConf for <naam>-priority/source_match
|
||||
// check in curConf for <naam>-priority/source_match
|
||||
bool selected = false;
|
||||
long long int curPrio = -1;
|
||||
DTSC::Scan input;
|
||||
|
|
@ -376,17 +367,19 @@ JSON::Value Util::getInputBySource(const std::string &filename, bool isProvider)
|
|||
bool noProviderNoPick = false;
|
||||
for (unsigned int i = 0; i < input_size; ++i){
|
||||
DTSC::Scan tmp_input = inputs.getIndice(i);
|
||||
|
||||
//if match voor current stream && priority is hoger dan wat we al hebben
|
||||
|
||||
// if match voor current stream && priority is hoger dan wat we al hebben
|
||||
if (tmp_input.getMember("source_match") && curPrio < tmp_input.getMember("priority").asInt()){
|
||||
if (tmp_input.getMember("source_match").getSize()){
|
||||
for(unsigned int j = 0; j < tmp_input.getMember("source_match").getSize(); ++j){
|
||||
for (unsigned int j = 0; j < tmp_input.getMember("source_match").getSize(); ++j){
|
||||
std::string source = tmp_input.getMember("source_match").getIndice(j).asString();
|
||||
std::string front = source.substr(0,source.find('*'));
|
||||
std::string back = source.substr(source.find('*')+1);
|
||||
MEDIUM_MSG("Checking input %s: %s (%s)", inputs.getIndiceName(i).c_str(), tmp_input.getMember("name").asString().c_str(), source.c_str());
|
||||
|
||||
if (filename.substr(0,front.size()) == front && filename.substr(filename.size()-back.size()) == back){
|
||||
std::string front = source.substr(0, source.find('*'));
|
||||
std::string back = source.substr(source.find('*') + 1);
|
||||
MEDIUM_MSG("Checking input %s: %s (%s)", inputs.getIndiceName(i).c_str(),
|
||||
tmp_input.getMember("name").asString().c_str(), source.c_str());
|
||||
|
||||
if (filename.substr(0, front.size()) == front &&
|
||||
filename.substr(filename.size() - back.size()) == back){
|
||||
if (tmp_input.getMember("non-provider") && !isProvider){
|
||||
noProviderNoPick = true;
|
||||
continue;
|
||||
|
|
@ -398,11 +391,13 @@ JSON::Value Util::getInputBySource(const std::string &filename, bool isProvider)
|
|||
}
|
||||
}else{
|
||||
std::string source = tmp_input.getMember("source_match").asString();
|
||||
std::string front = source.substr(0,source.find('*'));
|
||||
std::string back = source.substr(source.find('*')+1);
|
||||
MEDIUM_MSG("Checking input %s: %s (%s)", inputs.getIndiceName(i).c_str(), tmp_input.getMember("name").asString().c_str(), source.c_str());
|
||||
|
||||
if (filename.substr(0,front.size()) == front && filename.substr(filename.size()-back.size()) == back){
|
||||
std::string front = source.substr(0, source.find('*'));
|
||||
std::string back = source.substr(source.find('*') + 1);
|
||||
MEDIUM_MSG("Checking input %s: %s (%s)", inputs.getIndiceName(i).c_str(),
|
||||
tmp_input.getMember("name").asString().c_str(), source.c_str());
|
||||
|
||||
if (filename.substr(0, front.size()) == front &&
|
||||
filename.substr(filename.size() - back.size()) == back){
|
||||
if (tmp_input.getMember("non-provider") && !isProvider){
|
||||
noProviderNoPick = true;
|
||||
continue;
|
||||
|
|
@ -412,7 +407,6 @@ JSON::Value Util::getInputBySource(const std::string &filename, bool isProvider)
|
|||
input = tmp_input;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
if (!selected){
|
||||
|
|
@ -427,16 +421,15 @@ JSON::Value Util::getInputBySource(const std::string &filename, bool isProvider)
|
|||
return ret;
|
||||
}
|
||||
|
||||
|
||||
/// Attempt to start a push for streamname to target.
|
||||
/// streamname MUST be pre-sanitized
|
||||
/// target gets variables replaced and may be altered by the PUSH_OUT_START trigger response.
|
||||
/// Attempts to match the altered target to an output that can push to it.
|
||||
pid_t Util::startPush(const std::string & streamname, std::string & target) {
|
||||
if (Triggers::shouldTrigger("PUSH_OUT_START", streamname)) {
|
||||
std::string payload = streamname+"\n"+target;
|
||||
pid_t Util::startPush(const std::string &streamname, std::string &target){
|
||||
if (Triggers::shouldTrigger("PUSH_OUT_START", streamname)){
|
||||
std::string payload = streamname + "\n" + target;
|
||||
std::string filepath_response;
|
||||
Triggers::doTrigger("PUSH_OUT_START", payload, streamname.c_str(), false, filepath_response);
|
||||
Triggers::doTrigger("PUSH_OUT_START", payload, streamname.c_str(), false, filepath_response);
|
||||
target = filepath_response;
|
||||
}
|
||||
if (!target.size()){
|
||||
|
|
@ -447,7 +440,7 @@ pid_t Util::startPush(const std::string & streamname, std::string & target) {
|
|||
// The target can hold variables like current time etc
|
||||
streamVariables(target, streamname);
|
||||
|
||||
//Attempt to load up configuration and find this stream
|
||||
// Attempt to load up configuration and find this stream
|
||||
std::string output_bin = "";
|
||||
{
|
||||
Util::DTSCShmReader rCapa(SHM_CAPA);
|
||||
|
|
@ -458,17 +451,19 @@ pid_t Util::startPush(const std::string & streamname, std::string & target) {
|
|||
}
|
||||
std::string checkTarget = target.substr(0, target.rfind('?'));
|
||||
unsigned int outputs_size = outputs.getSize();
|
||||
for (unsigned int i = 0; i<outputs_size && !output_bin.size(); ++i){
|
||||
for (unsigned int i = 0; i < outputs_size && !output_bin.size(); ++i){
|
||||
DTSC::Scan output = outputs.getIndice(i);
|
||||
if (output.getMember("push_urls")){
|
||||
unsigned int push_count = output.getMember("push_urls").getSize();
|
||||
for (unsigned int j = 0; j < push_count; ++j){
|
||||
std::string tar_match = output.getMember("push_urls").getIndice(j).asString();
|
||||
std::string front = tar_match.substr(0,tar_match.find('*'));
|
||||
std::string back = tar_match.substr(tar_match.find('*')+1);
|
||||
MEDIUM_MSG("Checking output %s: %s (%s)", outputs.getIndiceName(i).c_str(), output.getMember("name").asString().c_str(), checkTarget.c_str());
|
||||
|
||||
if (checkTarget.substr(0,front.size()) == front && checkTarget.substr(checkTarget.size()-back.size()) == back){
|
||||
std::string front = tar_match.substr(0, tar_match.find('*'));
|
||||
std::string back = tar_match.substr(tar_match.find('*') + 1);
|
||||
MEDIUM_MSG("Checking output %s: %s (%s)", outputs.getIndiceName(i).c_str(),
|
||||
output.getMember("name").asString().c_str(), checkTarget.c_str());
|
||||
|
||||
if (checkTarget.substr(0, front.size()) == front &&
|
||||
checkTarget.substr(checkTarget.size() - back.size()) == back){
|
||||
output_bin = Util::getMyPath() + "MistOut" + output.getMember("name").asString();
|
||||
break;
|
||||
}
|
||||
|
|
@ -476,26 +471,21 @@ pid_t Util::startPush(const std::string & streamname, std::string & target) {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (output_bin == ""){
|
||||
FAIL_MSG("No output found for target %s, aborting push.", target.c_str());
|
||||
return 0;
|
||||
}
|
||||
INFO_MSG("Pushing %s to %s through %s", streamname.c_str(), target.c_str(), output_bin.c_str());
|
||||
// Start output.
|
||||
char* argv[] = {
|
||||
(char*)output_bin.c_str(),
|
||||
(char*)"--stream", (char*)streamname.c_str(),
|
||||
(char*)target.c_str(),
|
||||
(char*)NULL
|
||||
};
|
||||
char *argv[] ={(char *)output_bin.c_str(), (char *)"--stream", (char *)streamname.c_str(),
|
||||
(char *)target.c_str(), (char *)NULL};
|
||||
|
||||
int stdErr = 2;
|
||||
return Util::Procs::StartPiped(argv, 0, 0, &stdErr);
|
||||
|
||||
}
|
||||
|
||||
uint8_t Util::getStreamStatus(const std::string & streamname){
|
||||
uint8_t Util::getStreamStatus(const std::string &streamname){
|
||||
char pageName[NAME_BUFFER_SIZE];
|
||||
snprintf(pageName, NAME_BUFFER_SIZE, SHM_STREAM_STATE, streamname.c_str());
|
||||
IPC::sharedPage streamStatus(pageName, 1, false, false);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue