Mirrors/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2024-07-07 04:19:25 +02:00
Code Issues Releases Wiki Activity

Refactor tags in WebhookMovie

Browse Source
This commit is contained in:
Bogdan 2024-02-02 13:39:06 +02:00
parent 35c6fef2d1
commit 7198aa24a6
2 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/NzbDrone.Core/Notifications/Webhook/WebhookBase.cs
View File

@ -36,7 +36,10 @@ protected WebhookGrabPayload BuildOnGrabPayload(GrabMessage message)
EventType = WebhookEventType.Grab, EventType = WebhookEventType.Grab,
InstanceName = _configFileProvider.InstanceName, InstanceName = _configFileProvider.InstanceName,
ApplicationUrl = _configService.ApplicationUrl, ApplicationUrl = _configService.ApplicationUrl,
Movie = new WebhookMovie(message.Movie, tags: GetTagLabels(message.Movie)), Movie = new WebhookMovie(message.Movie)
{
Tags = GetTagLabels(message.Movie)
},
RemoteMovie = new WebhookRemoteMovie(remoteMovie), RemoteMovie = new WebhookRemoteMovie(remoteMovie),
Release = new WebhookRelease(quality, remoteMovie), Release = new WebhookRelease(quality, remoteMovie),
DownloadClient = message.DownloadClientName, DownloadClient = message.DownloadClientName,
@ -55,7 +58,10 @@ protected WebhookImportPayload BuildOnDownloadPayload(DownloadMessage message)
EventType = WebhookEventType.Download, EventType = WebhookEventType.Download,
InstanceName = _configFileProvider.InstanceName, InstanceName = _configFileProvider.InstanceName,
ApplicationUrl = _configService.ApplicationUrl, ApplicationUrl = _configService.ApplicationUrl,
Movie = new WebhookMovie(message.Movie, tags: GetTagLabels(message.Movie)), Movie = new WebhookMovie(message.Movie)
{
Tags = GetTagLabels(message.Movie)
},
RemoteMovie = new WebhookRemoteMovie(message.Movie), RemoteMovie = new WebhookRemoteMovie(message.Movie),
MovieFile = new WebhookMovieFile(movieFile), MovieFile = new WebhookMovieFile(movieFile),
Release = new WebhookGrabbedRelease(message.Release), Release = new WebhookGrabbedRelease(message.Release),
@ -86,7 +92,10 @@ protected WebhookAddedPayload BuildOnMovieAdded(Movie movie)
EventType = WebhookEventType.MovieAdded, EventType = WebhookEventType.MovieAdded,
InstanceName = _configFileProvider.InstanceName, InstanceName = _configFileProvider.InstanceName,
ApplicationUrl = _configService.ApplicationUrl, ApplicationUrl = _configService.ApplicationUrl,
Movie = new WebhookMovie(movie, tags: GetTagLabels(movie)), Movie = new WebhookMovie(movie)
{
Tags = GetTagLabels(movie)
},
AddMethod = movie.AddOptions.AddMethod AddMethod = movie.AddOptions.AddMethod
}; };
} }
@ -98,7 +107,10 @@ protected WebhookMovieFileDeletePayload BuildOnMovieFileDelete(MovieFileDeleteMe
EventType = WebhookEventType.MovieFileDelete, EventType = WebhookEventType.MovieFileDelete,
InstanceName = _configFileProvider.InstanceName, InstanceName = _configFileProvider.InstanceName,
ApplicationUrl = _configService.ApplicationUrl, ApplicationUrl = _configService.ApplicationUrl,
Movie = new WebhookMovie(deleteMessage.Movie, tags: GetTagLabels(deleteMessage.Movie)), Movie = new WebhookMovie(deleteMessage.Movie)
{
Tags = GetTagLabels(deleteMessage.Movie)
},
MovieFile = new WebhookMovieFile(deleteMessage.MovieFile), MovieFile = new WebhookMovieFile(deleteMessage.MovieFile),
DeleteReason = deleteMessage.Reason DeleteReason = deleteMessage.Reason
}; };
@ -111,7 +123,10 @@ protected WebhookMovieDeletePayload BuildOnMovieDelete(MovieDeleteMessage delete
EventType = WebhookEventType.MovieDelete, EventType = WebhookEventType.MovieDelete,
InstanceName = _configFileProvider.InstanceName, InstanceName = _configFileProvider.InstanceName,
ApplicationUrl = _configService.ApplicationUrl, ApplicationUrl = _configService.ApplicationUrl,
Movie = new WebhookMovie(deleteMessage.Movie, tags: GetTagLabels(deleteMessage.Movie)), Movie = new WebhookMovie(deleteMessage.Movie)
{
Tags = GetTagLabels(deleteMessage.Movie)
},
DeletedFiles = deleteMessage.DeletedFiles DeletedFiles = deleteMessage.DeletedFiles
}; };
@ -130,7 +145,10 @@ protected WebhookRenamePayload BuildOnRenamePayload(Movie movie, List<RenamedMov
EventType = WebhookEventType.Rename, EventType = WebhookEventType.Rename,
InstanceName = _configFileProvider.InstanceName, InstanceName = _configFileProvider.InstanceName,
ApplicationUrl = _configService.ApplicationUrl, ApplicationUrl = _configService.ApplicationUrl,
Movie = new WebhookMovie(movie, tags: GetTagLabels(movie)), Movie = new WebhookMovie(movie)
{
Tags = GetTagLabels(movie)
},
RenamedMovieFiles = renamedFiles.ConvertAll(x => new WebhookRenamedMovieFile(x)) RenamedMovieFiles = renamedFiles.ConvertAll(x => new WebhookRenamedMovieFile(x))
}; };
} }
@ -185,7 +203,10 @@ protected WebhookManualInteractionPayload BuildManualInteractionRequiredPayload(
EventType = WebhookEventType.ManualInteractionRequired, EventType = WebhookEventType.ManualInteractionRequired,
InstanceName = _configFileProvider.InstanceName, InstanceName = _configFileProvider.InstanceName,
ApplicationUrl = _configService.ApplicationUrl, ApplicationUrl = _configService.ApplicationUrl,
Movie = new WebhookMovie(message.Movie, tags: GetTagLabels(message.Movie)), Movie = new WebhookMovie(message.Movie)
{
Tags = GetTagLabels(message.Movie)
},
DownloadInfo = new WebhookDownloadClientItem(quality, message.TrackedDownload.DownloadItem), DownloadInfo = new WebhookDownloadClientItem(quality, message.TrackedDownload.DownloadItem),
DownloadClient = message.DownloadClientName, DownloadClient = message.DownloadClientName,
DownloadClientType = message.DownloadClientType, DownloadClientType = message.DownloadClientType,

6
src/NzbDrone.Core/Notifications/Webhook/WebhookMovie.cs
View File

@ -34,12 +34,6 @@ public WebhookMovie(Movie movie)
Overview = movie.MovieMetadata.Value.Overview; Overview = movie.MovieMetadata.Value.Overview;
} }
public WebhookMovie(Movie movie, IEnumerable<string> tags)
: this(movie)
{
Tags = tags;
}
public WebhookMovie(Movie movie, MovieFile movieFile) public WebhookMovie(Movie movie, MovieFile movieFile)
: this(movie) : this(movie)
{ {