Merge pull request #68 from srcnalt/feature/cleanup

Avoid Code Stripping for Package
srcnalt · Jul 4, 2023 · 512d234 · 512d234
2 parents d51ac7c + 31101f8
commit 512d234
Show file tree

Hide file tree

Showing 10 changed files with 95 additions and 4 deletions.
diff --git a/Editor.meta b/Editor.meta
diff --git a/Editor/LinkXmlTransferer.cs b/Editor/LinkXmlTransferer.cs
@@ -0,0 +1,26 @@
+using System.IO;
+using UnityEditor;
+using UnityEditor.Build;
+using UnityEditor.UnityLinker;
+using UnityEditor.Build.Reporting;
+
+namespace OpenAI
+{
+    public class LinkXmlTransferer : IUnityLinkerProcessor
+    {
+        private const string SearchFolder = "Packages/com.srcnalt.openai-unity/Resources";
+
+        int IOrderedCallback.callbackOrder => 0;
+
+        public string GenerateAdditionalLinkXmlFile(BuildReport report, UnityLinkerBuildPipelineData data)
+        {
+            string[] linkXmlGuid = AssetDatabase.FindAssets("link", new string[] { SearchFolder });
+            string linkXmlPath = AssetDatabase.GUIDToAssetPath(linkXmlGuid[0]);
+            return Path.GetFullPath(linkXmlPath);
+        }
+
+        public void OnBeforeRun(BuildReport report, UnityLinkerBuildPipelineData data) { }
+
+        public void OnAfterRun(BuildReport report, UnityLinkerBuildPipelineData data) { }
+    }
+}
diff --git a/Editor/LinkXmlTransferer.cs.meta b/Editor/LinkXmlTransferer.cs.meta
diff --git a/Editor/OpenAI.Editor.asmdef b/Editor/OpenAI.Editor.asmdef
@@ -0,0 +1,16 @@
+{
+    "name": "OpenAI.Editor",
+    "rootNamespace": "",
+    "references": [],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}
diff --git a/Editor/OpenAI.Editor.asmdef.meta b/Editor/OpenAI.Editor.asmdef.meta
diff --git a/Resources.meta b/Resources.meta
diff --git a/Resources/link.xml b/Resources/link.xml
@@ -0,0 +1,3 @@
+<linker>
+    <assembly fullname="OpenAI.Runtime" preserve="all" />
+</linker>
diff --git a/Resources/link.xml.meta b/Resources/link.xml.meta
diff --git a/Runtime/OpenAIApi.cs b/Runtime/OpenAIApi.cs
@@ -164,7 +164,7 @@ private async Task<T> DispatchRequest<T>(string path, List<IMultipartFormSection
                 var formSections = UnityWebRequest.SerializeFormSections(form, boundary);
                 var contentType = $"{ContentType.MultipartFormData}; boundary={Encoding.UTF8.GetString(boundary)}";
                 request.uploadHandler = new UploadHandlerRaw(formSections) {contentType = contentType};
-                request.downloadHandler = (DownloadHandler) new DownloadHandlerBuffer();
+                request.downloadHandler = new DownloadHandlerBuffer();
                 var asyncOperation = request.SendWebRequest();
 
                 while (!asyncOperation.isDone) await Task.Yield();

diff --git a/Samples~/Whisper/Whisper.cs b/Samples~/Whisper/Whisper.cs
@@ -1,5 +1,4 @@
-using System;
-using UnityEngine;
+using UnityEngine;
 using UnityEngine.UI;
 
 namespace OpenAI
@@ -21,6 +20,9 @@ public class Whisper : MonoBehaviour
 
         private void Start()
         {
+            #if UNITY_WEBGL && !UNITY_EDITOR
+            dropdown.options.Add(new Dropdown.OptionData("Microphone not supported on WebGL"));
+            #else
             foreach (var device in Microphone.devices)
             {
                 dropdown.options.Add(new Dropdown.OptionData(device));
@@ -30,6 +32,7 @@ private void Start()
 
             var index = PlayerPrefs.GetInt("user-mic-device-index");
             dropdown.SetValueWithoutNotify(index);
+            #endif
         }
 
         private void ChangeMicrophone(int index)
@@ -43,22 +46,28 @@ private void StartRecording()
             recordButton.enabled = false;
 
             var index = PlayerPrefs.GetInt("user-mic-device-index");
+
+            #if !UNITY_WEBGL
             clip = Microphone.Start(dropdown.options[index].text, false, duration, 44100);
+            #endif
         }
 
         private async void EndRecording()
         {
             message.text = "Transcripting...";
 
+            #if !UNITY_WEBGL
             Microphone.End(null);
+            #endif
+
             byte[] data = SaveWav.Save(fileName, clip);
 
             var req = new CreateAudioTranscriptionsRequest
             {
                 FileData = new FileData() {Data = data, Name = "audio.wav"},
                 // File = Application.persistentDataPath + "/" + fileName,
                 Model = "whisper-1",
-                Language = "en"
+                Language = "id"
             };
             var res = await openai.CreateAudioTranscription(req);