UTF-8文字列と勘違いしていたため、VoiceModelIdが壊れていた

uuidみたいに他の人が扱っていなければinterface上変わりないのでbreakingにはならない…はず…

Author: yamachu

src/VoicevoxCoreSharp.Core.Unity/Runtime/Script/Synthesizer.cs

@@ -72,7 +72,7 @@ public ResultCode UnloadVoiceModel(string modelId)
         {
             unsafe
             {
-                fixed (byte* ptr = System.Text.Encoding.UTF8.GetBytes(modelId))
+                fixed (byte* ptr = NativeUuid.ToUUIDv4ByteArray(modelId))
                 {
                     return CoreUnsafe.voicevox_synthesizer_unload_voice_model((VoicevoxSynthesizer*)Handle, ptr).FromNative();
                 }
@@ -94,7 +94,7 @@ public bool IsLoadedVoiceModel(string modelId)
         {
             unsafe
             {
-                fixed (byte* ptr = System.Text.Encoding.UTF8.GetBytes(modelId))
+                fixed (byte* ptr = NativeUuid.ToUUIDv4ByteArray(modelId))
                 {
                     return CoreUnsafe.voicevox_synthesizer_is_loaded_voice_model((VoicevoxSynthesizer*)Handle, ptr);
                 }

src/VoicevoxCoreSharp.Core.Unity/Runtime/Script/VoiceModel.cs

@@ -34,9 +34,22 @@ public class VoiceModelFile : IDisposable
         internal VoiceModelFileHandle Handle { get; private set; }
         private bool _disposed = false;
 
-        private unsafe VoiceModelFile(VoicevoxVoiceModelFile* modelHandle)
+        public string Id { get; private set; }
+
+        public string MetasJson { get; private set; }
+
+        private VoiceModelFile()
+        {
+            Handle = new VoiceModelFileHandle(IntPtr.Zero);
+            Id = string.Empty;
+            MetasJson = string.Empty;
+        }
+
+        private unsafe VoiceModelFile(VoicevoxVoiceModelFile* modelHandle, string id, string metasJson)
         {
             Handle = new VoiceModelFileHandle(new IntPtr(modelHandle));
+            Id = id;
+            MetasJson = metasJson;
         }
 
         [Obsolete("Use VoiceModelFile.Open(string modelPath, out VoiceModelFile voiceModel) instead.")]
@@ -55,44 +68,26 @@ public static ResultCode Open(string modelPath, out VoiceModelFile voiceModel)
                     var result = CoreUnsafe.voicevox_voice_model_file_open(ptr, &p).FromNative();
                     if (result == ResultCode.RESULT_OK)
                     {
-                        voiceModel = new VoiceModelFile(p);
+                        byte* idPtr = stackalloc byte[16];
+                        CoreUnsafe.voicevox_voice_model_file_id(p, idPtr);
+                        var id = NativeUuid.ToUUIDv4(idPtr);
+
+                        var jsonPtr = CoreUnsafe.voicevox_voice_model_file_create_metas_json(p);
+                        var json = StringConvertCompat.ToUTF8String(jsonPtr);
+                        CoreUnsafe.voicevox_json_free(jsonPtr);
+
+                        voiceModel = new VoiceModelFile(p, id, json);
                     }
                     else
                     {
-                        voiceModel = new VoiceModelFile(null);
+                        voiceModel = new VoiceModelFile();
                     }
 
                     return result;
                 }
             }
         }
 
-        public string Id
-        {
-            get
-            {
-                unsafe
-                {
-                    byte* ptr = stackalloc byte[16];
-                    CoreUnsafe.voicevox_voice_model_file_id((VoicevoxVoiceModelFile*)Handle, ptr);
-                    return StringConvertCompat.ToUTF8String(ptr);
-                }
-            }
-        }
-
-        public string MetasJson
-        {
-            get
-            {
-                unsafe
-                {
-                    var ptr = CoreUnsafe.voicevox_voice_model_file_create_metas_json((VoicevoxVoiceModelFile*)Handle);
-                    var json = StringConvertCompat.ToUTF8String(ptr);
-                    CoreUnsafe.voicevox_json_free(ptr);
-                    return json;
-                }
-            }
-        }
 
         public void Dispose()
         {

src/VoicevoxCoreSharp.Core/Synthesizer.cs

@@ -72,7 +72,7 @@ public ResultCode UnloadVoiceModel(string modelId)
         {
             unsafe
             {
-                fixed (byte* ptr = System.Text.Encoding.UTF8.GetBytes(modelId))
+                fixed (byte* ptr = NativeUuid.ToUUIDv4ByteArray(modelId))
                 {
                     return CoreUnsafe.voicevox_synthesizer_unload_voice_model((VoicevoxSynthesizer*)Handle, ptr).FromNative();
                 }
@@ -94,7 +94,7 @@ public bool IsLoadedVoiceModel(string modelId)
         {
             unsafe
             {
-                fixed (byte* ptr = System.Text.Encoding.UTF8.GetBytes(modelId))
+                fixed (byte* ptr = NativeUuid.ToUUIDv4ByteArray(modelId))
                 {
                     return CoreUnsafe.voicevox_synthesizer_is_loaded_voice_model((VoicevoxSynthesizer*)Handle, ptr);
                 }

src/VoicevoxCoreSharp.Core/VoiceModel.cs

@@ -75,7 +75,7 @@ public string Id
                 {
                     byte* ptr = stackalloc byte[16];
                     CoreUnsafe.voicevox_voice_model_file_id((VoicevoxVoiceModelFile*)Handle, ptr);
-                    return StringConvertCompat.ToUTF8String(ptr);
+                    return NativeUuid.ToUUIDv4(ptr);
                 }
             }
         }

tests/VoicevoxCoreSharp.Core.Tests/SynthesizerTest.cs

@@ -33,5 +33,25 @@ public void Tts()
             Assert.True(wavLength > 0);
             Assert.NotNull(wav);
         }
+
+        [Fact]
+        public void VoiceModelLoaded()
+        {
+            OpenJtalk.New(Consts.OpenJTalkDictDir, out var openJtalk);
+            var initializeOptions = InitializeOptions.Default();
+            var onnxruntimeOptions = new LoadOnnxruntimeOptions(Path.Join(AppContext.BaseDirectory, Helper.GetOnnxruntimeAssemblyName()));
+            if (Onnxruntime.LoadOnce(onnxruntimeOptions, out var onnruntime) != ResultCode.RESULT_OK)
+            {
+                Assert.Fail("Failed to initialize onnxruntime");
+            }
+            Synthesizer.New(onnruntime, openJtalk, initializeOptions, out var synthesizer);
+
+            VoiceModelFile.Open(Consts.SampleVoiceModel, out var voiceModel);
+            synthesizer.LoadVoiceModel(voiceModel);
+
+            Assert.True(synthesizer.IsLoadedVoiceModel(voiceModel.Id));
+            synthesizer.UnloadVoiceModel(voiceModel.Id);
+            Assert.False(synthesizer.IsLoadedVoiceModel(voiceModel.Id));
+        }
     }
 }