From 406ef4534d33ac89bae05da6d0b3048cbf277cdc Mon Sep 17 00:00:00 2001 From: Alejandro Alvarez Melucci Date: Wed, 19 Jun 2024 13:56:34 -0300 Subject: [PATCH 1/4] Adding debug logs --- .../FileBrowserFactory/DCLFileBrowserFactory.cs | 4 +++- .../FileBrowserIntegration/FileBrowserWrapper.cs | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/unity-renderer/Assets/DCLServices/DCLFileBrowser/FileBrowserFactory/DCLFileBrowserFactory.cs b/unity-renderer/Assets/DCLServices/DCLFileBrowser/FileBrowserFactory/DCLFileBrowserFactory.cs index 77e58065d6..3844aa515e 100644 --- a/unity-renderer/Assets/DCLServices/DCLFileBrowser/FileBrowserFactory/DCLFileBrowserFactory.cs +++ b/unity-renderer/Assets/DCLServices/DCLFileBrowser/FileBrowserFactory/DCLFileBrowserFactory.cs @@ -6,12 +6,14 @@ public static IDCLFileBrowserService GetFileBrowserService() { #if UNITY_WEBGL && !UNITY_EDITOR +UnityEngine.Debug.Log($"DCLFileBrowserFactory.GetFileBrowserService UNITY_WEBGL && !UNITY_EDITOR"); return new DCLFileBrowserServiceWebGL(); #endif - #if FILE_BROWSER_PRESENT + UnityEngine.Debug.Log($"DCLFileBrowserFactory.GetFileBrowserService FILE_BROWSER_PRESENT is defined"); return new FileBrowserIntegration.FileBrowserWrapper(); #endif + UnityEngine.Debug.Log($"DCLFileBrowserFactory.GetFileBrowserService FILE_BROWSER_PRESENT is NOT defined, returning service mock!"); return new DCLFileBrowserServiceMock(); } } diff --git a/unity-renderer/Assets/DCLServices/DCLFileBrowser/FileBrowserIntegration/FileBrowserWrapper.cs b/unity-renderer/Assets/DCLServices/DCLFileBrowser/FileBrowserIntegration/FileBrowserWrapper.cs index f098893b69..a9edd01e66 100644 --- a/unity-renderer/Assets/DCLServices/DCLFileBrowser/FileBrowserIntegration/FileBrowserWrapper.cs +++ b/unity-renderer/Assets/DCLServices/DCLFileBrowser/FileBrowserIntegration/FileBrowserWrapper.cs @@ -20,9 +20,11 @@ public void SaveFile(string title, string directory, string defaultName, byte[] public async UniTask SaveFileAsync(string title, string directory, string defaultName, byte[] content, ExtensionFilter[] extensions) { + UnityEngine.Debug.Log($"FileBrowserWrapper.SaveFileAsync start of method"); UniTaskCompletionSource completionSource = new UniTaskCompletionSource(); FileBrowser.Instance.SaveFileAsync(path => completionSource.TrySetResult(path), title, directory, defaultName, ConvertExtensionFilters(extensions)); var path = await completionSource.Task; + UnityEngine.Debug.Log($"FileBrowserWrapper.SaveFileAsync path:{path} before calling System.IO.File.WriteAllBytesAsync"); await System.IO.File.WriteAllBytesAsync(path, content); } From b81be5c074ef216547d4950f01a5cd5d8616248f Mon Sep 17 00:00:00 2001 From: Alejandro Alvarez Melucci Date: Wed, 19 Jun 2024 16:29:57 -0300 Subject: [PATCH 2/4] test removing IO call --- .../FileBrowserIntegration/FileBrowserWrapper.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/unity-renderer/Assets/DCLServices/DCLFileBrowser/FileBrowserIntegration/FileBrowserWrapper.cs b/unity-renderer/Assets/DCLServices/DCLFileBrowser/FileBrowserIntegration/FileBrowserWrapper.cs index a9edd01e66..93b466e188 100644 --- a/unity-renderer/Assets/DCLServices/DCLFileBrowser/FileBrowserIntegration/FileBrowserWrapper.cs +++ b/unity-renderer/Assets/DCLServices/DCLFileBrowser/FileBrowserIntegration/FileBrowserWrapper.cs @@ -1,6 +1,7 @@ using Crosstales.FB; using Cysharp.Threading.Tasks; using JetBrains.Annotations; +using System.Threading.Tasks; namespace DCLServices.DCLFileBrowser.FileBrowserIntegration { @@ -25,7 +26,8 @@ public async UniTask SaveFileAsync(string title, string directory, string defaul FileBrowser.Instance.SaveFileAsync(path => completionSource.TrySetResult(path), title, directory, defaultName, ConvertExtensionFilters(extensions)); var path = await completionSource.Task; UnityEngine.Debug.Log($"FileBrowserWrapper.SaveFileAsync path:{path} before calling System.IO.File.WriteAllBytesAsync"); - await System.IO.File.WriteAllBytesAsync(path, content); + //await System.IO.File.WriteAllBytesAsync(path, content); + await Task.CompletedTask; } private static Crosstales.FB.ExtensionFilter[] ConvertExtensionFilters(ExtensionFilter[] extensions) From 693e4fb4dbcc30c31b257f1640e87759970c6249 Mon Sep 17 00:00:00 2001 From: Alejandro Alvarez Melucci Date: Thu, 20 Jun 2024 11:23:00 -0300 Subject: [PATCH 3/4] Test removing backpack analytic call --- .../HUD/BackpackEditorHUDV2/BackpackEditorHUDController.cs | 2 +- .../MainScripts/DCL/ServiceProviders/Analytics/Analytics.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/BackpackEditorHUDController.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/BackpackEditorHUDController.cs index 10ad64ec7f..f144f8fa61 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/BackpackEditorHUDController.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/HUD/BackpackEditorHUDV2/BackpackEditorHUDController.cs @@ -983,7 +983,7 @@ internal async UniTask VrmExport(CancellationToken ct) view?.SetVRMSuccessToastActive(false); } - backpackAnalyticsService.SendVRMExportSucceeded(); + //backpackAnalyticsService.SendVRMExportSucceeded(); } } } diff --git a/unity-renderer/Assets/Scripts/MainScripts/DCL/ServiceProviders/Analytics/Analytics.cs b/unity-renderer/Assets/Scripts/MainScripts/DCL/ServiceProviders/Analytics/Analytics.cs index 119295e2b2..ad9a22d88b 100644 --- a/unity-renderer/Assets/Scripts/MainScripts/DCL/ServiceProviders/Analytics/Analytics.cs +++ b/unity-renderer/Assets/Scripts/MainScripts/DCL/ServiceProviders/Analytics/Analytics.cs @@ -8,7 +8,7 @@ /// public class Analytics : IAnalytics { - private static bool VERBOSE = false; + private static bool VERBOSE = true; public void SendAnalytic(string eventName, Dictionary data) { @@ -21,4 +21,4 @@ public void SendAnalytic(string eventName, Dictionary data) internal void SendToSegment(string eventName, Dictionary data) { WebInterface.ReportAnalyticsEvent(eventName, data.Select(x => new WebInterface.AnalyticsPayload.Property(x.Key, x.Value)).ToArray()); } public void Dispose() { } -} \ No newline at end of file +} From 21a55c10e21e4105c058ade95977818efb285ff8 Mon Sep 17 00:00:00 2001 From: Alejandro Alvarez Melucci Date: Thu, 20 Jun 2024 12:02:53 -0300 Subject: [PATCH 4/4] Revert IO call --- .../FileBrowserIntegration/FileBrowserWrapper.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/unity-renderer/Assets/DCLServices/DCLFileBrowser/FileBrowserIntegration/FileBrowserWrapper.cs b/unity-renderer/Assets/DCLServices/DCLFileBrowser/FileBrowserIntegration/FileBrowserWrapper.cs index 93b466e188..a9edd01e66 100644 --- a/unity-renderer/Assets/DCLServices/DCLFileBrowser/FileBrowserIntegration/FileBrowserWrapper.cs +++ b/unity-renderer/Assets/DCLServices/DCLFileBrowser/FileBrowserIntegration/FileBrowserWrapper.cs @@ -1,7 +1,6 @@ using Crosstales.FB; using Cysharp.Threading.Tasks; using JetBrains.Annotations; -using System.Threading.Tasks; namespace DCLServices.DCLFileBrowser.FileBrowserIntegration { @@ -26,8 +25,7 @@ public async UniTask SaveFileAsync(string title, string directory, string defaul FileBrowser.Instance.SaveFileAsync(path => completionSource.TrySetResult(path), title, directory, defaultName, ConvertExtensionFilters(extensions)); var path = await completionSource.Task; UnityEngine.Debug.Log($"FileBrowserWrapper.SaveFileAsync path:{path} before calling System.IO.File.WriteAllBytesAsync"); - //await System.IO.File.WriteAllBytesAsync(path, content); - await Task.CompletedTask; + await System.IO.File.WriteAllBytesAsync(path, content); } private static Crosstales.FB.ExtensionFilter[] ConvertExtensionFilters(ExtensionFilter[] extensions)