Skip to content

Commit e68b297

Browse files
committed
chore/file move
move JavaSearch code file into new folder-Java
1 parent 764a2a5 commit e68b297

File tree

4 files changed

+5
-27
lines changed

4 files changed

+5
-27
lines changed
Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.Threading.Tasks;
43
using System.Runtime.InteropServices;
4+
using System.Threading.Tasks;
55

66
namespace PCL2.Neo.Models.Minecraft.Java
77
{
@@ -12,27 +12,6 @@ public class Java
1212
{
1313
public static async Task<IEnumerable<JavaEntity>> SearchJava()
1414
{
15-
//switch (Environment.OSVersion.Platform)
16-
//{
17-
// case PlatformID.Win32NT:
18-
// javaList.AddRange(await JavaSearcher.Windows.SearchJava());
19-
// break;
20-
// case PlatformID.Unix:
21-
// javaList.AddRange(Unix.SerachJavaForLinuxAsync());
22-
// break;
23-
// case PlatformID.MacOSX:
24-
// break;
25-
// default:
26-
// throw new PlatformNotSupportedException();
27-
//}
28-
29-
// warning: Environment.OSVersion.Platform will have different performance in different .net planform
30-
// detail: .net type : | system | performance
31-
// .net framewrok: macos | Not Support
32-
// .net Core <= 3.1 macos | Unix
33-
// .net 5+ macos | macosx
34-
// this problenm is fixed by follow code
35-
3615
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
3716
{
3817
return await Windows.SearchJavaAsync(); // TODO: Read setting to get whether full search or not.

PCL2.Neo/Models/Minecraft/JavaData.cs renamed to PCL2.Neo/Models/Minecraft/Java/JavaData.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using System.IO;
33
using System.Text.RegularExpressions;
44

5-
namespace PCL2.Neo.Models.Minecraft.Java
5+
namespace PCL2.Neo.Models.Minecraft
66
{
77
public class JavaEntity(string path)
88
{
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
using System;
2-
using System.Collections.Concurrent;
32
using System.Collections.Generic;
43
using System.IO;
54
using System.Linq;
65
using System.Runtime.InteropServices;
76
using System.Threading.Tasks;
87

9-
namespace PCL2.Neo.Models.Minecraft.Java
8+
namespace PCL2.Neo.Models.Minecraft
109
{
1110
/// <summary>
1211
/// 处理Unix系统下的java
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class Windows
2121
@"Packages\Microsoft.4297127D64EC6_8wekyb3d8bbwe\LocalCache\Local\runtime")
2222
];
2323

24-
public static async Task<IEnumerable<JavaEntity>> SearchJavaAsync(bool fullSearch = false, int maxDeep = 7)
24+
public static async Task<IEnumerable<JavaEntity>> SearchJavaAsync(bool fullSearch, int maxDeep)
2525
{
2626
var javaEntities = new List<string>();
2727

@@ -117,7 +117,7 @@ private static IEnumerable<string> SearchFolders(string folderPath, int deep, in
117117

118118
private static Task<IEnumerable<string>> SearchFolderAsync(
119119
string folderPath, int deep = 0, int maxDeep = MaxDeep)
120-
=> Task.Run((() => SearchFolders(folderPath, deep, maxDeep)));
120+
=> Task.Run(() => SearchFolders(folderPath, deep, maxDeep));
121121

122122
private static Task<IEnumerable<string>> SearchDirves(int maxDeep)
123123
{

0 commit comments

Comments
 (0)