feat: Add more code

dadav · Feb 28, 2024 · b252d98 · b252d98
1 parent 1c4aede
commit b252d98
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 58 deletions.
diff --git a/cmd/serve.go b/cmd/serve.go
@@ -19,7 +19,6 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"os"
 	"path/filepath"
 	"strings"
 
@@ -69,26 +68,10 @@ to quickly create a Cobra application.`,
 				return nil, errors.New("not implemented")
 			}, func(r *http.Request, data []byte) error {
 				if strings.HasPrefix(r.URL.Path, "/v3/files") {
-					releaseFile := filepath.Base(r.URL.Path)
-					module := v3.ReleaseToModule(strings.TrimSuffix(releaseFile, ".tar.gz"))
-					cacheFileDir := filepath.Join(config.ModulesDir, module)
-
-					if _, err := os.Stat(cacheFileDir); err != nil {
-						if errors.Is(err, os.ErrNotExist) {
-							err = os.MkdirAll(cacheFileDir, os.ModePerm)
-							if err != nil {
-								return err
-							}
-						} else {
-							return err
-						}
-					}
-					cacheFile := filepath.Join(cacheFileDir, releaseFile)
-					err := os.WriteFile(cacheFile, data, 0644)
-					if err != nil {
-						return err
-					}
-					return backend.ConfiguredBackend.LoadModules()
+					releaseFile := strings.TrimSuffix(filepath.Base(r.URL.Path), ".tar.gz")
+					module := v3.ReleaseToModule(releaseFile)
+					version := strings.TrimPrefix(releaseFile, module)
+					return backend.ConfiguredBackend.AddRelease(module, version, data)
 				}
 				return errors.New("no caching")
 			}))

diff --git a/internal/backend/filesystem.go b/internal/backend/filesystem.go
@@ -77,27 +77,31 @@ func (s *FilesystemBackend) GetAllReleases() []*gen.Release {
 	return result
 }
 
-func (s *FilesystemBackend) AddRelease(name string, data []byte) error {
+func (s *FilesystemBackend) AddRelease(name, version string, data []byte) error {
+	releaseFile := fmt.Sprintf("%s-%s.tar.gz", name, version)
+	cacheFileDir := filepath.Join(config.ModulesDir, name)
+	if _, err := os.Stat(cacheFileDir); err != nil {
+		if errors.Is(err, os.ErrNotExist) {
+			err = os.MkdirAll(cacheFileDir, os.ModePerm)
+			if err != nil {
+				return err
+			}
+		} else {
+			return err
+		}
+	}
+
+	cacheFile := filepath.Join(cacheFileDir, releaseFile)
+	_, err := os.Stat(cacheFile)
+	if err == nil {
+		return nil
+	}
+
+	err = os.WriteFile(cacheFile, data, 0644)
+	if err != nil {
+		return err
+	}
 	return nil
-	// module := v3.ReleaseToModule(name)
-	// cacheFileDir := filepath.Join(config.ModulesDir, module)
-	//
-	// if _, err := os.Stat(cacheFileDir); err != nil {
-	// 	if errors.Is(err, os.ErrNotExist) {
-	// 		err = os.MkdirAll(cacheFileDir, os.ModePerm)
-	// 		if err != nil {
-	// 			return err
-	// 		}
-	// 	} else {
-	// 		return err
-	// 	}
-	// }
-	// cacheFile := filepath.Join(cacheFileDir, releaseFile)
-	// err := os.WriteFile(cacheFile, data, 0644)
-	// if err != nil {
-	// 	return err
-	// }
-	// return nil
 }
 
 func (s *FilesystemBackend) GetAllModules() []*gen.Module {

diff --git a/internal/backend/interface.go b/internal/backend/interface.go
@@ -19,5 +19,5 @@ type Backend interface {
 	GetReleaseBySlug(string) (*gen.Release, error)
 
 	// Add a new release
-	AddRelease(releaseName string, data []byte) error
+	AddRelease(module string, version string, data []byte) error
 }
diff --git a/internal/middleware/cache.go b/internal/middleware/cache.go
@@ -14,22 +14,6 @@ func CacheMiddleware(readCacheCallback func(r *http.Request) ([]byte, error), wr
 				return
 			}
 
-			// if err != nil {
-			// 	log.Log.Debugf("Skipping caching of %s?\n", r.URL.Path, r.URL.RawQuery)
-			// 	next.ServeHTTP(w, r)
-			// 	return
-			// }
-
-			// if _, err := os.Stat(cacheFile); err == nil {
-			// 	content, err := os.ReadFile(cacheFile)
-			// 	if err != nil {
-			// 		http.Error(w, "Failed to read cache", http.StatusInternalServerError)
-			// 		return
-			// 	}
-			// w.Write(data)
-			// 	return
-			// }
-
 			capturedResponseWriter := &capturedResponseWriter{ResponseWriter: w}
 			next.ServeHTTP(capturedResponseWriter, r)