Merge branch 'dev' into fb-streamingassets

Author: coryleach

README.md

@@ -1,6 +1,6 @@
 <h1 align="center">Gameframe.SaveLoad 👋</h1>
 <p>
-  <img alt="Version" src="https://img.shields.io/badge/version-1.0.6-blue.svg?cacheSeconds=2592000" />
+  <img alt="Version" src="https://img.shields.io/badge/version-1.0.7-blue.svg?cacheSeconds=2592000" />
   <a href="https://twitter.com/Cory Leach">
     <img alt="Twitter: coryleach" src="https://img.shields.io/twitter/follow/coryleach.svg?style=social" target="_blank" />
   </a>
@@ -13,15 +13,15 @@ Serialization helper utility that supports save, load and encryption.
 #### Using UnityPackageManager (for Unity 2019.3 or later)
 Open the package manager window (menu: Window > Package Manager)<br/>
 Select "Add package from git URL...", fill in the pop-up with the following link:<br/>
-https://github.com/coryleach/UnitySaveLoad.git#1.0.6<br/>
+https://github.com/coryleach/UnitySaveLoad.git#1.0.7<br/>
 
 #### Using UnityPackageManager (for Unity 2019.1 or later)
 
 Find the manifest.json file in the Packages folder of your project and edit it to look like this:
 ```js
 {
   "dependencies": {
-    "com.gameframe.saveload": "https://github.com/coryleach/UnitySaveLoad.git#1.0.6",
+    "com.gameframe.saveload": "https://github.com/coryleach/UnitySaveLoad.git#1.0.7",
     ...
   },
 }
@@ -70,7 +70,11 @@ manager.LoadUnityObjectOverwrite(myScriptableObject,"MyUnityObjectData.data");
 
 ## Enable Json.Net Support
 
-Ensure the [Json.Net for Unity](https://assetstore.unity.com/packages/tools/input-management/json-net-for-unity-11347) package has been imported.</br>
+This package has been tested with version 3.0.2 of the newtonsoft json package.
+Import the Netwonsoft Json package from the package manager or copy and paste the below into your package manifest.
+```C#
+"com.unity.nuget.newtonsoft-json": "3.0.2"
+```
 In player settings add the string 'JSON_DOT_NET' to Scripting Define Symbols.
 
 <!-- DOC-END -->

Runtime/SaveLoadManager.cs

@@ -101,6 +101,7 @@ public void GetFiles(List<string> list, string folder = null, bool streamingAsse
             {
                 folder = defaultFolder;
             }
+            
             SaveLoadUtility.GetSavedFiles(list, folder,baseFolder, streamingAssets);
         }
 

Runtime/SaveLoadUtility.cs

@@ -122,9 +122,10 @@ public static object Load(System.Type objectType, ISerializationMethod serializa
         /// </summary>
         /// <param name="folderName">folder containing the save files</param>
         /// <param name="baseFolderPath">base path to the folder</param>
+        /// <param name="extension">include only files with this extension</param>
         /// <param name="streamingAssets">Will use Application.streamingAssetsPath as base path if true otherwise Application.persistentDataPath</param>
         /// <returns>list of file names</returns>
-        public static IEnumerable<string> EnumerateSavedFiles(string folderName = null, string baseFolderPath = null, bool streamingAssets = false)
+        public static IEnumerable<string> EnumerateSavedFiles(string folderName = null, string baseFolderPath = null, string extension = null, bool streamingAssets = false)
         {
             var savePath = GetSavePath(folderName,baseFolderPath,streamingAssets);
 
@@ -134,7 +135,8 @@ public static IEnumerable<string> EnumerateSavedFiles(string folderName = null,
                 yield break;
             }
 
-            foreach ( var file in Directory.EnumerateFiles(savePath,"*",SearchOption.AllDirectories) )
+            var searchPattern = string.IsNullOrEmpty(extension) ? "*" : $"*.{extension}";
+            foreach ( var file in Directory.EnumerateFiles(savePath,searchPattern,SearchOption.AllDirectories) )
             {
                 yield return Path.GetFileName(file);
             }
@@ -145,11 +147,12 @@ public static IEnumerable<string> EnumerateSavedFiles(string folderName = null,
         /// </summary>
         /// <param name="folderName"></param>
         /// <param name="baseFolderPath"></param>
+        /// <param name="extension">include only files with this extension</param>
         /// <param name="streamingAssets">Will use Application.streamingAssetsPath as base path if true otherwise Application.persistentDataPath</param>
         /// <returns>Array of file names</returns>
-        public static string[] GetSavedFiles(string folderName = null, string baseFolderPath = null, bool streamingAssets = false)
+        public static string[] GetSavedFiles(string folderName = null, string baseFolderPath = null, string extension = null, bool streamingAssets = false)
         {
-            return EnumerateSavedFiles(folderName, baseFolderPath).ToArray();
+            return EnumerateSavedFiles(folderName, baseFolderPath, extension, streamingAssets).ToArray();
         }
 
         /// <summary>
@@ -158,12 +161,13 @@ public static string[] GetSavedFiles(string folderName = null, string baseFolder
         /// <param name="list">list to be populated with file names</param>
         /// <param name="folderName"></param>
         /// <param name="baseFolderPath"></param>
+        /// <param name="extension">include only files with this extension</param>
         /// <param name="streamingAssets">Will use Application.streamingAssetsPath as base path if true otherwise Application.persistentDataPath</param>
         /// <returns>Array of file names</returns>
-        public static void GetSavedFiles(List<string> list, string folderName = null, string baseFolderPath = null, bool streamingAssets = false)
+        public static void GetSavedFiles(List<string> list, string folderName = null, string baseFolderPath = null, string extension = null, bool streamingAssets = false)
         {
             list.Clear();
-            list.AddRange(EnumerateSavedFiles(folderName, baseFolderPath, streamingAssets));
+            list.AddRange(EnumerateSavedFiles(folderName, baseFolderPath, extension streamingAssets));
         }
 
         /// <summary>

Tests/Editor/SaveLoadUtilityTests.cs

@@ -26,10 +26,12 @@ private ISerializationMethod GetSerializationMethod(SerializationMethodType meth
                     return new SerializationMethodUnityJson();
                 case SerializationMethodType.UnityJsonEncrypted:
                     return new SerializationMethodUnityJsonEncrypted(TestKey,TestSalt);
+#if JSON_DOT_NET
                 case SerializationMethodType.JsonDotNet:
                     return new SerializationMethodJsonDotNet();
                 case SerializationMethodType.JsonDotNetEncrypted:
                     return new SerializationMethodJsonDotNetEncrypted(TestKey,TestSalt);
+#endif
                 case SerializationMethodType.Custom:
                     return new SerializationMethodBinary();
                 default:
@@ -93,6 +95,29 @@ public void CanGetFiles()
             Assert.IsTrue(files.Length == 0);
         }
 
+        [Test]
+        public void CanGetFilesWithExtension()
+        {
+            var testSave = new SaveLoadTestObject() {testData = "SaveFileExists"};
+            var serializationMethod = GetSerializationMethod(SerializationMethodType.Binary);
+            var filename = "TestSave.sav";
+            var folder = "TestFolder";
+
+            SaveLoadUtility.Save(testSave,serializationMethod,filename,folder);
+
+            var files = SaveLoadUtility.GetSavedFiles(folder,null, "sav");
+            Assert.IsTrue(files.Length == 1);
+
+            //Files should contain a list of names that exactly match the file name used
+            //omits the path of the file
+            Assert.IsTrue(files[0] == filename);
+
+            SaveLoadUtility.DeleteSavedFile(filename,folder);
+
+            files = SaveLoadUtility.GetSavedFiles();
+            Assert.IsTrue(files.Length == 0);
+        }
+
         [TearDown]
         public void TearDown()
         {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.gameframe.saveload",
   "displayName": "Gameframe.SaveLoad",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Serialization helper utility that supports save, load and encryption.",
   "keywords": [],
   "author": {