From 2c4e740e6eb8497e2c210c2faafb579193e99192 Mon Sep 17 00:00:00 2001 From: Piotr Date: Sat, 1 Jun 2024 14:33:22 +0200 Subject: [PATCH] Add zip create functionality to map executor The zip-create.go file was introduced to provide functionality for creating zip files. Changes were also made in the map-executor.go file to integrate this new zip create function. The implemented function takes a file path and archive file name as input and creates a zip archive. --- cmd/worker/actions/zip/zip-create.go | 129 +++++++++++++++++++++++++++ internal/executor/map-executor.go | 2 + 2 files changed, 131 insertions(+) create mode 100644 cmd/worker/actions/zip/zip-create.go diff --git a/cmd/worker/actions/zip/zip-create.go b/cmd/worker/actions/zip/zip-create.go new file mode 100644 index 0000000..3ff1e7b --- /dev/null +++ b/cmd/worker/actions/zip/zip-create.go @@ -0,0 +1,129 @@ +package zip + +import ( + "archive/zip" + "github.com/PiotrFerenc/mash2/cmd/worker/actions" + "github.com/PiotrFerenc/mash2/internal/configuration" + "github.com/PiotrFerenc/mash2/internal/types" + "io" + "os" + "path/filepath" +) + +type archiveToFile struct { + config *configuration.Config + filePath actions.Property + archiveFileName actions.Property + createdArchivePath actions.Property +} + +func CreateArchiveToFile(config *configuration.Config) actions.Action { + return &archiveToFile{ + config: config, + filePath: actions.Property{ + Name: "filePath", + Type: actions.Text, + Description: "The path of the directory to be archived", + DisplayName: "Directory Path", + Validation: "required", + }, + archiveFileName: actions.Property{ + Name: "archiveFileName", + Type: actions.Text, + Description: "The name of the archive file", + DisplayName: "Archive File Name", + Validation: "required", + }, + createdArchivePath: actions.Property{ + Name: "createdArchivePath", + Type: actions.Text, + Description: "The path where the new archive was created", + DisplayName: "Created Archive Path", + Validation: "", + }, + } +} +func (action *archiveToFile) GetCategoryName() string { + return "zip" +} + +func (action *archiveToFile) Inputs() []actions.Property { + return []actions.Property{ + action.filePath, + action.archiveFileName, + } +} + +func (action *archiveToFile) Outputs() []actions.Property { + return []actions.Property{ + action.createdArchivePath, + } +} + +// Execute performs the archive to file action. +// It takes a Process message as input, extracts the file path and archive file name properties from the message, +// creates a new archive file at the specified path, and adds the files from the specified file path to the archive. +// The resulting archive file path is set as a property in the message. +// +// Parameters: +// - message: The input Process message containing the file path and archive file name properties. +// +// Returns: +// - types.Process: The modified Process message with the archive file path property set. +// - error: An error if any occurred during the execution. +func (action *archiveToFile) Execute(message types.Process) (types.Process, error) { + filePath, err := action.filePath.GetStringFrom(&message) + if err != nil { + return types.Process{}, err + } + archiveFileName, err := action.archiveFileName.GetStringFrom(&message) + if err != nil { + return types.Process{}, err + } + archiveFullPath := filepath.Join(action.config.Folder.TmpFolder, archiveFileName) + archiveFile, err := os.Create(archiveFullPath) + if err != nil { + return types.Process{}, err + } + defer archiveFile.Close() + + zipWriter := zip.NewWriter(archiveFile) + defer zipWriter.Close() + + err = filepath.Walk(filePath, func(path string, info os.FileInfo, err error) error { + if err != nil { + return err + } + + // Only add files to the archive, skip directories + //if info.IsDir() { + // return nil + //} + + fileToZip, err := os.Open(path) + if err != nil { + return err + } + defer fileToZip.Close() + + header, err := zip.FileInfoHeader(info) + if err != nil { + return err + } + + header.Method = zip.Deflate + writer, err := zipWriter.CreateHeader(header) + if err != nil { + return err + } + + _, err = io.Copy(writer, fileToZip) + return err + }) + if err != nil { + return types.Process{}, err + } + + message.SetString(action.createdArchivePath.Name, archiveFullPath) + return message, nil +} diff --git a/internal/executor/map-executor.go b/internal/executor/map-executor.go index 9c80217..09c83aa 100644 --- a/internal/executor/map-executor.go +++ b/internal/executor/map-executor.go @@ -10,6 +10,7 @@ import ( "github.com/PiotrFerenc/mash2/cmd/worker/actions/git" "github.com/PiotrFerenc/mash2/cmd/worker/actions/math" "github.com/PiotrFerenc/mash2/cmd/worker/actions/others" + "github.com/PiotrFerenc/mash2/cmd/worker/actions/zip" "github.com/PiotrFerenc/mash2/internal/configuration" "github.com/PiotrFerenc/mash2/internal/queues" "github.com/PiotrFerenc/mash2/internal/types" @@ -122,6 +123,7 @@ func CreateActionMap(config *configuration.Config) map[string]actions.Action { "file-create": file.CreateContentToFile(config), "docker-run": docker.CreateDockerRun(), "docker-remove": docker.CreateDockerRemove(), + "zip-create": zip.CreateArchiveToFile(), "file-delete": file.CreateDeleteFileAction(config), "file-append": file.CreateAppendContentToFile(config), //"for-each": common.CreateForEachLoop(),