From 2392ee2694372a6e7f42883a2cdc7b168d12fa94 Mon Sep 17 00:00:00 2001 From: Friedrich Brunzema Date: Mon, 9 Feb 2015 22:04:31 -0500 Subject: [PATCH 1/3] File Upload Issue --- BaseSpace.SDK/Infrastructure/FileUpload.cs | 75 +++++++++++++--------- 1 file changed, 45 insertions(+), 30 deletions(-) diff --git a/BaseSpace.SDK/Infrastructure/FileUpload.cs b/BaseSpace.SDK/Infrastructure/FileUpload.cs index 29ea11f..9fbf407 100644 --- a/BaseSpace.SDK/Infrastructure/FileUpload.cs +++ b/BaseSpace.SDK/Infrastructure/FileUpload.cs @@ -18,7 +18,7 @@ public class FileUpload protected IClientSettings ClientSettings { get; set; } protected IRequestOptions Options { get; set; } protected ILog Logger = LogManager.GetCurrentClassLogger(); - + public FileUpload(IWebClient webClient, IClientSettings settings, IRequestOptions options) { WebClient = webClient; @@ -26,20 +26,20 @@ public FileUpload(IWebClient webClient, IClientSettings settings, IRequestOption Options = options; } - public virtual TResult UploadFile(FileUploadRequestBase request) - where TResult : FileResponse - { - Logger.DebugFormat("numthreads {0}", request.ThreadCount); - TResult file = null; + public virtual TResult UploadFile(FileUploadRequestBase request) + where TResult : FileResponse + { + Logger.DebugFormat("numthreads {0}", request.ThreadCount); + TResult file = null; RetryLogic.DoWithRetry(ClientSettings.RetryAttempts, string.Format("Uploading file {0}", request.FileInfo.Name), () => - { + { request.MultiPart = request.FileInfo.Length >= ClientSettings.FileUploadMultipartSizeThreshold; file = request.MultiPart.Value ? UploadFile_MultiPart(request) : - WebClient.Send(request); + WebClient.Send(request); }, Logger, retryHandler: (exc) => { @@ -59,14 +59,14 @@ public virtual TResult UploadFile(FileUploadRequestBase reques return file; } - protected virtual TResult UploadFile_MultiPart(FileUploadRequestBase request) - where TResult : FileResponse + protected virtual TResult UploadFile_MultiPart(FileUploadRequestBase request) + where TResult : FileResponse { Logger.InfoFormat("File Upload: {0}: Initiating multipart upload", request.FileInfo.Name); - var fileUploadresp = WebClient.Send(request); + var fileUploadresp = WebClient.Send(request); - var server = ClientSettings.BaseSpaceApiUrl.TrimEnd('/'); + var server = ClientSettings.BaseSpaceApiUrl.TrimEnd('/'); uint chunkSize = ClientSettings.FileUploadMultipartChunkSize; @@ -125,7 +125,7 @@ protected virtual TResult UploadFile_MultiPart(FileUploadRequestBase @@ -143,7 +143,7 @@ protected virtual TResult UploadFile_MultiPart(FileUploadRequestBase Date: Thu, 5 Mar 2015 08:36:11 -0500 Subject: [PATCH 2/3] Added feature to allow sharing of project through the SDK --- BaseSpace.SDK.sln | 11 +-- BaseSpace.SDK/BaseSpace.SDK.csproj | 15 +--- BaseSpace.SDK/BaseSpace.SDK.nuspec | 2 +- BaseSpace.SDK/BaseSpaceClient.cs | 4 + BaseSpace.SDK/Constants.cs | 1 + BaseSpace.SDK/Interfaces/IBaseSpaceClient.cs | 2 + .../Request/CreateProjectShareRequest.cs | 73 +++++++++++++++++++ .../Response/ProjectShareResponse.cs | 9 +++ BaseSpace.SDK/Types/Invite.cs | 59 +++++++++++++++ 9 files changed, 154 insertions(+), 22 deletions(-) create mode 100644 BaseSpace.SDK/ServiceModels/Request/CreateProjectShareRequest.cs create mode 100644 BaseSpace.SDK/ServiceModels/Response/ProjectShareResponse.cs create mode 100644 BaseSpace.SDK/Types/Invite.cs diff --git a/BaseSpace.SDK.sln b/BaseSpace.SDK.sln index 591d761..df35da1 100644 --- a/BaseSpace.SDK.sln +++ b/BaseSpace.SDK.sln @@ -1,21 +1,12 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 +VisualStudioVersion = 12.0.31101.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BaseSpace.SDK", "BaseSpace.SDK\BaseSpace.SDK.csproj", "{53207AEA-0E50-45AB-9AA5-D460CD3844BB}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{455352A5-C36E-4341-AD1F-935800684CC9}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BaseSpace.SDK.Tests", "BaseSpace.SDK.Tests\BaseSpace.SDK.Tests.csproj", "{FC73DFAB-7F44-4D55-91FC-339C968E1298}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget (2)", ".nuget (2)", "{E6DCBAD8-85F3-477E-B14C-084952A5F624}" - ProjectSection(SolutionItems) = preProject - .nuget\NuGet.Config = .nuget\NuGet.Config - .nuget\NuGet.exe = .nuget\NuGet.exe - .nuget\NuGet.targets = .nuget\NuGet.targets - EndProjectSection -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU diff --git a/BaseSpace.SDK/BaseSpace.SDK.csproj b/BaseSpace.SDK/BaseSpace.SDK.csproj index 890e3e8..8940e1b 100644 --- a/BaseSpace.SDK/BaseSpace.SDK.csproj +++ b/BaseSpace.SDK/BaseSpace.SDK.csproj @@ -42,7 +42,7 @@ ..\packages\Common.Logging.2.1.2\lib\net40\Common.Logging.dll - ..\packages\TerminalVelocity.Sharp.1.0.0.72\lib\net40\Illumina.TerminalVelocity.dll + ..\..\BrightSpark\output\bin\Illumina.TerminalVelocity.dll False @@ -98,6 +98,7 @@ + @@ -179,6 +180,7 @@ + @@ -228,6 +230,7 @@ + @@ -264,17 +267,7 @@ - - - Designer - - - Designer - - - -