jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qol: inline variable declaration

Browse Source
This commit is contained in:
Gary Sharp
2025-07-20 15:12:33 +10:00
parent 5792771ea1
commit 1add4ee0f5
89 changed files with 1229 additions and 1512 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Services/Jobs/JobQueues/Cache.cs
+4 -8
View File
@@ -76,9 +76,8 @@ namespace Disco.Services.Jobs.JobQueues
public JobQueueToken UpdateQueue(JobQueue JobQueue)
{
var token = JobQueueToken.FromJobQueue(JobQueue);
JobQueueToken existingToken;
if (_Cache.TryGetValue(JobQueue.Id, out existingToken))
if (_Cache.TryGetValue(JobQueue.Id, out var existingToken))
{
if (_Cache.TryUpdate(JobQueue.Id, token, existingToken))
{
@@ -103,8 +102,7 @@ namespace Disco.Services.Jobs.JobQueues
}
public bool RemoveQueue(int JobQueueId)
{
JobQueueToken token;
if (_Cache.TryRemove(JobQueueId, out token))
if (_Cache.TryRemove(JobQueueId, out _))
{
CalculateSubjectCache();
return true;
@@ -116,8 +114,7 @@ namespace Disco.Services.Jobs.JobQueues
}
public JobQueueToken GetQueue(int JobQueueId)
{
JobQueueToken token;
if (_Cache.TryGetValue(JobQueueId, out token))
if (_Cache.TryGetValue(JobQueueId, out var token))
return token;
else
return null;
@@ -128,8 +125,7 @@ namespace Disco.Services.Jobs.JobQueues
}
private IEnumerable<JobQueueToken> GetQueuesForSubject(string SubjectId)
{
List<JobQueueToken> tokens;
if (_SubjectCache.TryGetValue(SubjectId, out tokens))
if (_SubjectCache.TryGetValue(SubjectId, out var tokens))
return tokens;
else
return Enumerable.Empty<JobQueueToken>();
Disco.Services/Jobs/JobQueues/JobQueueService.cs
+3 -5
View File
@@ -14,7 +14,7 @@ namespace Disco.Services.Jobs.JobQueues
{
public static class JobQueueService
{
private const string _cacheHttpRequestKey = "Disco_UserQueuesToken_{0}";
private const string _cacheHttpRequestKey = "Disco_UserQueuesToken";
private static Cache _cache;
public static void Initialize(DiscoDataContext Database)
@@ -168,21 +168,19 @@ namespace Disco.Services.Jobs.JobQueues
}
public static ReadOnlyCollection<JobQueueToken> UsersQueues(AuthorizationToken UserAuthorization)
{
string cacheKey = string.Format(_cacheHttpRequestKey, UserAuthorization.User.UserId);
ReadOnlyCollection<JobQueueToken> tokens = null;
// Check for ASP.NET
if (HttpContext.Current != null)
{
tokens = (ReadOnlyCollection<JobQueueToken>)HttpContext.Current.Items[_cacheHttpRequestKey];
}
if (tokens == null)
{
var subjectIds = (new string[] { UserAuthorization.User.UserId }).Concat(UserAuthorization.GroupMembership);
tokens = _cache.GetQueuesForSubject(subjectIds);
HttpContext.Current.Items[_cacheHttpRequestKey] = tokens;
if (HttpContext.Current != null)
HttpContext.Current.Items[_cacheHttpRequestKey] = tokens;
}
return tokens;