emu-mirrors/ryujinx-final
Archived
0
0
Fork 0
Code Activity

Prefer a 'TryGetValue' call over a Dictionary indexer access guarded by a 'ContainsKey' (#5231)

Browse source 
* Prefer a 'TryGetValue' call over a Dictionary indexer access guarded by a 'ContainsKey' check to avoid double lookup

* fix
This commit is contained in:
Marco Carvalho 2023-06-09 08:05:32 -03:00 committed by GitHub
parent 2bf4555591
commit e94d24f508
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Ryujinx.HLE/FileSystem/ContentManager.cs
View file

@ -181,7 +181,7 @@ namespace Ryujinx.HLE.FileSystem
} }
} }
if (_locationEntries.ContainsKey(storageId) && _locationEntries[storageId]?.Count == 0) if (_locationEntries.TryGetValue(storageId, out var locationEntriesItem) && locationEntriesItem?.Count == 0)
{ {
_locationEntries.Remove(storageId); _locationEntries.Remove(storageId);
} }
@ -347,9 +347,9 @@ namespace Ryujinx.HLE.FileSystem
{ {
lock (_lock) lock (_lock)
{ {
if (_contentDictionary.ContainsKey((titleId, contentType))) if (_contentDictionary.TryGetValue((titleId, contentType), out var contentDictionaryItem))
{ {
return UInt128Utils.FromHex(_contentDictionary[(titleId, contentType)]); return UInt128Utils.FromHex(contentDictionaryItem);
} }
} }
@ -719,9 +719,9 @@ namespace Ryujinx.HLE.FileSystem
Nca nca = new Nca(_virtualFileSystem.KeySet, storage); Nca nca = new Nca(_virtualFileSystem.KeySet, storage);
if (updateNcas.ContainsKey(nca.Header.TitleId)) if (updateNcas.TryGetValue(nca.Header.TitleId, out var updateNcasItem))
{ {
updateNcas[nca.Header.TitleId].Add((nca.Header.ContentType, entry.FullName)); updateNcasItem.Add((nca.Header.ContentType, entry.FullName));
} }
else else
{ {
@ -732,10 +732,8 @@ namespace Ryujinx.HLE.FileSystem
} }
} }
if (updateNcas.ContainsKey(SystemUpdateTitleId)) if (updateNcas.TryGetValue(SystemUpdateTitleId, out var ncaEntry))
{ {
var ncaEntry = updateNcas[SystemUpdateTitleId];
string metaPath = ncaEntry.Find(x => x.type == NcaContentType.Meta).path; string metaPath = ncaEntry.Find(x => x.type == NcaContentType.Meta).path;
CnmtContentMetaEntry[] metaEntries = null; CnmtContentMetaEntry[] metaEntries = null;
@ -770,9 +768,9 @@ namespace Ryujinx.HLE.FileSystem
throw new FileNotFoundException("System update title was not found in the firmware package."); throw new FileNotFoundException("System update title was not found in the firmware package.");
} }
if (updateNcas.ContainsKey(SystemVersionTitleId)) if (updateNcas.TryGetValue(SystemVersionTitleId, out var updateNcasItem))
{ {
string versionEntry = updateNcas[SystemVersionTitleId].Find(x => x.type != NcaContentType.Meta).path; string versionEntry = updateNcasItem.Find(x => x.type != NcaContentType.Meta).path;
using (Stream ncaStream = GetZipStream(archive.GetEntry(versionEntry))) using (Stream ncaStream = GetZipStream(archive.GetEntry(versionEntry)))
{ {
@ -916,9 +914,9 @@ namespace Ryujinx.HLE.FileSystem
} }
} }
if (updateNcas.ContainsKey(nca.Header.TitleId)) if (updateNcas.TryGetValue(nca.Header.TitleId, out var updateNcasItem))
{ {
updateNcas[nca.Header.TitleId].Add((nca.Header.ContentType, entry.FullPath)); updateNcasItem.Add((nca.Header.ContentType, entry.FullPath));
} }
else else
{ {

8
src/Ryujinx.Input/Motion/CemuHook/Client.cs
View file

@ -338,12 +338,10 @@ namespace Ryujinx.Input.Motion.CemuHook
{ {
int slot = inputData.Shared.Slot; int slot = inputData.Shared.Slot;
if (_motionData.ContainsKey(clientId)) if (_motionData.TryGetValue(clientId, out var motionDataItem))
{ {
if (_motionData[clientId].ContainsKey(slot)) if (motionDataItem.TryGetValue(slot, out var previousData))
{ {
MotionInput previousData = _motionData[clientId][slot];
previousData.Update(accelerometer, gyroscrope, timestamp, cemuHookConfig.Sensitivity, (float)cemuHookConfig.GyroDeadzone); previousData.Update(accelerometer, gyroscrope, timestamp, cemuHookConfig.Sensitivity, (float)cemuHookConfig.GyroDeadzone);
} }
else else
@ -352,7 +350,7 @@ namespace Ryujinx.Input.Motion.CemuHook
input.Update(accelerometer, gyroscrope, timestamp, cemuHookConfig.Sensitivity, (float)cemuHookConfig.GyroDeadzone); input.Update(accelerometer, gyroscrope, timestamp, cemuHookConfig.Sensitivity, (float)cemuHookConfig.GyroDeadzone);
_motionData[clientId].Add(slot, input); motionDataItem.Add(slot, input);
} }
} }
else else