public async Task<HttpResponseMessage> ApplyConflict(string filename, long remoteVersion, string remoteServerId, string remoteServerUrl) { var canonicalFilename = FileHeader.Canonize(filename); var localMetadata = Synchronizations.GetLocalMetadata(canonicalFilename); if (localMetadata == null) throw new HttpResponseException(HttpStatusCode.NotFound); var contentStream = await Request.Content.ReadAsStreamAsync(); var current = new HistoryItem { ServerId = Storage.Id.ToString(), Version = localMetadata.Value<long>(SynchronizationConstants.RavenSynchronizationVersion) }; var currentConflictHistory = Historian.DeserializeHistory(localMetadata); currentConflictHistory.Add(current); var remote = new HistoryItem { ServerId = remoteServerId, Version = remoteVersion }; var remoteMetadata = RavenJObject.Load(new JsonTextReader(new StreamReader(contentStream))); var remoteConflictHistory = Historian.DeserializeHistory(remoteMetadata); remoteConflictHistory.Add(remote); var conflict = new ConflictItem { CurrentHistory = currentConflictHistory, RemoteHistory = remoteConflictHistory, FileName = canonicalFilename, RemoteServerUrl = Uri.UnescapeDataString(remoteServerUrl) }; ConflictArtifactManager.Create(canonicalFilename, conflict); Publisher.Publish(new ConflictNotification { FileName = filename, SourceServerUrl = remoteServerUrl, Status = ConflictStatus.Detected, RemoteFileHeader = new FileHeader(canonicalFilename, remoteMetadata) }); Log.Debug("Conflict applied for a file '{0}' (remote version: {1}, remote server id: {2}).", filename, remoteVersion, remoteServerId); return GetEmptyMessage(HttpStatusCode.NoContent); }
public static bool IsDirectChildOfCurrent(RavenJObject destinationMetadata, RavenJObject sourceMetadata) { long destVersion = destinationMetadata.Value<long>(SynchronizationConstants.RavenSynchronizationVersion); var destServerId = destinationMetadata.Value<string>(SynchronizationConstants.RavenSynchronizationSource); var version = new HistoryItem { ServerId = destServerId, Version = destVersion }; var history = DeserializeHistory(sourceMetadata); long sourceVersion = sourceMetadata.Value<long>(SynchronizationConstants.RavenSynchronizationVersion); var sourceServerId = sourceMetadata.Value<string>(SynchronizationConstants.RavenSynchronizationSource); history.Add(new HistoryItem { ServerId = sourceServerId, Version = sourceVersion }); return history.Contains(version); }