Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public async Task<IActionResult> ProcessUpload(Guid tempKey)

using (var stream = tempFile.OpenReadStream())
{
return Ok(_managementService.UnpackStream(stream));
return Ok(await _managementService.UnpackStreamAsync(stream));
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,9 @@ public interface ISyncManagementService
Func<SyncActionOptions, uSyncCallbacks, Task<SyncActionResult>> GetHandlerMethodAsync(HandlerActions action);
Task<SyncFileVersionCheckResult> GetSyncFileInfo();
Task<PerformActionResponse> PerformActionAsync(PerformActionRequest actionRequest, IUser? user);
UploadImportResult UnpackStream(Stream stream);

[Obsolete("use UnpackStreamAsync will be removed in v19")]
UploadImportResult UnpackStream(Stream stream)
=> UnpackStreamAsync(stream).Result;
Task<UploadImportResult> UnpackStreamAsync(Stream stream);
}
Original file line number Diff line number Diff line change
Expand Up @@ -427,8 +427,8 @@ public Stream CompressExportFolder()
/// <summary>
/// take a zip file as a stream expand it over the current uSync folder.
/// </summary>
public UploadImportResult UnpackStream(Stream stream)
=> _syncActionService.UnpackImportFromStream(stream);
public async Task<UploadImportResult> UnpackStreamAsync(Stream stream)
=> await _syncActionService.UnpackImportFromStreamAsync(stream);

public async Task<SyncFileVersionCheckResult> GetSyncFileInfo()
=> await _syncVersionFileService.GetSyncFileInfo(_configService.GetWorkingFolder());
Expand Down
Loading