diff --git a/packages/fileimport-service/src/controller/daemon.ts b/packages/fileimport-service/src/controller/daemon.ts index e518cc1b5..88292bcae 100644 --- a/packages/fileimport-service/src/controller/daemon.ts +++ b/packages/fileimport-service/src/controller/daemon.ts @@ -164,6 +164,7 @@ async function doTask( info.streamId, `File upload: ${info.fileName}`, existingBranch?.id || '', + info.branchName, regionName ], { diff --git a/packages/fileimport-service/src/ifc-dotnet/Program.cs b/packages/fileimport-service/src/ifc-dotnet/Program.cs index 6c694292e..55fc7ff50 100644 --- a/packages/fileimport-service/src/ifc-dotnet/Program.cs +++ b/packages/fileimport-service/src/ifc-dotnet/Program.cs @@ -4,31 +4,45 @@ using Speckle.Importers.Ifc; using Speckle.Sdk.Common; using Speckle.Sdk.Models.Extensions; -var filePathArgument = new Argument(name: "filePath"); +var filePathArgument = new Argument("filePath"); var outputPathArgument = new Argument("outputPath"); -var streamIdArgument = new Argument("streamId"); -var commitMessageArgument = new Argument("commitMessage"); +var projectIdArgument = new Argument("projectId"); +var versionMessageArgument = new Argument("versionMessage"); var modelIdArgument = new Argument("modelId"); +var modelNameArgument = new Argument("modelName"); var regionNameArgument = new Argument("regionName"); var rootCommand = new RootCommand { filePathArgument, outputPathArgument, - streamIdArgument, - commitMessageArgument, + projectIdArgument, + versionMessageArgument, modelIdArgument, + modelNameArgument, regionNameArgument, }; + rootCommand.SetHandler( - async (filePath, outputPath, streamId, commitMessage, modelId, _) => + async (filePath, outputPath, projectId, versionMessage, modelId, modelName, _) => { try { var token = Environment.GetEnvironmentVariable("USER_TOKEN").NotNull("USER_TOKEN is missing"); var url = Environment.GetEnvironmentVariable("SPECKLE_SERVER_URL") ?? "http://127.0.0.1:3000"; - var commitId = await Import.Ifc(url, filePath, streamId, modelId, commitMessage, token); - File.WriteAllText(outputPath, JsonSerializer.Serialize(new { success = true, commitId })); + ImporterArgs args = new() + { + ServerUrl = new(url), + FilePath = filePath, + ProjectId = projectId, + ModelId = modelId, + ModelName = modelName, + VersionMessage = versionMessage, + Token = token + }; + + var version = await Import.Ifc(args); + File.WriteAllText(outputPath, JsonSerializer.Serialize(new { success = true, commitId = version.id })); } catch (Exception e) { @@ -42,9 +56,10 @@ rootCommand.SetHandler( }, filePathArgument, outputPathArgument, - streamIdArgument, - commitMessageArgument, + projectIdArgument, + versionMessageArgument, modelIdArgument, + modelNameArgument, regionNameArgument ); await rootCommand.InvokeAsync(args); diff --git a/packages/fileimport-service/src/ifc-dotnet/ifc-converter.csproj b/packages/fileimport-service/src/ifc-dotnet/ifc-converter.csproj index df2c94ad1..42a5aad86 100644 --- a/packages/fileimport-service/src/ifc-dotnet/ifc-converter.csproj +++ b/packages/fileimport-service/src/ifc-dotnet/ifc-converter.csproj @@ -10,7 +10,7 @@ - +