clean code

cmd/cli/main.go

@@ -196,6 +196,18 @@ func viewWebsite(scAddress string, config *pkgConfig.Config) error {
 	logger.Infof("Website owner: %s", owner)
 
 	zipFile, err := webmanager.RequestWebsite(scAddress, &config.NetworkInfos)
+
+	firstCreationTimestamp, err := website.GetFirstCreationTimestamp(&config.NetworkInfos, address)
+	if err != nil {
+		logger.Warnf("failed to get first creation timestamp of %s: %v", address, err)
+	}
+
+	lastUpdateTimestamp, err := website.GetLastUpdateTimestamp(&config.NetworkInfos, address)
+	if err != nil {
+		logger.Warnf("failed to get last update timestamp of %s: %v", address, err)
+	}
+
+	websiteBytes, err := website.Fetch(&config.NetworkInfos, address)
 	if err != nil {
 		return fmt.Errorf("failed to request website: %v", err)
 	}
@@ -207,10 +219,9 @@ func viewWebsite(scAddress string, config *pkgConfig.Config) error {
 		return fmt.Errorf("failed to get file %s from zip: %v", fileName, err)
 	}
 
-	logger.Infof("viewing content for %s:\n %s", scAddress, indexFile)
 	prettyPrintUnixTimestamp(int64(firstCreationTimestamp), int64(lastUpdateTimestamp))
 
-	logger.Infof("%s content:\n %s", fileName, content)
+	logger.Infof("viewing content for %s:\n %s", scAddress, indexFile)
 
 	return nil
 }

pkg/website/delete.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 
 	"github.com/massalabs/DeWeb/pkg/config"
-	"github.com/massalabs/station/pkg/logger"
 	"github.com/massalabs/station/pkg/node/sendoperation"
 	"github.com/massalabs/station/pkg/node/sendoperation/signer"
 	"github.com/massalabs/station/pkg/onchain"
@@ -31,7 +30,5 @@ func Delete(conf *config.Config, address string) (*string, error) {
 		return nil, fmt.Errorf("deleting website: %w", err)
 	}
 
-	logger.Infof("Event received : %s", res.Event)
-
 	return &res.OperationResponse.OperationID, nil
 }

pkg/website/read.go

@@ -65,33 +65,45 @@ func fetchAllChunks(client *node.Client, websiteAddress string, chunkNumber int3
 }
 
 // GetOwner retrieves the owner of the website.
-func GetOwner(network *config.NetworkInfos, websiteAddress string) (string, uint64, uint64, error) {
+func GetOwner(network *config.NetworkInfos, websiteAddress string) (string, error) {
 	client := node.NewClient(network.NodeURL)
 
 	ownerResponse, err := node.FetchDatastoreEntry(client, websiteAddress, convert.ToBytes(ownerKey))
 	if err != nil {
-		return "", 0, 0, fmt.Errorf("fetching website owner: %w", err)
+		return "", fmt.Errorf("fetching website owner: %w", err)
 	}
 
+	return string(ownerResponse.FinalValue), nil
+}
+
+func GetFirstCreationTimestamp(network *config.NetworkInfos, websiteAddress string) (uint64, error) {
+	client := node.NewClient(network.NodeURL)
+
 	firstCreationTimestampResponse, err := node.FetchDatastoreEntry(client, websiteAddress, convert.ToBytes(firstCreationTimestampKey))
 	if err != nil {
-		return "", 0, 0, fmt.Errorf("fetching website first creation timestamp: %w", err)
+		return 0, fmt.Errorf("fetching website first creation timestamp: %w", err)
 	}
 
-	lastUpdateTimestampResponse, err := node.FetchDatastoreEntry(client, websiteAddress, convert.ToBytes(lastUpdateTimestampKey))
+	castedFCTimestamp, err := convert.BytesToU64(firstCreationTimestampResponse.FinalValue)
 	if err != nil {
-		return "", 0, 0, fmt.Errorf("fetching website last update timestamp: %w", err)
+		return 0, fmt.Errorf("converting website first creation timestamp: %w", err)
 	}
 
-	castedFCTimestamp, err := convert.BytesToU64(firstCreationTimestampResponse.FinalValue)
+	return castedFCTimestamp, nil
+}
+
+func GetLastUpdateTimestamp(network *config.NetworkInfos, websiteAddress string) (uint64, error) {
+	client := node.NewClient(network.NodeURL)
+
+	lastUpdateTimestampResponse, err := node.FetchDatastoreEntry(client, websiteAddress, convert.ToBytes(firstCreationTimestampKey))
 	if err != nil {
-		return "", 0, 0, fmt.Errorf("converting website first creation timestamp: %w", err)
+		return 0, fmt.Errorf("fetching website last update timestamp: %w", err)
 	}
 
 	castedLUTimestamp, err := convert.BytesToU64(lastUpdateTimestampResponse.FinalValue)
 	if err != nil {
-		return "", 0, 0, fmt.Errorf("converting website last update timestamp: %w", err)
+		return 0, fmt.Errorf("converting website last update timestamp: %w", err)
 	}
 
-	return string(ownerResponse.FinalValue), castedFCTimestamp, castedLUTimestamp, nil
+	return castedLUTimestamp, nil
 }