Changeset 402 for binary-improvements2/WebServer/src/FileCache

Timestamp:

Jan 27, 2023, 7:28:00 PM (22 months ago)

Author:

alloc

Message:

• Major refactoring
• Using Utf8Json for (de)serialization
• Moving APIs to REST
• Removing dependencies from WebServer and MapRenderer to ServerFixes

Location:

binary-improvements2/WebServer/src/FileCache

Files:

• . (moved) (moved from binary-improvements2/7dtd-server-fixes/src/FileCache )
• AbstractCache.cs (modified) (2 diffs)
• DirectAccess.cs (modified) (2 diffs)
• InvalidateCachesCmd.cs (modified) (1 diff)
• MapTileCache.cs (deleted)
• SimpleCache.cs (modified) (2 diffs)

binary-improvements2/WebServer/src/FileCache/AbstractCache.cs

@@ -1 +1 @@
 using System.Collections.Generic;
 
-namespace AllocsFixes.FileCache {
+namespace Webserver.FileCache {
         public abstract class AbstractCache {
                 public abstract byte[] GetFileContent (string _filename);
-                public abstract (int, int) Invalidate ();
+                public abstract (int filesDropped, int bytesDropped) Invalidate ();
 
                 protected AbstractCache () {
@@ -16 +16 @@
                         
                         foreach (AbstractCache cache in caches) {
-                                (int, int) returned = cache.Invalidate ();
-                                filesDropped += returned.Item1;
-                                bytesDropped += returned.Item2;
+                                (int files, int bytes) = cache.Invalidate ();
+                                filesDropped += files;
+                                bytesDropped += bytes;
                         }
 

binary-improvements2/WebServer/src/FileCache/DirectAccess.cs

@@ -2 +2 @@
 using System.IO;
 
-namespace AllocsFixes.FileCache {
+namespace Webserver.FileCache {
         // Not caching at all, simply reading from disk on each request
         public class DirectAccess : AbstractCache {
@@ -9 +9 @@
                                 return File.Exists (_filename) ? File.ReadAllBytes (_filename) : null;
                         } catch (Exception e) {
-                                Log.Out ("Error in DirectAccess.GetFileContent: " + e);
+                                Log.Out ($"Error in DirectAccess.GetFileContent: {e}");
                         }
 

binary-improvements2/WebServer/src/FileCache/InvalidateCachesCmd.cs

@@ -2 +2 @@
 using JetBrains.Annotations;
 
-namespace AllocsFixes.FileCache {
+namespace Webserver.FileCache {
         [UsedImplicitly]
         public class InvalidateCachesCmd : ConsoleCmdAbstract {

binary-improvements2/WebServer/src/FileCache/SimpleCache.cs

@@ -3 +3 @@
 using System.IO;
 
-namespace AllocsFixes.FileCache {
+namespace Webserver.FileCache {
         // Caching all files, useful for completely static folders only
         public class SimpleCache : AbstractCache {
@@ -24 +24 @@
                                 }
                         } catch (Exception e) {
-                                Log.Out ("Error in SimpleCache.GetFileContent: " + e);
+                                Log.Out ($"Error in SimpleCache.GetFileContent: {e}");
                         }