diff options
Diffstat (limited to 'Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs')
| -rw-r--r-- | Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs index 1a66d0fe6..b718887af 100644 --- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs +++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/MachineStudioController.cs @@ -162,11 +162,11 @@ namespace Tango.MachineService.Controllers if (user != null && user.HasPermission(Permissions.PublishMachineStudioVersions)) { var latestVersion = db.MachineStudioVersions.ToList().OrderByDescending(x => Version.Parse(x.Version)).FirstOrDefault(); - Version currentVersion = Version.Parse(request.Version); + Version local_version = Version.Parse(request.Version); - if (latestVersion == null || currentVersion > Version.Parse(latestVersion.Version)) + if (latestVersion == null || local_version > Version.Parse(latestVersion.Version)) { - String newVersionFileName = "Machine Studio Version" + " " + currentVersion.ToString() + ".zip"; + String newVersionFileName = "Machine Studio v" + local_version.ToString() + ".zip"; var manager = new BlobStorageManager(); var container = manager.GetContainer(MachineServiceConfig.MACHINE_STUDIO_VERSIONS_CONTAINER); @@ -175,14 +175,24 @@ namespace Tango.MachineService.Controllers response.Token = Guid.NewGuid().ToString(); response.BlobAddress = blob.GenerateWriteSignature(TimeSpan.FromMinutes(30)); - _pendingUploads.Add(new MachineStudioPendingUpload() + MachineStudioPendingUpload pending_upload = new MachineStudioPendingUpload() { UserGuid = user.Guid, Comments = request.Comments, Token = response.Token, Version = request.Version, BlobName = blob.Name, - }); + }; + + if (request.WithInstaller) + { + String installerVersionFileName = "Machine Studio v" + local_version.ToString() + ".exe"; + var installerBlob = container.CreateEmptyBlob(installerVersionFileName); + response.InstallerBlobAddress = installerBlob.GenerateWriteSignature(TimeSpan.FromMinutes(30)); + pending_upload.InstallerBlobName = installerBlob.Name; + } + + _pendingUploads.Add(pending_upload); } else { @@ -220,6 +230,7 @@ namespace Tango.MachineService.Controllers { Comments = upload.Comments, BlobName = upload.BlobName, + InstallerBlobName = upload.InstallerBlobName, UserGuid = upload.UserGuid, Version = upload.Version, }); |