Alienjack/AxibugEmuOnline
1
0
Fork 0
forked from sin365/AxibugEmuOnline
Code Pull Requests Activity

补全Switch的Directory逻辑

Browse Source
This commit is contained in:
sin365 2025-04-25 14:39:11 +08:00
parent 24036739a7
commit 213ed7163c
7 changed files with 271 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

365
AxibugEmuOnline.Client/Assets/Plugins/AxiNSApi/AxiNSIO.cs
View File

@ -2,20 +2,24 @@
using nn.fs; using nn.fs;
#endif #endif
using System.Collections.Generic;
using System.Linq;
using System.Text.RegularExpressions;
public class AxiNSIO public class AxiNSIO
{ {
string save_name => AxiNS.instance.mount.SaveMountName; string save_name => AxiNS.instance.mount.SaveMountName;
public string save_path => $"{save_name}:/"; public string save_path => $"{save_name}:/";
#if UNITY_SWITCH #if UNITY_SWITCH
private FileHandle fileHandle = new nn.fs.FileHandle(); private FileHandle fileHandle = new nn.fs.FileHandle();
#endif #endif
/// <summary> /// <summary>
/// 检查Path是否存在 /// 检查Path是否存在
/// </summary> /// </summary>
/// <param name="filePath"></param> /// <param name="filePath"></param>
/// <returns></returns> /// <returns></returns>
public bool CheckPathExists(string filePath) public bool CheckPathExists(string filePath)
{ {
#if !UNITY_SWITCH #if !UNITY_SWITCH
return false; return false;
#else #else
@ -25,14 +29,14 @@ public class AxiNSIO
//这个异常捕获。真的别扭 //这个异常捕获。真的别扭
return nn.fs.FileSystem.ResultPathAlreadyExists.Includes(result); return nn.fs.FileSystem.ResultPathAlreadyExists.Includes(result);
#endif #endif
} }
/// <summary> /// <summary>
/// 检查Path是否不存在 /// 检查Path是否不存在
/// </summary> /// </summary>
/// <param name="filePath"></param> /// <param name="filePath"></param>
/// <returns></returns> /// <returns></returns>
public bool CheckPathNotFound(string filePath) public bool CheckPathNotFound(string filePath)
{ {
#if !UNITY_SWITCH #if !UNITY_SWITCH
return false; return false;
#else #else
@ -41,14 +45,14 @@ public class AxiNSIO
//这个异常捕获。真的别扭 //这个异常捕获。真的别扭
return nn.fs.FileSystem.ResultPathNotFound.Includes(result); return nn.fs.FileSystem.ResultPathNotFound.Includes(result);
#endif #endif
} }
/// <summary> /// <summary>
/// 创建目录，目录存在也会返回true /// 创建目录，目录存在也会返回true
/// </summary> /// </summary>
/// <param name="filePath"></param> /// <param name="filePath"></param>
/// <returns></returns> /// <returns></returns>
public bool CreateDir(string filePath) public bool CreateDir(string filePath)
{ {
#if !UNITY_SWITCH #if !UNITY_SWITCH
return false; return false;
#else #else
@ -60,40 +64,38 @@ public class AxiNSIO
} }
return true; return true;
#endif #endif
} }
/// <summary>
/// 保存并创建文件（如果目录不存在回先自动创建目录）
/// <summary> /// </summary>
/// 保存并创建文件（如果目录不存在回先自动创建目录） /// <param name="filePath"></param>
/// </summary> /// <param name="bw"></param>
/// <param name="filePath"></param> /// <returns></returns>
/// <param name="bw"></param> public bool FileToSaveWithCreate(string filePath, System.IO.MemoryStream ms)
/// <returns></returns> {
public bool FileToSaveWithCreate(string filePath, System.IO.MemoryStream ms) return FileToSaveWithCreate(filePath, ms.ToArray());
{ }
return FileToSaveWithCreate(filePath, ms.ToArray()); /// <summary>
} /// 保存并创建文件（如果目录不存在回先自动创建目录）
/// <summary> /// </summary>
/// 保存并创建文件（如果目录不存在回先自动创建目录） /// <param name="filePath"></param>
/// </summary> /// <param name="data"></param>
/// <param name="filePath"></param> /// <returns></returns>
/// <param name="data"></param> public AxiNSWait_FileToSaveByMSWithCreate FileToSaveWithCreateAsync(string filePath, System.IO.MemoryStream ms)
/// <returns></returns> {
public AxiNSWait_FileToSaveByMSWithCreate FileToSaveWithCreateAsync(string filePath, System.IO.MemoryStream ms) var wait = new AxiNSWait_FileToSaveByMSWithCreate(filePath, ms);
{ AxiNS.instance.wait.AddWait(wait);
var wait = new AxiNSWait_FileToSaveByMSWithCreate(filePath, ms); return wait;
AxiNS.instance.wait.AddWait(wait); }
return wait; /// <summary>
} /// 保存并创建文件（如果目录不存在回先自动创建目录）
/// <summary> /// </summary>
/// 保存并创建文件（如果目录不存在回先自动创建目录） /// <param name="filePath"></param>
/// </summary> /// <param name="data"></param>
/// <param name="filePath"></param> /// <returns></returns>
/// <param name="data"></param> public bool FileToSaveWithCreate(string filePath, byte[] data)
/// <returns></returns> {
public bool FileToSaveWithCreate(string filePath, byte[] data)
{
#if !UNITY_SWITCH #if !UNITY_SWITCH
return false; return false;
#else #else
@ -197,39 +199,39 @@ public class AxiNSIO
return true; return true;
#endif #endif
} }
/// <summary> /// <summary>
/// 保存并创建文件（如果目录不存在回先自动创建目录） /// 保存并创建文件（如果目录不存在回先自动创建目录）
/// </summary> /// </summary>
/// <param name="filePath"></param> /// <param name="filePath"></param>
/// <param name="data"></param> /// <param name="data"></param>
/// <returns></returns> /// <returns></returns>
public AxiNSWait_FileToSaveWithCreate FileToSaveWithCreateAsync(string filePath, byte[] data) public AxiNSWait_FileToSaveWithCreate FileToSaveWithCreateAsync(string filePath, byte[] data)
{ {
var wait = new AxiNSWait_FileToSaveWithCreate(filePath, data); var wait = new AxiNSWait_FileToSaveWithCreate(filePath, data);
AxiNS.instance.wait.AddWait(wait); AxiNS.instance.wait.AddWait(wait);
return wait; return wait;
} }
public byte[] LoadSwitchDataFile(string filename) public byte[] LoadSwitchDataFile(string filename)
{ {
LoadSwitchDataFile(filename, out byte[] outputData); LoadSwitchDataFile(filename, out byte[] outputData);
return outputData; return outputData;
} }
public bool LoadSwitchDataFile(string filename, ref System.IO.MemoryStream ms) public bool LoadSwitchDataFile(string filename, ref System.IO.MemoryStream ms)
{ {
if (LoadSwitchDataFile(filename, out byte[] outputData)) if (LoadSwitchDataFile(filename, out byte[] outputData))
{ {
using (System.IO.BinaryWriter writer = new System.IO.BinaryWriter(ms)) using (System.IO.BinaryWriter writer = new System.IO.BinaryWriter(ms))
{ {
writer.Write(outputData); writer.Write(outputData);
} }
return true; return true;
} }
return false; return false;
} }
public bool LoadSwitchDataFile(string filename, out byte[] outputData) public bool LoadSwitchDataFile(string filename, out byte[] outputData)
{ {
#if !UNITY_SWITCH #if !UNITY_SWITCH
outputData = null; outputData = null;
return false; return false;
@ -280,15 +282,94 @@ public class AxiNSIO
outputData = loadedData; outputData = loadedData;
return true; return true;
#endif #endif
} }
public AxiNSWait_LoadSwitchDataFile LoadSwitchDataFileAsync(string filename) public AxiNSWait_LoadSwitchDataFile LoadSwitchDataFileAsync(string filename)
{ {
var wait = new AxiNSWait_LoadSwitchDataFile(filename); var wait = new AxiNSWait_LoadSwitchDataFile(filename);
AxiNS.instance.wait.AddWait(wait); AxiNS.instance.wait.AddWait(wait);
return wait; return wait;
} }
public bool DeletePathFile(string filename)
public bool GetDirectoryFiles(string path, out string[] entrys)
{
#if !UNITY_SWITCH
entrys = null;
return false;
#else
return GetDirectoryEntrys(path,nn.fs.OpenDirectoryMode.File,out entrys);
#endif
}
public bool GetDirectoryDirs(string path, out string[] entrys)
{
#if !UNITY_SWITCH
entrys = null;
return false;
#else
return GetDirectoryEntrys(path, nn.fs.OpenDirectoryMode.Directory, out entrys);
#endif
}
#if UNITY_SWITCH
public bool GetDirectoryEntrys(string path, nn.fs.OpenDirectoryMode type, out string[] entrys)
{ {
entrys = null;
return false;
nn.fs.DirectoryHandle dirHandle = new nn.fs.DirectoryHandle();
nn.Result result = nn.fs.Directory.Open(ref dirHandle, path, type);
if (nn.fs.FileSystem.ResultPathNotFound.Includes(result))
{
UnityEngine.Debug.Log($"目录 {path} 不存在");
entrys = null;
return false;
}
long entryCount = 0;
nn.fs.Directory.GetEntryCount(ref entryCount, dirHandle);
nn.fs.DirectoryEntry[] dirEntries = new nn.fs.DirectoryEntry[entryCount];
long actualEntries = 0;
nn.fs.Directory.Read(ref actualEntries, dirEntries, dirHandle, entryCount);
entrys = new string[actualEntries];
for (int i = 0; i < actualEntries; i++)
{
entrys[i] = dirEntries[i].name;
}
nn.fs.Directory.Close(dirHandle);
return true;
}
#endif
public IEnumerable<string> EnumerateFiles(string path, string searchPattern)
{
#if !UNITY_SWITCH
yield break;
#else
// 将通配符转换为正则表达式（支持*和?）
var regexPattern = "^" +
Regex.Escape(searchPattern)
.Replace("\\*", ".*")
.Replace("\\?", ".")
+ "$";
var regex = new Regex(regexPattern, RegexOptions.IgnoreCase);
if (!GetDirectoryEntrys(path, nn.fs.OpenDirectoryMode.File, out string[] entrys))
{
yield break;
}
for (int i = 0; i < entrys.Length; i++)
{
if (regex.IsMatch(System.IO.Path.GetFileName(entrys[i])))
{
yield return entrys[i];
}
}
#endif
}
public bool DeletePathFile(string filename)
{
#if !UNITY_SWITCH #if !UNITY_SWITCH
return false; return false;
#else #else
@ -323,15 +404,15 @@ public class AxiNSIO
#endif #endif
#endif #endif
} }
public AxiNSWait_DeletePathFile DeletePathFileAsync(string filename) public AxiNSWait_DeletePathFile DeletePathFileAsync(string filename)
{ {
var wait = new AxiNSWait_DeletePathFile(filename); var wait = new AxiNSWait_DeletePathFile(filename);
AxiNS.instance.wait.AddWait(wait); AxiNS.instance.wait.AddWait(wait);
return wait; return wait;
} }
public bool DeletePathDir(string filename) public bool DeletePathDir(string filename)
{ {
#if !UNITY_SWITCH #if !UNITY_SWITCH
return false; return false;
#else #else
@ -364,21 +445,21 @@ public class AxiNSIO
UnityEngine.Switch.Notification.LeaveExitRequestHandlingSection(); UnityEngine.Switch.Notification.LeaveExitRequestHandlingSection();
#endif #endif
#endif #endif
} }
public AxiNSWait_DeletePathDir DeletePathDirAsync(string filename) public AxiNSWait_DeletePathDir DeletePathDirAsync(string filename)
{ {
var wait = new AxiNSWait_DeletePathDir(filename); var wait = new AxiNSWait_DeletePathDir(filename);
AxiNS.instance.wait.AddWait(wait); AxiNS.instance.wait.AddWait(wait);
return wait; return wait;
} }
/// <summary> /// <summary>
/// 递归删除目录 /// 递归删除目录
/// </summary> /// </summary>
/// <param name="filename"></param> /// <param name="filename"></param>
/// <returns></returns> /// <returns></returns>
public bool DeleteRecursivelyPathDir(string filename) public bool DeleteRecursivelyPathDir(string filename)
{ {
#if !UNITY_SWITCH #if !UNITY_SWITCH
return false; return false;
#else #else
@ -411,15 +492,15 @@ public class AxiNSIO
UnityEngine.Switch.Notification.LeaveExitRequestHandlingSection(); UnityEngine.Switch.Notification.LeaveExitRequestHandlingSection();
#endif #endif
#endif #endif
} }
/// <summary> /// <summary>
/// 递归删除情况 /// 递归删除情况
/// </summary> /// </summary>
/// <param name="filename"></param> /// <param name="filename"></param>
/// <returns></returns> /// <returns></returns>
public bool CleanRecursivelyPathDir(string filename) public bool CleanRecursivelyPathDir(string filename)
{ {
#if !UNITY_SWITCH #if !UNITY_SWITCH
return false; return false;
#else #else
@ -452,10 +533,10 @@ public class AxiNSIO
UnityEngine.Switch.Notification.LeaveExitRequestHandlingSection(); UnityEngine.Switch.Notification.LeaveExitRequestHandlingSection();
#endif #endif
#endif #endif
} }
public bool RenameDir(string oldpath, string newpath) public bool RenameDir(string oldpath, string newpath)
{ {
#if !UNITY_SWITCH #if !UNITY_SWITCH
return false; return false;
#else #else
@ -489,9 +570,9 @@ public class AxiNSIO
UnityEngine.Switch.Notification.LeaveExitRequestHandlingSection(); UnityEngine.Switch.Notification.LeaveExitRequestHandlingSection();
#endif #endif
#endif #endif
} }
bool EnsureParentDirectory(string filePath, bool bAutoCreateDir = true) bool EnsureParentDirectory(string filePath, bool bAutoCreateDir = true)
{ {
#if !UNITY_SWITCH #if !UNITY_SWITCH
return false; return false;
#else #else
@ -567,14 +648,14 @@ public class AxiNSIO
return true; return true;
#endif #endif
} }
/// <summary> /// <summary>
/// 检查指定挂载点是否可访问 /// 检查指定挂载点是否可访问
/// </summary> /// </summary>
/// <param name="pathPrefix">路径前缀，例如 "save:/" 或 "sd:/"</param> /// <param name="pathPrefix">路径前缀，例如 "save:/" 或 "sd:/"</param>
/// <returns>挂载点是否可访问</returns> /// <returns>挂载点是否可访问</returns>
bool IsMountPointAccessible(string pathPrefix) bool IsMountPointAccessible(string pathPrefix)
{ {
#if !UNITY_SWITCH #if !UNITY_SWITCH
return false; return false;
#else #else
@ -612,5 +693,5 @@ public class AxiNSIO
return true; // 其他挂载点需根据实际需求实现 return true; // 其他挂载点需根据实际需求实现
} }
#endif #endif
} }
} }

2
AxibugEmuOnline.Client/Assets/Plugins/AxiNSApi/AxiNSMount.cs
View File

@ -118,7 +118,7 @@ public class AxiNSMount
UnityEngine.Debug.LogError($"UnmountSDCardForDebug->ÒÑжÔØ{m_SdCardDebugMountName}:/ "); UnityEngine.Debug.LogError($"UnmountSDCardForDebug->ÒÑжÔØ{m_SdCardDebugMountName}:/ ");
bInSdCardDebugMount = false; bInSdCardDebugMount = false;
#endif #endif
} }
public void UnmountSDCard() public void UnmountSDCard()
{ {
#if UNITY_SWITCH #if UNITY_SWITCH

18
AxibugEmuOnline.Client/Assets/Script/AppMain/AxiIO/AxiIO.cs
View File

@ -1,6 +1,4 @@
using System; using System.Collections.Generic;
using System.Collections.Generic;
using System.IO;
namespace AxiIO namespace AxiIO
{ {
@ -15,7 +13,7 @@ namespace AxiIO
if (m_io == null) if (m_io == null)
{ {
#if UNITY_SWITCH && !UNITY_EDITOR #if UNITY_SWITCH && !UNITY_EDITOR
m_io = new NintendoSwitchIO(); m_io = new NSwitchIO();
#else #else
m_io = new CSharpIO(); m_io = new CSharpIO();
#endif #endif
@ -50,7 +48,7 @@ namespace AxiIO
AxiIO.io.file_WriteAllBytes(path, data); AxiIO.io.file_WriteAllBytes(path, data);
} }
internal static void WriteAllBytesFromStream(string path, MemoryStream ms) internal static void WriteAllBytesFromStream(string path, System.IO.MemoryStream ms)
{ {
AxiIO.io.file_WriteAllBytes(path, ms); AxiIO.io.file_WriteAllBytes(path, ms);
} }
@ -73,6 +71,16 @@ namespace AxiIO
return AxiIO.io.dir_EnumerateFiles(path, searchPattern); return AxiIO.io.dir_EnumerateFiles(path, searchPattern);
} }
public static string[] GetDirectories(string path)
{
return AxiIO.io.dir_GetDirectories(path);
}
public static string[] GetFiles(string path)
{
return AxiIO.io.dir_GetFiles(path);
}
internal static void Delete(string cacheDirPath, bool v) internal static void Delete(string cacheDirPath, bool v)
{ {
AxiIO.io.dir_Delete(cacheDirPath, v); AxiIO.io.dir_Delete(cacheDirPath, v);

10
AxibugEmuOnline.Client/Assets/Script/AppMain/AxiIO/CSharpIO.cs
View File

@ -56,5 +56,15 @@ namespace AxiIO
FileStream streaming = System.IO.File.OpenRead(filePath); FileStream streaming = System.IO.File.OpenRead(filePath);
return streaming.Read(readToArr, 0, 4); return streaming.Read(readToArr, 0, 4);
} }
public string[] dir_GetDirectories(string path)
{
return System.IO.Directory.GetDirectories(path);
}
public string[] dir_GetFiles(string path)
{
return System.IO.Directory.GetFiles(path);
}
} }
} }

2
AxibugEmuOnline.Client/Assets/Script/AppMain/AxiIO/IAxiIO.cs
View File

@ -15,5 +15,7 @@ namespace AxiIO
void file_WriteAllBytes(string filePath, byte[] data); void file_WriteAllBytes(string filePath, byte[] data);
void file_WriteAllBytes(string filePath, System.IO.MemoryStream ms); void file_WriteAllBytes(string filePath, System.IO.MemoryStream ms);
int file_ReadBytesToArr(string filePath, byte[] readToArr, int start, int len); int file_ReadBytesToArr(string filePath, byte[] readToArr, int start, int len);
string[] dir_GetDirectories(string path);
string[] dir_GetFiles(string path);
}; };
} }

27
AxibugEmuOnline.Client/Assets/Script/AppMain/AxiIO/NintendoSwitchIO.cs → AxibugEmuOnline.Client/Assets/Script/AppMain/AxiIO/NSwitchIO.cs
View File

@ -1,12 +1,11 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO;
namespace AxiIO namespace AxiIO
{ {
public class NintendoSwitchIO : IAxiIO public class NSwitchIO : IAxiIO
{ {
public NintendoSwitchIO() public NSwitchIO()
{ {
AxiNS.instance.Init(); AxiNS.instance.Init();
} }
@ -22,7 +21,7 @@ namespace AxiIO
public IEnumerable<string> dir_EnumerateFiles(string path, string searchPattern) public IEnumerable<string> dir_EnumerateFiles(string path, string searchPattern)
{ {
throw new NotImplementedException(); return AxiNS.instance.io.EnumerateFiles(path, searchPattern);
} }
public bool dir_Exists(string dirpath) public bool dir_Exists(string dirpath)
@ -30,6 +29,24 @@ namespace AxiIO
return AxiNS.instance.io.CheckPathExists(dirpath); return AxiNS.instance.io.CheckPathExists(dirpath);
} }
public string[] dir_GetDirectories(string path)
{
if (!AxiNS.instance.io.GetDirectoryDirs(path, out string[] result))
{
return new string[0];
}
return result;
}
public string[] dir_GetFiles(string path)
{
if (!AxiNS.instance.io.GetDirectoryFiles(path, out string[] result))
{
return new string[0];
}
return result;
}
public void file_Delete(string filePath) public void file_Delete(string filePath)
{ {
AxiNS.instance.io.DeletePathFile(filePath); AxiNS.instance.io.DeletePathFile(filePath);
@ -58,7 +75,7 @@ namespace AxiIO
AxiNS.instance.io.FileToSaveWithCreate(filePath, data); AxiNS.instance.io.FileToSaveWithCreate(filePath, data);
} }
public void file_WriteAllBytes(string filePath, MemoryStream ms) public void file_WriteAllBytes(string filePath, System.IO.MemoryStream ms)
{ {
AxiNS.instance.io.FileToSaveWithCreate(filePath, ms); AxiNS.instance.io.FileToSaveWithCreate(filePath, ms);
} }

0
AxibugEmuOnline.Client/Assets/Script/AppMain/AxiIO/NintendoSwitchIO.cs.meta → AxibugEmuOnline.Client/Assets/Script/AppMain/AxiIO/NSwitchIO.cs.meta
View File