Changeset 420 for binary-improvements/MapRendering/Web/Web.cs

Timestamp:

Mar 28, 2023, 5:11:02 PM (20 months ago)

Author:

alloc

Message:

A21 preparations.
NOT COMPATIBLE WITH A20 ANYMORE!

File:

• binary-improvements/MapRendering/Web/Web.cs (modified) (6 diffs)

binary-improvements/MapRendering/Web/Web.cs

@@ -7 +7 @@
 using System.Text;
 using System.Threading;
-using AllocsFixes.FileCache;
 using AllocsFixes.NetConnections.Servers.Web.Handlers;
 using AllocsFixes.NetConnections.Servers.Web.SSE;
 using UnityEngine;
+using Webserver.FileCache;
 
 namespace AllocsFixes.NetConnections.Servers.Web {
@@ -25 +25 @@
                 public Web () {
                         try {
-                                int webPort = GamePrefs.GetInt (EnumUtils.Parse<EnumGamePrefs> ("ControlPanelPort"));
+                                int webPort = GamePrefs.GetInt (EnumUtils.Parse<EnumGamePrefs> (nameof(EnumGamePrefs.WebDashboardPort)));
                                 if (webPort < 1 || webPort > 65533) {
-                                        Log.Out ("Webserver not started (ControlPanelPort not within 1-65533)");
+                                        Log.Out ("Webserver not started (WebDashboardPort not within 1-65533)");
                                         return;
                                 }
 
                                 if (!Directory.Exists (Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location) +
-                                                       "/webserver")) {
-                                        Log.Out ("Webserver not started (folder \"webserver\" not found in WebInterface mod folder)");
+                                                       "/webserver_legacy")) {
+                                        Log.Out ("Webserver not started (folder \"webserver_legacy\" not found in WebInterface mod folder)");
                                         return;
                                 }
@@ -40 +40 @@
                                 bool useStaticCache = false;
 
-                                string dataFolder = Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location) + "/webserver";
+                                string dataFolder = Path.GetDirectoryName (Assembly.GetExecutingAssembly ().Location) + "/webserver_legacy";
 
                                 if (!HttpListener.IsSupported) {
@@ -60 +60 @@
                                 RegisterPathHandler ("/map/", new StaticHandler (
                                                 GameIO.GetSaveGameDir () + "/map",
-                                                MapRendering.MapRendering.GetTileCache (),
+                                                MapRendering.MapRenderer.GetTileCache (),
                                                 false,
                                                 "web.map")
@@ -248 +248 @@
                                 if (con != null) {
                                         _con = con;
-                                        return GameManager.Instance.adminTools.GetUserPermissionLevel (_con.UserId);
+                                        return GameManager.Instance.adminTools.Users.GetUserPermissionLevel (_con.UserId);
                                 }
                         }
@@ -270 +270 @@
                                                 WebConnection con = connectionHandler.LogIn (id, _req.RemoteEndPoint.Address);
                                                 _con = con;
-                                                int level = GameManager.Instance.adminTools.GetUserPermissionLevel (con.UserId);
+                                                int level = GameManager.Instance.adminTools.Users.GetUserPermissionLevel (con.UserId);
                                                 Log.Out ("Steam OpenID login from {0} with ID {1}, permission level {2}",
                                                         remoteEndpointString, con.UserId, level);