Added "deletestreamsource" call that deletes a stream AND the corresponding source file.
This commit is contained in:
Thulinma
parent
31403f2685
commit
7af419fdad
12 changed files with 146 additions and 10 deletions
|
|
@ -511,6 +511,81 @@ void Controller::handleAPICommands(JSON::Value & Request, JSON::Value & Response
|
|||
}
|
||||
}
|
||||
}
|
||||
if (Request.isMember("deletestreamsource")){
|
||||
//if array, delete all elements
|
||||
//if object, delete all entries
|
||||
//if string, delete just the one
|
||||
if (Request["deletestreamsource"].isString()){
|
||||
switch (Controller::deleteStream(Request["deletestreamsource"].asStringRef(), Controller::Storage["streams"], true)){
|
||||
case 0:
|
||||
Response["deletestreamsource"] = "0: No action taken";
|
||||
break;
|
||||
case 1:
|
||||
Response["deletestreamsource"] = "1: Source file deleted";
|
||||
break;
|
||||
case 2:
|
||||
Response["deletestreamsource"] = "2: Source file and dtsh deleted";
|
||||
break;
|
||||
case -1:
|
||||
Response["deletestreamsource"] = "-1: Stream deleted, source remains";
|
||||
break;
|
||||
case -2:
|
||||
Response["deletestreamsource"] = "-2: Stream and source file deleted";
|
||||
break;
|
||||
case -3:
|
||||
Response["deletestreamsource"] = "-3: Stream, source file and dtsh deleted";
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (Request["deletestreamsource"].isArray()){
|
||||
jsonForEach(Request["deletestreamsource"], it){
|
||||
switch (Controller::deleteStream(it->asStringRef(), Controller::Storage["streams"], true)){
|
||||
case 0:
|
||||
Response["deletestreamsource"][it.num()] = "0: No action taken";
|
||||
break;
|
||||
case 1:
|
||||
Response["deletestreamsource"][it.num()] = "1: Source file deleted";
|
||||
break;
|
||||
case 2:
|
||||
Response["deletestreamsource"][it.num()] = "2: Source file and dtsh deleted";
|
||||
break;
|
||||
case -1:
|
||||
Response["deletestreamsource"][it.num()] = "-1: Stream deleted, source remains";
|
||||
break;
|
||||
case -2:
|
||||
Response["deletestreamsource"][it.num()] = "-2: Stream and source file deleted";
|
||||
break;
|
||||
case -3:
|
||||
Response["deletestreamsource"][it.num()] = "-3: Stream, source file and dtsh deleted";
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (Request["deletestreamsource"].isObject()){
|
||||
jsonForEach(Request["deletestreamsource"], it){
|
||||
switch (Controller::deleteStream(it.key(), Controller::Storage["streams"], true)){
|
||||
case 0:
|
||||
Response["deletestreamsource"][it.key()] = "0: No action taken";
|
||||
break;
|
||||
case 1:
|
||||
Response["deletestreamsource"][it.key()] = "1: Source file deleted";
|
||||
break;
|
||||
case 2:
|
||||
Response["deletestreamsource"][it.key()] = "2: Source file and dtsh deleted";
|
||||
break;
|
||||
case -1:
|
||||
Response["deletestreamsource"][it.key()] = "-1: Stream deleted, source remains";
|
||||
break;
|
||||
case -2:
|
||||
Response["deletestreamsource"][it.key()] = "-2: Stream and source file deleted";
|
||||
break;
|
||||
case -3:
|
||||
Response["deletestreamsource"][it.key()] = "-3: Stream, source file and dtsh deleted";
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (Request.isMember("addprotocol")){
|
||||
if (Request["addprotocol"].isArray()){
|
||||
jsonForEach(Request["addprotocol"], it){
|
||||
|
|
|
|||
|
|
@ -293,24 +293,75 @@ namespace Controller {
|
|||
|
||||
}
|
||||
|
||||
/// \triggers
|
||||
/// The `"STREAM_REMOVE"` trigger is stream-specific, and is ran whenever a stream is removed from the server configuration. If cancelled, the stream is not removed. Its payload is:
|
||||
/// ~~~~~~~~~~~~~~~
|
||||
/// streamname
|
||||
/// ~~~~~~~~~~~~~~~
|
||||
void deleteStream(const std::string & name, JSON::Value & out) {
|
||||
/// Deletes the stream (name) from the config (out), optionally also deleting the VoD source file if sourceFileToo is true.
|
||||
int deleteStream(const std::string & name, JSON::Value & out, bool sourceFileToo) {
|
||||
int ret = 0;
|
||||
if (sourceFileToo){
|
||||
std::string cleaned = name;
|
||||
Util::sanitizeName(cleaned);
|
||||
std::string strmSource;
|
||||
if (Util::getStreamStatus(cleaned) != STRMSTAT_OFF){
|
||||
DTSC::Meta mData = Util::getStreamMeta(cleaned);
|
||||
if (mData.sourceURI.size()){
|
||||
strmSource = mData.sourceURI;
|
||||
}
|
||||
}
|
||||
if (!strmSource.size()){
|
||||
std::string smp = cleaned.substr(0, cleaned.find_first_of("+ "));
|
||||
if (out.isMember(smp) && out[smp].isMember("source")){
|
||||
strmSource = out[smp]["source"].asStringRef();
|
||||
}
|
||||
}
|
||||
bool noFile = false;
|
||||
if (strmSource.size()){
|
||||
std::string prevInput;
|
||||
while (true){
|
||||
std::string oldSrc = strmSource;
|
||||
JSON::Value inputCapa = Util::getInputBySource(oldSrc, true);
|
||||
if (inputCapa["name"].asStringRef() == prevInput){break;}
|
||||
prevInput = inputCapa["name"].asStringRef();
|
||||
strmSource = inputCapa["source_file"].asStringRef();
|
||||
if (!strmSource.size()){
|
||||
noFile = true;
|
||||
break;
|
||||
}
|
||||
Util::streamVariables(strmSource, cleaned, oldSrc);
|
||||
}
|
||||
}
|
||||
if (noFile){
|
||||
WARN_MSG("Not deleting source for stream %s, since the stream does not have an unambiguous source file.", cleaned.c_str());
|
||||
}else{
|
||||
Util::streamVariables(strmSource, cleaned);
|
||||
if (!strmSource.size()){
|
||||
FAIL_MSG("Could not delete source for stream %s: unable to detect stream source URI using any method", cleaned.c_str());
|
||||
}else{
|
||||
if (unlink(strmSource.c_str())){
|
||||
FAIL_MSG("Could not delete source %s for %s: %s (%d)", strmSource.c_str(), cleaned.c_str(), strerror(errno), errno);
|
||||
}else{
|
||||
++ret;
|
||||
Log("STRM", "Deleting source file for stream "+cleaned+": "+strmSource);
|
||||
//Delete dtsh, ignore failures
|
||||
if (!unlink((strmSource+".dtsh").c_str())){
|
||||
++ret;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!out.isMember(name)){
|
||||
return;
|
||||
return ret;
|
||||
}
|
||||
/*LTS-START*/
|
||||
if(Triggers::shouldTrigger("STREAM_REMOVE")){
|
||||
if (!Triggers::doTrigger("STREAM_REMOVE", name, name)){
|
||||
return;
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
/*LTS-END*/
|
||||
Log("STRM", std::string("Deleted stream ") + name);
|
||||
Log("STRM", "Deleted stream " + name);
|
||||
out.removeMember(name);
|
||||
++ret;
|
||||
ret *= -1;
|
||||
if (inputProcesses.count(name)){
|
||||
pid_t procId = inputProcesses[name];
|
||||
if (Util::Procs::isRunning(procId)){
|
||||
|
|
@ -318,6 +369,7 @@ namespace Controller {
|
|||
}
|
||||
inputProcesses.erase(name);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
} //Controller namespace
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ namespace Controller {
|
|||
bool CheckAllStreams(JSON::Value & data);
|
||||
void CheckStreams(JSON::Value & in, JSON::Value & out);
|
||||
void AddStreams(JSON::Value & in, JSON::Value & out);
|
||||
void deleteStream(const std::string & name, JSON::Value & out);
|
||||
int deleteStream(const std::string & name, JSON::Value & out, bool sourceFileToo = false);
|
||||
|
||||
struct liveCheck {
|
||||
long long int lastms;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue