From 36e05561cc0e0d038dbc84c21357b972bacaf5ba Mon Sep 17 00:00:00 2001
From: John Guo <john@johng.cn>
Date: Tue, 14 Dec 2021 23:49:08 +0800
Subject: [PATCH] improve Export feature for package gres

---
 os/gres/gres.go             |  4 ++--
 os/gres/gres_resource.go    | 31 +++++++++++++++++++++++++------
 os/gres/gres_z_unit_test.go | 18 ++++++++++++++++++
 3 files changed, 45 insertions(+), 8 deletions(-)

diff --git a/os/gres/gres.go b/os/gres/gres.go
index 123dd7e0a..7bb9e815d 100644
--- a/os/gres/gres.go
+++ b/os/gres/gres.go
@@ -78,8 +78,8 @@ func ScanDirFile(path string, pattern string, recursive ...bool) []*File {
 }
 
 // Export exports and saves specified path `src` and all its sub files to specified system path `dst` recursively.
-func Export(src, dst string) error {
-	return defaultResource.Export(src, dst)
+func Export(src, dst string, option ...ExportOption) error {
+	return defaultResource.Export(src, dst, option...)
 }
 
 // Dump prints the files of the default resource object.
diff --git a/os/gres/gres_resource.go b/os/gres/gres_resource.go
index 74a10686a..1a925d444 100644
--- a/os/gres/gres_resource.go
+++ b/os/gres/gres_resource.go
@@ -17,6 +17,7 @@ import (
 	"github.com/gogf/gf/v2/internal/intlog"
 	"github.com/gogf/gf/v2/os/gfile"
 	"github.com/gogf/gf/v2/os/gtime"
+	"github.com/gogf/gf/v2/text/gstr"
 )
 
 type Resource struct {
@@ -224,15 +225,33 @@ func (r *Resource) doScanDir(path string, pattern string, recursive bool, onlyFi
 	return files
 }
 
-// Export exports and saves specified path `src` and all its sub files to specified system path `dst` recursively.
-func (r *Resource) Export(src, dst string) error {
+// ExportOption is the option for function Export.
+type ExportOption struct {
+	RemovePrefix string // Remove the prefix of file name from resource.
+}
+
+// Export exports and saves specified path `srcPath` and all its sub files to specified system path `dstPath` recursively.
+func (r *Resource) Export(src, dst string, option ...ExportOption) error {
 	var (
-		err   error
-		path  string
-		files = r.doScanDir(src, "*", true, false)
+		err          error
+		name         string
+		path         string
+		exportOption ExportOption
+		files        = r.doScanDir(src, "*", true, false)
 	)
+	if len(option) > 0 {
+		exportOption = option[0]
+	}
 	for _, file := range files {
-		path = gfile.Join(dst, file.Name())
+		name = file.Name()
+		if exportOption.RemovePrefix != "" {
+			name = gstr.TrimLeftStr(name, exportOption.RemovePrefix)
+		}
+		name = gstr.Trim(name, `\/`)
+		if name == "" {
+			continue
+		}
+		path = gfile.Join(dst, name)
 		if file.FileInfo().IsDir() {
 			err = gfile.Mkdir(path)
 		} else {
diff --git a/os/gres/gres_z_unit_test.go b/os/gres/gres_z_unit_test.go
index 0e3e514fb..6ace54c95 100644
--- a/os/gres/gres_z_unit_test.go
+++ b/os/gres/gres_z_unit_test.go
@@ -249,4 +249,22 @@ func Test_Export(t *testing.T) {
 		name := `template/index.html`
 		t.Assert(gfile.GetContents(gfile.Join(dst, name)), gres.GetContent(name))
 	})
+	gtest.C(t, func(t *gtest.T) {
+		var (
+			src = `template`
+			dst = gfile.TempDir(gtime.TimestampNanoStr())
+			err = gres.Export(src, dst, gres.ExportOption{
+				RemovePrefix: `template`,
+			})
+		)
+		defer gfile.Remove(dst)
+		t.AssertNil(err)
+		files, err := gfile.ScanDir(dst, "*", true)
+		t.AssertNil(err)
+		t.Assert(len(files), 13)
+
+		nameInRes := `template/index.html`
+		nameInSys := `index.html`
+		t.Assert(gfile.GetContents(gfile.Join(dst, nameInSys)), gres.GetContent(nameInRes))
+	})
 }