4.0.7 changes

Author: stephenlucerne

Platform/Android/ModIO.Implementation.Platform/AndroidDataLayout.cs

@@ -1,7 +1,10 @@
 #if UNITY_EDITOR || (MODIO_COMPILE_ALL && UNITY_EDITOR)
 
+using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Threading.Tasks;
+using UnityEngine;
 
 #pragma warning disable 1998 // These async functions don't use await!
 
@@ -12,18 +15,18 @@ internal class EditorDataService : IUserDataService, IPersistentDataService, ITe
     {
         /// <summary>Root directory for all data services.</summary>
         public readonly static string GlobalRootDirectory =
-            $@"{System.IO.Directory.GetCurrentDirectory()}/mod.io";
+            $@"{Application.persistentDataPath}/mod.io";
 
 #region Data
 
         /// <summary>Root directory for the data service.</summary>
-        string rootDir = null;
+        string rootDir;
 
         /// <summary>Root directory for the data service.</summary>
         public string RootDirectory
         {
             get {
-                return this.rootDir;
+                return rootDir;
             }
         }
 
@@ -35,9 +38,8 @@ public string RootDirectory
         async Task<Result> IUserDataService.InitializeAsync(string userProfileIdentifier,
                                                             long gameId, BuildSettings settings)
         {
-            // TODO(@jackson): Test dir creation
-            this.rootDir =
-                $"{EditorDataService.GlobalRootDirectory}/{gameId.ToString("00000")}/users/{userProfileIdentifier}";
+            rootDir =
+                $"{GlobalRootDirectory}/{gameId.ToString("00000")}/users/{userProfileIdentifier}";
 
             Logger.Log(LogLevel.Verbose, "Initialized EditorUserDataService: " + rootDir);
 
@@ -48,21 +50,19 @@ async Task<Result> IUserDataService.InitializeAsync(string userProfileIdentifier
         async Task<Result> IPersistentDataService.InitializeAsync(long gameId,
                                                                   BuildSettings settings)
         {
-            // TODO(@jackson): Test dir creation
-            this.rootDir =
-                $"{EditorDataService.GlobalRootDirectory}/{gameId.ToString("00000")}/data";
+            rootDir =
+                $"{GlobalRootDirectory}/{gameId.ToString("00000")}/data";
 
-            Logger.Log(LogLevel.Verbose, "Initialized EditorDataService as IPDS: " + rootDir);
+            Logger.Log(LogLevel.Verbose, "Initialized EditorPersistentDataService: " + rootDir);
 
             return ResultBuilder.Success;
         }
 
         /// <summary>Init as ITempDataService.</summary>
         async Task<Result> ITempDataService.InitializeAsync(long gameId, BuildSettings settings)
         {
-            // TODO(@jackson): Test dir creation
-            this.rootDir =
-                $"{EditorDataService.GlobalRootDirectory}/{gameId.ToString("00000")}/temp";
+            rootDir =
+                $"{GlobalRootDirectory}/{gameId.ToString("00000")}/temp";
 
             Logger.Log(LogLevel.Verbose, "Initialized EditorTempDataService: " + rootDir);
 
@@ -76,52 +76,68 @@ async Task<Result> ITempDataService.InitializeAsync(long gameId, BuildSettings s
         /// <summary>Opens a file stream for reading.</summary>
         public ModIOFileStream OpenReadStream(string filePath, out Result result)
         {
-            DebugUtil.AssertPathValid(filePath, this.rootDir);
+            // DebugUtil.AssertPathValid(filePath, rootDir);
             return SystemIOWrapper.OpenReadStream(filePath, out result);
         }
 
         /// <summary>Opens a file stream for writing.</summary>
         public ModIOFileStream OpenWriteStream(string filePath, out Result result)
         {
-            DebugUtil.AssertPathValid(filePath, this.rootDir);
+            // DebugUtil.AssertPathValid(filePath, rootDir);
             return SystemIOWrapper.OpenWriteStream(filePath, out result);
         }
 
         /// <summary>Reads an entire file asynchronously.</summary>
         public async Task<ResultAnd<byte[]>> ReadFileAsync(string filePath)
         {
-            DebugUtil.AssertPathValid(filePath, this.rootDir);
+            // DebugUtil.AssertPathValid(filePath, rootDir);
             return await SystemIOWrapper.ReadFileAsync(filePath);
         }
 
         /// <summary>Writes an entire file asynchronously.</summary>
         public async Task<Result> WriteFileAsync(string filePath, byte[] data)
         {
-            DebugUtil.AssertPathValid(filePath, this.rootDir);
+            // DebugUtil.AssertPathValid(filePath, rootDir);
             return await SystemIOWrapper.WriteFileAsync(filePath, data);
         }
 
         /// <summary>Deletes a file.</summary>
         public async Task<Result> DeleteFileAsync(string filePath)
         {
-            throw new System.NotImplementedException();
+            throw new NotImplementedException();
         }
 
         /// <summary>Deletes a directory and its contents recursively.</summary>
         public Result DeleteDirectory(string directoryPath)
         {
-            DebugUtil.AssertPathValid(directoryPath, this.rootDir);
+            // DebugUtil.AssertPathValid(directoryPath, rootDir);
             return SystemIOWrapper.DeleteDirectory(directoryPath);
         }
 
+        public Result MoveDirectory(string directoryPath, string newDirectoryPath)
+        {
+            return SystemIOWrapper.MoveDirectory(directoryPath, newDirectoryPath);
+        }
+        
+        public bool TryCreateParentDirectory(string path)
+        {
+            return SystemIOWrapper.TryCreateParentDirectory(path, out Result _);
+        }
+
+        public bool IsThereEnoughDiskSpaceFor(long bytes)
+        {
+            // Not implemented for this platform
+            return true;
+        }
+
 #endregion // Operations
 
 #region Utility
 
         /// <summary>Determines whether a file exists.</summary>
         public bool FileExists(string filePath)
         {
-            DebugUtil.AssertPathValid(filePath, this.rootDir);
+            // DebugUtil.AssertPathValid(filePath, rootDir);
             return SystemIOWrapper.FileExists(filePath, out Result r);
         }
 
@@ -135,18 +151,18 @@ public ResultAnd<List<string>> ListAllFiles(string directoryPath)
         public async Task<ResultAnd<(long fileSize, string fileHash)>> GetFileSizeAndHash(
             string filePath)
         {
-            DebugUtil.AssertPathValid(filePath, this.rootDir);
+            // DebugUtil.AssertPathValid(filePath, rootDir);
             return await SystemIOWrapper.GetFileSizeAndHash(filePath);
         }
 
         /// <summary>Determines whether a directory exists.</summary>
         public bool DirectoryExists(string directoryPath)
         {
-            DebugUtil.AssertPathValid(directoryPath, this.rootDir);
+            // DebugUtil.AssertPathValid(directoryPath, rootDir);
             return SystemIOWrapper.DirectoryExists(directoryPath);
         }
 
-        /// <summary>Determines whether a path can be handled by this data service.</summary>
+        // /// <summary>Determines whether a path can be handled by this data service.</summary>
         // public bool CanHandlePath(string path)
         // {
         //     // NOTE(@jackson): For EditorDataService, all services handle all paths

Platform/Editor/ModIO.Implementation.Platform/EditorDataService.cs

@@ -17,6 +17,7 @@ internal static partial class PlatformConfiguration
         /// <summary>Holds the value for the platform header value to use in requests.</summary>
         public static string RESTAPI_HEADER = "linux";
 #endif
+        public const bool SynchronizedDataJobs = false;
 
         /// <summary>Creates the user data storage service.</summary>
         public static async Task<ResultAnd<IUserDataService>> CreateUserDataService(