Include proper image cleanup

cmd/backend/images.go

@@ -6,11 +6,9 @@ import (
 	"image"
 	"io"
 	"io/fs"
-	"log"
 	"os"
 	"path/filepath"
 	"strings"
-	"time"
 
 	"github.com/chai2010/webp"
 	"github.com/disintegration/imaging"
@@ -49,58 +47,67 @@ func SaveImage(src io.Reader, maxHeight, maxWidth int, path string) (string, err
 	return filename, nil
 }
 
-func CleanUpImages(c *Config) {
-	for {
-		if err := filepath.Walk(c.PicsDir, func(path string, info fs.FileInfo, err error) error {
-			if err != nil {
-				return err
+func CleanUpImages(c *Config, db *DB) error {
+	if err := filepath.Walk(c.PicsDir, func(path string, info fs.FileInfo, err error) error {
+		if err != nil {
+			return fmt.Errorf("error walking images filepath: %v", err)
+		}
+
+		if !info.IsDir() {
+			imageName := info.Name()
+			imagePath := path
+			imageWasFound := false
+
+			if err = filepath.Walk(c.ArticleDir, func(path string, info fs.FileInfo, err error) error {
+				if err != nil {
+					return fmt.Errorf("error walking articles filepath: %v", err)
+				}
+
+				if !info.IsDir() {
+					mdFile, err := os.Open(path)
+					if err != nil {
+						return fmt.Errorf("error opening article %v: %v", info.Name(), err)
+					}
+					defer mdFile.Close()
+
+					scanner := bufio.NewScanner(mdFile)
+
+					for scanner.Scan() {
+						if strings.Contains(scanner.Text(), imageName) {
+							imageWasFound = true
+						}
+					}
+
+					return scanner.Err()
+				}
+
+				return nil
+			}); err != nil {
+				return fmt.Errorf("error walking articles filepath: %v", err)
 			}
 
-			if !info.IsDir() {
-				imageName := info.Name()
-				absImageName := path
+			users, err := db.GetAllUsers(c)
+			if err != nil {
+				return fmt.Errorf("error getting all users: %v", err)
+			}
 
-				if err = filepath.Walk(c.ArticleDir, func(path string, info fs.FileInfo, err error) error {
-					if err != nil {
-						return err
-					}
-
-					if !info.IsDir() {
-						mdFile, err := os.Open(path)
-						if err != nil {
-							return err
-						}
-						defer mdFile.Close()
-
-						scanner := bufio.NewScanner(mdFile)
-						imageWasFound := false
-
-						for scanner.Scan() {
-							if strings.Contains(scanner.Text(), imageName) {
-								imageWasFound = true
-							}
-						}
-
-						if !imageWasFound {
-							if err = os.Remove(absImageName); err != nil {
-								return err
-							}
-						}
-
-						return scanner.Err()
-					}
-
-					return nil
-				}); err != nil {
-					return err
+			for _, user := range users {
+				if imageName == user.ProfilePicLink {
+					imageWasFound = true
 				}
 			}
 
-			return nil
-		}); err != nil {
-			log.Println(err)
+			if !imageWasFound {
+				if err = os.Remove(imagePath); err != nil {
+					return fmt.Errorf("error removing unused image: %v", err)
+				}
+			}
 		}
 
-		time.Sleep(time.Hour)
+		return nil
+	}); err != nil {
+		return fmt.Errorf("error cleaning up: %v", err)
 	}
+
+	return nil
 }