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

[DatFile] Remove ambiguous code hwere possible

Browse Source
This commit is contained in:
Matt Nadareski
2016-10-30 23:29:58 -07:00
parent 54dffb746c
commit c5bf282b80
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
SabreTools.Helper/Dats/DatFile.cs
View File

@@ -5246,8 +5246,8 @@ namespace SabreTools.Helper.Dats
keys.Sort((a, b) => keys.Sort((a, b) =>
{ {
NaturalComparer nc = new NaturalComparer(); NaturalComparer nc = new NaturalComparer();
int adeep = a.Count(c => c == Path.AltDirectorySeparatorChar || c == Path.DirectorySeparatorChar); int adeep = a.Count(c => c == '/' || c == '\\');
int bdeep = b.Count(c => c == Path.AltDirectorySeparatorChar || c == Path.DirectorySeparatorChar); int bdeep = b.Count(c => c == '/' || c == '\\');
if (adeep == bdeep) if (adeep == bdeep)
{ {
@@ -5271,12 +5271,12 @@ namespace SabreTools.Helper.Dats
tempDat.FileName = HttpUtility.HtmlDecode(String.IsNullOrEmpty(tempDat.Name) tempDat.FileName = HttpUtility.HtmlDecode(String.IsNullOrEmpty(tempDat.Name)
? FileName ? FileName
: (shortname : (shortname
? Path.GetFileName(tempDat.Name) ? Style.GetFileName(tempDat.Name)
: tempDat.Name.Replace(Path.DirectorySeparatorChar.ToString(), " - ").Replace(Path.AltDirectorySeparatorChar.ToString(), " - ") : tempDat.Name.Replace("/", " - ").Replace("\\", " - ")
) )
); );
tempDat.Description += " (" + tempDat.Name.Replace(Path.DirectorySeparatorChar, '-').Replace(Path.AltDirectorySeparatorChar, '-') + ")"; tempDat.Description += " (" + tempDat.Name.Replace("/", " - ").Replace("\\", " - ") + ")";
tempDat.Name = Name + " (" + tempDat.Name.Replace(Path.DirectorySeparatorChar, '-').Replace(Path.AltDirectorySeparatorChar, '-') + ")"; tempDat.Name = Name + " (" + tempDat.Name.Replace("/", " - ").Replace("\\", " - ") + ")";
tempDat.Type = null; tempDat.Type = null;
// Write out the temporary DAT to the proper directory // Write out the temporary DAT to the proper directory
@@ -5289,8 +5289,8 @@ namespace SabreTools.Helper.Dats
// Clean the input list and set all games to be pathless // Clean the input list and set all games to be pathless
List<DatItem> items = Files[key]; List<DatItem> items = Files[key];
items.ForEach(item => item.Machine.Name = Path.GetFileName(item.Machine.Name)); items.ForEach(item => item.Machine.Name = Style.GetFileName(item.Machine.Name));
items.ForEach(item => item.Machine.Description = Path.GetFileName(item.Machine.Description)); items.ForEach(item => item.Machine.Description = Style.GetFileName(item.Machine.Description));
// Now add the game to the output DAT // Now add the game to the output DAT
if (tempDat.Files.ContainsKey(key)) if (tempDat.Files.ContainsKey(key))