diff --git a/App.config b/App.config index 64cbc0d..0805e28 100644 --- a/App.config +++ b/App.config @@ -1,11 +1,23 @@ - + - - + + + + + + + + + + + + + + - + diff --git a/LargeFileUploader.csproj b/LargeFileUploader.csproj index b239962..43b401e 100644 --- a/LargeFileUploader.csproj +++ b/LargeFileUploader.csproj @@ -37,25 +37,28 @@ false - - packages\Microsoft.Data.Edm.5.6.0\lib\net40\Microsoft.Data.Edm.dll + + False + packages\Microsoft.Data.Edm.5.6.1\lib\net40\Microsoft.Data.Edm.dll - - packages\Microsoft.Data.OData.5.6.0\lib\net40\Microsoft.Data.OData.dll + + False + packages\Microsoft.Data.OData.5.6.1\lib\net40\Microsoft.Data.OData.dll - - packages\Microsoft.Data.Services.Client.5.6.0\lib\net40\Microsoft.Data.Services.Client.dll + + False + packages\Microsoft.Data.Services.Client.5.6.1\lib\net40\Microsoft.Data.Services.Client.dll packages\Microsoft.WindowsAzure.ConfigurationManager.2.0.3\lib\net40\Microsoft.WindowsAzure.Configuration.dll - + False - packages\WindowsAzure.Storage.3.0.2.0\lib\net40\Microsoft.WindowsAzure.Storage.dll + packages\WindowsAzure.Storage.4.1.0\lib\net40\Microsoft.WindowsAzure.Storage.dll False - packages\Newtonsoft.Json.6.0.1\lib\net40\Newtonsoft.Json.dll + packages\Newtonsoft.Json.6.0.3\lib\net45\Newtonsoft.Json.dll @@ -63,8 +66,9 @@ - - packages\System.Spatial.5.6.0\lib\net40\System.Spatial.dll + + False + packages\System.Spatial.5.6.1\lib\net40\System.Spatial.dll diff --git a/LargeFileUploaderUtils.cs b/LargeFileUploaderUtils.cs index 5f4184b..d9142be 100644 --- a/LargeFileUploaderUtils.cs +++ b/LargeFileUploaderUtils.cs @@ -44,6 +44,7 @@ public static async Task UploadAsync(this FileInfo file, CloudStorageAccount sto var allBlockInFile = Enumerable .Range(0, 1 + ((int)(fileLength / NumBytesPerChunk))) .Select(_ => new BlockMetadata(_, fileLength, NumBytesPerChunk)) + .Where(block => block.Length > 0) .ToList(); var blockIdList = allBlockInFile.Select(_ => _.BlockId).ToList(); diff --git a/Program.cs b/Program.cs index 9452de3..aae52d3 100644 --- a/Program.cs +++ b/Program.cs @@ -8,12 +8,12 @@ class Program static void Main(string[] args) { LargeFileUploaderUtils.Log = Console.Out.WriteLine; - LargeFileUploaderUtils.NumBytesPerChunk = 512 * 1024; - + // LargeFileUploaderUtils.NumBytesPerChunk = 1 * 1024; + LargeFileUploaderUtils.UploadAsync( - inputFile: @"C:\Users\chgeuer\format504015.mp4", - storageConnectionString: "DefaultEndpointsProtocol=https;AccountName=accountname;AccountKey=XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX==", - containerName: "dummy1", + inputFile: @"C:\Users\chgeuer\github\chgeuer\AzureLargeFileUploader\bin\Debug\LargeFileUploader.exe", + storageConnectionString: Environment.GetEnvironmentVariable("AZURE_STORAGE_CONNECTION_STRING"), + containerName: "dummy222222", uploadParallelism: 2).Wait(); } } diff --git a/packages.config b/packages.config index 89c8d3d..2d7b39d 100644 --- a/packages.config +++ b/packages.config @@ -1,10 +1,10 @@  - - - + + + - - - + + + \ No newline at end of file