diff --git a/uSync8.ContentEdition/Checkers/ContentBaseChecker.cs b/uSync8.ContentEdition/Checkers/ContentBaseChecker.cs deleted file mode 100644 index f382978b..00000000 --- a/uSync8.ContentEdition/Checkers/ContentBaseChecker.cs +++ /dev/null @@ -1,195 +0,0 @@ -using System.Collections.Generic; -using System.Linq; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; - -using uSync8.ContentEdition.Mapping; -using uSync8.Core.Dependency; -using static Umbraco.Core.Constants; - -namespace uSync8.ContentEdition.Checkers -{ - public abstract class ContentBaseChecker - { - protected readonly IEntityService entityService; - private UmbracoObjectTypes contentTypeObjectType; - private SyncValueMapperCollection mappers; - - public UmbracoObjectTypes ObjectType { get; protected set; } = UmbracoObjectTypes.Unknown; - - public ContentBaseChecker(IEntityService entityService, - UmbracoObjectTypes contentTypeObjectType, - SyncValueMapperCollection mappers) - { - this.entityService = entityService; - this.contentTypeObjectType = contentTypeObjectType; - - this.mappers = mappers; - } - - protected uSyncDependency CalcDocTypeDependency(IContentBase item, DependencyFlags flags) - { - if (item.ContentType == null) return null; - - - var entity = entityService.GetKey(item.ContentTypeId, contentTypeObjectType); - - if (entity.Success) - { - var udi = Udi.Create(contentTypeObjectType.GetUdiType(), entity.Result); - - return new uSyncDependency() - { - Name = item.Name, - Udi = udi, - Order = DependencyOrders.ContentTypes, - Flags = flags & ~DependencyFlags.IncludeAncestors, - Level = item.Level - }; - } - - return null; - } - - protected IEnumerable GetParentDependencies(string path, int order, DependencyFlags flags) - { - var ids = path.Split(new char[] { ',' }, System.StringSplitOptions.RemoveEmptyEntries) - .Select(x => int.Parse(x)) - .ToArray(); - - var items = entityService.GetAll(this.ObjectType, ids); - foreach(var item in items) - { - order--; - yield return new uSyncDependency - { - Name = item.Name, - Udi = Udi.Create(this.ObjectType.GetUdiType(), item.Key), - Order = order, - Flags = flags & ~DependencyFlags.IncludeChildren, - Level = item.Level - }; - } - } - - protected IEnumerable GetParentDependencies(int id, int order, DependencyFlags flags) - { - var dependencies = new List(); - - var parent = entityService.GetParent(id); - if (parent != null) - { - dependencies.Add(new uSyncDependency() - { - Name = parent.Name, - Udi = Udi.Create(this.ObjectType.GetUdiType(), parent.Key), - Order = order, - Flags = flags & ~DependencyFlags.IncludeChildren, - Level = parent.Level - }); - - dependencies.AddRange(GetParentDependencies(parent.Id, order - 1, flags)); - } - - return dependencies; - } - - protected IEnumerable GetChildDepencies(int id, int order, DependencyFlags flags, int min, int max) - { - var children = entityService.GetChildren(id).ToList(); - if (children.Count == 0) return Enumerable.Empty(); - - var dependencies = new List(); - - var step = (max - min) / children.Count; - - foreach (var item in children.Select((Child, Index) => new { Child, Index })) - { - var stepCount = min + item.Index * step; - - uSyncDependency.FireUpdate($"Child Content : {item.Child.Name}", stepCount, uSyncContent.DependencyCountMax); - - dependencies.Add(new uSyncDependency() - { - Name = item.Child.Name, - Udi = Udi.Create(this.ObjectType.GetUdiType(), item.Child.Key), - Order = order, - Flags = flags & ~DependencyFlags.IncludeAncestors, - Level = item.Child.Level - }); - - if (flags.HasFlagAny(DependencyFlags.IncludeLinked | DependencyFlags.IncludeMedia)) - { - var contentChild = GetItemById(item.Child.Id); - dependencies.AddRange(GetPropertyDependencies(contentChild, flags)); - } - - dependencies.AddRange(GetChildDepencies(item.Child.Id, order + 1, flags, stepCount, stepCount + step)); - } - - return dependencies; - } - - protected abstract IContentBase GetItemById(int id); - - - protected readonly string[] settingsTypes = new string[] - { - UdiEntityType.Macro, UdiEntityType.DocumentType, UdiEntityType.DataType, UdiEntityType.DictionaryItem - }; - - /// - /// so do we want this ? go through all the picked values in the content, - /// and include them in the things to export ? - /// - /// - /// - protected IEnumerable GetPropertyDependencies(IContentBase item, DependencyFlags flags) - { - var dependencies = new List(); - - var propertyFlags = flags - & ~DependencyFlags.IncludeChildren; - - foreach (var property in item.Properties) - { - var editorAlias = property.PropertyType.PropertyEditorAlias; - var mapper = mappers.GetSyncMapper(editorAlias); - if (mapper != null) - { - foreach(var value in property.Values) - { - if (value.EditedValue == null) continue; - - var linkedDependencies = mapper.GetDependencies(value.EditedValue, editorAlias, propertyFlags); - - // include linked means all content we link to - if (flags.HasFlag(DependencyFlags.IncludeLinked)) - { - dependencies.AddRange(linkedDependencies.Where(x => x.Udi.EntityType == UdiEntityType.Document)); - } - - // include any settings things we would be dependent on for this property. - if (flags.HasFlag(DependencyFlags.IncludeDependencies)) - { - dependencies.AddRange(linkedDependencies.Where(x => settingsTypes.InvariantContains(x.Udi.EntityType))); - } - - // media means we include media items (the files are checked) - if (flags.HasFlag(DependencyFlags.IncludeMedia)) - { - var media = linkedDependencies.Where(x => x.Udi.EntityType == UdiEntityType.Media || x.Udi.EntityType == UdiEntityType.MediaFile).ToList(); - media.ForEach(x => { x.Flags |= DependencyFlags.IncludeAncestors; }); - - dependencies.AddRange(media); - } - } - } - } - - return dependencies; - } - - } -} diff --git a/uSync8.ContentEdition/Checkers/ContentChecker.cs b/uSync8.ContentEdition/Checkers/ContentChecker.cs deleted file mode 100644 index a098895c..00000000 --- a/uSync8.ContentEdition/Checkers/ContentChecker.cs +++ /dev/null @@ -1,73 +0,0 @@ -using System.Collections.Generic; - -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; - -using uSync8.ContentEdition.Mapping; -using uSync8.Core.Dependency; - -namespace uSync8.ContentEdition.Checkers -{ - public class ContentChecker : ContentBaseChecker, ISyncDependencyChecker - { - private readonly IContentService contentService; - - public ContentChecker(IEntityService entityService, - IContentService contentService, - SyncValueMapperCollection mappers) - : base(entityService, UmbracoObjectTypes.DocumentType, mappers) - { - this.contentService = contentService; - - ObjectType = UmbracoObjectTypes.Document; - } - - public IEnumerable GetDependencies(IContent item, DependencyFlags flags) - { - uSyncDependency.FireUpdate(item.Name); - - var dependencies = new List(); - - dependencies.Add(new uSyncDependency() - { - Name = item.Name, - Udi = item.GetUdi(), - Order = DependencyOrders.Content, - Flags = flags, - Level = item.Level - }); - - if (flags.HasFlag(DependencyFlags.IncludeDependencies)) - { - var contentType = CalcDocTypeDependency(item, flags); - if (contentType != null) - dependencies.Add(contentType); - } - - // if we are getting linked items or media, include in the look up. - if (flags.HasFlagAny(DependencyFlags.IncludeLinked | DependencyFlags.IncludeMedia | DependencyFlags.IncludeDependencies)) - { - uSyncDependency.FireUpdate($"{item.Name} Property Dependencies"); - dependencies.AddRange(GetPropertyDependencies(item, flags)); - } - - if (flags.HasFlag(DependencyFlags.IncludeAncestors)) - { - uSyncDependency.FireUpdate($"{item.Name} Ancestors"); - dependencies.AddRange(GetParentDependencies(item.Id, DependencyOrders.Content - 1, flags)); - } - - if (flags.HasFlag(DependencyFlags.IncludeChildren)) - { - uSyncDependency.FireUpdate($"{item.Name} Children"); - dependencies.AddRange(GetChildDepencies(item.Id, DependencyOrders.Content + 1, flags, 1, uSyncContent.DependencyCountMax)); - } - - return dependencies; - } - - protected override IContentBase GetItemById(int id) - => contentService.GetById(id); - } -} diff --git a/uSync8.ContentEdition/Checkers/DictionaryItemChecker.cs b/uSync8.ContentEdition/Checkers/DictionaryItemChecker.cs deleted file mode 100644 index d432f598..00000000 --- a/uSync8.ContentEdition/Checkers/DictionaryItemChecker.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Umbraco.Core; -using Umbraco.Core.Models; -using uSync8.Core.Dependency; - -namespace uSync8.ContentEdition.Checkers -{ - public class DictionaryItemChecker : ISyncDependencyChecker - { - public UmbracoObjectTypes ObjectType => UmbracoObjectTypes.Unknown; - - // public UmbracoObjectTypes ObjectType => UmbracoObjectTypes.DictionaryItem - - - public IEnumerable GetDependencies(IDictionaryItem item, DependencyFlags flags) - { - uSyncDependency.FireUpdate(item.ItemKey); - - var dependencies = new List(); - dependencies.Add(new uSyncDependency() - { - Name = item.ItemKey, - Order = DependencyOrders.DictionaryItems, - Udi = item.GetUdi(), - Flags = flags, - Level = 0 - }); - - return dependencies; - } - } -} diff --git a/uSync8.ContentEdition/Checkers/DomainChecker.cs b/uSync8.ContentEdition/Checkers/DomainChecker.cs deleted file mode 100644 index 3ca46589..00000000 --- a/uSync8.ContentEdition/Checkers/DomainChecker.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Umbraco.Core; -using Umbraco.Core.Models; -using uSync8.Core.Dependency; - -namespace uSync8.ContentEdition.Checkers -{ - public class DomainChecker : ISyncDependencyChecker - { - public UmbracoObjectTypes ObjectType => UmbracoObjectTypes.Unknown; - - public IEnumerable GetDependencies(IDomain item, DependencyFlags flags) - { - uSyncDependency.FireUpdate(item.DomainName); - - var dependencies = new List(); - dependencies.Add(new uSyncDependency() - { - Name = item.DomainName, - Order = DependencyOrders.Domain, - Udi = new GuidUdi("domain", item.Key), - Flags = flags, - Level = 0 - }); - - return dependencies; - } - } -} diff --git a/uSync8.ContentEdition/Checkers/MediaChecker.cs b/uSync8.ContentEdition/Checkers/MediaChecker.cs deleted file mode 100644 index cffd0463..00000000 --- a/uSync8.ContentEdition/Checkers/MediaChecker.cs +++ /dev/null @@ -1,65 +0,0 @@ -using System.Collections.Generic; - -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; - -using uSync8.ContentEdition.Mapping; -using uSync8.Core.Dependency; - -namespace uSync8.ContentEdition.Checkers -{ - public class MediaChecker : ContentBaseChecker, ISyncDependencyChecker - { - private readonly IMediaService mediaService; - - public MediaChecker(IEntityService entityService, - IMediaService mediaService, - SyncValueMapperCollection mappers) - : base(entityService, UmbracoObjectTypes.MediaType, mappers) - { - this.mediaService = mediaService; - - ObjectType = UmbracoObjectTypes.Media; - } - - public IEnumerable GetDependencies(IMedia item, DependencyFlags flags) - { - uSyncDependency.FireUpdate(item.Name); - - var dependencies = new List(); - - dependencies.Add(new uSyncDependency() - { - Name = item.Name, - Udi = item.GetUdi(), - Order = DependencyOrders.Media, - Flags = flags, - Level = item.Level - }); - - if (flags.HasFlag(DependencyFlags.IncludeDependencies)) - { - var contentType = CalcDocTypeDependency(item, flags); - if (contentType != null) - dependencies.Add(contentType); - } - - if (flags.HasFlag(DependencyFlags.IncludeAncestors)) - { - // dependencies.AddRange(GetParentDependencies(item.Id, DependencyOrders.Media - 1, flags)); - dependencies.AddRange(GetParentDependencies(item.Path, DependencyOrders.Media - 1, flags)); - } - - if (flags.HasFlag(DependencyFlags.IncludeChildren)) - { - dependencies.AddRange(GetChildDepencies(item.Id, DependencyOrders.Media + 1 , flags, 1, uSyncContent.DependencyCountMax)); - } - - return dependencies; - } - - protected override IContentBase GetItemById(int id) - => mediaService.GetById(id); - } -} diff --git a/uSync8.ContentEdition/Checkers/RelationTypeChecker.cs b/uSync8.ContentEdition/Checkers/RelationTypeChecker.cs deleted file mode 100644 index 204977e3..00000000 --- a/uSync8.ContentEdition/Checkers/RelationTypeChecker.cs +++ /dev/null @@ -1,27 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Umbraco.Core; -using Umbraco.Core.Models; -using uSync8.Core.Dependency; - -namespace uSync8.ContentEdition.Checkers -{ - public class RelationTypeChecker : ISyncDependencyChecker - { - public UmbracoObjectTypes ObjectType => UmbracoObjectTypes.RelationType; - - public IEnumerable GetDependencies(IRelationType item, DependencyFlags flags) - { - return new uSyncDependency() - { - Name = item.Name, - Udi = item.GetUdi(), - Order = DependencyOrders.RelationTypes, - Flags = flags - }.AsEnumerableOfOne(); - } - } -} diff --git a/uSync8.ContentEdition/uSync8.ContentEdition.csproj b/uSync8.ContentEdition/uSync8.ContentEdition.csproj index 9dcf6f57..0d811985 100644 --- a/uSync8.ContentEdition/uSync8.ContentEdition.csproj +++ b/uSync8.ContentEdition/uSync8.ContentEdition.csproj @@ -245,12 +245,6 @@ - - - - - - diff --git a/uSync8.ContentEdition/uSync8ContentEdition.cs b/uSync8.ContentEdition/uSync8ContentEdition.cs index 3e39c150..da451b73 100644 --- a/uSync8.ContentEdition/uSync8ContentEdition.cs +++ b/uSync8.ContentEdition/uSync8ContentEdition.cs @@ -13,8 +13,6 @@ using uSync8.ContentEdition.Mapping; using Newtonsoft.Json; using Newtonsoft.Json.Serialization; -using uSync8.Core.Dependency; -using uSync8.ContentEdition.Checkers; namespace uSync8.ContentEdition { diff --git a/uSync8.Core/Dependency/Checkers/ContentTypeBaseChecker.cs b/uSync8.Core/Dependency/Checkers/ContentTypeBaseChecker.cs deleted file mode 100644 index 2fd65fb7..00000000 --- a/uSync8.Core/Dependency/Checkers/ContentTypeBaseChecker.cs +++ /dev/null @@ -1,152 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; -using static Umbraco.Core.Constants; - -namespace uSync8.Core.Dependency -{ - public class ContentTypeBaseChecker - where TObject : IContentTypeComposition - { - - private readonly IEntityService entityService; - private readonly IDataTypeService dataTypeService; - private readonly ILocalizationService localizationService; - - public virtual UmbracoObjectTypes ObjectType { get; } - - public ContentTypeBaseChecker( - IEntityService entityService, - IDataTypeService dataTypeService, - ILocalizationService localizationService) - { - this.entityService = entityService; - this.dataTypeService = dataTypeService; - this.localizationService = localizationService; - } - - protected IEnumerable CalcDataTypeDependencies(TObject item, DependencyFlags flags) - { - var dataTypes = new List(); - - var dictionaryKeys = new List(); - - foreach(var property in item.PropertyTypes) - { - var dataType = dataTypeService.GetDataType(property.DataTypeId); - if (dataType != null) - { - dataTypes.Add(new uSyncDependency() - { - Name = dataType.Name, - Udi = dataType.GetUdi(), - Order = DependencyOrders.DataTypes, - Flags = flags, - Level = item.Level - }); - } - - // TODO: Dictionary Item Dependencies, when labels start with # - if (property.Name.StartsWith("#")) - { - dictionaryKeys.Add(property.Name.Substring(1)); - } - } - - foreach(var tab in item.PropertyGroups) - { - if (tab.Name.StartsWith("#")) - dictionaryKeys.Add(tab.Name.Substring(1)); - } - - dataTypes.AddRange(GetDictionaryDependencies(dictionaryKeys, flags)); - - return dataTypes; - } - - private IEnumerable GetDictionaryDependencies(IEnumerable keys, DependencyFlags flags) - { - var dependencies = new List(); - - foreach(var key in keys) - { - var item = localizationService.GetDictionaryItemByKey(key); - if (item != null) - { - - dependencies.Add(new uSyncDependency() - { - Name = item.ItemKey, - Flags = flags, - Order = DependencyOrders.DictionaryItems, - Level = 0, - Udi = item.GetUdi() // strong chance you can't do this with a dictionary item :( - }); - } - } - - return dependencies; - } - - protected IEnumerable CalcCompositions(IContentTypeComposition item, int priority, DependencyFlags flags) - { - var contentTypes = new List(); - - foreach (var composition in item.ContentTypeComposition) - { - contentTypes.Add(new uSyncDependency() - { - Name = item.Name, - Udi = composition.GetUdi(), - Order = priority, - Level = composition.Level, - Flags = flags - }); - - if (composition.ContentTypeComposition != null && composition.ContentTypeComposition.Any()) - { - contentTypes.AddRange(CalcCompositions(composition, priority - 1, flags)); - } - } - - return contentTypes; - } - - - - protected IEnumerable CalcChildren(int itemId, DependencyFlags flags) - { - var childItems = new List(); - - if (flags.HasFlag(DependencyFlags.IncludeChildren)) - { - var children = entityService.GetDescendants(itemId, this.ObjectType); - - if (children != null && children.Any()) - { - foreach (var child in children.OrderBy(x => x.Level)) - { - if (child != null) - { - childItems.Add(new uSyncDependency() - { - Name = child.Name, - Udi = Udi.Create(UdiEntityType.FromUmbracoObjectType(this.ObjectType), child.Key), - Flags = flags & ~DependencyFlags.IncludeAncestors, - Level = child.Level, - Order = DependencyOrders.ContentTypes + child.Level - }); - } - } - } - } - - return childItems; - } - } -} diff --git a/uSync8.Core/Dependency/Checkers/ContentTypeChecker.cs b/uSync8.Core/Dependency/Checkers/ContentTypeChecker.cs deleted file mode 100644 index 8f58dc62..00000000 --- a/uSync8.Core/Dependency/Checkers/ContentTypeChecker.cs +++ /dev/null @@ -1,78 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; - -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; -using static Umbraco.Core.Constants; - -namespace uSync8.Core.Dependency -{ - public class ContentTypeChecker : - ContentTypeBaseChecker, - ISyncDependencyChecker - { - - public override UmbracoObjectTypes ObjectType => UmbracoObjectTypes.DocumentType; - - public ContentTypeChecker(IDataTypeService dataTypeService, ILocalizationService localizationService, IEntityService entityService) - : base(entityService, dataTypeService, localizationService) - { - } - - - public IEnumerable GetDependencies(IContentType item, DependencyFlags flags) - { - uSyncDependency.FireUpdate(item.Name, 1, 1); - - var dependentflags = flags & ~DependencyFlags.IncludeChildren; - - var dependencies = new List(); - - dependencies.Add(new uSyncDependency() - { - Name = item.Name, - Udi = item.GetUdi(), - Order = DependencyOrders.ContentTypes, - Flags = dependentflags, - Level = item.Level - }); - - - if (flags.HasFlag(DependencyFlags.IncludeDependencies)) { - dependencies.AddRange(CalcDataTypeDependencies(item, dependentflags)); ; - dependencies.AddRange(CalcCompositions(item, DependencyOrders.ContentTypes - 1, dependentflags)); - dependencies.AddRange(CalcTemplateDependencies(item, dependentflags)); - } - - dependencies.AddRange(CalcChildren(item.Id, flags)); - - return dependencies; - } - - - private IEnumerable CalcTemplateDependencies(IContentType item, DependencyFlags flags) - { - var templates = new List(); - - if (flags.HasFlag(DependencyFlags.IncludeViews)) - { - foreach (var template in item.AllowedTemplates) - { - templates.Add(new uSyncDependency() - { - Name = item.Name, - Udi = template.GetUdi(), - Order = DependencyOrders.Templates, - Flags = flags, - Level = template.Path.ToDelimitedList().Count() - }); - } - } - - return templates; - } - - } -} diff --git a/uSync8.Core/Dependency/Checkers/DataTypeChecker.cs b/uSync8.Core/Dependency/Checkers/DataTypeChecker.cs deleted file mode 100644 index 5d912a65..00000000 --- a/uSync8.Core/Dependency/Checkers/DataTypeChecker.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Umbraco.Core; -using Umbraco.Core.Models; - -namespace uSync8.Core.Dependency -{ - public class DataTypeChecker : ISyncDependencyChecker - { - public UmbracoObjectTypes ObjectType => UmbracoObjectTypes.DataType; - - public IEnumerable GetDependencies(IDataType item, DependencyFlags flags) - { - uSyncDependency.FireUpdate(item.Name, 1, 1); - - var dependencies = new List(); - dependencies.Add(new uSyncDependency() - { - Name = item.Name, - Order = DependencyOrders.DataTypes, - Udi = item.GetUdi(), - Flags = flags, - Level = item.Level - }); - - // what can datatypes depend on? - - return dependencies; - } - - } -} diff --git a/uSync8.Core/Dependency/Checkers/LanguageChecker.cs b/uSync8.Core/Dependency/Checkers/LanguageChecker.cs deleted file mode 100644 index 4dbc6446..00000000 --- a/uSync8.Core/Dependency/Checkers/LanguageChecker.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Umbraco.Core; -using Umbraco.Core.Models; - -namespace uSync8.Core.Dependency -{ - public class LanguageChecker : ISyncDependencyChecker - { - public UmbracoObjectTypes ObjectType => UmbracoObjectTypes.Language; - - public IEnumerable GetDependencies(ILanguage item, DependencyFlags flags) - { - var dependencies = new List - { - new uSyncDependency() - { - Name= item.CultureName, - Udi = item.GetUdi(), - Order = DependencyOrders.Languages, - Flags = flags, - Level = 0 - } - }; - - return dependencies; - - } - } -} diff --git a/uSync8.Core/Dependency/Checkers/MacroChecker.cs b/uSync8.Core/Dependency/Checkers/MacroChecker.cs deleted file mode 100644 index 4614640c..00000000 --- a/uSync8.Core/Dependency/Checkers/MacroChecker.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Umbraco.Core; -using Umbraco.Core.Models; - -namespace uSync8.Core.Dependency -{ - public class MacroChecker : ISyncDependencyChecker - { - public UmbracoObjectTypes ObjectType => UmbracoObjectTypes.Unknown; - - public IEnumerable GetDependencies(IMacro item, DependencyFlags flags) - { - var dependencies = new List - { - new uSyncDependency() - { - Name = item.Name, - Udi = item.GetUdi(), - Order = DependencyOrders.Macros, - Flags = flags - - } - }; - - return dependencies; - } - } -} diff --git a/uSync8.Core/Dependency/Checkers/MediaTypeChecker.cs b/uSync8.Core/Dependency/Checkers/MediaTypeChecker.cs deleted file mode 100644 index 3d2981bb..00000000 --- a/uSync8.Core/Dependency/Checkers/MediaTypeChecker.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; - -namespace uSync8.Core.Dependency -{ - public class MediaTypeChecker : - ContentTypeBaseChecker, - ISyncDependencyChecker - { - public MediaTypeChecker( - IEntityService entityService, - IDataTypeService dataTypeService, - ILocalizationService localizationService) - : base(entityService, dataTypeService, localizationService) - { } - - public override UmbracoObjectTypes ObjectType => UmbracoObjectTypes.MediaType; - - public IEnumerable GetDependencies(IMediaType item, DependencyFlags flags) - { - var dependencies = new List(); - - var dependentFlags = flags & ~DependencyFlags.IncludeChildren; - - dependencies.Add(new uSyncDependency() - { - Name = item.Name, - Udi = item.GetUdi(), - Order = DependencyOrders.MediaTypes, - Flags = flags, - Level = item.Level - }); - - if (flags.HasFlag(DependencyFlags.IncludeDependencies)) - { - dependencies.AddRange(CalcDataTypeDependencies(item, dependentFlags)); - dependencies.AddRange(CalcCompositions(item, DependencyOrders.MediaTypes - 1, dependentFlags)); - } - - dependencies.AddRange(CalcChildren(item.Id, flags)); - - return dependencies; - } - } -} diff --git a/uSync8.Core/Dependency/Checkers/MemberTypeChecker.cs b/uSync8.Core/Dependency/Checkers/MemberTypeChecker.cs deleted file mode 100644 index 720421cf..00000000 --- a/uSync8.Core/Dependency/Checkers/MemberTypeChecker.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; - -namespace uSync8.Core.Dependency -{ - public class MemberTypeChecker : ContentTypeBaseChecker, - ISyncDependencyChecker - { - public MemberTypeChecker( - IEntityService entityService, - IDataTypeService dataTypeService, ILocalizationService localizationService) - : base(entityService, dataTypeService, localizationService) - { - } - - public override UmbracoObjectTypes ObjectType => UmbracoObjectTypes.MemberType; - - public IEnumerable GetDependencies(IMemberType item, DependencyFlags flags) - { - var dependencies = new List(); - - var dependentFlags = flags & ~DependencyFlags.IncludeChildren; - - - dependencies.Add(new uSyncDependency() - { - Name = item.Name, - Udi = item.GetUdi(), - Order = DependencyOrders.MemberTypes, - Flags = flags, - Level = item.Level - }); - - if (flags.HasFlag(DependencyFlags.IncludeDependencies)) - { - dependencies.AddRange(CalcDataTypeDependencies(item, dependentFlags)); - dependencies.AddRange(CalcCompositions(item, DependencyOrders.MemberTypes - 1, dependentFlags)); - } - - dependencies.AddRange(CalcChildren(item.Id, flags)); - - return dependencies; - } - } -} diff --git a/uSync8.Core/Dependency/Checkers/TemplateChecker.cs b/uSync8.Core/Dependency/Checkers/TemplateChecker.cs deleted file mode 100644 index 9c51b074..00000000 --- a/uSync8.Core/Dependency/Checkers/TemplateChecker.cs +++ /dev/null @@ -1,129 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Text.RegularExpressions; -using System.Threading.Tasks; - -using Umbraco.Core; -using Umbraco.Core.Models; -using Umbraco.Core.Services; - -namespace uSync8.Core.Dependency -{ - public class TemplateChecker : ISyncDependencyChecker - { - private IFileService fileService; - - public TemplateChecker(IFileService fileService) - { - this.fileService = fileService; - } - - public UmbracoObjectTypes ObjectType => UmbracoObjectTypes.Template; - - public IEnumerable GetDependencies(ITemplate item, DependencyFlags flags) - { - var dependencies = new List(); - - // only get teh dependencies for templates if the flag is set. - if (!flags.HasFlag(DependencyFlags.IncludeViews)) return dependencies; - - dependencies.Add(new uSyncDependency() - { - Name = item.Name, - Order = DependencyOrders.Templates, - Udi = item.GetUdi(), - Flags = flags, - Level = CalculateLevel(item) - }); - - // always get the parents of a template?? - - // if (flags.HasFlag(DependencyFlags.IncludeAncestors)) - // { - dependencies.AddRange(GetParents(item, DependencyOrders.Templates - 1, flags)); - // } - - if (flags.HasFlag(DependencyFlags.IncludeChildren)) - { - // children check. - dependencies.AddRange(GetChildren(item, DependencyOrders.Templates + 1, flags)); - } - - return dependencies; - } - - private IEnumerable GetParents(ITemplate item, int order, DependencyFlags flags) - { - var templates = new List(); - - if (!string.IsNullOrWhiteSpace(item.MasterTemplateAlias)) - { - var master = fileService.GetTemplate(item.MasterTemplateAlias); - if (master != null) - { - templates.Add(new uSyncDependency() - { - Name = item.Name, - Order = order, - Udi = master.GetUdi(), - Level = CalculateLevel(master), - Flags = flags & ~DependencyFlags.IncludeAncestors - }); - - templates.AddRange(GetParents(master, order - 1, flags)); - } - } - - return templates; - } - - private IEnumerable GetChildren(ITemplate item, int order, DependencyFlags flags) - { - var templates = new List(); - - var children = fileService.GetTemplateChildren(item.Id); - if (children != null && children.Any()) - { - foreach(var child in children) - { - templates.Add(new uSyncDependency() - { - Name = item.Name, - Order = order, - Udi = child.GetUdi(), - Flags = flags & ~DependencyFlags.IncludeAncestors, - Level = CalculateLevel(child) - }); - - GetChildren(child, order + 1, flags); - } - } - - return templates; - } - - private int CalculateLevel(ITemplate item) - { - return item.Path.ToDelimitedList().Count(); - - /* - if (item.MasterTemplateAlias.IsNullOrWhiteSpace()) return 1; - - int level = 1; - var current = item; - while (!string.IsNullOrWhiteSpace(current.MasterTemplateAlias) && level < 20) - { - level++; - var parent = fileService.GetTemplate(current.MasterTemplateAlias); - if (parent == null) return level; - - current = parent; - } - - return level; - */ - } - } -} diff --git a/uSync8.Core/uSync8.Core.csproj b/uSync8.Core/uSync8.Core.csproj index 38ed99a9..9e0e44b5 100644 --- a/uSync8.Core/uSync8.Core.csproj +++ b/uSync8.Core/uSync8.Core.csproj @@ -166,17 +166,9 @@ - - - - - - - -