Rename "Packaging" commands

--HG--
branch : dev
This commit is contained in:
Renaud Paquay
2010-07-22 22:21:41 -07:00
parent b1e38c6785
commit ca5e6af4f2

View File

@@ -2,21 +2,24 @@
using Orchard.Commands; using Orchard.Commands;
using Orchard.Environment.Extensions; using Orchard.Environment.Extensions;
using Orchard.Packaging.Services; using Orchard.Packaging.Services;
using Orchard.UI.Notify;
namespace Orchard.Packaging.Commands { namespace Orchard.Packaging.Commands {
[OrchardFeature("Packaging")] [OrchardFeature("Packaging")]
public class PackagingCommands : DefaultOrchardCommandHandler { public class PackagingCommands : DefaultOrchardCommandHandler {
private readonly IPackageManager _packageManager; private readonly IPackageManager _packageManager;
private readonly INotifier _notifier;
public PackagingCommands(IPackageManager packageManager) { public PackagingCommands(IPackageManager packageManager, INotifier notifier) {
_packageManager = packageManager; _packageManager = packageManager;
_notifier = notifier;
} }
[OrchardSwitch] [OrchardSwitch]
public string Filename { get; set; } public string Filename { get; set; }
[CommandHelp("module create package <moduleName> [/Filename:filename.zip]\r\n\t" + "Create a package for the module <moduleName>. The default filename is <moduleName>-<moduleVersion>.zip.")] [CommandHelp("packaging create package <moduleName>\r\n\t" + "Create a package for the module <moduleName>. The default filename is <moduleName>-<moduleVersion>.zip.")]
[CommandName("module create package")] [CommandName("packaging create package")]
[OrchardSwitches("Filename")] [OrchardSwitches("Filename")]
public void CreatePackage(string moduleName) { public void CreatePackage(string moduleName) {
var packageData = _packageManager.Harvest(moduleName); var packageData = _packageManager.Harvest(moduleName);
@@ -25,10 +28,7 @@ namespace Orchard.Packaging.Commands {
return; return;
} }
var filename = Filename; var filename = string.Format("{0}-{1}.zip", packageData.ExtensionName, packageData.ExtensionVersion);
if(string.IsNullOrEmpty(filename)) {
filename = string.Format("{0}-{1}.zip", packageData.ExtensionName, packageData.ExtensionVersion);
}
using(var stream = File.Create(filename)) { using(var stream = File.Create(filename)) {
packageData.PackageStream.CopyTo(stream); packageData.PackageStream.CopyTo(stream);
@@ -36,11 +36,14 @@ namespace Orchard.Packaging.Commands {
} }
var fileInfo = new FileInfo(filename); var fileInfo = new FileInfo(filename);
foreach (var entry in _notifier.List()) {
Context.Output.WriteLine(entry.Message);
}
Context.Output.WriteLine(T("Package \"{0}\" successfully created", fileInfo.FullName)); Context.Output.WriteLine(T("Package \"{0}\" successfully created", fileInfo.FullName));
} }
[CommandHelp("module install package <filename>\r\n\t" + "Install a module from a package <filename>.")] [CommandHelp("packaging install package <filename>\r\n\t" + "Install a module from a package <filename>.")]
[CommandName("module install package")] [CommandName("packaging install package")]
public void InstallPackage(string filename) { public void InstallPackage(string filename) {
if (!File.Exists(filename)) { if (!File.Exists(filename)) {
Context.Output.WriteLine(T("File \"{0}\" does not exist.", filename)); Context.Output.WriteLine(T("File \"{0}\" does not exist.", filename));
@@ -48,7 +51,9 @@ namespace Orchard.Packaging.Commands {
using (var stream = File.Open(filename, FileMode.Open, FileAccess.Read)) { using (var stream = File.Open(filename, FileMode.Open, FileAccess.Read)) {
var packageInfo = _packageManager.Install(stream); var packageInfo = _packageManager.Install(stream);
Context.Output.WriteLine(T("Package \"{0}\" successfully installed at \"{1}\"", packageInfo.ExtensionName, packageInfo.ExtensionPath)); foreach (var entry in _notifier.List()) {
Context.Output.WriteLine(entry.Message);
}
} }
} }
} }