Implement puzzle deletion and theme management; enhance logging in theme creation

Author: Eric-Philippe

controllers/puzzles.go

@@ -224,8 +224,25 @@ func (p *PuzzleController) DeletePuzzle(c *gin.Context) {
 		return
 	}
 
-	// TODO: Implement puzzle deletion
-	// This would remove the puzzle directory and .alghive file
+	// Delete the puzzle opened directory if it exists, and the .alghive file
+	puzzleDir := filepath.Join(services.PuzzlesDir, themeName, puzzleName)
+	if err := services.RemoveAll(puzzleDir); err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to delete puzzle directory"})
+		return
+	}
+	alghiveFile := filepath.Join(services.PuzzlesDir, themeName, puzzleName+".alghive")
+	if err := services.RemoveAll(alghiveFile); err != nil {
+		c.JSON(http.StatusInternalServerError, gin.H{"error": "Failed to delete puzzle file"})
+		return
+	}
+	
+	// Remove puzzle from theme
+	for i, puzzle := range theme.Puzzles {
+		if puzzle.GetName() == puzzleName {
+			theme.Puzzles = append(theme.Puzzles[:i], theme.Puzzles[i+1:]...)
+			break
+		}
+	}
 
 	c.JSON(http.StatusOK, gin.H{"message": "Puzzle deleted"})
 }

services/loader.go

@@ -3,6 +3,7 @@ package services
 import (
 	"archive/zip"
 	"io"
+	"log"
 	"os"
 	"path/filepath"
 	"sync"
@@ -163,54 +164,62 @@ func (p *PuzzlesLoader) HasTheme(name string) bool {
 	return p.GetTheme(name) != nil
 }
 
-// CreateTheme creates a new theme
 func (p *PuzzlesLoader) CreateTheme(name string) error {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	
-	if p.HasTheme(name) {
-		return os.ErrExist
-	}
-	
-	themePath := filepath.Join(PuzzlesDir, name)
-	err := os.MkdirAll(themePath, 0755)
-	if err != nil {
-		return err
-	}
-	
-	p.Themes = append(p.Themes, models.Theme{
-		Name: name,
-		Path: themePath,
-		Puzzles: []models.Puzzle{},
-	})
-	
-	return nil
+    log.Printf("Creating theme: %s", name)
+
+    p.mu.Lock()
+    defer p.mu.Unlock()
+
+    // Avoid calling HasTheme here to prevent a lock conflict
+    for _, theme := range p.Themes {
+        if theme.Name == name {
+            return os.ErrExist
+        }
+    }
+
+    themePath := filepath.Join(PuzzlesDir, name)
+    err := os.MkdirAll(themePath, 0755)
+    if err != nil {
+        return err
+    }
+
+    p.Themes = append(p.Themes, models.Theme{
+        Name:    name,
+        Path:    themePath,
+        Puzzles: []models.Puzzle{},
+    })
+
+    return nil
 }
 
-// DeleteTheme deletes a theme
 func (p *PuzzlesLoader) DeleteTheme(name string) error {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	
-	theme := p.GetTheme(name)
-	if theme == nil {
-		return os.ErrNotExist
-	}
-	
-	err := os.RemoveAll(theme.Path)
-	if err != nil {
-		return err
-	}
-	
-	// Remove theme from slice
-	for i, t := range p.Themes {
-		if t.Name == name {
-			p.Themes = append(p.Themes[:i], p.Themes[i+1:]...)
-			break
-		}
-	}
-	
-	return nil
+    p.mu.Lock()
+    defer p.mu.Unlock()
+
+    idx := -1
+    var themePath string
+
+    for i, theme := range p.Themes {
+        if theme.Name == name {
+            idx = i
+            themePath = theme.Path
+            break
+        }
+    }
+
+    if idx == -1 {
+        return os.ErrNotExist
+    }
+
+    err := os.RemoveAll(themePath)
+    if err != nil {
+        return err
+    }
+
+    // Remove theme from slice
+    p.Themes = append(p.Themes[:idx], p.Themes[idx+1:]...)
+
+    return nil
 }
 
 // GetPuzzleSizes returns the compressed and uncompressed sizes of a puzzle

services/utils.go

@@ -19,3 +19,8 @@ func GetDirSize(path string) (int64, error) {
 	})
 	return size, err
 }
+
+// RemoveAll removes a directory and all its contents
+func RemoveAll(path string) error {
+	return os.RemoveAll(path)
+}