yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some cleanup

Browse Source
This commit is contained in:
Shannon
2019-01-14 18:03:06 +11:00
parent aa6342cc30
commit b3585b0083
5 changed files with 2 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/Umbraco.Core/Models/Packaging/InstallationSummary.cs
View File

@@ -2,8 +2,6 @@
using System.Collections.Generic;
using System.Linq;
using System.Runtime.Serialization;
using Umbraco.Core.IO;
using Umbraco.Core.Services;
namespace Umbraco.Core.Models.Packaging
{
@@ -23,45 +21,7 @@ namespace Umbraco.Core.Models.Packaging
public IEnumerable<IContent> ContentInstalled { get; set; } = Enumerable.Empty<IContent>();
public IEnumerable<PackageAction> Actions { get; set; } = Enumerable.Empty<PackageAction>();
public bool PackageInstalled { get; set; }
//public static InstallationSummary FromPackageDefinition(PackageDefinition def, IContentTypeService contentTypeService, IDataTypeService dataTypeService, IFileService fileService, ILocalizationService localizationService, IMacroService macroService)
//{
// var macros = TryGetIntegerIds(def.Macros).Select(macroService.GetById).ToList();
// var templates = TryGetIntegerIds(def.Templates).Select(fileService.GetTemplate).ToList();
// var contentTypes = TryGetIntegerIds(def.DocumentTypes).Select(contentTypeService.Get).ToList(); // fixme - media types?
// var dataTypes = TryGetIntegerIds(def.DataTypes).Select(dataTypeService.GetDataType).ToList();
// var dictionaryItems = TryGetIntegerIds(def.DictionaryItems).Select(localizationService.GetDictionaryItemById).ToList();
// var languages = TryGetIntegerIds(def.Languages).Select(localizationService.GetLanguageById).ToList();
// for (var i = 0; i < def.Files.Count; i++)
// {
// var filePath = def.Files[i];
// def.Files[i] = filePath.GetRelativePath();
// }
// return new InstallationSummary
// {
// ContentTypesInstalled = contentTypes,
// DataTypesInstalled = dataTypes,
// DictionaryItemsInstalled = dictionaryItems,
// FilesInstalled = def.Files,
// LanguagesInstalled = languages,
// MacrosInstalled = macros,
// MetaData = def,
// TemplatesInstalled = templates,
// };
//}
//private static IEnumerable<int> TryGetIntegerIds(IEnumerable<string> ids)
//{
// var intIds = new List<int>();
// foreach (var id in ids)
// {
// if (int.TryParse(id, out var parsed))
// intIds.Add(parsed);
// }
// return intIds;
//}
}
}

8
src/Umbraco.Core/Models/Packaging/PackageDefinition.cs
View File

@@ -34,7 +34,6 @@ namespace Umbraco.Core.Models.Packaging
UmbracoVersion = compiled.UmbracoVersion,
Url = compiled.Url,
Version = compiled.Version,
//fixme: Is OriginalPath correct here?
Files = compiled.Files.Select(x => x.OriginalPath).ToList()
};
}
@@ -54,13 +53,6 @@ namespace Umbraco.Core.Models.Packaging
[Url]
public string Url { get; set; } = string.Empty;
//fixme: remove this
/// <summary>
/// This is a generated GUID which is used to determine a temporary folder name for processing the package
/// </summary>
[DataMember(Name = "folder")]
public Guid FolderId { get; set; }
[ReadOnly(true)]
[DataMember(Name = "packagePath")]
public string PackagePath { get; set; } = string.Empty;