fix: gracefully handle empty module identifier

spicetify · Jun 27, 2024 · d4f9fc1 · d4f9fc1
1 parent c40af9d
commit d4f9fc1
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 19 deletions.
diff --git a/build/darwin/Contents/Resources/Scripts/main.applescript b/build/darwin/Contents/Resources/Scripts/main.applescript
diff --git a/build/darwin/Contents/Resources/Scripts/main.scpt b/build/darwin/Contents/Resources/Scripts/main.scpt
diff --git a/build/darwin/Contents/Resources/Scripts/main.scpt.old b/build/darwin/Contents/Resources/Scripts/main.scpt.old
diff --git a/module/module.go b/module/module.go
@@ -175,10 +175,12 @@ func EnableModuleInVault(identifier StoreIdentifier) error {
 	module.Enabled = identifier.Version
 	vault.setModule(identifier.ModuleIdentifier, module)
 
-	destroySymlink(identifier.ModuleIdentifier)
-	if len(module.Enabled) > 0 {
-		if err := createSymlink(identifier); err != nil {
-			return err
+	if len(string(identifier.ModuleIdentifier)) > 0 {
+		destroySymlink(identifier.ModuleIdentifier)
+		if len(string(module.Enabled)) > 0 {
+			if err := createSymlink(identifier); err != nil {
+				return err
+			}
 		}
 	}
 

diff --git a/module/vault.go b/module/vault.go
@@ -114,7 +114,7 @@ type StoreIdentifier struct {
 	Version
 }
 
-var storeIdentifierRe = regexp.MustCompile(`^(?<module_identifier>[^@]+)@(?<version>[^@]*)$`)
+var storeIdentifierRe = regexp.MustCompile(`^(?<module_identifier>[^@]*)@(?<version>[^@]*)$`)
 
 func NewStoreIdentifier(identifier string) StoreIdentifier {
 	parts := storeIdentifierRe.FindStringSubmatch(identifier)