tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SoundSpecifier read as ValueDataNode can ONLY deserialize ResourcePath

Browse Source
This commit is contained in:
Vera Aguilera Puerto
2021-10-07 13:22:01 +02:00
parent 365c7da4dc
commit 094841314a
1 changed files with 3 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Content.Shared/Sound/SoundSpecifierTypeSerializer.cs
View File

@@ -1,17 +1,11 @@
using System; using System;
using Content.Shared.Audio;
using Robust.Shared.ContentPack;
using Robust.Shared.IoC; using Robust.Shared.IoC;
using Robust.Shared.Prototypes;
using Robust.Shared.Serialization;
using Robust.Shared.Serialization.Manager; using Robust.Shared.Serialization.Manager;
using Robust.Shared.Serialization.Manager.Attributes; using Robust.Shared.Serialization.Manager.Attributes;
using Robust.Shared.Serialization.Manager.Result; using Robust.Shared.Serialization.Manager.Result;
using Robust.Shared.Serialization.Markdown.Mapping; using Robust.Shared.Serialization.Markdown.Mapping;
using Robust.Shared.Serialization.Markdown.Validation; using Robust.Shared.Serialization.Markdown.Validation;
using Robust.Shared.Serialization.Markdown.Value; using Robust.Shared.Serialization.Markdown.Value;
using Robust.Shared.Serialization.TypeSerializers.Implementations;
using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
using Robust.Shared.Serialization.TypeSerializers.Interfaces; using Robust.Shared.Serialization.TypeSerializers.Interfaces;
using Robust.Shared.Utility; using Robust.Shared.Utility;
@@ -46,14 +40,7 @@ namespace Content.Shared.Sound
public DeserializationResult Read(ISerializationManager serializationManager, ValueDataNode node, public DeserializationResult Read(ISerializationManager serializationManager, ValueDataNode node,
IDependencyCollection dependencies, bool skipHook, ISerializationContext? context = null) IDependencyCollection dependencies, bool skipHook, ISerializationContext? context = null)
{ {
var value = node.Value; return new DeserializedValue<SoundSpecifier>(new SoundPathSpecifier(node.Value));
if (dependencies.Resolve<IPrototypeManager>().HasIndex<SoundCollectionPrototype>(value))
return new DeserializedValue<SoundSpecifier>(new SoundCollectionSpecifier(value));
if (dependencies.Resolve<IResourceManager>().ContentFileExists(value))
return new DeserializedValue<SoundSpecifier>(new SoundPathSpecifier(value));
throw new InvalidMappingException("SoundSpecifier is neither a resource path or sound collection identifier");
} }
public ValidationNode Validate(ISerializationManager serializationManager, MappingDataNode node, public ValidationNode Validate(ISerializationManager serializationManager, MappingDataNode node,
@@ -71,11 +58,10 @@ namespace Content.Shared.Sound
public ValidationNode Validate(ISerializationManager serializationManager, ValueDataNode node, public ValidationNode Validate(ISerializationManager serializationManager, ValueDataNode node,
IDependencyCollection dependencies, ISerializationContext? context = null) IDependencyCollection dependencies, ISerializationContext? context = null)
{ {
if (serializationManager.ValidateNode<ResourcePath>(node, context) is not ErrorNode if (serializationManager.ValidateNode<ResourcePath>(node, context) is not ErrorNode)
|| serializationManager.ValidateNodeWith<string, PrototypeIdSerializer<SoundCollectionPrototype>, ValueDataNode>(node, context) is not ErrorNode)
return new ValidatedValueNode(node); return new ValidatedValueNode(node);
return new ErrorNode(node, "SoundSpecifier value is neither a valid resource path nor an existing sound collection identifier!"); return new ErrorNode(node, "SoundSpecifier value is not a valid resource path!");
} }
} }
} }