fix: read command does not work properly

EverestAPI · Dec 21, 2023 · cbe827a · cbe827a
1 parent 2160f17
commit cbe827a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/CelesteTAS-EverestInterop/Source/TAS/Input/Commands/ReadCommand.cs b/CelesteTAS-EverestInterop/Source/TAS/Input/Commands/ReadCommand.cs
@@ -83,10 +83,13 @@ void FindTheFile() {
             if (fileDirectory != null) {
                 // Path.Combine can handle the case when filePath is an absolute path
                 string absoluteOrRelativePath = Path.Combine(fileDirectory, filePath);
+                if (!absoluteOrRelativePath.EndsWith(".tas", StringComparison.InvariantCulture)) {
+                    absoluteOrRelativePath += ".tas";
+                }
                 if (File.Exists(absoluteOrRelativePath)) {
                     filePath = absoluteOrRelativePath;
                 } else if (Directory.GetParent(absoluteOrRelativePath) is { } directoryInfo && Directory.Exists(directoryInfo.ToString())) {
-                    List<string> files = Directory.GetFiles(directoryInfo.ToString(), $"{Path.GetFileName(filePath)}*.tas").ToList();
+                    List<string> files = Directory.GetFiles(directoryInfo.ToString(), $"{Path.GetFileNameWithoutExtension(filePath)}*.tas").ToList();
                     files.Sort((s1, s2) => string.Compare(s1, s2, StringComparison.InvariantCulture));
                     if (files.FirstOrDefault() is { } shortenedFilePath) {
                         filePath = shortenedFilePath;

diff --git a/Studio/Studio.cs b/Studio/Studio.cs
@@ -573,10 +573,14 @@ string FindTheFile(string fileDirectory, string filePath) {
             if (fileDirectory != null) {
                 // Path.Combine can handle the case when filePath is an absolute path
                 string absoluteOrRelativePath = Path.Combine(fileDirectory, filePath);
+                if (!absoluteOrRelativePath.EndsWith(".tas", StringComparison.InvariantCulture)) {
+                    absoluteOrRelativePath += ".tas";
+                }
                 if (File.Exists(absoluteOrRelativePath) && absoluteOrRelativePath != CurrentFileName) {
                     filePath = absoluteOrRelativePath;
                 } else if (Directory.GetParent(absoluteOrRelativePath) is { } directoryInfo && Directory.Exists(directoryInfo.ToString())) {
-                    string[] files = Directory.GetFiles(directoryInfo.ToString(), $"{Path.GetFileName(filePath)}*.tas");
+                    List<string> files = Directory.GetFiles(directoryInfo.ToString(), $"{Path.GetFileNameWithoutExtension(filePath)}*.tas").ToList();
+                    files.Sort((s1, s2) => string.Compare(s1, s2, StringComparison.InvariantCulture));
                     if (files.FirstOrDefault(path => path != CurrentFileName) is { } shortenedFilePath) {
                         filePath = shortenedFilePath;
                     }