fix: Fixed subfolder extratction for transports

Author: TwoTenPvP

MLAPI-Editor/MLAPIEditor.cs

@@ -1,4 +1,4 @@
-#define NOASYNC
+#define NOASYNC
 
 using System;
 using System.Collections;
@@ -49,7 +49,8 @@ public void OnGUI()
         for (int i = 0; i < releases.Length; i++)
         {
             string bodySummary = releases[i].body.Substring(0, releases[i].body.Length > 100 ? 100 : releases[i].body.Length);
-            if (releases[i].body.Length > 100) bodySummary += "...";
+            if (releases[i].body.Length > 100)
+                bodySummary += "...";
             EditorGUILayout.LabelField(releases[i].tag_name + ": " + releases[i].name + (bodySummary.Trim().Length > 0 ? (" - " + bodySummary) : ""));
         }
         GUILayout.EndScrollView();
@@ -130,12 +131,13 @@ public static MLAPIVersion GetVersionDiff(MLAPIVersion v1, MLAPIVersion v2)
 
     public static MLAPIVersion Parse(string version)
     {
-        if (version == "None") return new MLAPIVersion()
-        {
-            MAJOR = byte.MaxValue,
-            MINOR = byte.MaxValue,
-            PATCH = byte.MaxValue
-        };
+        if (version == "None")
+            return new MLAPIVersion()
+            {
+                MAJOR = byte.MaxValue,
+                MINOR = byte.MaxValue,
+                PATCH = byte.MaxValue
+            };
 
         string v = version;
         if (version[0] == 'v')
@@ -216,6 +218,7 @@ public class TransportArtifact
     public bool preferNet45;
     public bool experimental;
     public int mlapi_major_version;
+    public int[] required_build_targets;
 }
 
 [Serializable]
@@ -237,7 +240,7 @@ public class GithubAsset
 [InitializeOnLoad]
 public class MLAPIEditor : EditorWindow
 {
-    private const int COMPATIBLE_ARTIFACT_PATH_VERSION = 1;
+    private const int COMPATIBLE_ARTIFACT_PATH_VERSION = 2;
     private const string API_URL = "https://api.github.com/repos/MidLevel/MLAPI/releases";
     private const string TRANSPORT_ARTIFACT_PATH_URL = "https://api.github.com/repos/MidLevel/MLAPI.Transports/contents/artifact_paths.json";
     private const string TRANSPORT_ARTIFACT_DOWNLOAD_URL_TEMPLATE = "https://ci.appveyor.com/api/projects/MidLevel/MLAPI-Transports/artifacts/<path>?branch=master";
@@ -428,6 +431,28 @@ private void OnGUI()
                                 EditorGUILayout.Space();
                             }
 
+                            if (transportArtifacts.artifacts[i].required_build_targets == null)
+                            {
+                                transportArtifacts.artifacts[i].required_build_targets = new int[0];
+                            }
+
+                            for (int j = 0; j < transportArtifacts.artifacts[i].required_build_targets.Length; j++)
+                            {
+                                try
+                                {
+                                    if (!MLAPIEditorExtensions.IsPlatformSupported((BuildTarget)transportArtifacts.artifacts[i].required_build_targets[j]))
+                                    {
+                                        EditorGUILayout.HelpBox("This transport requires the " + ((BuildTarget)transportArtifacts.artifacts[i].required_build_targets[j]) + " build target to be installed!", MessageType.Warning);
+                                        break;
+                                    }
+                                }
+                                catch (Exception)
+                                {
+
+                                }
+                            }
+
+
                             if (transportArtifacts.artifacts[i].experimental)
                             {
                                 EditorGUILayout.Space();
@@ -516,8 +541,10 @@ private void OnGUI()
         {
             releases = new GithubRelease[0];
             releaseFoldoutStatus = new bool[0];
-            if (EditorPrefs.HasKey(Application.productName + "/MLAPI_version")) EditorPrefs.DeleteKey(Application.productName + "/MLAPI_version");
-            if (EditorPrefs.HasKey(Application.productName + "/MLAPI_lastUpdated")) EditorPrefs.DeleteKey(Application.productName + "/MLAPI_lastUpdated");
+            if (EditorPrefs.HasKey(Application.productName + "/MLAPI_version"))
+                EditorPrefs.DeleteKey(Application.productName + "/MLAPI_version");
+            if (EditorPrefs.HasKey(Application.productName + "/MLAPI_lastUpdated"))
+                EditorPrefs.DeleteKey(Application.productName + "/MLAPI_lastUpdated");
         }
 
         GUILayout.EndArea();
@@ -607,7 +634,8 @@ private IEnumerator InstallRelease(int index)
             waiting = false;
         }
 
-        while (waiting) yield return null;
+        while (waiting)
+            yield return null;
 
         if (accepted)
         {
@@ -762,17 +790,17 @@ private IEnumerator InstallTransport(int index)
 
                     foreach (ZipStorer.ZipFileEntry entry in dir)
                     {
-                        if (useNet35 && entry.FilenameInZip.Contains("net35"))
+                        if (useNet35 && entry.FilenameInZip.Contains("net35") && entry.FilenameInZip.Length > entry.FilenameInZip.LastIndexOf("net35", StringComparison.Ordinal) + 6)
                         {
                             int lastIndexOfNet35 = entry.FilenameInZip.LastIndexOf("net35", StringComparison.Ordinal);
-                            string fileSubPath = entry.FilenameInZip.Substring(lastIndexOfNet35, entry.FilenameInZip.Length - lastIndexOfNet35);
+                            string fileSubPath = entry.FilenameInZip.Substring(lastIndexOfNet35 + 6, entry.FilenameInZip.Length - (lastIndexOfNet35 + 6));
 
                             zip.ExtractFile(entry, Path.Combine(transportDirectory, fileSubPath));
                         }
-                        else if (useNet45 && entry.FilenameInZip.Contains("net45"))
+                        else if (useNet45 && entry.FilenameInZip.Contains("net45") && entry.FilenameInZip.Length > entry.FilenameInZip.LastIndexOf("net35", StringComparison.Ordinal) + 6)
                         {
                             int lastIndexOfNet45 = entry.FilenameInZip.LastIndexOf("net45", StringComparison.Ordinal);
-                            string fileSubPath = entry.FilenameInZip.Substring(lastIndexOfNet45, entry.FilenameInZip.Length - lastIndexOfNet45);
+                            string fileSubPath = entry.FilenameInZip.Substring(lastIndexOfNet45 + 6, entry.FilenameInZip.Length - (lastIndexOfNet45 + 6));
 
                             zip.ExtractFile(entry, Path.Combine(transportDirectory, fileSubPath));
                         }
@@ -830,7 +858,7 @@ private IEnumerator FetchAll()
                 isParsing = true;
                 string json = www.downloadHandler.text;
 
-                //This makes it from a json array to the individual objects in the array. 
+                //This makes it from a json array to the individual objects in the array.
                 //The JSON serializer cant take arrays. We have to split it up outselves.
                 List<string> releasesJson = new List<string>();
                 int depth = 0;
@@ -986,7 +1014,8 @@ private void Stop()
 
         void Update()
         {
-            if (!coroutine.MoveNext()) Stop();
+            if (!coroutine.MoveNext())
+                Stop();
         }
     }
 }
@@ -1031,6 +1060,22 @@ public static Rect GetEditorMainWindowPos()
         }
         throw new NotSupportedException("Can't find internal main window. Maybe something has changed inside Unity");
     }
+
+    public static bool IsPlatformSupported(BuildTarget target)
+    {
+        try
+        {
+            Type moduleManager = Type.GetType("UnityEditor.Modules.ModuleManager,UnityEditor.dll");
+            MethodInfo isPlatformSupportLoadedMethod = moduleManager.GetMethod("IsPlatformSupportLoaded", BindingFlags.Static | BindingFlags.NonPublic);
+            MethodInfo getTargetStringFromBuildTargetMethod = moduleManager.GetMethod("GetTargetStringFromBuildTarget", BindingFlags.Static | BindingFlags.NonPublic);
+
+            return (bool)isPlatformSupportLoadedMethod.Invoke(null, new object[] { (string)getTargetStringFromBuildTargetMethod.Invoke(null, new object[] { target }) });
+        }
+        catch (Exception)
+        {
+            return true;
+        }
+    }
 }
 
 #region ZipStorer
@@ -1074,7 +1119,7 @@ public class ZipStorer : IDisposable
         /// </summary>
         public enum Compression : ushort
         {
-            /// <summary>Uncompressed storage</summary> 
+            /// <summary>Uncompressed storage</summary>
             Store = 0,
             /// <summary>Deflate compression method</summary>
             Deflate = 8
@@ -1257,7 +1302,7 @@ public static ZipStorer Open(Stream _stream, FileAccess _access, bool _leaveOpen
         /// <param name="_method">Compression method</param>
         /// <param name="_pathname">Full path of file to add to Zip storage</param>
         /// <param name="_filenameInZip">Filename and path as desired in Zip directory</param>
-        /// <param name="_comment">Comment for stored file</param>        
+        /// <param name="_comment">Comment for stored file</param>
         public ZipFileEntry AddFile(Compression _method, string _pathname, string _filenameInZip, string _comment = null)
         {
             if (Access == FileAccess.Read)
@@ -1277,7 +1322,7 @@ public ZipFileEntry AddStream(Compression _method, string _filenameInZip, Stream
         {
 #if NOASYNC
             return this.AddStreamAsync(_method, _filenameInZip, _source, _modTime, _comment);
-#else            
+#else
             return Task.Run(() => this.AddStreamAsync(_method, _filenameInZip, _source, _modTime, _comment)).Result;
 #endif
         }
@@ -1292,8 +1337,8 @@ public ZipFileEntry AddStream(Compression _method, string _filenameInZip, Stream
         /// <param name="_comment">Comment for stored file</param>
 #if NOASYNC
         private ZipFileEntry
-#else                
-        public async Task<ZipFileEntry> 
+#else
+        public async Task<ZipFileEntry>
 #endif
         AddStreamAsync(Compression _method, string _filenameInZip, Stream _source, DateTime _modTime, string _comment = null)
         {
@@ -1410,7 +1455,7 @@ public void Close()
         }
 
         /// <summary>
-        /// Read all the file records in the central directory 
+        /// Read all the file records in the central directory
         /// </summary>
         /// <returns>List of all entries in directory</returns>
         public List<ZipFileEntry> ReadCentralDir()
@@ -1514,7 +1559,7 @@ public bool ExtractFile(ZipFileEntry _zfe, Stream _stream)
         {
 #if NOASYNC
             return this.ExtractFileAsync(_zfe, _stream);
-#else                
+#else
             return Task.Run(() => ExtractFileAsync(_zfe, _stream)).Result;
 #endif
         }
@@ -1528,8 +1573,8 @@ public bool ExtractFile(ZipFileEntry _zfe, Stream _stream)
         /// <remarks>Unique compression methods are Store and Deflate</remarks>
 #if NOASYNC
         private bool
-#else                
-        public async Task<bool> 
+#else
+        public async Task<bool>
 #endif
         ExtractFileAsync(ZipFileEntry _zfe, Stream _stream)
         {
@@ -1703,7 +1748,7 @@ private void WriteLocalHeader(ZipFileEntry _zfe)
             byte[] extraInfo = this.CreateExtraInfo(_zfe);
 
             this.ZipFileStream.Write(new byte[] { 80, 75, 3, 4, 20, 0 }, 0, 6); // No extra header
-            this.ZipFileStream.Write(BitConverter.GetBytes((ushort)(_zfe.EncodeUTF8 ? 0x0800 : 0)), 0, 2); // filename and comment encoding 
+            this.ZipFileStream.Write(BitConverter.GetBytes((ushort)(_zfe.EncodeUTF8 ? 0x0800 : 0)), 0, 2); // filename and comment encoding
             this.ZipFileStream.Write(BitConverter.GetBytes((ushort)_zfe.Method), 0, 2);  // zipping method
             this.ZipFileStream.Write(BitConverter.GetBytes(DateTimeToDosTime(_zfe.ModifyTime)), 0, 4); // zipping date and time
             this.ZipFileStream.Write(new byte[] { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, 0, 12); // unused CRC, un/compressed size, updated later
@@ -1745,7 +1790,7 @@ private void WriteCentralDirRecord(ZipFileEntry _zfe)
             byte[] extraInfo = this.CreateExtraInfo(_zfe);
 
             this.ZipFileStream.Write(new byte[] { 80, 75, 1, 2, 23, 0xB, 20, 0 }, 0, 8);
-            this.ZipFileStream.Write(BitConverter.GetBytes((ushort)(_zfe.EncodeUTF8 ? 0x0800 : 0)), 0, 2); // filename and comment encoding 
+            this.ZipFileStream.Write(BitConverter.GetBytes((ushort)(_zfe.EncodeUTF8 ? 0x0800 : 0)), 0, 2); // filename and comment encoding
             this.ZipFileStream.Write(BitConverter.GetBytes((ushort)_zfe.Method), 0, 2);  // zipping method
             this.ZipFileStream.Write(BitConverter.GetBytes(DateTimeToDosTime(_zfe.ModifyTime)), 0, 4);  // zipping date and time
             this.ZipFileStream.Write(BitConverter.GetBytes(_zfe.Crc32), 0, 4); // file CRC
@@ -1771,16 +1816,16 @@ private uint get32bitSize(long size)
             return size >= 0xFFFFFFFF ? 0xFFFFFFFF : (uint)size;
         }
 
-        /* 
+        /*
         Zip64 end of central directory record
-            zip64 end of central dir 
+            zip64 end of central dir
             signature                       4 bytes  (0x06064b50)
             size of zip64 end of central
             directory record                8 bytes
             version made by                 2 bytes
             version needed to extract       2 bytes
             number of this disk             4 bytes
-            number of the disk with the 
+            number of the disk with the
             start of the central directory  4 bytes
             total number of entries in the
             central directory on this disk  8 bytes
@@ -1790,13 +1835,13 @@ size of the central directory   8 bytes
             offset of start of central
             directory with respect to
             the starting disk number        8 bytes
-            zip64 extensible data sector    (variable size)        
-        
+            zip64 extensible data sector    (variable size)
+
         Zip64 end of central directory locator
-            zip64 end of central dir locator 
+            zip64 end of central dir locator
             signature                       4 bytes  (0x07064b50)
             number of the disk with the
-            start of the zip64 end of 
+            start of the zip64 end of
             central directory               4 bytes
             relative offset of the zip64
             end of central directory record 8 bytes
@@ -1826,19 +1871,19 @@ private void WriteEndRecord(long _size, long _offset)
             this.ZipFileStream.Write(new byte[] { 80, 75, 6, 6 }, 0, 4);
             this.ZipFileStream.Write(BitConverter.GetBytes((Int64)44), 0, 8); // size of zip64 end of central directory
             this.ZipFileStream.Write(BitConverter.GetBytes((UInt16)45), 0, 2); // version made by
-            this.ZipFileStream.Write(BitConverter.GetBytes((UInt16)45), 0, 2); // version needed to extract 
+            this.ZipFileStream.Write(BitConverter.GetBytes((UInt16)45), 0, 2); // version needed to extract
             this.ZipFileStream.Write(BitConverter.GetBytes((UInt32)0), 0, 4); // current disk
-            this.ZipFileStream.Write(BitConverter.GetBytes((UInt32)0), 0, 4); // start of central directory 
+            this.ZipFileStream.Write(BitConverter.GetBytes((UInt32)0), 0, 4); // start of central directory
             this.ZipFileStream.Write(BitConverter.GetBytes((Int64)Files.Count + ExistingFiles), 0, 8); // total number of entries in the central directory in disk
             this.ZipFileStream.Write(BitConverter.GetBytes((Int64)Files.Count + ExistingFiles), 0, 8); // total number of entries in the central directory
             this.ZipFileStream.Write(BitConverter.GetBytes(_size), 0, 8); // size of the central directory
             this.ZipFileStream.Write(BitConverter.GetBytes(_offset), 0, 8); // offset of start of central directory with respect to the starting disk number
 
             // Zip64 end of central directory locator
             this.ZipFileStream.Write(new byte[] { 80, 75, 6, 7 }, 0, 4);
-            this.ZipFileStream.Write(BitConverter.GetBytes((UInt32)0), 0, 4); // number of the disk 
+            this.ZipFileStream.Write(BitConverter.GetBytes((UInt32)0), 0, 4); // number of the disk
             this.ZipFileStream.Write(BitConverter.GetBytes(dirOffset), 0, 8); // relative offset of the zip64 end of central directory record
-            this.ZipFileStream.Write(BitConverter.GetBytes((UInt32)1), 0, 4); // total number of disks 
+            this.ZipFileStream.Write(BitConverter.GetBytes((UInt32)1), 0, 4); // total number of disks
 
             Encoding encoder = this.EncodeUTF8 ? Encoding.UTF8 : DefaultEncoding;
             byte[] encodedComment = encoder.GetBytes(this.Comment);
@@ -1852,8 +1897,8 @@ private void WriteEndRecord(long _size, long _offset)
         // Copies all the source file into the zip storage
 #if NOASYNC
         private Compression
-#else                
-        private async Task<Compression> 
+#else
+        private async Task<Compression>
 #endif
         Store(ZipFileEntry _zfe, Stream _source)
         {
@@ -1882,7 +1927,7 @@ private async Task<Compression>
                 bytesRead = await _source.ReadAsync(buffer, 0, buffer.Length);
                 if (bytesRead > 0)
                     await outStream.WriteAsync(buffer, 0, bytesRead);
-#endif 
+#endif
 
                 for (uint i = 0; i < bytesRead; i++)
                 {
@@ -1921,14 +1966,14 @@ private async Task<Compression>
         }
 
         /* DOS Date and time:
-            MS-DOS date. The date is a packed value with the following format. Bits Description 
-                0-4 Day of the month (1–31) 
-                5-8 Month (1 = January, 2 = February, and so on) 
-                9-15 Year offset from 1980 (add 1980 to get actual year) 
-            MS-DOS time. The time is a packed value with the following format. Bits Description 
-                0-4 Second divided by 2 
-                5-10 Minute (0–59) 
-                11-15 Hour (0–23 on a 24-hour clock) 
+            MS-DOS date. The date is a packed value with the following format. Bits Description
+                0-4 Day of the month (1–31)
+                5-8 Month (1 = January, 2 = February, and so on)
+                9-15 Year offset from 1980 (add 1980 to get actual year)
+            MS-DOS time. The time is a packed value with the following format. Bits Description
+                0-4 Second divided by 2
+                5-10 Minute (0–59)
+                11-15 Hour (0–23 on a 24-hour clock)
         */
         private uint DateTimeToDosTime(DateTime _dt)
         {
@@ -2021,7 +2066,7 @@ private void ReadExtraInfo(byte[] buffer, int offset, ZipFileEntry _zfe)
         }
 
         /* CRC32 algorithm
-          The 'magic number' for the CRC is 0xdebb20e3.  
+          The 'magic number' for the CRC is 0xdebb20e3.
           The proper CRC pre and post conditioning is used, meaning that the CRC register is
           pre-conditioned with all ones (a starting value of 0xffffffff) and the value is post-conditioned by
           taking the one's complement of the CRC residual.
@@ -2141,4 +2186,4 @@ public void Dispose()
         #endregion
     }
 }
-#endregion
+#endregion