refactor: move file access methods to static class (#82)

Author: ttu

JsonFlatFileDataStore/DataStore.cs

@@ -5,10 +5,8 @@
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.Dynamic;
 using System.Globalization;
-using System.IO;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
@@ -71,7 +69,7 @@ public DataStore(string path, bool useLowerCamelCase = true, string keyProperty
  _decryptJson = (json => json);
  }
 
- _jsonData = JObject.Parse(ReadJsonFromFile(path));
+ _jsonData = GetJsonObjectFromFile();
 
  // Run updates on a background thread and use BlockingCollection to prevent multiple updates to run simultaneously
  Task.Run(() =>
@@ -103,8 +101,8 @@ public DataStore(string path, bool useLowerCamelCase = true, string keyProperty
  // Ignore this and exit
  break;
  }
- 
- var jsonText = ReadJsonFromFile(_filePath);
+
+ var jsonText = GetJsonTextFromFile();
 
  foreach (var action in batch)
  {
@@ -121,7 +119,7 @@ public DataStore(string path, bool useLowerCamelCase = true, string keyProperty
 
  try
  {
- writeSuccess = WriteJsonToFile(_filePath, jsonText);
+ writeSuccess = FileAccess.WriteJsonToFile(_filePath, _encryptJson, jsonText);
 
  lock (_jsonData)
  {
@@ -165,14 +163,14 @@ public void UpdateAll(string jsonData)
  _jsonData = JObject.Parse(jsonData);
  }
 
- WriteJsonToFile(_filePath, jsonData);
+ FileAccess.WriteJsonToFile(_filePath, _encryptJson, jsonData);
  }
 
  public void Reload()
  {
  lock (_jsonData)
  {
- _jsonData = JObject.Parse(ReadJsonFromFile(_filePath));
+ _jsonData = GetJsonObjectFromFile();
  }
  }
 
@@ -181,7 +179,7 @@ public T GetItem<T>(string key)
  if (_reloadBeforeGetCollection)
  {
  // This might be a bad idea especially if the file is in use, as this can take a long time
- _jsonData = JObject.Parse(ReadJsonFromFile(_filePath));
+ _jsonData = GetJsonObjectFromFile();
  }
 
  var token = _jsonData[key];
@@ -204,7 +202,7 @@ public dynamic GetItem(string key)
  if (_reloadBeforeGetCollection)
  {
  // This might be a bad idea especially if the file is in use, as this can take a long time
- _jsonData = JObject.Parse(ReadJsonFromFile(_filePath));
+ _jsonData = GetJsonObjectFromFile();
  }
 
  var token = _jsonData[key];
@@ -358,7 +356,7 @@ private IDocumentCollection<T> GetCollection<T>(string path, Func<JToken, T> rea
  if (_reloadBeforeGetCollection)
  {
  // This might be a bad idea especially if the file is in use, as this can take a long time
- _jsonData = JObject.Parse(ReadJsonFromFile(_filePath));
+ _jsonData = GetJsonObjectFromFile();
  }
 
  return _jsonData[path]?
@@ -469,59 +467,9 @@ private dynamic SingleDynamicItemReadConverter(JToken e)
  }
  }
 
- private string ReadJsonFromFile(string path)
- {
- Stopwatch sw = null;
- string json = "{}";
-
- while (true)
- {
- try
- {
- json = File.ReadAllText(path);
- break;
- }
- catch (FileNotFoundException)
- {
- json = _encryptJson(json);
- File.WriteAllText(path, json);
- break;
- }
- catch (IOException e) when (e.Message.Contains("because it is being used by another process"))
- {
- // If some other process is using this file, retry operation unless elapsed times is greater than 10sec
- sw = sw ?? Stopwatch.StartNew();
- if (sw.ElapsedMilliseconds > 10000)
- throw;
- }
- }
+ private string GetJsonTextFromFile() => FileAccess.ReadJsonFromFile(_filePath, _encryptJson, _decryptJson);
 
- return _decryptJson(json);
- }
-
- private bool WriteJsonToFile(string path, string content)
- {
- Stopwatch sw = null;
- while (true)
- {
- try
- {
- File.WriteAllText(path, _encryptJson(content));
- return true;
- }
- catch (IOException e) when (e.Message.Contains("because it is being used by another process"))
- {
- // If some other process is using this file, retry operation unless elapsed times is greater than 10sec
- sw = sw ?? Stopwatch.StartNew();
- if (sw.ElapsedMilliseconds > 10000)
- return false;
- }
- catch (Exception)
- {
- return false;
- }
- }
- }
+ private JObject GetJsonObjectFromFile() => JObject.Parse(GetJsonTextFromFile());
 
  private class CommitAction
  {

JsonFlatFileDataStore/FileAccess.cs

@@ -0,0 +1,64 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+
+namespace JsonFlatFileDataStore
+{
+ public static class FileAccess
+ {
+ public static string ReadJsonFromFile(string path, Func<string, string> encryptJson, Func<string, string> decryptJson)
+ {
+ Stopwatch sw = null;
+ var json = "{}";
+
+ while (true)
+ {
+ try
+ {
+ json = File.ReadAllText(path);
+ break;
+ }
+ catch (FileNotFoundException)
+ {
+ json = encryptJson(json);
+ File.WriteAllText(path, json);
+ break;
+ }
+ catch (IOException e) when (e.Message.Contains("because it is being used by another process"))
+ {
+ // If some other process is using this file, retry operation unless elapsed times is greater than 10sec
+ sw ??= Stopwatch.StartNew();
+ if (sw.ElapsedMilliseconds > 10000)
+ throw;
+ }
+ }
+
+ return decryptJson(json);
+ }
+
+ public static bool WriteJsonToFile(string path, Func<string, string> encryptJson, string content)
+ {
+ Stopwatch sw = null;
+
+ while (true)
+ {
+ try
+ {
+ File.WriteAllText(path, encryptJson(content));
+ return true;
+ }
+ catch (IOException e) when (e.Message.Contains("because it is being used by another process"))
+ {
+ // If some other process is using this file, retry operation unless elapsed times is greater than 10sec
+ sw ??= Stopwatch.StartNew();
+ if (sw.ElapsedMilliseconds > 10000)
+ return false;
+ }
+ catch (Exception)
+ {
+ return false;
+ }
+ }
+ }
+ }
+}