Skip to content

Commit f833928

Browse files
KedamaOvOKedamaOvO
committed
allow access FileServer via LAN
clean code
1 parent 4dcb536 commit f833928

11 files changed

+83
-76
lines changed

‎DefaultLanguage.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ namespace OsuDataDistributeRestful
66
public class DefaultLanguage : I18nProvider
77
{
88
public static LanguageElement AllowRequireAdministrator = "AllowLAN requires that the administrator run sync";
9-
public static LanguageElement PortIsOccupied = "Port({0}) is occupied";
9+
public static LanguageElement PortIsOccupied = "Port {0} is occupied";
1010

1111
public static GuiLanguageElement AllowLAN = "Allow LAN";
1212
public static GuiLanguageElement EnableFileHttpServer = "Enable file HTTP server";

‎OsuDataDistributeRestfulPlugin.cs

+18-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
using Sync.Tools;
55
using System;
66
using System.Linq;
7-
using System.Threading.Tasks;
7+
using System.Net;
8+
using System.Net.Sockets;
89

910
namespace OsuDataDistributeRestful
1011
{
@@ -27,13 +28,29 @@ public OsuDataDistributeRestfulPlugin() : base(PLUGIN_NAME, PLUGIN_AUTHOR)
2728
m_config_manager.AddItem(new SettingIni());
2829

2930
ApiServer = new ApiServer(Setting.ApiPort);
31+
EventBus.BindEvent<PluginEvents.ProgramReadyEvent>(e => ApiServer.Start());
32+
if (Setting.AllowLAN)
33+
EventBus.BindEvent<PluginEvents.ProgramReadyEvent>(e => PrintLanAddress());
34+
3035
if (Setting.EnableFileHttpServer)
3136
{
3237
fileHttpServer = new FileServer(Setting.FilePort);
3338
fileHttpServer.Start();
3439
}
3540
}
3641

42+
private void PrintLanAddress()
43+
{
44+
//Display IP Address
45+
var ips = Dns.GetHostEntry(Dns.GetHostName()).AddressList.Where(ip => ip.AddressFamily == AddressFamily.InterNetwork).Distinct();
46+
int n = 1;
47+
foreach (var ip in ips)
48+
{
49+
bool recommend = ip.ToString().StartsWith("192.168.");
50+
IO.CurrentIO.WriteColor($"[ODDR]IP {n++}:{ip}", recommend ? ConsoleColor.Green : ConsoleColor.White);
51+
}
52+
}
53+
3754
#region Initializtion
3855

3956
private void ORTDP_Initialize()
@@ -82,8 +99,6 @@ public override void OnEnable()
8299
{
83100
Sync.Tools.IO.CurrentIO.WriteColor(PLUGIN_NAME + " By " + PLUGIN_AUTHOR, ConsoleColor.DarkCyan);
84101
Initialize();
85-
86-
base.EventBus.BindEvent<PluginEvents.ProgramReadyEvent>(e => ApiServer.Start());
87102
}
88103

89104
public override void OnExit()

‎Server/ActionResult.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@ internal class ActionResult
88
/// MIME
99
/// </summary>
1010
public string ContentType { get; set; } = "application/octet-stream";
11+
1112
public int Code { get; private set; } = 200;
1213

1314
public object Data { get; private set; }
1415

15-
public ActionResult(object a,int code=200)
16+
public ActionResult(object a, int code = 200)
1617
{
1718
ContentType = "text/json; charset=UTF-8";
1819
Data = a;

‎Server/Api/OlspApis.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public OlspApis(Plugin olsp_plguin)
2121
public ActionResult GetDictValue(string providable_data_name)
2222
{
2323
if (!olsp.EnumProvidableDataName().Any(p => p == providable_data_name))
24-
return new ActionResult(new { code = 404}, 404);
24+
return new ActionResult(new { code = 404 }, 404);
2525

2626
var result = olsp.GetData(providable_data_name);
2727
return new ActionResult(new
@@ -75,7 +75,7 @@ public ActionResult GetModsImage()
7575
var result = olsp.GetData("olsp_mod_save_path") as string;
7676
if (string.IsNullOrEmpty(result)) return new ActionResult(null);
7777

78-
if(File.Exists(result))
78+
if (File.Exists(result))
7979
{
8080
var fs = File.Open(result, FileMode.Open, FileAccess.Read, FileShare.Read);
8181
string ext = Path.GetExtension(result);

‎Server/Api/OrtdpApis.cs

+21-21
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
using System;
99
using System.Collections.Generic;
1010
using System.IO;
11-
using static OsuRTDataProvider.Listen.OsuListenerManager;
1211

1312
namespace OsuDataDistributeRestful.Api
1413
{
@@ -46,30 +45,29 @@ public object GetGameMode()
4645
return new { gameMode = mode, gameModeText = mode.ToString() };
4746
}
4847

49-
5048
[Route("/isTournetMode")]
51-
public object GetTourneyMode()
49+
public object GetTourneyMode()
5250
=> new { value = ortdp.TourneyListenerManagers != null };
5351

5452
[Route("/tournetModeListenCount")]
55-
public object GetTournetModeListenCount()
53+
public object GetTournetModeListenCount()
5654
=> new { count = ortdp.TourneyListenerManagersCount };
5755

5856
#region Beatmap
5957

6058
[Route("/beatmap/info")]
61-
public object GetBeatmapInfo()=>
59+
public object GetBeatmapInfo() =>
6260
MakeBeatmap(ortdp.ListenerManager.GetCurrentData(ProvideDataMask.Beatmap).Beatmap);
6361

6462
[Route("/beatmap")]
6563
public object GetBeatmap()
6664
{
6765
var beatmap = ortdp.ListenerManager.GetCurrentData(ProvideDataMask.Beatmap).Beatmap;
6866

69-
if(File.Exists(beatmap.FilenameFull))
67+
if (File.Exists(beatmap.FilenameFull))
7068
return new ActionResult(File.OpenRead(beatmap.FilenameFull)) { ContentType = "text/plain; charset=utf-8" };
7169

72-
return new ActionResult(new { code = 404,message="no found beatmap file" });
70+
return new ActionResult(new { code = 404, message = "no found beatmap file" });
7371
}
7472

7573
[Route("/beatmap/audio")]
@@ -89,7 +87,7 @@ public ActionResult GetAudioFile()
8987
};
9088
}
9189

92-
return new ActionResult(new { code = 404 },200);
90+
return new ActionResult(new { code = 404 }, 200);
9391
}
9492

9593
[Route("/beatmap/background")]
@@ -134,7 +132,7 @@ public ActionResult GetVideoFile()
134132
return new ActionResult(new { code = 404 }, 200);
135133
}
136134

137-
#endregion
135+
#endregion Beatmap
138136

139137
#region Playing
140138

@@ -150,7 +148,7 @@ public object GetPlayingInfo(int id)
150148
}
151149

152150
[Route("/playing/info")]
153-
public object GetPlayingInfo()=>
151+
public object GetPlayingInfo() =>
154152
MakeProvideDatas(
155153
ProvideDataMask.Score |
156154
ProvideDataMask.HealthPoint |
@@ -178,17 +176,18 @@ public object GetPlayingMods()
178176
public object GetPlayingTime()
179177
=> new { time = ortdp.ListenerManager.GetCurrentData(ProvideDataMask.Time).Time };
180178

181-
#endregion
179+
#endregion Playing
182180

183181
#region tools
184-
private object MakeProvideDatas(ProvideDataMask mask,Func<ProvideData,object> selector)
182+
183+
private object MakeProvideDatas(ProvideDataMask mask, Func<ProvideData, object> selector)
185184
{
186185
bool isTourney = ortdp.TourneyListenerManagersCount != 0;
187186

188187
var ret = new
189188
{
190189
tourneyMode = isTourney,
191-
count = isTourney ? ortdp.TourneyListenerManagersCount:1,
190+
count = isTourney ? ortdp.TourneyListenerManagersCount : 1,
192191
list = new List<object>()
193192
};
194193

@@ -256,25 +255,26 @@ private object MakeBeatmap(Beatmap beatmap)
256255
folder = Path.GetFileName(beatmap.Folder),
257256
filename = beatmap.Filename,
258257
audioFilename = beatmap.AudioFilename,
259-
backroundFilename=beatmap.BackgroundFilename,
260-
videoFilename=beatmap.VideoFilename
258+
backroundFilename = beatmap.BackgroundFilename,
259+
videoFilename = beatmap.VideoFilename
261260
};
262261
}
263262

264263
private string GetContentType(string fileExtention)
265264
{
266265
switch (fileExtention.ToLower())
267266
{
268-
case ".jpg":case ".jpeg": return "image/jpeg";
269-
case ".png":return "image/png";
270-
case ".ogg":return "audio/ogg";
267+
case ".jpg": case ".jpeg": return "image/jpeg";
268+
case ".png": return "image/png";
269+
case ".ogg": return "audio/ogg";
271270

272-
case ".mp4":return "video/mp4";
273-
case ".avi":return "video/x-msvideo";
271+
case ".mp4": return "video/mp4";
272+
case ".avi": return "video/x-msvideo";
274273
default:
275274
return "application/octet-stream";
276275
}
277276
}
278-
#endregion
277+
278+
#endregion tools
279279
}
280280
}

‎Server/Api/RtppdApis.cs

+7-6
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ public object GetPlayingStatus(int id)
3535
[Route("/playingStatus")]
3636
public object GetPlayingStatus()
3737
{
38-
List < RestfulDisplayer > displayers = EnumerateRestfulDisplayers();
38+
List<RestfulDisplayer> displayers = EnumerateRestfulDisplayers();
3939
return new
4040
{
4141
count = displayers.Count,
42-
list = displayers.Select(d=> new { playing = d?.IsPlay})
42+
list = displayers.Select(d => new { playing = d?.IsPlay })
4343
};
4444
}
4545

@@ -57,8 +57,8 @@ public object GetPP()
5757

5858
return new
5959
{
60-
count =displayers.Count,
61-
list = displayers.Select(d=>(d?.PPTuple == null) ? null : MakePP(d?.PPTuple))
60+
count = displayers.Count,
61+
list = displayers.Select(d => (d?.PPTuple == null) ? null : MakePP(d?.PPTuple))
6262
};
6363
}
6464

@@ -110,6 +110,7 @@ private object MakePP(PPTuple? tuple)
110110
maxpp = tuple?.MaxPP,
111111
};
112112
}
113+
113114
private object MakeHitCount(HitCountTuple? tuple)
114115
{
115116
return new
@@ -139,7 +140,7 @@ private RestfulDisplayer GetDisplayer(int i)
139140

140141
private List<RestfulDisplayer> EnumerateRestfulDisplayers()
141142
{
142-
List<RestfulDisplayer> displayers=new List<RestfulDisplayer>();
143+
List<RestfulDisplayer> displayers = new List<RestfulDisplayer>();
143144
if (rtppd.TourneyMode)
144145
{
145146
for (int i = 0; i < rtppd.TourneyWindowCount; i++)
@@ -151,7 +152,7 @@ private List<RestfulDisplayer> EnumerateRestfulDisplayers()
151152
return displayers;
152153
}
153154

154-
class RestfulDisplayer : DisplayerBase
155+
private class RestfulDisplayer : DisplayerBase
155156
{
156157
public bool IsPlay { get; private set; } = false;
157158
public HitCountTuple HitCountTuple { get; private set; }

‎Server/ApiServer.cs

+16-29
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using System.IO;
88
using System.Linq;
99
using System.Net;
10-
using System.Net.Sockets;
1110
using System.Reflection;
1211

1312
namespace OsuDataDistributeRestful.Server
@@ -17,12 +16,13 @@ public class ApiServer : ServerBase
1716
private Dictionary<RouteTemplate, Method> m_route_dict =
1817
new Dictionary<RouteTemplate, Method>();
1918

20-
struct Method
19+
private struct Method
2120
{
2221
public MethodInfo MethodInfo;
2322
public object Instance;
2423
}
25-
class ParamCollection : Dictionary<string, string>
24+
25+
private class ParamCollection : Dictionary<string, string>
2626
{
2727
public ParamCollection()
2828
{
@@ -39,7 +39,8 @@ public string TryGetValue(string key)
3939
return null;
4040
}
4141
}
42-
class RouteTemplate
42+
43+
private class RouteTemplate
4344
{
4445
private struct TemplateNode
4546
{
@@ -98,7 +99,7 @@ public bool TryMatch(string path, out ParamCollection @params)
9899
}
99100
}
100101

101-
class Apis : IApi
102+
private class Apis : IApi
102103
{
103104
private readonly ApiServer m_apiServer;
104105

@@ -128,39 +129,25 @@ public ApiServer(int port = 10800) : base(port)
128129
public void RegisterResource(IApi api)
129130
{
130131
Type api_type = api.GetType();
131-
RouteAttribute api_route = api_type.GetCustomAttribute<RouteAttribute>()??new RouteAttribute("/");
132+
RouteAttribute api_route = api_type.GetCustomAttribute<RouteAttribute>() ?? new RouteAttribute("/");
132133

133-
foreach(var method in api_type.GetMethods())
134+
foreach (var method in api_type.GetMethods())
134135
{
135136
RouteAttribute method_route = method.GetCustomAttribute<RouteAttribute>();
136137
if (method_route != null)
137138
{
138139
string route = method_route.Route;
139140
if (route[0] == '/')
140-
route=route.Remove(0,1);
141+
route = route.Remove(0, 1);
141142

142-
route = Path.Combine(api_route.Route, route).Replace(Path.DirectorySeparatorChar,'/');
143+
route = Path.Combine(api_route.Route, route).Replace(Path.DirectorySeparatorChar, '/');
143144

144145
RouteTemplate route_template = new RouteTemplate(route);
145146
m_route_dict.Add(route_template, new Method() { Instance = api, MethodInfo = method });
146147
}
147148
}
148149
}
149150

150-
protected override void OnStarted()
151-
{
152-
if (AllowLAN)
153-
{
154-
//Display IP Address
155-
var ips = Dns.GetHostEntry(Dns.GetHostName()).AddressList.Where(ip => ip.AddressFamily == AddressFamily.InterNetwork);
156-
int n = 1;
157-
foreach (var ip in ips)
158-
{
159-
IO.CurrentIO.Write($"[ODDR]IP {n++}:{ip}");
160-
}
161-
}
162-
}
163-
164151
protected override void OnResponse(HttpListenerRequest request, HttpListenerResponse response)
165152
{
166153
var matched_route = m_route_dict.Select(route => new
@@ -195,7 +182,7 @@ protected override void OnResponse(HttpListenerRequest request, HttpListenerResp
195182
Return404(response);
196183
}
197184
}
198-
catch(Exception e)
185+
catch (Exception e)
199186
{
200187
IO.CurrentIO.WriteColor(e.ToString(), ConsoleColor.Yellow);
201188
Return500(response);
@@ -207,9 +194,9 @@ protected override void OnResponse(HttpListenerRequest request, HttpListenerResp
207194
}
208195
}
209196

210-
private ActionResult CallMethod(Method method,ParamCollection @params)
197+
private ActionResult CallMethod(Method method, ParamCollection @params)
211198
{
212-
var params_instance=method.MethodInfo.GetParameters()
199+
var params_instance = method.MethodInfo.GetParameters()
213200
.Select(p => TypeConvert(p.ParameterType, @params.TryGetValue(p.Name)))
214201
.ToArray();
215202
var ret = method.MethodInfo.Invoke(method.Instance, params_instance);
@@ -219,9 +206,9 @@ private ActionResult CallMethod(Method method,ParamCollection @params)
219206
return ret as ActionResult;
220207
}
221208

222-
private object TypeConvert(Type type,string str)
209+
private object TypeConvert(Type type, string str)
223210
{
224-
object val=str;
211+
object val = str;
225212

226213
try
227214
{
@@ -234,7 +221,7 @@ private object TypeConvert(Type type,string str)
234221
else if (type == typeof(float))
235222
val = float.Parse(str, CultureInfo.InvariantCulture);
236223
}
237-
catch(FormatException e)
224+
catch (FormatException e)
238225
{
239226
IO.CurrentIO.WriteColor($"[ODDR]{e}", ConsoleColor.Yellow);
240227
}

0 commit comments

Comments
 (0)