OBB fix, readme update

TrentSterling · Dec 9, 2019 · d612274 · d612274
1 parent 8eea85e
commit d612274
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/Assets/Plugins/BetterStreamingAssets/BSA_BetterStreamingAssets.cs b/Assets/Plugins/BetterStreamingAssets/BSA_BetterStreamingAssets.cs
@@ -519,7 +519,7 @@ private static int GetDirectoryIndex(string path)
 
             // find first file there
             var index = Array.BinarySearch(s_paths, path, StringComparer.OrdinalIgnoreCase);
-            if ( index > 0 )
+            if ( index >= 0 )
                 return ~index;
 
             // if the end, no such directory exists
@@ -577,15 +577,22 @@ private static void GetStreamingAssetsInfoFromJar(string apkPath, List<string> p
                             var fileName = Encoding.UTF8.GetString(header.Filename);
                             if (fileName.StartsWith(prefix) && !fileName.StartsWith(assetsPrefix))
                             {
-                                Debug.LogAssertionFormat("BetterStreamingAssets: file {0} seems to be a Streaming Asset, but is compressed. Ignoring.", fileName);
+                                Debug.LogAssertionFormat("BetterStreamingAssets: file {0} seems to be a Streaming Asset, but is compressed. If this is a App Bundle build, see README for a possible workaround.", fileName);
                             }
 #endif
                             // we only want uncompressed files
                         }
                         else
                         {
                             var fileName = Encoding.UTF8.GetString(header.Filename);
-                            if ( fileName.StartsWith(prefix) )
+
+                            if (fileName.EndsWith("/"))
+                            {
+                                // there's some strangeness when it comes to OBB: directories are listed as files
+                                // simply ignoring them should be enough
+                                Debug.Assert(header.UncompressedSize == 0);
+                            }
+                            else if ( fileName.StartsWith(prefix) )
                             {
                                 // ignore normal assets...
                                 if ( fileName.StartsWith(assetsPrefix) )

diff --git a/Assets/Plugins/BetterStreamingAssets/Editor/BSA_BetterStreamingAssetsTests.cs b/Assets/Plugins/BetterStreamingAssets/Editor/BSA_BetterStreamingAssetsTests.cs
@@ -20,7 +20,7 @@ public class BetterStreamingAssetsTests
         private const int TexturesCount = 2;
         private const int BundlesTypesCount = 3;
 
-        private const string TestDirName = "BSATest";
+        private const string TestDirName = "bsatest";
         private const string TestPath = "Assets/StreamingAssets/" + TestDirName;
         private const string TestResourcesPath = "Assets/Resources/" + TestDirName;
         private const int TestFiles = SizesCount * 2 + SizesCount * 2 * BundlesTypesCount + TexturesCount * BundlesTypesCount + TexturesCount;
@@ -48,10 +48,10 @@ public static void GenerateTestData()
                 long mb = 1024 * 1024;
                 foreach ( var size in SizesMB )
                 {
-                    var p = "Assets/raw_compressable_" + size.ToString("00") + "MB.bytes";
+                    var p = "Assets/raw_compressable_" + size.ToString("00") + "mb.bytes";
                     paths.Add(p);
                     CreateZeroFile(p, size * mb);
-                    p = "Assets/raw_uncompressable_" + size.ToString("00") + "MB.bytes";
+                    p = "Assets/raw_uncompressable_" + size.ToString("00") + "mb.bytes";
                     paths.Add(p);
                     CreateRandomFile(p, size * mb, random);
                 }

diff --git a/Assets/Plugins/BetterStreamingAssets/README.txt b/Assets/Plugins/BetterStreamingAssets/README.txt
@@ -13,6 +13,10 @@ Support/Feedback: [email protected]
 Twitter:          @gwiazdorrr
 Support Page:     http://dmprog.pl/unity-plugins/
 
+Note on Android & App Bundles
+------------------
+App Bundles (.aab) builds are bugged when it comes to Streaming Assets. See https://github.com/gwiazdorrr/BetterStreamingAssets/issues/10 for details. The bottom line is:
+!!! Keep all file names in Streaming Assets lowercase! !!!
 
 Usage:
 ------