lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Incremental refactoring of ImportExport and Recipes.

Browse Source
This commit is contained in:
Sipke Schoorstra
2015-07-15 00:01:23 +01:00
parent 18469ad462
commit 19126126d6
44 changed files with 371 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Orchard.Web/Modules/Orchard.ImportExport/Commands/ImportExportCommands.cs
View File

@@ -4,9 +4,11 @@ using System.IO;
using System.Linq;
using Orchard.Commands;
using Orchard.ContentManagement.MetaData;
using Orchard.ImportExport.Models;
using Orchard.ImportExport.Providers;
using Orchard.ImportExport.RecipeBuilderSteps;
using Orchard.ImportExport.Services;
using Orchard.Recipes.Models;
using Orchard.Recipes.RecipeBuilders;
using Orchard.Recipes.Services;
using Orchard.Security;
using Orchard.Settings;
@@ -95,13 +97,10 @@ namespace Orchard.ImportExport.Commands {
.ToList();
var enteredSteps = (Steps ?? String.Empty).Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries);
var exportSteps = new List<IExportStepProvider>();
var exportOptions = new ExportOptions {
CustomSteps = enteredSteps
};
var recipeBuilderSteps = new List<IRecipeBuilderStep>();
if (Metadata || Data) {
var dataStep = _orchardServices.WorkContext.Resolve<DataExportStep>();
var dataStep = _orchardServices.WorkContext.Resolve<DataRecipeBuilderStep>();
if(Data)
dataStep.DataContentTypes = exportTypes;
@@ -110,17 +109,22 @@ namespace Orchard.ImportExport.Commands {
dataStep.SchemaContentTypes = exportTypes;
dataStep.VersionHistoryOptions = versionOption;
exportSteps.Add(dataStep);
recipeBuilderSteps.Add(dataStep);
}
if (SiteSettings) {
var siteSettingsStep = _orchardServices.WorkContext.Resolve<SiteSettingsExportStep>();
exportSteps.Add(siteSettingsStep);
var siteSettingsStep = _orchardServices.WorkContext.Resolve<SiteSettingsBuilderStep>();
recipeBuilderSteps.Add(siteSettingsStep);
}
if (enteredSteps.Any()) {
var customStepsStep = _orchardServices.WorkContext.Resolve<CustomStepsRecipeBuilderStep>();
recipeBuilderSteps.Add(customStepsStep);
}
Context.Output.WriteLine(T("Export starting..."));
var exportFilePath = _importExportService.Export(exportSteps, exportOptions);
var exportFilePath = _importExportService.Export(recipeBuilderSteps);
Context.Output.WriteLine(T("Export completed at {0}", exportFilePath));
}

39
src/Orchard.Web/Modules/Orchard.ImportExport/Controllers/AdminController.cs
View File

@@ -4,8 +4,6 @@ using System.IO;
using System.Linq;
using System.Web.Mvc;
using Orchard.ContentManagement;
using Orchard.ContentManagement.MetaData;
using Orchard.ImportExport.Models;
using Orchard.ImportExport.Services;
using Orchard.ImportExport.ViewModels;
using Orchard.Localization;
@@ -15,22 +13,16 @@ using Orchard.UI.Notify;
namespace Orchard.ImportExport.Controllers {
public class AdminController : Controller, IUpdateModel {
private readonly IImportExportService _importExportService;
private readonly IContentDefinitionManager _contentDefinitionManager;
private readonly ICustomExportStep _customExportStep;
private readonly IRecipeResultAccessor _recipeResultAccessor;
private readonly IEnumerable<IExportStepProvider> _exportStepProviders;
private readonly IEnumerable<IRecipeBuilderStep> _exportStepProviders;
public AdminController(
IOrchardServices services,
IImportExportService importExportService,
IContentDefinitionManager contentDefinitionManager,
ICustomExportStep customExportStep,
IRecipeResultAccessor recipeResultAccessor,
IEnumerable<IExportStepProvider> exportStepProviders) {
IImportExportService importExportService,
IRecipeResultAccessor recipeResultAccessor,
IEnumerable<IRecipeBuilderStep> exportStepProviders) {
_importExportService = importExportService;
_contentDefinitionManager = contentDefinitionManager;
_customExportStep = customExportStep;
_recipeResultAccessor = recipeResultAccessor;
_exportStepProviders = exportStepProviders;
Services = services;
@@ -75,10 +67,7 @@ namespace Orchard.ImportExport.Controllers {
}
public ActionResult Export() {
var customSteps = new List<string>();
_customExportStep.Register(customSteps);
var exportSteps = _exportStepProviders.OrderBy(x => x.Position).Select(x => new ExportStepViewModel {
var exportSteps = _exportStepProviders.OrderBy(x => x.Priority).Select(x => new ExportStepViewModel {
Name = x.Name,
DisplayName = x.DisplayName,
Description = x.Description,
@@ -86,7 +75,6 @@ namespace Orchard.ImportExport.Controllers {
}).Where(x => x != null);
var viewModel = new ExportViewModel {
CustomSteps = customSteps.Select(x => new CustomStepEntry { CustomStep = x }).ToList(),
ExportSteps = exportSteps.ToList()
};
@@ -94,33 +82,22 @@ namespace Orchard.ImportExport.Controllers {
}
[HttpPost, ActionName("Export")]
public ActionResult ExportPOST() {
public ActionResult ExportPOST(ExportViewModel viewModel) {
if (!Services.Authorizer.Authorize(Permissions.Export, T("Not allowed to export.")))
return new HttpUnauthorizedResult();
var viewModel = new ExportViewModel {
CustomSteps = new List<CustomStepEntry>(),
ExportSteps = new List<ExportStepViewModel>()
};
UpdateModel(viewModel);
var exportStepNames = viewModel.ExportSteps.Where(x => x.IsSelected).Select(x => x.Name);
var exportStepsQuery = from name in exportStepNames
let provider = _exportStepProviders.SingleOrDefault(x => x.Name == name)
where provider != null
select provider;
var exportSteps = exportStepsQuery.ToArray();
var customSteps = viewModel.CustomSteps.Where(c => c.IsChecked).Select(c => c.CustomStep);
var exportOptions = new ExportOptions {
CustomSteps = customSteps
};
foreach (var exportStep in exportSteps) {
exportStep.UpdateEditor(Services.New, this);
}
var exportFilePath = _importExportService.Export(exportSteps, exportOptions);
var exportFilePath = _importExportService.Export(exportSteps);
var exportFileName = "export.xml";
return File(exportFilePath, "text/xml", exportFileName);

6
src/Orchard.Web/Modules/Orchard.ImportExport/Models/ExportOptions.cs
View File

@@ -4,10 +4,4 @@ namespace Orchard.ImportExport.Models {
public class ExportOptions {
public IEnumerable<string> CustomSteps { get; set; }
}
public enum VersionHistoryOptions {
Published,
Draft,
Latest
}
}

2
src/Orchard.Web/Modules/Orchard.ImportExport/Module.txt
View File

@@ -8,4 +8,4 @@ OrchardVersion: 1.9
Description: Provides content item data import and export capability.
FeatureDescription: Imports and exports content item data
Category: Content
Dependencies: Orchard.jQuery
Dependencies: Orchard.jQuery, Orchard.Recipes

35
src/Orchard.Web/Modules/Orchard.ImportExport/Orchard.ImportExport.csproj
View File

@@ -71,23 +71,15 @@
<Compile Include="Models\ExportOptions.cs" />
<Compile Include="Permissions.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Providers\SetupRecipeExportStep.cs" />
<Compile Include="Providers\SiteSettingsExportStep.cs" />
<Compile Include="Providers\DataExportStep.cs" />
<Compile Include="ViewModels\ContentTypeEntry.cs" />
<Compile Include="RecipeBuilderSteps\CustomStepsRecipeBuilderStep.cs" />
<Compile Include="Services\ExportContext.cs" />
<Compile Include="ViewModels\CustomStepEntry.cs" />
<Compile Include="ViewModels\ExportStepViewModel.cs" />
<Compile Include="ViewModels\SetupRecipeStepViewModel.cs" />
<Compile Include="ViewModels\SiteSettingsStepViewModel.cs" />
<Compile Include="ViewModels\DataExportStepViewModel.cs" />
<Compile Include="Services\ICustomExportStep.cs" />
<Compile Include="Services\IExportEventHandler.cs" />
<Compile Include="Services\IImportExportService.cs" />
<Compile Include="Services\IImportStepProvider.cs" />
<Compile Include="Services\ImportExportService.cs" />
<Compile Include="Services\IExportStepProvider.cs" />
<Compile Include="Services\ImportStepProvider.cs" />
<Compile Include="Services\ExportStepProvider.cs" />
<Compile Include="ViewModels\CustomStepsViewModel.cs" />
<Compile Include="ViewModels\ExportStepViewModel.cs" />
<Compile Include="ViewModels\ExportViewModel.cs" />
<Compile Include="ViewModels\ImportResultViewModel.cs" />
<Compile Include="ViewModels\ImportViewModel.cs" />
@@ -106,9 +98,12 @@
<Name>Orchard.Core</Name>
<Private>false</Private>
</ProjectReference>
<ProjectReference Include="..\Orchard.Recipes\Orchard.Recipes.csproj">
<Project>{fc1d74e8-7a4d-48f4-83de-95c6173780c4}</Project>
<Name>Orchard.Recipes</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Content Include="Scripts\exportstep-data.js" />
<Content Include="Styles\images\menu.importexport.png" />
<Content Include="Styles\exportstep-data.css" />
<Content Include="Styles\menu.importexport-admin.css" />
@@ -128,19 +123,9 @@
<ItemGroup>
<Content Include="Views\Admin\ImportResult.cshtml" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Content Include="Views\EditorTemplates\ExportSteps\Data.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\EditorTemplates\ExportSteps\SiteSettings.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\EditorTemplates\ExportSteps\SetupRecipe.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Scripts\Web.config">
<SubType>Designer</SubType>
</Content>
<Content Include="Views\EditorTemplates\ExportSteps\CustomSteps.cshtml" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

67
src/Orchard.Web/Modules/Orchard.ImportExport/RecipeBuilderSteps/CustomStepsRecipeBuilderStep.cs Normal file
View File

@@ -0,0 +1,67 @@
using System.Collections.Generic;
using System.Linq;
using Orchard.ContentManagement;
using Orchard.ImportExport.Models;
using Orchard.ImportExport.Services;
using Orchard.ImportExport.ViewModels;
using Orchard.Localization;
using Orchard.Recipes.Services;
namespace Orchard.ImportExport.RecipeBuilderSteps {
public class CustomStepsRecipeBuilderStep : RecipeBuilderStep {
private readonly IEnumerable<IExportEventHandler> _exportEventHandlers;
private readonly ICustomExportStep _customExportStep;
public CustomStepsRecipeBuilderStep(IEnumerable<IExportEventHandler> exportEventHandlers, ICustomExportStep customExportStep) {
_exportEventHandlers = exportEventHandlers;
_customExportStep = customExportStep;
CustomSteps = new List<string>();
}
public override string Name {
get { return "CustomSteps"; }
}
public override LocalizedString DisplayName {
get { return T("Additional Export Steps"); }
}
public override LocalizedString Description {
get { return T("Exports additional items."); }
}
public override int Priority { get { return 60; } }
public IList<string> CustomSteps { get; set; }
public override dynamic BuildEditor(dynamic shapeFactory) {
return UpdateEditor(shapeFactory, null);
}
public override dynamic UpdateEditor(dynamic shapeFactory, IUpdateModel updater) {
var customSteps = new List<string>();
_customExportStep.Register(customSteps);
var viewModel = new CustomStepsViewModel {
CustomSteps = customSteps.Select(x => new CustomStepEntry { CustomStep = x}).ToList()
};
if (updater != null && updater.TryUpdateModel(viewModel, Prefix, null, null)) {
CustomSteps = viewModel.CustomSteps.Where(x => x.IsChecked).Select(x => x.CustomStep).ToList();
}
return shapeFactory.EditorTemplate(TemplateName: "ExportSteps/CustomSteps", Model: viewModel, Prefix: Prefix);
}
public override void Build(BuildContext context) {
var exportContext = new ExportContext {
Document = context.RecipeDocument,
ExportOptions = new ExportOptions {
CustomSteps = CustomSteps
}
};
_exportEventHandlers.Invoke(x => x.Exporting(exportContext), Logger);
_exportEventHandlers.Invoke(x => x.Exported(exportContext), Logger);
}
}
}

9
src/Orchard.Web/Modules/Orchard.ImportExport/Services/ExportContext.cs Normal file
View File

@@ -0,0 +1,9 @@
using System.Xml.Linq;
using Orchard.ImportExport.Models;
namespace Orchard.ImportExport.Services {
public class ExportContext {
public XDocument Document { get; set; }
public ExportOptions ExportOptions { get; set; }
}
}

9
src/Orchard.Web/Modules/Orchard.ImportExport/Services/IExportEventHandler.cs
View File

@@ -1,13 +1,6 @@
using System.Xml.Linq;
using Orchard.Events;
using Orchard.ImportExport.Models;
using Orchard.Events;
namespace Orchard.ImportExport.Services {
public class ExportContext {
public XDocument Document { get; set; }
public ExportOptions ExportOptions { get; set; }
}
public interface IExportEventHandler : IEventHandler {
void Exporting(ExportContext context);
void Exported(ExportContext context);

9
src/Orchard.Web/Modules/Orchard.ImportExport/Services/IImportExportService.cs
View File

@@ -1,12 +1,9 @@
using System.Collections.Generic;
using Orchard.ImportExport.Models;
using Orchard.Recipes.Services;
namespace Orchard.ImportExport.Services {
public interface IImportExportService : IDependency {
string Import(string recipeText);
string Export(IEnumerable<IExportStepProvider> steps, ExportOptions exportOptions);
string Export(IEnumerable<IRecipeBuilderStep> steps);
}
}
}

11
src/Orchard.Web/Modules/Orchard.ImportExport/Services/IImportStepProvider.cs
View File

@@ -1,11 +0,0 @@
using Orchard.ContentManagement;
using Orchard.Localization;
namespace Orchard.ImportExport.Services {
public interface IImportStepProvider : IDependency {
string Name { get; }
LocalizedString DisplayName { get; }
dynamic BuildEditor(dynamic shapeFactory);
dynamic UpdateEditor(dynamic shapeFactory, IUpdateModel updater);
}
}

70
src/Orchard.Web/Modules/Orchard.ImportExport/Services/ImportExportService.cs
View File

@@ -1,11 +1,6 @@
using System;
using System.Collections.Generic;
using System.Xml;
using System.Xml.Linq;
using Orchard.ContentManagement;
using Orchard.Environment.Descriptor;
using Orchard.FileSystems.AppData;
using Orchard.ImportExport.Models;
using Orchard.Localization;
using Orchard.Logging;
using Orchard.Recipes.Services;
@@ -15,29 +10,23 @@ namespace Orchard.ImportExport.Services {
public class ImportExportService : IImportExportService {
private readonly IOrchardServices _orchardServices;
private readonly IAppDataFolder _appDataFolder;
private readonly IRecipeParser _recipeParser;
private readonly IRecipeManager _recipeManager;
private readonly IShellDescriptorManager _shellDescriptorManager;
private readonly IRecipeBuilder _recipeBuilder;
private readonly IRecipeExecutor _recipeExecutor;
private readonly IClock _clock;
private readonly IEnumerable<IExportEventHandler> _exportEventHandlers;
private const string ExportsDirectory = "Exports";
public ImportExportService(
IOrchardServices orchardServices,
IAppDataFolder appDataFolder,
IRecipeParser recipeParser,
IRecipeManager recipeManager,
IShellDescriptorManager shellDescriptorManager,
IClock clock,
IEnumerable<IExportEventHandler> exportEventHandlers) {
IRecipeBuilder recipeBuilder,
IRecipeExecutor recipeExecutor,
IClock clock) {
_orchardServices = orchardServices;
_appDataFolder = appDataFolder;
_recipeParser = recipeParser;
_recipeManager = recipeManager;
_shellDescriptorManager = shellDescriptorManager;
_recipeBuilder = recipeBuilder;
_recipeExecutor = recipeExecutor;
_clock = clock;
_exportEventHandlers = exportEventHandlers;
Logger = NullLogger.Instance;
T = NullLocalizer.Instance;
}
@@ -46,46 +35,16 @@ namespace Orchard.ImportExport.Services {
public ILogger Logger { get; set; }
public string Import(string recipeText) {
var recipe = _recipeParser.ParseRecipe(recipeText);
var executionId = _recipeManager.Execute(recipe);
UpdateShell();
return executionId;
return _recipeExecutor.Execute(recipeText);
}
public string Export(IEnumerable<IExportStepProvider> steps, ExportOptions exportOptions) {
var exportDocument = CreateExportRoot();
var context = new ExportContext {
Document = exportDocument,
ExportOptions = exportOptions
};
_exportEventHandlers.Invoke(x => x.Exporting(context), Logger);
foreach (var step in steps) {
step.Export(context);
}
_exportEventHandlers.Invoke(x => x.Exported(context), Logger);
return WriteExportFile(exportDocument.ToString());
}
private XDocument CreateExportRoot() {
var exportRoot = new XDocument(
new XDeclaration("1.0", "", "yes"),
new XComment("Exported from Orchard"),
new XElement("Orchard",
new XElement("Recipe",
new XElement("ExportUtc", XmlConvert.ToString(_clock.UtcNow, XmlDateTimeSerializationMode.Utc))
)
)
);
return exportRoot;
public string Export(IEnumerable<IRecipeBuilderStep> steps) {
var recipe = _recipeBuilder.Build(steps);
return WriteExportFile(recipe);
}
private string WriteExportFile(string exportDocument) {
var exportFile = String.Format("Export-{0}-{1}.xml", _orchardServices.WorkContext.CurrentUser.UserName, DateTime.UtcNow.Ticks);
var exportFile = String.Format("Export-{0}-{1}.xml", _orchardServices.WorkContext.CurrentUser.UserName, _clock.UtcNow.Ticks);
if (!_appDataFolder.DirectoryExists(ExportsDirectory)) {
_appDataFolder.CreateDirectory(ExportsDirectory);
}
@@ -95,10 +54,5 @@ namespace Orchard.ImportExport.Services {
return _appDataFolder.MapPath(path);
}
private void UpdateShell() {
var descriptor = _shellDescriptorManager.GetShellDescriptor();
_shellDescriptorManager.UpdateShellDescriptor(descriptor.SerialNumber, descriptor.Features, descriptor.Parameters);
}
}
}

21
src/Orchard.Web/Modules/Orchard.ImportExport/Services/ImportStepProvider.cs
View File

@@ -1,21 +0,0 @@
using Orchard.ContentManagement;
using Orchard.Localization;
namespace Orchard.ImportExport.Services {
public abstract class ImportStepProvider : Component, IImportStepProvider {
public abstract string Name { get; }
public abstract LocalizedString DisplayName { get; }
protected virtual string Prefix {
get { return GetType().Name; }
}
public virtual dynamic BuildEditor(dynamic shapeFactory) {
return null;
}
public virtual dynamic UpdateEditor(dynamic shapeFactory, IUpdateModel updater) {
return null;
}
}
}

7
src/Orchard.Web/Modules/Orchard.ImportExport/ViewModels/CustomStepsViewModel.cs Normal file
View File

@@ -0,0 +1,7 @@
using System.Collections.Generic;
namespace Orchard.ImportExport.ViewModels {
public class CustomStepsViewModel {
public IList<CustomStepEntry> CustomSteps { get; set; }
}
}

1
src/Orchard.Web/Modules/Orchard.ImportExport/ViewModels/ExportViewModel.cs
View File

@@ -2,7 +2,6 @@
namespace Orchard.ImportExport.ViewModels {
public class ExportViewModel {
public IList<CustomStepEntry> CustomSteps { get; set; }
public IList<ExportStepViewModel> ExportSteps { get; set; }
}
}

17
src/Orchard.Web/Modules/Orchard.ImportExport/Views/Admin/Export.cshtml
View File

@@ -1,5 +1,5 @@
@using Orchard.Utility.Extensions
@model Orchard.ImportExport.ViewModels.ExportViewModel
@model Orchard.ImportExport.ViewModels.CustomStepsViewModel
@{ Layout.Title = T("Export").ToString(); }
@using (Html.BeginFormAntiForgeryPost()) {
Html.ValidationSummary();
@@ -25,20 +25,5 @@
}
}
if (Model.CustomSteps.Any()) {
<fieldset>
<legend>@T("Choose the custom steps to execute in the export file:")</legend>
<ol>
@for (var customStepIndex = 0; customStepIndex < Model.CustomSteps.Count; customStepIndex++) {
<li>
<input type="hidden" value="@Model.CustomSteps[customStepIndex].CustomStep" name="@Html.NameOf(m => m.CustomSteps[customStepIndex].CustomStep)" />
<input type="checkbox" value="true" name="@Html.NameOf(m => m.CustomSteps[customStepIndex].IsChecked)" id="@Html.NameOf(m => m.CustomSteps[customStepIndex].IsChecked)" />
<label class="forcheckbox" for="@Html.NameOf(m => m.CustomSteps[customStepIndex].IsChecked)">@Model.CustomSteps[customStepIndex].CustomStep.CamelFriendly()</label>
</li>
}
</ol>
</fieldset>
}
<button type="submit" class="primaryAction">@T("Export")</button>
}

17
src/Orchard.Web/Modules/Orchard.ImportExport/Views/EditorTemplates/ExportSteps/CustomSteps.cshtml Normal file
View File

@@ -0,0 +1,17 @@
@using Orchard.Utility.Extensions
@model Orchard.ImportExport.ViewModels.CustomStepsViewModel
@if (Model.CustomSteps.Any()) {
<fieldset>
<legend>@T("Choose the custom steps to execute in the export file:")</legend>
<ol>
@for (var customStepIndex = 0; customStepIndex < Model.CustomSteps.Count; customStepIndex++) {
var closureIndex = customStepIndex;
<li>
<input type="hidden" value="@Model.CustomSteps[customStepIndex].CustomStep" name="@Html.NameOf(m => m.CustomSteps[closureIndex].CustomStep)" />
<input type="checkbox" value="true" name="@Html.NameOf(m => m.CustomSteps[closureIndex].IsChecked)" id="@Html.NameOf(m => m.CustomSteps[closureIndex].IsChecked)" />
<label class="forcheckbox" for="@Html.NameOf(m => m.CustomSteps[closureIndex].IsChecked)">@Model.CustomSteps[closureIndex].CustomStep.CamelFriendly()</label>
</li>
}
</ol>
</fieldset>
}

7
src/Orchard.Web/Modules/Orchard.Recipes/Models/VersionHistoryOptions.cs Normal file
View File

@@ -0,0 +1,7 @@
namespace Orchard.Recipes.Models {
public enum VersionHistoryOptions {
Published,
Draft,
Latest
}
}

43
src/Orchard.Web/Modules/Orchard.Recipes/Orchard.Recipes.csproj
View File

@@ -51,6 +51,7 @@
<Reference Include="Autofac">
<HintPath>..\..\..\..\lib\autofac\Autofac.dll</HintPath>
</Reference>
<Reference Include="Microsoft.CSharp" />
<Reference Include="System" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Web.ApplicationServices" />
@@ -68,6 +69,10 @@
</ItemGroup>
<ItemGroup>
<Content Include="Module.txt" />
<Content Include="Scripts\exportstep-data.js" />
<Content Include="Styles\exportstep-data.css" />
<Content Include="Styles\images\menu.importexport.png" />
<Content Include="Styles\menu.importexport-admin.css" />
<Content Include="Web.config" />
</ItemGroup>
<ItemGroup>
@@ -75,7 +80,11 @@
<Compile Include="Migrations.cs" />
<Compile Include="Models\RecipeResultRecord.cs" />
<Compile Include="Models\RecipeStepResultRecord.cs" />
<Compile Include="Models\VersionHistoryOptions.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="RecipeBuilders\DataRecipeBuilderStep.cs" />
<Compile Include="RecipeBuilders\SetupRecipeBuilderStep.cs" />
<Compile Include="RecipeBuilders\SiteSettingsBuilderStep.cs" />
<Compile Include="RecipeHandlers\CommandRecipeHandler.cs" />
<Compile Include="RecipeHandlers\DataRecipeHandler.cs" />
<Compile Include="RecipeHandlers\FeatureRecipeHandler.cs" />
@@ -85,6 +94,13 @@
<Compile Include="RecipeHandlers\SettingsRecipeHandler.cs" />
<Compile Include="RecipeHandlers\ThemeRecipeHandler.cs" />
<Compile Include="Routes.cs" />
<Compile Include="Services\BuildContext.cs" />
<Compile Include="Services\IRecipeExecutor.cs" />
<Compile Include="Services\RecipeExecutor.cs" />
<Compile Include="Services\IRecipeBuilder.cs" />
<Compile Include="Services\RecipeBuilder.cs" />
<Compile Include="Services\IRecipeBuilderStep.cs" />
<Compile Include="Services\RecipeBuilderStep.cs" />
<Compile Include="Services\RecipeHarvester.cs" />
<Compile Include="Services\RecipeManager.cs" />
<Compile Include="Services\RecipeParser.cs" />
@@ -92,6 +108,13 @@
<Compile Include="Services\RecipeScheduler.cs" />
<Compile Include="Services\RecipeStepExecutor.cs" />
<Compile Include="Services\RecipeStepQueue.cs" />
<Compile Include="ViewModels\ContentTypeEntry.cs" />
<Compile Include="ViewModels\CustomStepEntry.cs" />
<Compile Include="ViewModels\DataExportStepViewModel.cs" />
<Compile Include="ViewModels\ImportResultViewModel.cs" />
<Compile Include="ViewModels\ImportViewModel.cs" />
<Compile Include="ViewModels\SetupRecipeStepViewModel.cs" />
<Compile Include="ViewModels\SiteSettingsStepViewModel.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Orchard\Orchard.Framework.csproj">
@@ -112,7 +135,25 @@
<Name>Orchard.Themes</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Content Include="Scripts\Web.config">
<SubType>Designer</SubType>
</Content>
</ItemGroup>
<ItemGroup>
<Content Include="Styles\Web.config">
<SubType>Designer</SubType>
</Content>
</ItemGroup>
<ItemGroup>
<Content Include="Views\EditorTemplates\ExportSteps\Data.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\EditorTemplates\ExportSteps\SetupRecipe.cshtml" />
</ItemGroup>
<ItemGroup>
<Content Include="Views\EditorTemplates\ExportSteps\SiteSettings.cshtml" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>

20
src/Orchard.Web/Modules/Orchard.ImportExport/Providers/DataExportStep.cs → src/Orchard.Web/Modules/Orchard.Recipes/RecipeBuilders/DataRecipeBuilderStep.cs
View File

@@ -4,18 +4,18 @@ using System.Xml.Linq;
using Orchard.ContentManagement;
using Orchard.ContentManagement.MetaData;
using Orchard.ContentManagement.MetaData.Models;
using Orchard.ImportExport.Models;
using Orchard.ImportExport.Services;
using Orchard.ImportExport.ViewModels;
using Orchard.Localization;
using Orchard.Recipes.Models;
using Orchard.Recipes.Services;
using Orchard.Recipes.ViewModels;
namespace Orchard.ImportExport.Providers {
public class DataExportStep : ExportStepProvider {
namespace Orchard.Recipes.RecipeBuilders {
public class DataRecipeBuilderStep : RecipeBuilderStep {
private readonly IContentDefinitionManager _contentDefinitionManager;
private readonly IOrchardServices _orchardServices;
private readonly IContentDefinitionWriter _contentDefinitionWriter;
public DataExportStep(
public DataRecipeBuilderStep(
IContentDefinitionManager contentDefinitionManager,
IOrchardServices orchardServices,
IContentDefinitionWriter contentDefinitionWriter) {
@@ -37,7 +37,7 @@ namespace Orchard.ImportExport.Providers {
get { return T("Exports content items and content item definitions."); }
}
public override int Position { get { return 10; } }
public override int Priority { get { return 10; } }
public IList<string> SchemaContentTypes { get; set; }
public IList<string> DataContentTypes { get; set; }
@@ -67,7 +67,7 @@ namespace Orchard.ImportExport.Providers {
return shapeFactory.EditorTemplate(TemplateName: "ExportSteps/Data", Model: viewModel, Prefix: Prefix);
}
public override void Export(ExportContext context) {
public override void Build(BuildContext context) {
var dataContentTypes = DataContentTypes;
var schemaContentTypes = SchemaContentTypes;
var exportVersionOptions = GetContentExportVersionOptions(VersionHistoryOptions);
@@ -76,10 +76,10 @@ namespace Orchard.ImportExport.Providers {
: Enumerable.Empty<ContentItem>();
if(schemaContentTypes.Any())
context.Document.Element("Orchard").Add(ExportMetadata(schemaContentTypes));
context.RecipeDocument.Element("Orchard").Add(ExportMetadata(schemaContentTypes));
if(contentItems.Any())
context.Document.Element("Orchard").Add(ExportData(dataContentTypes, contentItems, ImportBatchSize));
context.RecipeDocument.Element("Orchard").Add(ExportData(dataContentTypes, contentItems, ImportBatchSize));
}
private XElement ExportMetadata(IEnumerable<string> contentTypes) {

16
src/Orchard.Web/Modules/Orchard.ImportExport/Providers/SetupRecipeExportStep.cs → src/Orchard.Web/Modules/Orchard.Recipes/RecipeBuilders/SetupRecipeBuilderStep.cs
View File

@@ -1,12 +1,12 @@
using Orchard.ContentManagement;
using Orchard.ImportExport.Services;
using Orchard.ImportExport.ViewModels;
using Orchard.Localization;
using Orchard.Recipes.Services;
using Orchard.Recipes.ViewModels;
namespace Orchard.ImportExport.Providers {
public class SetupRecipeExportStep : ExportStepProvider {
namespace Orchard.Recipes.RecipeBuilders {
public class SetupRecipeBuilderStep : RecipeBuilderStep {
private readonly IOrchardServices _orchardServices;
public SetupRecipeExportStep(IOrchardServices orchardServices) {
public SetupRecipeBuilderStep(IOrchardServices orchardServices) {
_orchardServices = orchardServices;
}
@@ -22,7 +22,7 @@ namespace Orchard.ImportExport.Providers {
get { return T("Turns the export file into a Setup recipe."); }
}
public override int Position { get { return -10; } }
public override int Priority { get { return -10; } }
public string RecipeName { get; set; }
public string RecipeDescription { get; set; }
@@ -54,8 +54,8 @@ namespace Orchard.ImportExport.Providers {
return shapeFactory.EditorTemplate(TemplateName: "ExportSteps/SetupRecipe", Model: viewModel, Prefix: Prefix);
}
public override void Export(ExportContext context) {
var recipeElement = context.Document.Element("Orchard").Element("Recipe");
public override void Build(BuildContext context) {
var recipeElement = context.RecipeDocument.Element("Orchard").Element("Recipe");
recipeElement.SetElementValue("Name", RecipeName);
recipeElement.SetElementValue("Description", RecipeDescription);

16
src/Orchard.Web/Modules/Orchard.ImportExport/Providers/SiteSettingsExportStep.cs → src/Orchard.Web/Modules/Orchard.Recipes/RecipeBuilders/SiteSettingsBuilderStep.cs
View File

@@ -2,15 +2,15 @@
using System.Linq;
using System.Xml.Linq;
using Orchard.ContentManagement;
using Orchard.ImportExport.Services;
using Orchard.ImportExport.ViewModels;
using Orchard.Localization;
using Orchard.Recipes.Services;
using Orchard.Recipes.ViewModels;
namespace Orchard.ImportExport.Providers {
public class SiteSettingsExportStep : ExportStepProvider {
namespace Orchard.Recipes.RecipeBuilders {
public class SiteSettingsBuilderStep : RecipeBuilderStep {
private readonly IOrchardServices _orchardServices;
public SiteSettingsExportStep(IOrchardServices orchardServices) {
public SiteSettingsBuilderStep(IOrchardServices orchardServices) {
_orchardServices = orchardServices;
}
@@ -26,7 +26,7 @@ namespace Orchard.ImportExport.Providers {
get { return T("Exports site settings."); }
}
public override int Position { get { return 20; } }
public override int Priority { get { return 20; } }
public override dynamic BuildEditor(dynamic shapeFactory) {
return UpdateEditor(shapeFactory, null);
@@ -37,8 +37,8 @@ namespace Orchard.ImportExport.Providers {
return shapeFactory.EditorTemplate(TemplateName: "ExportSteps/SiteSettings", Model: viewModel, Prefix: Prefix);
}
public override void Export(ExportContext context) {
context.Document.Element("Orchard").Add(ExportSiteSettings());
public override void Build(BuildContext context) {
context.RecipeDocument.Element("Orchard").Add(ExportSiteSettings());
}
private XElement ExportSiteSettings() {

0
src/Orchard.Web/Modules/Orchard.ImportExport/Scripts/Web.config → src/Orchard.Web/Modules/Orchard.Recipes/Scripts/Web.config
View File

0
src/Orchard.Web/Modules/Orchard.ImportExport/Scripts/exportstep-data.js → src/Orchard.Web/Modules/Orchard.Recipes/Scripts/exportstep-data.js
View File

7
src/Orchard.Web/Modules/Orchard.Recipes/Services/BuildContext.cs Normal file
View File

@@ -0,0 +1,7 @@
using System.Xml.Linq;
namespace Orchard.Recipes.Services {
public class BuildContext {
public XDocument RecipeDocument { get; set; }
}
}

7
src/Orchard.Web/Modules/Orchard.Recipes/Services/IRecipeBuilder.cs Normal file
View File

@@ -0,0 +1,7 @@
using System.Collections.Generic;
namespace Orchard.Recipes.Services {
public interface IRecipeBuilder : IDependency {
string Build(IEnumerable<IRecipeBuilderStep> steps);
}
}

8
src/Orchard.Web/Modules/Orchard.ImportExport/Services/IExportStepProvider.cs → src/Orchard.Web/Modules/Orchard.Recipes/Services/IRecipeBuilderStep.cs
View File

@@ -1,14 +1,14 @@
using Orchard.ContentManagement;
using Orchard.Localization;
namespace Orchard.ImportExport.Services {
public interface IExportStepProvider : IDependency {
namespace Orchard.Recipes.Services {
public interface IRecipeBuilderStep : IDependency {
string Name { get; }
LocalizedString DisplayName { get; }
LocalizedString Description { get; }
int Position { get; }
int Priority { get; }
dynamic BuildEditor(dynamic shapeFactory);
dynamic UpdateEditor(dynamic shapeFactory, IUpdateModel updater);
void Export(ExportContext context);
void Build(BuildContext context);
}
}

5
src/Orchard.Web/Modules/Orchard.Recipes/Services/IRecipeExecutor.cs Normal file
View File

@@ -0,0 +1,5 @@
namespace Orchard.Recipes.Services {
public interface IRecipeExecutor : IDependency {
string Execute(string recipeText);
}
}

31
src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeBuilder.cs Normal file
View File

@@ -0,0 +1,31 @@
using System.Collections.Generic;
using System.Xml.Linq;
namespace Orchard.Recipes.Services {
public class RecipeBuilder : Component, IRecipeBuilder {
public string Build(IEnumerable<IRecipeBuilderStep> steps) {
var exportDocument = CreateRecipeRoot();
var context = new BuildContext {
RecipeDocument = CreateRecipeRoot()
};
foreach (var step in steps) {
step.Build(context);
}
return exportDocument.ToString();
}
private XDocument CreateRecipeRoot() {
var recipeRoot = new XDocument(
new XDeclaration("1.0", "", "yes"),
new XComment("Exported from Orchard"),
new XElement("Orchard",
new XElement("Recipe")
)
);
return recipeRoot;
}
}
}

8
src/Orchard.Web/Modules/Orchard.ImportExport/Services/ExportStepProvider.cs → src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeBuilderStep.cs
View File

@@ -1,12 +1,12 @@
using Orchard.ContentManagement;
using Orchard.Localization;
namespace Orchard.ImportExport.Services {
public abstract class ExportStepProvider : Component, IExportStepProvider {
namespace Orchard.Recipes.Services {
public abstract class RecipeBuilderStep : Component, IRecipeBuilderStep {
public abstract string Name { get; }
public abstract LocalizedString DisplayName { get; }
public abstract LocalizedString Description { get; }
public virtual int Position { get { return 0; } }
public virtual int Priority { get { return 0; } }
protected virtual string Prefix {
get { return GetType().Name; }
@@ -20,6 +20,6 @@ namespace Orchard.ImportExport.Services {
return null;
}
public virtual void Export(ExportContext context) {}
public virtual void Build(BuildContext context) {}
}
}

31
src/Orchard.Web/Modules/Orchard.Recipes/Services/RecipeExecutor.cs Normal file
View File

@@ -0,0 +1,31 @@
using Orchard.Environment.Descriptor;
namespace Orchard.Recipes.Services {
public class RecipeExecutor : Component, IRecipeExecutor {
private readonly IRecipeParser _recipeParser;
private readonly IRecipeManager _recipeManager;
private readonly IShellDescriptorManager _shellDescriptorManager;
public RecipeExecutor(
IRecipeParser recipeParser,
IRecipeManager recipeManager,
IShellDescriptorManager shellDescriptorManager) {
_recipeParser = recipeParser;
_recipeManager = recipeManager;
_shellDescriptorManager = shellDescriptorManager;
}
public string Execute(string recipeText) {
var recipe = _recipeParser.ParseRecipe(recipeText);
var executionId = _recipeManager.Execute(recipe);
UpdateShell();
return executionId;
}
private void UpdateShell() {
var descriptor = _shellDescriptorManager.GetShellDescriptor();
_shellDescriptorManager.UpdateShellDescriptor(descriptor.SerialNumber, descriptor.Features, descriptor.Parameters);
}
}
}

16
src/Orchard.Web/Modules/Orchard.Recipes/Styles/Web.config Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<system.webServer>
<staticContent>
<clientCache cacheControlMode="UseMaxAge" cacheControlMaxAge="7.00:00:00" />
</staticContent>
<handlers accessPolicy="Script,Read">
<!--
iis7 - for any request to a file exists on disk, return it via native http module.
accessPolicy 'Script' is to allow for a managed 404 page.
-->
<add name="StaticFile" path="*" verb="*" modules="StaticFileModule" preCondition="integratedMode" resourceType="File" requireAccess="Read" />
</handlers>
</system.webServer>
</configuration>

9
src/Orchard.Web/Modules/Orchard.Recipes/Styles/exportstep-data.css Normal file
View File

@@ -0,0 +1,9 @@
fieldset.export-step-data table.items {
width: 500px;
margin: 0;
}
fieldset.export-step-data table.items td,
fieldset.export-step-data table.items thead tr.sub th {
padding: 0 12px;
}

BIN
src/Orchard.Web/Modules/Orchard.Recipes/Styles/images/menu.importexport.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

6
src/Orchard.Web/Modules/Orchard.Recipes/Styles/menu.importexport-admin.css Normal file
View File

@@ -0,0 +1,6 @@
.navicon-import-export {
background-image:url(images/menu.importexport.png) !important;
}
.navicon-import-export:hover {
background-position:0 -30px !important;
}

2
src/Orchard.Web/Modules/Orchard.ImportExport/ViewModels/ContentTypeEntry.cs → src/Orchard.Web/Modules/Orchard.Recipes/ViewModels/ContentTypeEntry.cs
View File

@@ -1,4 +1,4 @@
namespace Orchard.ImportExport.ViewModels {
namespace Orchard.Recipes.ViewModels {
public class ContentTypeEntry {
public string Name { get; set; }
public string DisplayName { get; set; }

6
src/Orchard.Web/Modules/Orchard.Recipes/ViewModels/CustomStepEntry.cs Normal file
View File

@@ -0,0 +1,6 @@
namespace Orchard.Recipes.ViewModels {
public class CustomStepEntry {
public string CustomStep { get; set; }
public bool IsChecked { get; set; }
}
}

4
src/Orchard.Web/Modules/Orchard.ImportExport/ViewModels/DataExportStepViewModel.cs → src/Orchard.Web/Modules/Orchard.Recipes/ViewModels/DataExportStepViewModel.cs
View File

@@ -1,7 +1,7 @@
using System.Collections.Generic;
using Orchard.ImportExport.Models;
using Orchard.Recipes.Models;
namespace Orchard.ImportExport.ViewModels {
namespace Orchard.Recipes.ViewModels {
public class DataExportStepViewModel {
public DataExportStepViewModel() {
ContentTypes = new List<ContentTypeEntry>();

7
src/Orchard.Web/Modules/Orchard.Recipes/ViewModels/ImportResultViewModel.cs Normal file
View File

@@ -0,0 +1,7 @@
using Orchard.Recipes.Models;
namespace Orchard.Recipes.ViewModels {
public class ImportResultViewModel {
public RecipeResult Result { get; set; }
}
}

4
src/Orchard.Web/Modules/Orchard.Recipes/ViewModels/ImportViewModel.cs Normal file
View File

@@ -0,0 +1,4 @@
namespace Orchard.Recipes.ViewModels {
public class ImportViewModel {
}
}

2
src/Orchard.Web/Modules/Orchard.ImportExport/ViewModels/SetupRecipeStepViewModel.cs → src/Orchard.Web/Modules/Orchard.Recipes/ViewModels/SetupRecipeStepViewModel.cs
View File

@@ -1,4 +1,4 @@
namespace Orchard.ImportExport.ViewModels {
namespace Orchard.Recipes.ViewModels {
public class SetupRecipeStepViewModel {
public string RecipeName { get; set; }
public string RecipeDescription { get; set; }

2
src/Orchard.Web/Modules/Orchard.ImportExport/ViewModels/SiteSettingsStepViewModel.cs → src/Orchard.Web/Modules/Orchard.Recipes/ViewModels/SiteSettingsStepViewModel.cs
View File

@@ -1,3 +1,3 @@
namespace Orchard.ImportExport.ViewModels {
namespace Orchard.Recipes.ViewModels {
public class SiteSettingsStepViewModel {}
}

2
src/Orchard.Web/Modules/Orchard.ImportExport/Views/EditorTemplates/ExportSteps/Data.cshtml → src/Orchard.Web/Modules/Orchard.Recipes/Views/EditorTemplates/ExportSteps/Data.cshtml
View File

@@ -1,4 +1,4 @@
@model Orchard.ImportExport.ViewModels.DataExportStepViewModel
@model Orchard.Recipes.ViewModels.DataExportStepViewModel
@{
Style.Include("exportstep-data.css");
Script.Require("jQuery");

2
src/Orchard.Web/Modules/Orchard.ImportExport/Views/EditorTemplates/ExportSteps/SetupRecipe.cshtml → src/Orchard.Web/Modules/Orchard.Recipes/Views/EditorTemplates/ExportSteps/SetupRecipe.cshtml
View File

@@ -1,4 +1,4 @@
@model Orchard.ImportExport.ViewModels.SetupRecipeStepViewModel
@model Orchard.Recipes.ViewModels.SetupRecipeStepViewModel
<div>
@Html.LabelFor(m => m.RecipeName, T("Name"))
@Html.TextBoxFor(m => m.RecipeName, new { @class = "text medium" })

2
src/Orchard.Web/Modules/Orchard.ImportExport/Views/EditorTemplates/ExportSteps/SiteSettings.cshtml → src/Orchard.Web/Modules/Orchard.Recipes/Views/EditorTemplates/ExportSteps/SiteSettings.cshtml
View File

@@ -1,2 +1,2 @@
@model Orchard.ImportExport.ViewModels.SiteSettingsStepViewModel
@model Orchard.Recipes.ViewModels.SiteSettingsStepViewModel
@Html.Hint(T("Please verify that you are not exporting confidential information, such as passwords or application keys."))