Browse Source

Studio improvements

pull/10363/head
Yunus Emre Kalkan 5 years ago
parent
commit
1f33987532
  1. 25
      studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Nuget/NugetSourceCodeStore.cs
  2. 29
      studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/ModuleInstalling/ModuleInstallingPipeline.cs
  3. 4
      studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/ModuleInstallingPipelineBuilderBase.cs
  4. 4
      studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/Steps/SourceCodeDownloadStep.cs

25
studio/src/Volo.Abp.Studio.Domain.CommonServices/Volo/Abp/Studio/Nuget/NugetSourceCodeStore.cs

@ -34,10 +34,7 @@ namespace Volo.Abp.Studio.Nuget
string templateSource = null,
bool includePreReleases = false)
{
if (type == SourceCodeTypes.Template)
{
name = TemplateNugetPackageInfoProvider.GetNugetPackageName(name);
}
name = GetNugetPackageName(name, type);
var latestVersion = await GetLatestVersionAsync(name, includePreReleases);
@ -54,10 +51,7 @@ namespace Volo.Abp.Studio.Nuget
public async Task<string> GetCachedSourceCodeFilePathAsync(string name, string type, string version = null,
bool includePreReleases = false)
{
if (type == SourceCodeTypes.Template)
{
name = TemplateNugetPackageInfoProvider.GetNugetPackageName(name);
}
name = GetNugetPackageName(name, type);
if (version == null)
{
@ -148,5 +142,20 @@ namespace Volo.Abp.Studio.Nuget
".nuget",
"packages");
}
private string GetNugetPackageName(string name, string type)
{
if (type == SourceCodeTypes.Template)
{
return TemplateNugetPackageInfoProvider.GetNugetPackageName(name);
}
if (type == SourceCodeTypes.Module)
{
return $"{name}.SourceCode";
}
return name;
}
}
}

29
studio/src/Volo.Abp.Studio.ModuleInstaller.Abstractions/Volo/Abp/Studio/ModuleInstalling/ModuleInstallingPipeline.cs

@ -1,4 +1,6 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace Volo.Abp.Studio.ModuleInstalling
@ -22,5 +24,30 @@ namespace Volo.Abp.Studio.ModuleInstalling
await step.ExecuteAsync(Context);
}
}
public void Add(ModuleInstallingPipelineStep step)
{
Steps.Add(step);
}
public void Remove(Type stepType)
{
Steps.RemoveAll(step => step.GetType() == stepType);
}
public void Replace(Type stepType, ModuleInstallingPipelineStep step)
{
Steps.ReplaceOne(step => step.GetType() == stepType , step);
}
public void InsertAfter(Type stepType, ModuleInstallingPipelineStep step)
{
Steps.InsertAfter(step => step.GetType() == stepType , step);
}
public void InsertBefore(Type stepType, ModuleInstallingPipelineStep step)
{
Steps.InsertBefore(step => step.GetType() == stepType , step);
}
}
}

4
studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/ModuleInstallingPipelineBuilderBase.cs

@ -10,10 +10,10 @@ namespace Volo.Abp.Studio.ModuleInstalling
if (context.WithSourceCode)
{
pipeline.Steps.Add(new SourceCodeDownloadStep());
pipeline.Add(new SourceCodeDownloadStep());
}
pipeline.Steps.Add(new PackageReferencingStep());
pipeline.Add(new PackageReferencingStep());
return pipeline;
}

4
studio/src/Volo.Abp.Studio.ModuleInstaller/Volo/Abp/Studio/ModuleInstalling/Steps/SourceCodeDownloadStep.cs

@ -13,10 +13,8 @@ namespace Volo.Abp.Studio.ModuleInstalling.Steps
{
var _nugetSourceCodeStoreManager = context.ServiceProvider.GetRequiredService<INugetSourceCodeStore>();
var sourceCodePackageName = $"{context.ModuleName}.SourceCode";
var zipFilePath = await _nugetSourceCodeStoreManager.GetCachedSourceCodeFilePathAsync(
sourceCodePackageName,
context.ModuleName,
SourceCodeTypes.Module,
context.Version);

Loading…
Cancel
Save