Deal with macos / juce zip __MACOSX directory stuff (#7254)

the __MACOSX directory is special. juce zipfile doesn't treat it as so. Now we do. Basically. Closes #7249
surge-synthesizer · Oct 14, 2023 · ef61c49 · ef61c49
1 parent ac92a7b
commit ef61c49
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/src/surge-xt/gui/SkinSupport.cpp b/src/surge-xt/gui/SkinSupport.cpp
@@ -141,8 +141,15 @@ void SkinDB::rescanForSkins(SurgeStorage *storage)
                     {
                         if (fs::is_directory(d))
                         {
-                            alldirs.push_back(d);
-                            workStack.push_back(d);
+                            if (d.path().filename().u8string() == "__MACOSX")
+                            {
+                                // skip this mis-zipped dir. See #7249
+                            }
+                            else
+                            {
+                                alldirs.push_back(d);
+                                workStack.push_back(d);
+                            }
                         }
                     }
                 }

diff --git a/src/surge-xt/gui/SurgeGUIEditor.cpp b/src/surge-xt/gui/SurgeGUIEditor.cpp
@@ -224,6 +224,19 @@ class DroppedUserDataHandler
                       << std::endl;
             return false;
         }
+
+        // mac zip can create a place for the finder bundle that juce
+        // unzips as opposed to applies. Nuke it. See #7249
+        if (fs::is_directory(uncompressTo / "__MACOSX"))
+        {
+            try
+            {
+                fs::remove_all(uncompressTo / "__MACOSX");
+            }
+            catch (const fs::filesystem_error &)
+            {
+            }
+        }
         return true;
     }