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.Data/Configuration/ConfigurationCache.cs
+11 -20
View File
@@ -53,11 +53,9 @@ namespace Disco.Data.Configuration
{
var cache = Cache(Database);
ConfigurationCacheScopeType scopeCache;
if (cache.TryGetValue(Scope, out scopeCache))
if (cache.TryGetValue(Scope, out var scopeCache))
{
ConfigurationCacheItemType item = default(ConfigurationCacheItemType);
if (scopeCache.TryGetValue(Key, out item))
if (scopeCache.TryGetValue(Key, out var item))
return item;
}
@@ -93,8 +91,7 @@ namespace Disco.Data.Configuration
Database.ConfigurationItems.Add(configItem);
// Add Item to Cache
ConfigurationCacheScopeType scopeCache;
if (!cacheStore.TryGetValue(Scope, out scopeCache))
if (!cacheStore.TryGetValue(Scope, out var scopeCache))
{
scopeCache = new ConfigurationCacheScopeType();
cacheStore.TryAdd(Scope, scopeCache);
@@ -134,10 +131,9 @@ namespace Disco.Data.Configuration
Database.ConfigurationItems.Remove(configItem);
// Remove item from Cache
ConfigurationCacheScopeType scopeCache;
if (cacheStore.TryGetValue(Scope, out scopeCache))
if (cacheStore.TryGetValue(Scope, out var scopeCache))
{
scopeCache.TryRemove(Key, out item);
scopeCache.TryRemove(Key, out _);
}
return null;
@@ -148,8 +144,7 @@ namespace Disco.Data.Configuration
configItem.Value = Value;
// Update Cache
ConfigurationCacheScopeType scopeCache;
if (cacheStore.TryGetValue(Scope, out scopeCache))
if (cacheStore.TryGetValue(Scope, out var scopeCache))
{
scopeCache.TryRemove(Key, out item);
item = new ConfigurationCacheItemType(configItem, ObjectValue);
@@ -167,8 +162,7 @@ namespace Disco.Data.Configuration
{
var cache = ConfigurationCache.cacheStore;
ConfigurationCacheScopeType scopeCache;
if (cache.TryGetValue(ExistingItem.Item1.Scope, out scopeCache))
if (cache.TryGetValue(ExistingItem.Item1.Scope, out var scopeCache))
{
ConfigurationCacheItemType newItem = new ConfigurationCacheItemType(ExistingItem.Item1, Value);
scopeCache.TryUpdate(ExistingItem.Item1.Key, newItem, ExistingItem);
@@ -340,8 +334,7 @@ namespace Disco.Data.Configuration
{
var cache = Cache(Database);
ConfigurationCacheScopeType scopeCache;
if (cache.TryGetValue(Scope, out scopeCache))
if (cache.TryGetValue(Scope, out var scopeCache))
{
return scopeCache.Keys.ToList();
}
@@ -365,8 +358,7 @@ namespace Disco.Data.Configuration
// Remove item from Cache
if (cacheStore != null)
{
ConfigurationCacheScopeType scopeCache;
cacheStore.TryRemove(Scope, out scopeCache);
cacheStore.TryRemove(Scope, out var scopeCache);
}
}
}
@@ -406,10 +398,9 @@ namespace Disco.Data.Configuration
// Remove item from Cache
if (cacheItem != null)
{
ConfigurationCacheScopeType scopeCache;
if (cacheStore.TryGetValue(Scope, out scopeCache))
if (cacheStore.TryGetValue(Scope, out var scopeCache))
{
scopeCache.TryRemove(Key, out cacheItem);
scopeCache.TryRemove(Key, out _);
}
}
}
Disco.Data/Repository/DiscoDataSeeder.cs
+2 -3
View File
@@ -264,8 +264,7 @@ namespace Disco.Data.Repository
foreach (var configurationItem in configurationItems)
{
int profileId = int.Parse(configurationItem.Scope.Substring(configurationItem.Scope.IndexOf(":") + 1));
DeviceProfile dp;
if (deviceProfiles.TryGetValue(profileId, out dp))
if (deviceProfiles.TryGetValue(profileId, out var dp))
{
switch (configurationItem.Key)
{
@@ -273,7 +272,7 @@ namespace Disco.Data.Repository
dp.ComputerNameTemplate = configurationItem.Value;
break;
case "DistributionType":
dp.DistributionType = (DeviceProfile.DistributionTypes)(int.Parse(configurationItem.Value));
dp.DistributionType = (DeviceProfile.DistributionTypes)int.Parse(configurationItem.Value);
break;
case "OrganisationalUnit":
dp.OrganisationalUnit = configurationItem.Value;
Disco.Data/Repository/Monitor/RepositoryMonitor.cs
+1 -2
View File
@@ -49,9 +49,8 @@ namespace Disco.Data.Repository.Monitor
private static Type EntityTypeFromProxy(Type EntityProxyType)
{
Type EntityType;
if (entityProxyTypeCache.TryGetValue(EntityProxyType, out EntityType))
if (entityProxyTypeCache.TryGetValue(EntityProxyType, out var EntityType))
return EntityType;
EntityType = EntityProxyType;