Changeset 391 for binary-improvements2/7dtd-server-fixes/src/FileCache

Timestamp:

Aug 7, 2022, 3:02:24 PM (2 years ago)

Author:

alloc

Message:

Major refactoring/cleanup

Location:

binary-improvements2/7dtd-server-fixes/src/FileCache

Files:

• DirectAccess.cs (modified) (1 diff)
• MapTileCache.cs (modified) (2 diffs)
• SimpleCache.cs (modified) (1 diff)

binary-improvements2/7dtd-server-fixes/src/FileCache/DirectAccess.cs

@@ -7 +7 @@
                 public override byte[] GetFileContent (string _filename) {
                         try {
-                                if (!File.Exists (_filename)) {
-                                        return null;
-                                }
-
-                                return File.ReadAllBytes (_filename);
+                                return File.Exists (_filename) ? File.ReadAllBytes (_filename) : null;
                         } catch (Exception e) {
                                 Log.Out ("Error in DirectAccess.GetFileContent: " + e);

binary-improvements2/7dtd-server-fixes/src/FileCache/MapTileCache.cs

@@ -36 +36 @@
                                 lock (cache) {
                                         CurrentZoomFile cacheEntry = cache [_zoomlevel];
-                                        
-                                        if (cacheEntry.filename == null || !cacheEntry.filename.Equals (_filename)) {
-                                                cacheEntry.filename = _filename;
 
-                                                if (!File.Exists (_filename)) {
-                                                        cacheEntry.pngData = null;
-                                                        return null;
-                                                }
+                                        if (cacheEntry.filename != null && cacheEntry.filename.Equals (_filename)) {
+                                                return cacheEntry.pngData;
+                                        }
 
-                                                Profiler.BeginSample ("ReadPng");
-                                                cacheEntry.pngData = ReadAllBytes (_filename);
-                                                Profiler.EndSample ();
+                                        cacheEntry.filename = _filename;
+
+                                        if (!File.Exists (_filename)) {
+                                                cacheEntry.pngData = null;
+                                                return null;
                                         }
+
+                                        Profiler.BeginSample ("ReadPng");
+                                        cacheEntry.pngData = ReadAllBytes (_filename);
+                                        Profiler.EndSample ();
 
                                         return cacheEntry.pngData;
@@ -103 +105 @@
                                         }
 
-                                        if (!File.Exists (_filename)) {
-                                                return transparentTile;
-                                        }
-
-                                        return ReadAllBytes (_filename);
+                                        return !File.Exists (_filename) ? transparentTile : ReadAllBytes (_filename);
                                 }
                         } catch (Exception e) {

binary-improvements2/7dtd-server-fixes/src/FileCache/SimpleCache.cs

@@ -11 +11 @@
                         try {
                                 lock (fileCache) {
-                                        if (!fileCache.ContainsKey (_filename)) {
-                                                if (!File.Exists (_filename)) {
-                                                        return null;
-                                                }
+                                        if (fileCache.ContainsKey (_filename)) {
+                                                return fileCache [_filename];
+                                        }
 
-                                                fileCache.Add (_filename, File.ReadAllBytes (_filename));
+                                        if (!File.Exists (_filename)) {
+                                                return null;
                                         }
+
+                                        fileCache.Add (_filename, File.ReadAllBytes (_filename));
 
                                         return fileCache [_filename];