mirror of
https://github.com/Ombi-app/Ombi.git
synced 2025-08-19 21:03:17 -07:00
fix(auto-delete): 🐛 We now also auto delete music requests, this was previously missing
This commit is contained in:
parent
03352d4547
commit
9fe1f8e988
1 changed files with 18 additions and 1 deletions
|
@ -16,14 +16,16 @@ namespace Ombi.Schedule.Jobs.Ombi
|
||||||
private readonly ISettingsService<OmbiSettings> _ombiSettings;
|
private readonly ISettingsService<OmbiSettings> _ombiSettings;
|
||||||
private readonly IMovieRequestRepository _movieRequests;
|
private readonly IMovieRequestRepository _movieRequests;
|
||||||
private readonly ITvRequestRepository _tvRequestRepository;
|
private readonly ITvRequestRepository _tvRequestRepository;
|
||||||
|
private readonly IMusicRequestRepository _musicRequestRepository;
|
||||||
private readonly ILogger<AutoDeleteRequests> _logger;
|
private readonly ILogger<AutoDeleteRequests> _logger;
|
||||||
|
|
||||||
public AutoDeleteRequests(ISettingsService<OmbiSettings> ombiSettings, IMovieRequestRepository movieRequest,
|
public AutoDeleteRequests(ISettingsService<OmbiSettings> ombiSettings, IMovieRequestRepository movieRequest,
|
||||||
ILogger<AutoDeleteRequests> logger, ITvRequestRepository tvRequestRepository)
|
ILogger<AutoDeleteRequests> logger, ITvRequestRepository tvRequestRepository, IMusicRequestRepository musicRequestRepository)
|
||||||
{
|
{
|
||||||
_ombiSettings = ombiSettings;
|
_ombiSettings = ombiSettings;
|
||||||
_movieRequests = movieRequest;
|
_movieRequests = movieRequest;
|
||||||
_tvRequestRepository = tvRequestRepository;
|
_tvRequestRepository = tvRequestRepository;
|
||||||
|
_musicRequestRepository = _musicRequestRepository;
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -37,6 +39,7 @@ namespace Ombi.Schedule.Jobs.Ombi
|
||||||
var date = DateTime.UtcNow.AddDays(-settings.AutoDeleteAfterDays).Date;
|
var date = DateTime.UtcNow.AddDays(-settings.AutoDeleteAfterDays).Date;
|
||||||
await ProcessMovieRequests(date);
|
await ProcessMovieRequests(date);
|
||||||
await ProcessTvRequests(date);
|
await ProcessTvRequests(date);
|
||||||
|
await ProcessMusicRequests(date);
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task ProcessMovieRequests(DateTime date)
|
private async Task ProcessMovieRequests(DateTime date)
|
||||||
|
@ -66,6 +69,20 @@ namespace Ombi.Schedule.Jobs.Ombi
|
||||||
await _tvRequestRepository.DeleteRange(parentRequests);
|
await _tvRequestRepository.DeleteRange(parentRequests);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async Task ProcessMusicRequests(DateTime date)
|
||||||
|
{
|
||||||
|
var requestsToDelete = await _musicRequestRepository.GetAll().Where(x => x.Available && x.MarkedAsAvailable.HasValue && x.MarkedAsAvailable.Value < date).ToListAsync();
|
||||||
|
|
||||||
|
_logger.LogInformation($"Deleting {requestsToDelete.Count} music requests that have now been scheduled for deletion, All available requests before {date::MM/dd/yyyy} will be deleted");
|
||||||
|
foreach (var r in requestsToDelete)
|
||||||
|
{
|
||||||
|
_logger.LogInformation($"Deleting music title {r.Title} as it was approved on {r.MarkedAsApproved:MM/dd/yyyy hh:mm tt}");
|
||||||
|
}
|
||||||
|
|
||||||
|
await _musicRequestRepository.DeleteRange(requestsToDelete);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
private bool _disposed;
|
private bool _disposed;
|
||||||
|
|
||||||
protected virtual void Dispose(bool disposing)
|
protected virtual void Dispose(bool disposing)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue