mirror/nzbget
1
0
Fork 0
mirror of https://github.com/nzbget/nzbget.git synced 2026-06-12 13:44:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

added built-in update feature to windows package; accessible via web-interface -> settings -> system -> check for updates

Browse Source
This commit is contained in:
Andrey Prygunkov
2015-03-02 20:49:05 +00:00
parent bc0c8fc84a
commit e9356ebe79
12 changed files with 336 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
daemon/util/Script.cpp
View File

@@ -132,7 +132,14 @@ void EnvironmentStrings::InitFromCurrentProcess()
for (int i = 0; (*g_szEnvironmentVariables)[i]; i++)
{
char* szVar = (*g_szEnvironmentVariables)[i];
Append(strdup(szVar));
// Ignore all env vars set by NZBGet.
// This is to avoid the passing of env vars after program update (when NZBGet is
// started from a script which was started by a previous instance of NZBGet).
// Format: NZBXX_YYYY (XX are any two characters, YYYY are any number of any characters).
if (!(!strncmp(szVar, "NZB", 3) && strlen(szVar) > 5 && szVar[5] == '_'))
{
Append(strdup(szVar));
}
}
}
@@ -202,7 +209,7 @@ ScriptController::ScriptController()
m_bTerminated = false;
m_bDetached = false;
m_hProcess = 0;
m_environmentStrings.InitFromCurrentProcess();
ResetEnv();
m_mutexRunning.Lock();
m_RunningScripts.push_back(this);
@@ -225,9 +232,13 @@ ScriptController::~ScriptController()
void ScriptController::UnregisterRunningScript()
{
m_mutexRunning.Lock();
m_RunningScripts.erase(std::find(m_RunningScripts.begin(), m_RunningScripts.end(), this));
m_mutexRunning.Unlock();
m_mutexRunning.Lock();
RunningScripts::iterator it = std::find(m_RunningScripts.begin(), m_RunningScripts.end(), this);
if (it != m_RunningScripts.end())
{
m_RunningScripts.erase(it);
}
m_mutexRunning.Unlock();
}
void ScriptController::ResetEnv()
@@ -401,6 +412,8 @@ int ScriptController::Execute()
CreatePipe(&hReadPipe, &hWritePipe, &SecurityAttributes, 0);
SetHandleInformation(hReadPipe, HANDLE_FLAG_INHERIT, 0);
STARTUPINFO StartupInfo;
memset(&StartupInfo, 0, sizeof(StartupInfo));
StartupInfo.cb = sizeof(StartupInfo);