Changeset 402 for binary-improvements2/MapRendering/src/MapTileCache.cs

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

File:

• binary-improvements2/MapRendering/src/MapTileCache.cs (copied) (copied from binary-improvements2/7dtd-server-fixes/src/FileCache/MapTileCache.cs ) (7 diffs)

binary-improvements2/MapRendering/src/MapTileCache.cs

@@ -1 +1 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using UnityEngine;
 using UnityEngine.Profiling;
+using Webserver.FileCache;
 using Object = UnityEngine.Object;
 
-namespace AllocsFixes.FileCache {
+namespace MapRendering {
         // Special "cache" for map tile folder as both map rendering and webserver access files in there.
         // Only map rendering tiles are cached. Writing is done by WriteThrough.
@@ -25 +27 @@
                 }
 
+                // SetZoomCount only called before processing happens in MapRenderer.ctor, no locking required
+                [SuppressMessage ("ReSharper", "InconsistentlySynchronizedField")]
                 public void SetZoomCount (int _count) {
                         cache = new CurrentZoomFile[_count];
@@ -55 +59 @@
                                 }
                         } catch (Exception e) {
-                                Log.Warning ("Error in MapTileCache.LoadTile: " + e);
+                                Log.Warning ($"Error in MapTileCache.LoadTile: {e}");
                         }
 
@@ -81 +85 @@
                                 }
                         } catch (Exception e) {
-                                Log.Warning ("Error in MapTileCache.SaveTile: " + e);
+                                Log.Warning ($"Error in MapTileCache.SaveTile: {e}");
                         }
                 }
@@ -92 +96 @@
                                 }
                         } catch (Exception e) {
-                                Log.Warning ("Error in MapTileCache.ResetTile: " + e);
+                                Log.Warning ($"Error in MapTileCache.ResetTile: {e}");
                         }
                 }
@@ -108 +112 @@
                                 }
                         } catch (Exception e) {
-                                Log.Warning ("Error in MapTileCache.GetFileContent: " + e);
+                                Log.Warning ($"Error in MapTileCache.GetFileContent: {e}");
                         }
 
@@ -119 +123 @@
 
                 private static byte[] ReadAllBytes (string _path) {
-                        using (FileStream fileStream = new FileStream(_path, FileMode.Open, FileAccess.Read, FileShare.Read, 4096)) {
-                                int bytesRead = 0;
-                                int bytesLeft = (int) fileStream.Length;
-                                byte[] result = new byte[bytesLeft];
-                                while (bytesLeft > 0) {
-                                        int readThisTime = fileStream.Read (result, bytesRead, bytesLeft);
-                                        if (readThisTime == 0) {
-                                                throw new IOException ("Unexpected end of stream");
-                                        }
-
-                                        bytesRead += readThisTime;
-                                        bytesLeft -= readThisTime;
+                        using FileStream fileStream = new FileStream(_path, FileMode.Open, FileAccess.Read, FileShare.Read, 4096);
+                        
+                        int bytesRead = 0;
+                        int bytesLeft = (int) fileStream.Length;
+                        byte[] result = new byte[bytesLeft];
+                        while (bytesLeft > 0) {
+                                int readThisTime = fileStream.Read (result, bytesRead, bytesLeft);
+                                if (readThisTime == 0) {
+                                        throw new IOException ("Unexpected end of stream");
                                 }
 
-                                return result;
+                                bytesRead += readThisTime;
+                                bytesLeft -= readThisTime;
                         }
+
+                        return result;
                 }