com.elestrago.unity.package-tools 2.2.0 → 2.2.1

package/CAHNGELOG.md

@@ -2,6 +2,14 @@
 
 ---
 
+## [2.2.1](https://gitlab.com/elestrago-pkg/package-tool/-/tags/2.2.1)
+
+### Added
+
+- Added cleanup of empty ancestor folders under `Assets/Samples/` after the `Claude Skills` post-import hook finishes, so importing the sample leaves no stub `Assets/Samples/<Package>/<Version>/` directories behind.
+
+---
+
 ## [2.2.0](https://gitlab.com/elestrago-pkg/package-tool/-/tags/2.2.0)
 
 ### Added

package/Samples~/ClaudeSkills/Editor/ClaudeSkillsPostImport.cs

@@ -152,10 +152,56 @@ namespace PackageTool.Samples.ClaudeSkills
 				"{0} Done. Installed: {1}, Replaced: {2}, Skipped: {3}.",
 				LOG_PREFIX, installed, replaced, skipped);
 
-			AssetDatabase.DeleteAsset(sampleRootAssetPath);
+			DeleteSampleAndEmptyAncestors(sampleRootAssetPath);
+		}
+
+		private static void DeleteSampleAndEmptyAncestors(string sampleRootAssetPath)
+		{
+			if (!AssetDatabase.DeleteAsset(sampleRootAssetPath))
+			{
+				Debug.LogWarningFormat(
+					"{0} Could not remove imported sample folder [{1}].",
+					LOG_PREFIX,
+					sampleRootAssetPath);
+				AssetDatabase.Refresh();
+				return;
+			}
+
+			// Walk up Assets/Samples/<Package>/<Version>/<Sample>, removing each ancestor that the
+			// just-deleted sample left empty. Bounded to the Assets/Samples subtree so we never
+			// touch unrelated project folders.
+			var current = GetParentAssetPath(sampleRootAssetPath);
+			while (!string.IsNullOrEmpty(current) && IsWithinSamplesTree(current))
+			{
+				var fullPath = Path.GetFullPath(current);
+				if (!Directory.Exists(fullPath))
+					break;
+				if (Directory.GetFileSystemEntries(fullPath).Length > 0)
+					break;
+				if (!AssetDatabase.DeleteAsset(current))
+					break;
+
+				Debug.LogFormat("{0} Removed empty folder [{1}].", LOG_PREFIX, current);
+				current = GetParentAssetPath(current);
+			}
+
 			AssetDatabase.Refresh();
 		}
 
+		private static string GetParentAssetPath(string assetPath)
+		{
+			if (string.IsNullOrEmpty(assetPath))
+				return null;
+			var lastSlash = assetPath.LastIndexOf('/');
+			return lastSlash <= 0 ? null : assetPath.Substring(0, lastSlash);
+		}
+
+		private static bool IsWithinSamplesTree(string assetPath)
+		{
+			return string.Equals(assetPath, "Assets/Samples", StringComparison.Ordinal)
+				|| assetPath.StartsWith("Assets/Samples/", StringComparison.Ordinal);
+		}
+
 		private static void CopySkillDirectory(string source, string destination)
 		{
 			Directory.CreateDirectory(destination);

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "com.elestrago.unity.package-tools",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "displayName": "Package Tool",
   "description": "Tool for create unity packages",
   "category": "unity",
   "unity": "2021.3",
   "homepage": "https://gitlab.com/elestrago-pkg/package-tool",
-  "documentationUrl": "https://gitlab.com/elestrago-pkg/package-tool/-/blob/2.2.0/README.md",
-  "changelogUrl": "https://gitlab.com/elestrago-pkg/package-tool/-/blob/2.2.0/CHANGELOG.md",
-  "licensesUrl": "https://gitlab.com/elestrago-pkg/package-tool/-/blob/2.2.0/LICENSE",
+  "documentationUrl": "https://gitlab.com/elestrago-pkg/package-tool/-/blob/2.2.1/README.md",
+  "changelogUrl": "https://gitlab.com/elestrago-pkg/package-tool/-/blob/2.2.1/CHANGELOG.md",
+  "licensesUrl": "https://gitlab.com/elestrago-pkg/package-tool/-/blob/2.2.1/LICENSE",
   "license": "MIT",
   "keywords": [
     "unity",