Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Try derialize string to object #23

Merged
merged 1 commit into from
Jul 12, 2022
Merged

Try derialize string to object #23

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 27 additions & 8 deletions src/Dawoe.OEmbedPickerPropertyEditor.Core/ValueConverters/OEmbedPickerValueConverter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,21 @@
// </copyright>

using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Dawoe.OEmbedPickerPropertyEditor.Configuration;
using Dawoe.OEmbedPickerPropertyEditor.Models;
using Newtonsoft.Json;
using Umbraco.Core;

#if NET472
using Umbraco.Core.Models.PublishedContent;
using Umbraco.Core.PropertyEditors;
#else
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Core.PropertyEditors;
using Umbraco.Extensions;
#endif

namespace Dawoe.OEmbedPickerPropertyEditor.ValueConverters
Expand Down Expand Up @@ -53,21 +56,37 @@ public override object ConvertIntermediateToObject(
object inter,
bool preview)
{
var allowMultiple = propertyType.DataType.ConfigurationAs<OEmbedPickerConfiguration>().AllowMultiple;
var isMultiple = this.IsMultipleDataType(propertyType.DataType);

if (string.IsNullOrWhiteSpace(inter?.ToString()))
var sourceString = inter?.ToString();

if (string.IsNullOrWhiteSpace(sourceString))
{
return allowMultiple ? Enumerable.Empty<OEmbedItem>() : null;
return isMultiple ? Enumerable.Empty<OEmbedItem>() : null;
}

var items = JsonConvert.DeserializeObject<List<OEmbedItem>>(inter.ToString() ?? string.Empty);

if (allowMultiple)
if (sourceString.DetectIsJson())
{
return items;
try
{
var items = JsonConvert.DeserializeObject<List<OEmbedItem>>(sourceString);

return isMultiple ? items : this.FirstOrDefault(items);
}
catch
{
}
}

return items?.FirstOrDefault();
return isMultiple ? Enumerable.Empty<OEmbedItem>() : null;
}

private bool IsMultipleDataType(PublishedDataType dataType)
{
var config = ConfigurationEditor.ConfigurationAs<OEmbedPickerConfiguration>(dataType.Configuration);
return config.AllowMultiple;
}

private object FirstOrDefault(IList items) => items.Count == 0 ? null : items[0];
}
}