mirror of
https://github.com/Radarr/Radarr.git
synced 2025-04-24 06:27:08 -04:00
Refactor movie tags for CustomScript, Webhook and Notifiarr events
(cherry picked from commit cc0a284660f139d5f47b27a2c389973e5e888587) Closes #10003
This commit is contained in:
Mark McDowall
Bogdan
parent
190c4c5893
commit
38e7e37d57
3 changed files with 34 additions and 44 deletions
|
|
@ -69,7 +69,7 @@ namespace NzbDrone.Core.Notifications.CustomScript
|
|||
environmentVariables.Add("Radarr_Movie_Year", movie.MovieMetadata.Value.Year.ToString());
|
||||
environmentVariables.Add("Radarr_Movie_OriginalLanguage", IsoLanguages.Get(movie.MovieMetadata.Value.OriginalLanguage).ThreeLetterCode);
|
||||
environmentVariables.Add("Radarr_Movie_Genres", string.Join("|", movie.MovieMetadata.Value.Genres));
|
||||
environmentVariables.Add("Radarr_Movie_Tags", string.Join("|", movie.Tags.Select(t => _tagRepository.Find(t)?.Label).Where(l => l.IsNotNullOrWhiteSpace())));
|
||||
environmentVariables.Add("Radarr_Movie_Tags", string.Join("|", GetTagLabels(movie)));
|
||||
environmentVariables.Add("Radarr_Movie_ImdbId", movie.MovieMetadata.Value.ImdbId ?? string.Empty);
|
||||
environmentVariables.Add("Radarr_Movie_TmdbId", movie.MovieMetadata.Value.TmdbId.ToString());
|
||||
environmentVariables.Add("Radarr_Movie_In_Cinemas_Date", movie.MovieMetadata.Value.InCinemas.ToString() ?? string.Empty);
|
||||
|
|
@ -107,7 +107,7 @@ namespace NzbDrone.Core.Notifications.CustomScript
|
|||
environmentVariables.Add("Radarr_Movie_Year", movie.MovieMetadata.Value.Year.ToString());
|
||||
environmentVariables.Add("Radarr_Movie_OriginalLanguage", IsoLanguages.Get(movie.MovieMetadata.Value.OriginalLanguage).ThreeLetterCode);
|
||||
environmentVariables.Add("Radarr_Movie_Genres", string.Join("|", movie.MovieMetadata.Value.Genres));
|
||||
environmentVariables.Add("Radarr_Movie_Tags", string.Join("|", movie.Tags.Select(t => _tagRepository.Get(t).Label)));
|
||||
environmentVariables.Add("Radarr_Movie_Tags", string.Join("|", GetTagLabels(movie)));
|
||||
environmentVariables.Add("Radarr_Movie_Path", movie.Path);
|
||||
environmentVariables.Add("Radarr_Movie_ImdbId", movie.MovieMetadata.Value.ImdbId ?? string.Empty);
|
||||
environmentVariables.Add("Radarr_Movie_TmdbId", movie.MovieMetadata.Value.TmdbId.ToString());
|
||||
|
|
@ -164,7 +164,7 @@ namespace NzbDrone.Core.Notifications.CustomScript
|
|||
environmentVariables.Add("Radarr_Movie_Year", movie.MovieMetadata.Value.Year.ToString());
|
||||
environmentVariables.Add("Radarr_Movie_OriginalLanguage", IsoLanguages.Get(movie.MovieMetadata.Value.OriginalLanguage).ThreeLetterCode);
|
||||
environmentVariables.Add("Radarr_Movie_Genres", string.Join("|", movie.MovieMetadata.Value.Genres));
|
||||
environmentVariables.Add("Radarr_Movie_Tags", string.Join("|", movie.Tags.Select(t => _tagRepository.Get(t).Label)));
|
||||
environmentVariables.Add("Radarr_Movie_Tags", string.Join("|", GetTagLabels(movie)));
|
||||
environmentVariables.Add("Radarr_Movie_Path", movie.Path);
|
||||
environmentVariables.Add("Radarr_Movie_ImdbId", movie.MovieMetadata.Value.ImdbId ?? string.Empty);
|
||||
environmentVariables.Add("Radarr_Movie_TmdbId", movie.MovieMetadata.Value.TmdbId.ToString());
|
||||
|
|
@ -191,7 +191,7 @@ namespace NzbDrone.Core.Notifications.CustomScript
|
|||
environmentVariables.Add("Radarr_Movie_Year", movie.MovieMetadata.Value.Year.ToString());
|
||||
environmentVariables.Add("Radarr_Movie_OriginalLanguage", IsoLanguages.Get(movie.MovieMetadata.Value.OriginalLanguage).ThreeLetterCode);
|
||||
environmentVariables.Add("Radarr_Movie_Genres", string.Join("|", movie.MovieMetadata.Value.Genres));
|
||||
environmentVariables.Add("Radarr_Movie_Tags", string.Join("|", movie.Tags.Select(t => _tagRepository.Get(t).Label)));
|
||||
environmentVariables.Add("Radarr_Movie_Tags", string.Join("|", GetTagLabels(movie)));
|
||||
environmentVariables.Add("Radarr_Movie_Path", movie.Path);
|
||||
environmentVariables.Add("Radarr_Movie_ImdbId", movie.MovieMetadata.Value.ImdbId ?? string.Empty);
|
||||
environmentVariables.Add("Radarr_Movie_TmdbId", movie.MovieMetadata.Value.TmdbId.ToString());
|
||||
|
|
@ -216,7 +216,7 @@ namespace NzbDrone.Core.Notifications.CustomScript
|
|||
environmentVariables.Add("Radarr_Movie_Year", movie.Year.ToString());
|
||||
environmentVariables.Add("Radarr_Movie_OriginalLanguage", IsoLanguages.Get(movie.MovieMetadata.Value.OriginalLanguage).ThreeLetterCode);
|
||||
environmentVariables.Add("Radarr_Movie_Genres", string.Join("|", movie.MovieMetadata.Value.Genres));
|
||||
environmentVariables.Add("Radarr_Movie_Tags", string.Join("|", movie.Tags.Select(t => _tagRepository.Get(t).Label)));
|
||||
environmentVariables.Add("Radarr_Movie_Tags", string.Join("|", GetTagLabels(movie)));
|
||||
environmentVariables.Add("Radarr_Movie_Path", movie.Path);
|
||||
environmentVariables.Add("Radarr_Movie_ImdbId", movie.MovieMetadata.Value.ImdbId ?? string.Empty);
|
||||
environmentVariables.Add("Radarr_Movie_TmdbId", movie.MovieMetadata.Value.TmdbId.ToString());
|
||||
|
|
@ -246,7 +246,7 @@ namespace NzbDrone.Core.Notifications.CustomScript
|
|||
environmentVariables.Add("Radarr_Movie_Year", movie.MovieMetadata.Value.Year.ToString());
|
||||
environmentVariables.Add("Radarr_Movie_OriginalLanguage", IsoLanguages.Get(movie.MovieMetadata.Value.OriginalLanguage).ThreeLetterCode);
|
||||
environmentVariables.Add("Radarr_Movie_Genres", string.Join("|", movie.MovieMetadata.Value.Genres));
|
||||
environmentVariables.Add("Radarr_Movie_Tags", string.Join("|", movie.Tags.Select(t => _tagRepository.Get(t).Label)));
|
||||
environmentVariables.Add("Radarr_Movie_Tags", string.Join("|", GetTagLabels(movie)));
|
||||
environmentVariables.Add("Radarr_Movie_Path", movie.Path);
|
||||
environmentVariables.Add("Radarr_Movie_ImdbId", movie.MovieMetadata.Value.ImdbId ?? string.Empty);
|
||||
environmentVariables.Add("Radarr_Movie_TmdbId", movie.MovieMetadata.Value.TmdbId.ToString());
|
||||
|
|
@ -318,7 +318,7 @@ namespace NzbDrone.Core.Notifications.CustomScript
|
|||
environmentVariables.Add("Radarr_Movie_Year", movie.MovieMetadata.Value.Year.ToString());
|
||||
environmentVariables.Add("Radarr_Movie_OriginalLanguage", IsoLanguages.Get(movie.MovieMetadata.Value.OriginalLanguage).ThreeLetterCode);
|
||||
environmentVariables.Add("Radarr_Movie_Genres", string.Join("|", movie.MovieMetadata.Value.Genres));
|
||||
environmentVariables.Add("Radarr_Movie_Tags", string.Join("|", movie.Tags.Select(t => _tagRepository.Get(t).Label)));
|
||||
environmentVariables.Add("Radarr_Movie_Tags", string.Join("|", GetTagLabels(movie)));
|
||||
environmentVariables.Add("Radarr_Movie_Path", movie.Path);
|
||||
environmentVariables.Add("Radarr_Movie_ImdbId", movie.MovieMetadata.Value.ImdbId ?? string.Empty);
|
||||
environmentVariables.Add("Radarr_Movie_TmdbId", movie.MovieMetadata.Value.TmdbId.ToString());
|
||||
|
|
@ -385,5 +385,14 @@ namespace NzbDrone.Core.Notifications.CustomScript
|
|||
{
|
||||
return possibleParent.IsParentPath(path);
|
||||
}
|
||||
|
||||
private List<string> GetTagLabels(Movie movie)
|
||||
{
|
||||
return _tagRepository.GetTags(movie.Tags)
|
||||
.Select(t => t.Label)
|
||||
.Where(l => l.IsNotNullOrWhiteSpace())
|
||||
.OrderBy(l => l)
|
||||
.ToList();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -37,10 +37,7 @@ namespace NzbDrone.Core.Notifications.Webhook
|
|||
EventType = WebhookEventType.Grab,
|
||||
InstanceName = _configFileProvider.InstanceName,
|
||||
ApplicationUrl = _configService.ApplicationUrl,
|
||||
Movie = new WebhookMovie(message.Movie)
|
||||
{
|
||||
Tags = GetTagLabels(message.Movie)
|
||||
},
|
||||
Movie = new WebhookMovie(message.Movie, GetTagLabels(message.Movie)),
|
||||
RemoteMovie = new WebhookRemoteMovie(remoteMovie),
|
||||
Release = new WebhookRelease(quality, remoteMovie),
|
||||
DownloadClient = message.DownloadClientName,
|
||||
|
|
@ -59,10 +56,7 @@ namespace NzbDrone.Core.Notifications.Webhook
|
|||
EventType = WebhookEventType.Download,
|
||||
InstanceName = _configFileProvider.InstanceName,
|
||||
ApplicationUrl = _configService.ApplicationUrl,
|
||||
Movie = new WebhookMovie(message.Movie)
|
||||
{
|
||||
Tags = GetTagLabels(message.Movie)
|
||||
},
|
||||
Movie = new WebhookMovie(message.Movie, GetTagLabels(message.Movie)),
|
||||
RemoteMovie = new WebhookRemoteMovie(message.Movie),
|
||||
MovieFile = new WebhookMovieFile(movieFile),
|
||||
Release = new WebhookGrabbedRelease(message.Release),
|
||||
|
|
@ -93,10 +87,7 @@ namespace NzbDrone.Core.Notifications.Webhook
|
|||
EventType = WebhookEventType.MovieAdded,
|
||||
InstanceName = _configFileProvider.InstanceName,
|
||||
ApplicationUrl = _configService.ApplicationUrl,
|
||||
Movie = new WebhookMovie(movie)
|
||||
{
|
||||
Tags = GetTagLabels(movie)
|
||||
},
|
||||
Movie = new WebhookMovie(movie, GetTagLabels(movie)),
|
||||
AddMethod = movie.AddOptions.AddMethod
|
||||
};
|
||||
}
|
||||
|
|
@ -108,10 +99,7 @@ namespace NzbDrone.Core.Notifications.Webhook
|
|||
EventType = WebhookEventType.MovieFileDelete,
|
||||
InstanceName = _configFileProvider.InstanceName,
|
||||
ApplicationUrl = _configService.ApplicationUrl,
|
||||
Movie = new WebhookMovie(deleteMessage.Movie)
|
||||
{
|
||||
Tags = GetTagLabels(deleteMessage.Movie)
|
||||
},
|
||||
Movie = new WebhookMovie(deleteMessage.Movie, GetTagLabels(deleteMessage.Movie)),
|
||||
MovieFile = new WebhookMovieFile(deleteMessage.MovieFile),
|
||||
DeleteReason = deleteMessage.Reason
|
||||
};
|
||||
|
|
@ -124,10 +112,7 @@ namespace NzbDrone.Core.Notifications.Webhook
|
|||
EventType = WebhookEventType.MovieDelete,
|
||||
InstanceName = _configFileProvider.InstanceName,
|
||||
ApplicationUrl = _configService.ApplicationUrl,
|
||||
Movie = new WebhookMovie(deleteMessage.Movie)
|
||||
{
|
||||
Tags = GetTagLabels(deleteMessage.Movie)
|
||||
},
|
||||
Movie = new WebhookMovie(deleteMessage.Movie, GetTagLabels(deleteMessage.Movie)),
|
||||
DeletedFiles = deleteMessage.DeletedFiles
|
||||
};
|
||||
|
||||
|
|
@ -146,10 +131,7 @@ namespace NzbDrone.Core.Notifications.Webhook
|
|||
EventType = WebhookEventType.Rename,
|
||||
InstanceName = _configFileProvider.InstanceName,
|
||||
ApplicationUrl = _configService.ApplicationUrl,
|
||||
Movie = new WebhookMovie(movie)
|
||||
{
|
||||
Tags = GetTagLabels(movie)
|
||||
},
|
||||
Movie = new WebhookMovie(movie, GetTagLabels(movie)),
|
||||
RenamedMovieFiles = renamedFiles.ConvertAll(x => new WebhookRenamedMovieFile(x))
|
||||
};
|
||||
}
|
||||
|
|
@ -204,10 +186,7 @@ namespace NzbDrone.Core.Notifications.Webhook
|
|||
EventType = WebhookEventType.ManualInteractionRequired,
|
||||
InstanceName = _configFileProvider.InstanceName,
|
||||
ApplicationUrl = _configService.ApplicationUrl,
|
||||
Movie = new WebhookMovie(message.Movie)
|
||||
{
|
||||
Tags = GetTagLabels(message.Movie)
|
||||
},
|
||||
Movie = new WebhookMovie(message.Movie, GetTagLabels(message.Movie)),
|
||||
DownloadInfo = new WebhookDownloadClientItem(quality, message.TrackedDownload.DownloadItem),
|
||||
DownloadClient = message.DownloadClientInfo?.Name,
|
||||
DownloadClientType = message.DownloadClientInfo?.Type,
|
||||
|
|
@ -233,7 +212,7 @@ namespace NzbDrone.Core.Notifications.Webhook
|
|||
Year = 1970,
|
||||
FolderPath = "C:\\testpath",
|
||||
ReleaseDate = "1970-01-01",
|
||||
Tags = new[] { "test-tag" }
|
||||
Tags = new List<string> { "test-tag" }
|
||||
},
|
||||
RemoteMovie = new WebhookRemoteMovie
|
||||
{
|
||||
|
|
@ -254,12 +233,13 @@ namespace NzbDrone.Core.Notifications.Webhook
|
|||
};
|
||||
}
|
||||
|
||||
private IEnumerable<string> GetTagLabels(Movie movie)
|
||||
private List<string> GetTagLabels(Movie movie)
|
||||
{
|
||||
return movie.Tags?
|
||||
.Select(t => _tagRepository.Find(t)?.Label)
|
||||
return _tagRepository.GetTags(movie.Tags)
|
||||
.Select(t => t.Label)
|
||||
.Where(l => l.IsNotNullOrWhiteSpace())
|
||||
.OrderBy(l => l);
|
||||
.OrderBy(l => l)
|
||||
.ToList();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -16,13 +16,13 @@ namespace NzbDrone.Core.Notifications.Webhook
|
|||
public int TmdbId { get; set; }
|
||||
public string ImdbId { get; set; }
|
||||
public string Overview { get; set; }
|
||||
public IEnumerable<string> Tags { get; set; }
|
||||
public List<string> Tags { get; set; }
|
||||
|
||||
public WebhookMovie()
|
||||
{
|
||||
}
|
||||
|
||||
public WebhookMovie(Movie movie)
|
||||
public WebhookMovie(Movie movie, List<string> tags)
|
||||
{
|
||||
Id = movie.Id;
|
||||
Title = movie.Title;
|
||||
|
|
@ -32,10 +32,11 @@ namespace NzbDrone.Core.Notifications.Webhook
|
|||
TmdbId = movie.TmdbId;
|
||||
ImdbId = movie.ImdbId;
|
||||
Overview = movie.MovieMetadata.Value.Overview;
|
||||
Tags = tags;
|
||||
}
|
||||
|
||||
public WebhookMovie(Movie movie, MovieFile movieFile)
|
||||
: this(movie)
|
||||
public WebhookMovie(Movie movie, MovieFile movieFile, List<string> tags)
|
||||
: this(movie, tags)
|
||||
{
|
||||
FilePath = Path.Combine(movie.Path, movieFile.RelativePath);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue