diff --git a/Assets/Speckle Connector/ConverterUnity.cs b/Assets/Speckle Connector/ConverterUnity.cs index 660b15c..54d9edd 100644 --- a/Assets/Speckle Connector/ConverterUnity.cs +++ b/Assets/Speckle Connector/ConverterUnity.cs @@ -20,6 +20,8 @@ namespace Objects.Converter.Unity public string Name => nameof(ConverterUnity); public string Author => "Speckle"; public string WebsiteOrEmail => "https://speckle.systems"; + + public ProgressReport Report { get; } public IEnumerable GetServicedApplications() => new string[] {Applications.Other}; //TODO: add unity diff --git a/Assets/Speckle Connector/Core/Sentry.dll b/Assets/Speckle Connector/Core/Sentry.dll index be67ff9..fff7479 100644 Binary files a/Assets/Speckle Connector/Core/Sentry.dll and b/Assets/Speckle Connector/Core/Sentry.dll differ diff --git a/Assets/Speckle Connector/Core/SpeckleCore2.deps.json b/Assets/Speckle Connector/Core/SpeckleCore2.deps.json index aba7cfc..6c95a2f 100644 --- a/Assets/Speckle Connector/Core/SpeckleCore2.deps.json +++ b/Assets/Speckle Connector/Core/SpeckleCore2.deps.json @@ -13,7 +13,7 @@ "Microsoft.CSharp": "4.7.0", "NETStandard.Library": "2.0.3", "Piwik.Tracker": "3.0.0", - "Sentry": "3.9.0", + "Sentry": "3.9.4", "Speckle.Newtonsoft.Json": "12.0.3.1", "System.Data.SQLite.Core": "1.0.115" }, @@ -98,7 +98,7 @@ } } }, - "Sentry/3.9.0": { + "Sentry/3.9.4": { "dependencies": { "Microsoft.Bcl.AsyncInterfaces": "5.0.0", "System.Buffers": "4.5.1", @@ -108,8 +108,8 @@ }, "runtime": { "lib/netstandard2.0/Sentry.dll": { - "assemblyVersion": "3.9.0.0", - "fileVersion": "3.9.0.0" + "assemblyVersion": "3.9.4.0", + "fileVersion": "3.9.4.0" } } }, @@ -340,12 +340,12 @@ "path": "piwik.tracker/3.0.0", "hashPath": "piwik.tracker.3.0.0.nupkg.sha512" }, - "Sentry/3.9.0": { + "Sentry/3.9.4": { "type": "package", "serviceable": true, - "sha512": "sha512-U++mXgv9PVz6l28XXxLY9F6T2t/QuW+PtF4MBmBF4djnKWiqv3fHEHszKdux/t7tw1/wM2k0JdDrLSnOfcXhtg==", - "path": "sentry/3.9.0", - "hashPath": "sentry.3.9.0.nupkg.sha512" + "sha512": "sha512-q7LK5E/xNNNO0hVNYjvTqOKAzzKy2+YHxtmd9WKlrp2bo9/55VMtyQmqqjacQ8Tha6ugj50Z5XWu+2IEUiN4+Q==", + "path": "sentry/3.9.4", + "hashPath": "sentry.3.9.4.nupkg.sha512" }, "Speckle.Newtonsoft.Json/12.0.3.1": { "type": "package", diff --git a/Assets/Speckle Connector/Core/SpeckleCore2.dll b/Assets/Speckle Connector/Core/SpeckleCore2.dll index 704a002..aa3c801 100644 Binary files a/Assets/Speckle Connector/Core/SpeckleCore2.dll and b/Assets/Speckle Connector/Core/SpeckleCore2.dll differ diff --git a/Assets/Speckle Connector/Core/SpeckleCore2.xml b/Assets/Speckle Connector/Core/SpeckleCore2.xml index 62ef34d..ab8bdd6 100644 --- a/Assets/Speckle Connector/Core/SpeckleCore2.xml +++ b/Assets/Speckle Connector/Core/SpeckleCore2.xml @@ -635,6 +635,11 @@ Used to ignore properties from expand objects etc + + + Keeps track of the conversion process + + Converts a native object to a Speckle one @@ -991,6 +996,21 @@ cannot correspond with the (ie, on receiving operations). + + + Keeps track of the conversion process + + + + + Keeps track of errors in the conversions. + + + + + Keeps track of errors in the operations of send/receive. + + Wrapper method around hashing functions. Defaults to md5. diff --git a/Assets/Speckle Connector/Editor/StreamManagerEditor.cs b/Assets/Speckle Connector/Editor/StreamManagerEditor.cs index c5568f8..f0e119d 100644 --- a/Assets/Speckle Connector/Editor/StreamManagerEditor.cs +++ b/Assets/Speckle Connector/Editor/StreamManagerEditor.cs @@ -7,6 +7,7 @@ using System.Threading.Tasks; using Sentry; using Speckle.Core.Api; using Speckle.Core.Credentials; +using Speckle.Core.Kits; using Speckle.Core.Logging; using Speckle.Core.Transports; using UnityEditor; @@ -175,7 +176,22 @@ namespace Speckle.ConnectorUnity var go = _streamManager.ConvertRecursivelyToNative(@base, Branches[SelectedBranchIndex].commits.items[SelectedCommitIndex].id); - + + try + { + await Client.CommitReceived(new CommitReceivedInput + { + streamId = SelectedStream.id, + commitId = Branches[SelectedBranchIndex].commits.items[SelectedCommitIndex].id, + message = $"received commit from {Applications.Unity} Editor", + sourceApplication = Applications.Unity + }); + } + catch + { + // Do nothing! + } + } catch (Exception e) { diff --git a/Assets/Speckle Connector/Objects/Objects.dll b/Assets/Speckle Connector/Objects/Objects.dll index 97154e6..ad3b857 100644 Binary files a/Assets/Speckle Connector/Objects/Objects.dll and b/Assets/Speckle Connector/Objects/Objects.dll differ diff --git a/Assets/Speckle Connector/Parallel Extensions.meta b/Assets/Speckle Connector/Parallel Extensions.meta new file mode 100644 index 0000000..68a1351 --- /dev/null +++ b/Assets/Speckle Connector/Parallel Extensions.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3da461ed2b4c84e44b90c3c53f225b29 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Speckle Connector/Receiver.cs b/Assets/Speckle Connector/Receiver.cs index 17ac027..6c33a81 100644 --- a/Assets/Speckle Connector/Receiver.cs +++ b/Assets/Speckle Connector/Receiver.cs @@ -13,6 +13,7 @@ using System.Linq; using System.Threading.Tasks; using Sentry; using Sentry.Protocol; +using Speckle.Core.Kits; using UnityEngine; namespace Speckle.ConnectorUnity @@ -155,6 +156,22 @@ namespace Speckle.ConnectorUnity { throw new SpeckleException(e.Message, e, true, SentryLevel.Error); } + + try + { + await Client.CommitReceived(new CommitReceivedInput + { + streamId = StreamId, + commitId = commitId, + message = "received commit from " + Applications.Unity, + sourceApplication = Applications.Unity + }); + } + catch + { + // Do nothing! + } + }