We don't actually need to restart HttpListener when the user changes the port
Changed Settings to implement INotifyPropertyChanged to allow consumers to potentially listen to individual property changes
This commit is contained in:
1 parent
07229424a4
commit
700e06b898
3 files changed
+35
-9
No files matched your search
@@ -28,6 +28,8 @@ namespace CommunityMapLocation.Api
|
|||||||
this.logger = logger;
|
this.logger = logger;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static string GetPrefix(int port) => $"http://localhost:{port}/";
|
||||||
|
|
||||||
private readonly Settings settings;
|
private readonly Settings settings;
|
||||||
private readonly UnityModManager.ModEntry.ModLogger logger;
|
private readonly UnityModManager.ModEntry.ModLogger logger;
|
||||||
|
|
||||||
@@ -66,7 +68,7 @@ namespace CommunityMapLocation.Api
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
listener.Prefixes.Add($"http://localhost:{settings.Port}/");
|
listener.Prefixes.Add(GetPrefix(settings.Port));
|
||||||
listener.Start();
|
listener.Start();
|
||||||
listener.BeginGetContext(HandleConnection, null);
|
listener.BeginGetContext(HandleConnection, null);
|
||||||
}
|
}
|
||||||
@@ -126,10 +128,15 @@ namespace CommunityMapLocation.Api
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
internal void Reload()
|
public void UpdateSettings()
|
||||||
{
|
{
|
||||||
Stop();
|
var prefix = GetPrefix(settings.Port);
|
||||||
Start();
|
|
||||||
|
if (listener.Prefixes.Count != 1 || listener.Prefixes.Single() != prefix)
|
||||||
|
{
|
||||||
|
listener.Prefixes.Clear();
|
||||||
|
listener.Prefixes.Add(prefix);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Stop()
|
public void Stop()
|
||||||
|
|||||||
@@ -1,15 +1,22 @@
|
|||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.ComponentModel;
|
||||||
using System.Runtime.CompilerServices;
|
using System.Runtime.CompilerServices;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityModManagerNet;
|
using UnityModManagerNet;
|
||||||
|
|
||||||
namespace CommunityMapLocation.Config
|
namespace CommunityMapLocation.Config
|
||||||
{
|
{
|
||||||
public class Settings : UnityModManager.ModSettings
|
public class Settings : UnityModManager.ModSettings, INotifyPropertyChanged
|
||||||
{
|
{
|
||||||
public int Port { get; set; } = 9090;
|
private int port = 9090;
|
||||||
public RequestSourceType RequestSourceType { get; set; } = RequestSourceType.Specific;
|
public int Port { get => port; set => Set(ref port, value); }
|
||||||
public string RequestSource { get; set; } = "https://pyronicampt.github.io";
|
|
||||||
|
private RequestSourceType requestSourceType = RequestSourceType.Specific;
|
||||||
|
public RequestSourceType RequestSourceType { get => requestSourceType; set => Set(ref requestSourceType, value); }
|
||||||
|
|
||||||
|
private string requestSource = "https://pyronicampt.github.io";
|
||||||
|
public string RequestSource { get => requestSource; set => Set(ref requestSource, value); }
|
||||||
|
|
||||||
public void Draw()
|
public void Draw()
|
||||||
{
|
{
|
||||||
@@ -30,5 +37,17 @@ namespace CommunityMapLocation.Config
|
|||||||
|
|
||||||
GUILayout.EndVertical();
|
GUILayout.EndVertical();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public event PropertyChangedEventHandler PropertyChanged;
|
||||||
|
|
||||||
|
// Todo: store and hold back property changes until Settings is saved to prevent rapidly reconfiguring server on each keypress?
|
||||||
|
private void Set<T>(ref T field, T value, [CallerMemberName] string propertyName = null)
|
||||||
|
{
|
||||||
|
if (!EqualityComparer<T>.Default.Equals(field, value))
|
||||||
|
{
|
||||||
|
field = value;
|
||||||
|
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -47,7 +47,7 @@ namespace CommunityMapLocation
|
|||||||
{
|
{
|
||||||
Settings.Save(modEntry);
|
Settings.Save(modEntry);
|
||||||
|
|
||||||
apiServer.Reload();
|
apiServer.UpdateSettings();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user