mirror of
https://github.com/Radarr/Radarr.git
synced 2024-09-17 15:02:34 +02:00
Fixed: Unable to execute custom scripts if IMDB ID is null (#2543)
fixes #1460
This commit is contained in:
parent
ae88645180
commit
d0406ced40
@ -1,4 +1,4 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Collections.Specialized;
|
using System.Collections.Specialized;
|
||||||
@ -98,9 +98,9 @@ public void OpenDefaultBrowser(string url)
|
|||||||
var process = new Process
|
var process = new Process
|
||||||
{
|
{
|
||||||
StartInfo = new ProcessStartInfo(url)
|
StartInfo = new ProcessStartInfo(url)
|
||||||
{
|
{
|
||||||
UseShellExecute = true
|
UseShellExecute = true
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
process.Start();
|
process.Start();
|
||||||
@ -129,16 +129,34 @@ public Process Start(string path, string args = null, StringDictionary environme
|
|||||||
{
|
{
|
||||||
foreach (DictionaryEntry environmentVariable in environmentVariables)
|
foreach (DictionaryEntry environmentVariable in environmentVariables)
|
||||||
{
|
{
|
||||||
startInfo.EnvironmentVariables.Add(environmentVariable.Key.ToString(), environmentVariable.Value.ToString());
|
try
|
||||||
|
{
|
||||||
|
_logger.Trace("Setting environment variable '{0}' to '{1}'", environmentVariable.Key, environmentVariable.Value);
|
||||||
|
startInfo.EnvironmentVariables.Add(environmentVariable.Key.ToString(), environmentVariable.Value.ToString());
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
if (environmentVariable.Value == null)
|
||||||
|
{
|
||||||
|
_logger.Error(e, "Unable to set environment variable '{0}', value is null", environmentVariable.Key);
|
||||||
|
}
|
||||||
|
|
||||||
|
else
|
||||||
|
{
|
||||||
|
_logger.Error(e, "Unable to set environment variable '{0}'", environmentVariable.Key);
|
||||||
|
}
|
||||||
|
|
||||||
|
throw;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.Debug("Starting {0} {1}", path, args);
|
logger.Debug("Starting {0} {1}", path, args);
|
||||||
|
|
||||||
var process = new Process
|
var process = new Process
|
||||||
{
|
{
|
||||||
StartInfo = startInfo
|
StartInfo = startInfo
|
||||||
};
|
};
|
||||||
|
|
||||||
process.OutputDataReceived += (sender, eventArgs) =>
|
process.OutputDataReceived += (sender, eventArgs) =>
|
||||||
{
|
{
|
||||||
@ -315,7 +333,7 @@ private List<Process> GetProcessesByName(string name)
|
|||||||
|
|
||||||
var monoProcesses = Process.GetProcessesByName("mono")
|
var monoProcesses = Process.GetProcessesByName("mono")
|
||||||
.Union(Process.GetProcessesByName("mono-sgen"))
|
.Union(Process.GetProcessesByName("mono-sgen"))
|
||||||
.Union(Process.GetProcessesByName("mono-sgen32"))
|
.Union(Process.GetProcessesByName("mono-sgen32"))
|
||||||
.Where(process =>
|
.Where(process =>
|
||||||
process.Modules.Cast<ProcessModule>()
|
process.Modules.Cast<ProcessModule>()
|
||||||
.Any(module =>
|
.Any(module =>
|
||||||
|
@ -37,7 +37,7 @@ public override void OnGrab(GrabMessage message)
|
|||||||
environmentVariables.Add("Radarr_EventType", "Grab");
|
environmentVariables.Add("Radarr_EventType", "Grab");
|
||||||
environmentVariables.Add("Radarr_Movie_Id", movie.Id.ToString());
|
environmentVariables.Add("Radarr_Movie_Id", movie.Id.ToString());
|
||||||
environmentVariables.Add("Radarr_Movie_Title", movie.Title);
|
environmentVariables.Add("Radarr_Movie_Title", movie.Title);
|
||||||
environmentVariables.Add("Radarr_Movie_ImdbId", movie.ImdbId);
|
environmentVariables.Add("Radarr_Movie_ImdbId", movie.ImdbId ?? string.Empty);
|
||||||
environmentVariables.Add("Radarr_Movie_TmdbId", movie.TmdbId.ToString());
|
environmentVariables.Add("Radarr_Movie_TmdbId", movie.TmdbId.ToString());
|
||||||
environmentVariables.Add("Radarr_Release_Title", remoteMovie.Release.Title);
|
environmentVariables.Add("Radarr_Release_Title", remoteMovie.Release.Title);
|
||||||
environmentVariables.Add("Radarr_Release_Indexer", remoteMovie.Release.Indexer);
|
environmentVariables.Add("Radarr_Release_Indexer", remoteMovie.Release.Indexer);
|
||||||
@ -61,7 +61,7 @@ public override void OnDownload(DownloadMessage message)
|
|||||||
environmentVariables.Add("Radarr_Movie_Id", movie.Id.ToString());
|
environmentVariables.Add("Radarr_Movie_Id", movie.Id.ToString());
|
||||||
environmentVariables.Add("Radarr_Movie_Title", movie.Title);
|
environmentVariables.Add("Radarr_Movie_Title", movie.Title);
|
||||||
environmentVariables.Add("Radarr_Movie_Path", movie.Path);
|
environmentVariables.Add("Radarr_Movie_Path", movie.Path);
|
||||||
environmentVariables.Add("Radarr_Movie_ImdbId", movie.ImdbId);
|
environmentVariables.Add("Radarr_Movie_ImdbId", movie.ImdbId ?? string.Empty);
|
||||||
environmentVariables.Add("Radarr_Movie_TmdbId", movie.TmdbId.ToString());
|
environmentVariables.Add("Radarr_Movie_TmdbId", movie.TmdbId.ToString());
|
||||||
environmentVariables.Add("Radarr_MovieFile_Id", movieFile.Id.ToString());
|
environmentVariables.Add("Radarr_MovieFile_Id", movieFile.Id.ToString());
|
||||||
environmentVariables.Add("Radarr_MovieFile_RelativePath", movieFile.RelativePath);
|
environmentVariables.Add("Radarr_MovieFile_RelativePath", movieFile.RelativePath);
|
||||||
@ -90,7 +90,7 @@ public override void OnMovieRename(Movie movie)
|
|||||||
environmentVariables.Add("Radarr_Movie_Id", movie.Id.ToString());
|
environmentVariables.Add("Radarr_Movie_Id", movie.Id.ToString());
|
||||||
environmentVariables.Add("Radarr_Movie_Title", movie.Title);
|
environmentVariables.Add("Radarr_Movie_Title", movie.Title);
|
||||||
environmentVariables.Add("Radarr_Movie_Path", movie.Path);
|
environmentVariables.Add("Radarr_Movie_Path", movie.Path);
|
||||||
environmentVariables.Add("Radarr_Movie_ImdbId", movie.ImdbId);
|
environmentVariables.Add("Radarr_Movie_ImdbId", movie.ImdbId ?? string.Empty);
|
||||||
environmentVariables.Add("Radarr_Movie_TmdbId", movie.TmdbId.ToString());
|
environmentVariables.Add("Radarr_Movie_TmdbId", movie.TmdbId.ToString());
|
||||||
|
|
||||||
ExecuteScript(environmentVariables);
|
ExecuteScript(environmentVariables);
|
||||||
|
Loading…
Reference in New Issue
Block a user