Merge pull request #22 from PikminGuts92/dev

Ark + midi enhancements

Author: PikminGuts92

Src/Apps/ArkHelper/Apps/PatchCreatorApp.cs

@@ -45,12 +45,21 @@ public void Parse(PatchCreatorOptions op)
         var hdrFileName = new FileInfo(op.InputPath).Name;
         var isUppercase = Path
             .GetFileNameWithoutExtension(hdrFileName)
-            .All(c => char.IsUpper(c));
+            .All(char.IsAsciiLetterUpper);
 
         var genDirName = isUppercase
             ? "GEN"
             : "gen";
 
+        // Use upper case if any file names do
+        var genDirNameInternal = ark
+            .Entries
+            .Any(x => x.FileName
+                .Where(char.IsAsciiLetter)
+                .All(char.IsAsciiLetterUpper))
+            ? "GEN"
+            : "gen";
+
         var arkExt = isUppercase
             ? ".ARK"
             : ".ark";
@@ -79,6 +88,10 @@ public void Parse(PatchCreatorOptions op)
                 ark.AddAdditionalPart(fullPartPath);
             }
         }
+        else
+        {
+            Log.Warning("Using inplace edit");
+        }
 
         var files = Directory.GetFiles(op.ArkFilesPath, "*", SearchOption.AllDirectories);
 
@@ -114,7 +127,7 @@ public void Parse(PatchCreatorOptions op)
                 internalPath = $"{internalPath.Substring(0, internalPath.Length - 1)}b";
 
                 if (!genPathedFile.IsMatch(internalPath))
-                    internalPath = internalPath.Insert(internalPath.LastIndexOf('/'), $"/{genDirName}");
+                    internalPath = internalPath.Insert(internalPath.LastIndexOf('/'), $"/{genDirNameInternal}");
 
                 // Creates temp dtb file
                 inputFilePath = ScriptHelper.ConvertDtaToDtb(file, tempDir, ark.Encrypted, (int)ark.Version);

Src/Apps/P9SongTool/Helpers/MidiHelper.cs

@@ -31,7 +31,7 @@ protected virtual MidiFile ParseBaseMidi(string midPath)
         }
 
         Log.Information("Using \"{MidPath}\" as base .mid file", midPath);
-        return new MidiFile(midPath);
+        return new MidiFile(midPath, strictChecking: false);
     }
 
     protected virtual List<(long tickPos, decimal framePos, int mpq)> CreateTempoMap()

Src/Core/Mackiloha/Ark/ArkEntry.cs

@@ -31,7 +31,7 @@ private bool IsValidPath(string text, bool directory = false)
 
     public string Extension => (!FileName.Contains('.')) ? "" : FileName.Remove(0, FileName.LastIndexOf('.') + 1);
 
-    public override bool Equals(object obj) => (obj is ArkEntry) && ((obj as ArkEntry).FullPath == this.FullPath);
-    public override int GetHashCode() => FullPath.GetHashCode();
-    public override string ToString() => $"{FullPath}";
+    public override bool Equals(object obj) => (obj is ArkEntry arkEntry) && string.Equals(arkEntry.FullPath, FullPath, StringComparison.InvariantCultureIgnoreCase);
+    public override int GetHashCode() => string.GetHashCode(FullPath, StringComparison.InvariantCultureIgnoreCase);
+    public override string ToString() => FullPath;
 }

version.txt

@@ -1 +1 @@
-1.3.1
+1.3.2