Browse Source

Download network `--template-source` instead of reading it as a local file

pull/25670/head
maliming 3 months ago
parent
commit
b3a526370f
No known key found for this signature in database GPG Key ID: A646B9CB645ECEA4
  1. 20
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs
  2. 1
      framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs

20
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/AbpIoSourceCodeStore.cs

@ -169,7 +169,15 @@ public class AbpIoSourceCodeStore : ISourceCodeStore, ITransientDependency
if (!string.IsNullOrWhiteSpace(templateSource) && !IsNetworkSource(templateSource)) if (!string.IsNullOrWhiteSpace(templateSource) && !IsNetworkSource(templateSource))
{ {
Logger.LogInformation("Using local " + type + ": " + name + ", version: " + version); Logger.LogInformation("Using local " + type + ": " + name + ", version: " + version);
return new TemplateFile(File.ReadAllBytes(Path.Combine(templateSource, name + "-" + version + ".zip")),
// A local template source can be a direct ".zip" file path or a folder that contains the "{name}-{version}.zip" file.
var localTemplateFilePath = templateSource.EndsWith(".zip", StringComparison.OrdinalIgnoreCase)
? templateSource
: Path.Combine(templateSource, name.Replace("/", ".").EnsureEndsWith('-') + version + ".zip");
Logger.LogInformation("Using local template file: " + localTemplateFilePath);
return new TemplateFile(File.ReadAllBytes(localTemplateFilePath),
version, latestVersion, nugetVersion); version, latestVersion, nugetVersion);
} }
@ -188,16 +196,6 @@ public class AbpIoSourceCodeStore : ISourceCodeStore, ITransientDependency
return new TemplateFile(File.ReadAllBytes(localCacheFile), version, latestVersion, nugetVersion); return new TemplateFile(File.ReadAllBytes(localCacheFile), version, latestVersion, nugetVersion);
} }
if (!skipCache && !templateSource.IsNullOrWhiteSpace() && type == SourceCodeTypes.Template)
{
var templateFilePath = templateSource.EndsWith(".zip")
? templateSource
: Path.Combine(templateSource, name.Replace("/", ".").EnsureEndsWith('-') + version + ".zip");
Logger.LogInformation("Using cached template: " + name + ", version: " + version + " from template source: " + templateFilePath);
return new TemplateFile(File.ReadAllBytes(templateFilePath), version, latestVersion, nugetVersion);
}
Logger.LogInformation("Downloading " + type + ": " + name + ", version: " + version); Logger.LogInformation("Downloading " + type + ": " + name + ", version: " + version);
var fileContent = await DownloadSourceCodeContentAsync( var fileContent = await DownloadSourceCodeContentAsync(

1
framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/TemplateProjectBuilder.cs

@ -69,6 +69,7 @@ public class TemplateProjectBuilder : IProjectBuilder, ITransientDependency
args.Version, args.Version,
args.TemplateSource, args.TemplateSource,
args.ExtraProperties.ContainsKey(NewCommand.Options.Preview.Long), args.ExtraProperties.ContainsKey(NewCommand.Options.Preview.Long),
skipCache: args.SkipCache,
trustUserVersion: args.TrustUserVersion trustUserVersion: args.TrustUserVersion
); );

Loading…
Cancel
Save