-
Notifications
You must be signed in to change notification settings - Fork 74
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Move CheckTraktToken to a Job #1201
Merged
Merged
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
using System; | ||
using System.Collections.Generic; | ||
using System.Threading.Tasks; | ||
using Microsoft.Extensions.Logging; | ||
using Shoko.Server.Scheduling.Acquisition.Attributes; | ||
using Shoko.Server.Scheduling.Attributes; | ||
using Shoko.Server.Scheduling.Concurrency; | ||
using Shoko.Server.Settings; | ||
using Shoko.Server.Providers.TraktTV; | ||
|
||
namespace Shoko.Server.Scheduling.Jobs.Trakt; | ||
|
||
[DatabaseRequired] | ||
[NetworkRequired] | ||
[DisallowConcurrencyGroup(ConcurrencyGroups.Trakt)] | ||
[JobKeyGroup(JobKeyGroup.Trakt)] | ||
public class CheckTraktTokenJob : BaseJob | ||
{ | ||
private readonly ISettingsProvider _settingsProvider; | ||
private readonly TraktTVHelper _traktHelper; | ||
|
||
public bool ForceRefresh; | ||
public override string TypeName => "Check and Refresh Trakt Token"; | ||
public override string Title => "Checking and Refreshing Trakt Token"; | ||
|
||
public override Task Process() | ||
{ | ||
try | ||
{ | ||
_logger.LogInformation("Processing {Job}", nameof(CheckTraktTokenJob)); | ||
var settings = _settingsProvider.GetSettings(); | ||
if (!settings.TraktTv.Enabled || string.IsNullOrEmpty(settings.TraktTv.TokenExpirationDate)) | ||
{ | ||
_logger.LogInformation("Trakt is not enabled or no token expiration date is set"); | ||
return Task.CompletedTask; | ||
} | ||
|
||
// Convert the Unix timestamp to DateTime | ||
var expirationDate = DateTimeOffset.FromUnixTimeSeconds(long.Parse(settings.TraktTv.TokenExpirationDate)).DateTime; | ||
|
||
// Check if the token needs refreshing | ||
if (ForceRefresh || DateTime.Now.Add(TimeSpan.FromDays(45)) >= expirationDate) | ||
{ | ||
_traktHelper.RefreshAuthToken(); | ||
krbrs marked this conversation as resolved.
Show resolved
Hide resolved
|
||
var newExpirationDate = DateTimeOffset.FromUnixTimeSeconds(long.Parse(settings.TraktTv.TokenExpirationDate)).DateTime; | ||
_logger.LogInformation("Trakt token refreshed successfully. New expiry date: {Date}", newExpirationDate); | ||
} | ||
else | ||
{ | ||
_logger.LogInformation("Trakt token is still valid. Expiry date: {Date}", expirationDate); | ||
} | ||
} | ||
catch (Exception ex) | ||
{ | ||
_logger.LogError(ex, "Error in {Job}: {Ex}", nameof(CheckTraktTokenJob), ex); | ||
} | ||
|
||
return Task.CompletedTask; | ||
} | ||
|
||
public CheckTraktTokenJob(ISettingsProvider settingsProvider, TraktTVHelper traktHelper) | ||
{ | ||
_settingsProvider = settingsProvider; | ||
_traktHelper = traktHelper; | ||
} | ||
|
||
protected CheckTraktTokenJob() { } | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should also probably add a check if the date is in the past, and unset the token if it is instead of trying to refresh.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If everybody is okay with my reply below, I'll mark this as resolved