lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-14 19:04:51 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Modifying the "package create" command to handle new Nuget's filename convention

Browse Source 
- e.g., Orchard.Module.Orchard.Blogs.0.8.0.nupkg
- Creating packages in Orchard.Web/Packages to prevent them from being added to /bin (common behavior when running orchard.exe)

--HG--
branch : nuget
This commit is contained in:
Sebastien Ros
2010-11-02 17:59:09 -07:00
parent 204bf60d18
commit fd16feef4a
3 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Orchard.Web/Modules/Orchard.Packaging/Commands/PackagingCommands.cs
View File

@@ -1,4 +1,6 @@
using System.IO;
using System;
using System.IO;
using System.Web.Hosting;
using Orchard.Commands;
using Orchard.Environment.Extensions;
using Orchard.Packaging.Services;
@@ -7,18 +9,17 @@ using Orchard.UI.Notify;
namespace Orchard.Packaging.Commands {
[OrchardFeature("Orchard.Packaging")]
public class PackagingCommands : DefaultOrchardCommandHandler {
private static readonly string OrchardWebProj = HostingEnvironment.MapPath("~/Orchard.Web.csproj");
private const string PackagePath = "Packages";
private readonly IPackageManager _packageManager;
public PackagingCommands(IPackageManager packageManager) {
_packageManager = packageManager;
}
[OrchardSwitch]
public string Filename { get; set; }
[CommandHelp("package create <moduleName>\r\n\t" + "Create a package for the module <moduleName>. The default filename is <moduleName>-<moduleVersion>.zip.")]
[CommandHelp("package create <moduleName>\r\n\t" + "Create a package for the module <moduleName>. The default filename is Orchard.<extension>.<moduleName>.<moduleVersion>.nupkg.")]
[CommandName("package create")]
[OrchardSwitches("Filename")]
public void CreatePackage(string moduleName) {
var packageData = _packageManager.Harvest(moduleName);
if (packageData == null) {
@@ -26,7 +27,16 @@ namespace Orchard.Packaging.Commands {
return;
}
var filename = string.Format("{0}-{1}.zip", packageData.ExtensionName, packageData.ExtensionVersion);
// append "Orchard.[ExtensionType]" to prevent conflicts with other packages (e.g, TinyMce, jQuery, ...)
var filename = string.Format("Orchard.{0}.{1}.{2}.nupkg", packageData.ExtensionType, packageData.ExtensionName, packageData.ExtensionVersion);
var packagePath = Path.Combine(Directory.GetParent(OrchardWebProj).FullName, PackagePath);
if(!Directory.Exists(packagePath)) {
Directory.CreateDirectory(packagePath);
}
// packages are created in a specific folder otherwise they are in /bin, which crashed the current shell
filename = Path.Combine(packagePath, filename);
using ( var stream = File.Create(filename) ) {
packageData.PackageStream.CopyTo(stream);

1
src/Orchard.Web/Modules/Orchard.Packaging/Services/PackageData.cs
View File

@@ -2,6 +2,7 @@ using System.IO;
namespace Orchard.Packaging.Services {
public class PackageData {
public string ExtensionType { get; set; }
public string ExtensionName { get; set; }
public string ExtensionVersion { get; set; }

1
src/Orchard.Web/Modules/Orchard.Packaging/Services/PackageManager.cs
View File

@@ -33,6 +33,7 @@ namespace Orchard.Packaging.Services {
return null;
}
return new PackageData {
ExtensionType = extensionDescriptor.ExtensionType,
ExtensionName = extensionDescriptor.Name,
ExtensionVersion = extensionDescriptor.Version,
PackageStream = _packageBuilder.BuildPackage(extensionDescriptor),