claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reduce Linq usage across entire project

Browse Source
This commit is contained in:
Matt Nadareski
2024-10-19 21:41:08 -04:00
parent 1c079aab18
commit b87b05f828
36 changed files with 215 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
SabreTools.FileTypes/Archives/TapeArchive.cs
View File

@@ -6,7 +6,6 @@ using System.Linq;
using Compress;
using SabreTools.Core.Tools;
using SabreTools.Hashing;
using SabreTools.Matching;
using SabreTools.Matching.Compare;
using SharpCompress.Archives;
using SharpCompress.Archives.Tar;
@@ -241,7 +240,7 @@ namespace SabreTools.FileTypes.Archives
try
{
TarArchive ta = TarArchive.Open(this.Filename!, new ReaderOptions { LeaveStreamOpen = false });
List<TarArchiveEntry> tarEntries = ta.Entries.OrderBy(e => e.Key, new NaturalReversedComparer()).ToList();
List<TarArchiveEntry> tarEntries = ta.Entries.OrderBy(e => e.Key ?? string.Empty, new NaturalReversedComparer()).ToList();
string? lastTarEntry = null;
foreach (TarArchiveEntry entry in tarEntries)
{
@@ -340,7 +339,7 @@ namespace SabreTools.FileTypes.Archives
oldTarFile = TarArchive.Open(archiveFileName);
// Get a list of all current entries
var entries = oldTarFile.Entries.Select(i => i.Key).ToList();
List<string> entries = [.. oldTarFile.Entries.Select(i => i.Key)];
// Map all inputs to index
var inputIndexMap = new Dictionary<string, int>();
@@ -367,7 +366,7 @@ namespace SabreTools.FileTypes.Archives
}
// Get the order for the entries with the new file
List<string> keys = inputIndexMap.Keys.ToList();
List<string> keys = [.. inputIndexMap.Keys];
keys.Sort(CompressUtils.TrrntZipStringCompare);
// Copy over all files to the new archive
@@ -480,7 +479,7 @@ namespace SabreTools.FileTypes.Archives
}
// Sort the keys in TZIP order
List<string> keys = inputIndexMap.Keys.ToList();
List<string> keys = [.. inputIndexMap.Keys];
keys.Sort(CompressUtils.TrrntZipStringCompare);
// Now add all of the files in order
@@ -506,7 +505,7 @@ namespace SabreTools.FileTypes.Archives
oldTarFile = TarArchive.Open(archiveFileName);
// Get a list of all current entries
var entries = oldTarFile.Entries.Select(i => i.Key).ToList();
List<string> entries = [.. oldTarFile.Entries.Select(i => i.Key)];
// Map all inputs to index
var inputIndexMap = new Dictionary<string, int>();
@@ -539,7 +538,7 @@ namespace SabreTools.FileTypes.Archives
}
// Get the order for the entries with the new file
List<string> keys = inputIndexMap.Keys.ToList();
List<string> keys = [.. inputIndexMap.Keys];
keys.Sort(CompressUtils.TrrntZipStringCompare);
// Copy over all files to the new archive