From bd467f0fb258c1f6bdb6c395d932bced70082f8e Mon Sep 17 00:00:00 2001 From: Phoebe Lartisant Date: Thu, 8 Aug 2024 16:23:31 +0200 Subject: [PATCH] Revert "add delete fn" This reverts commit f790544fa72a1461c6c15cbcc5ba49d4907ed475. --- cmd/cli/main.go | 24 ------------------------ pkg/webmanager/manager.go | 4 ++-- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/cmd/cli/main.go b/cmd/cli/main.go index a59c0ec..e9323a8 100644 --- a/cmd/cli/main.go +++ b/cmd/cli/main.go @@ -11,10 +11,8 @@ import ( "github.com/massalabs/DeWeb/int/utils" "github.com/massalabs/DeWeb/int/zipper" pkgConfig "github.com/massalabs/DeWeb/pkg/config" - "github.com/massalabs/DeWeb/pkg/webmanager" "github.com/massalabs/DeWeb/pkg/website" msConfig "github.com/massalabs/station/int/config" - "github.com/massalabs/station/pkg/cache" "github.com/massalabs/station/pkg/logger" "github.com/urfave/cli/v2" ) @@ -254,7 +252,6 @@ func viewWebsite(scAddress string, networkInfos *msConfig.NetworkInfos) error { logger.Infof("Website owner: %s", owner) // For debugging cache purposes: - // zipFile, err := webmanager.RequestWebsite(scAddress, networkInfos) zipFile, err := website.Fetch(networkInfos, scAddress) if err != nil { @@ -294,27 +291,6 @@ func deleteWebsite(siteAddress string, config *yamlConfig.Config) error { logger.Infof("Website %s deleted with operation ID: %s", siteAddress, *operationID) - err = deleteFromCache(siteAddress) - if err != nil { - return fmt.Errorf("failed to delete %s from cache: %v", siteAddress, err) - } - - logger.Infof("Website %s deleted from cache", siteAddress) - - return nil -} - -func deleteFromCache(scAddress string) error { - cache := new(cache.Cache) - fileName := fmt.Sprintf("website_%s.zip", scAddress) - - if cache.IsPresent(fileName) { - err := os.Remove(webmanager.CacheDir + fileName) - if err != nil { - return fmt.Errorf("failed to delete from cache: %v", err) - } - } - return nil } diff --git a/pkg/webmanager/manager.go b/pkg/webmanager/manager.go index 2a026de..82d5c9a 100644 --- a/pkg/webmanager/manager.go +++ b/pkg/webmanager/manager.go @@ -12,7 +12,7 @@ import ( "github.com/massalabs/station/pkg/logger" ) -const CacheDir = "./websitesCache/" +const cacheDir = "./websitesCache/" // getWebsiteResource fetches a resource from a website and returns its content. func GetWebsiteResource(network *msConfig.NetworkInfos, websiteAddress, resourceName string) ([]byte, bool, error) { @@ -100,7 +100,7 @@ func fetchAndCache(networkInfo *msConfig.NetworkInfos, scAddress string, cache * // Compares the last updated timestamp to the file's last modified timestamp. func isFileOutdated(fileName string, lastUpdated time.Time) (bool, error) { - fi, err := os.Stat(CacheDir + fileName) + fi, err := os.Stat(cacheDir + fileName) if err != nil { return false, fmt.Errorf("failed to get file info: %w", err) }