Merge branch 'master' into globbing

ddvk · Sep 24, 2024 · 5f8bea5 · 5f8bea5
2 parents 702474f + 52c6d12
commit 5f8bea5
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/archive/blob.go b/archive/blob.go
@@ -37,7 +37,7 @@ func (d *DocumentFiles) AddMap(name, filepath string) {
 // Prepare prepares a file for uploading (creates needed temp files or unpacks a zip)
 func Prepare(name, parentId, sourceDocPath, ext, tmpDir string) (files *DocumentFiles, id string, err error) {
 	files = &DocumentFiles{}
-	if ext == util.ZIP {
+	if ext == util.ZIP || ext == util.RMDOC {
 		var metadataPath string
 		id, files, metadataPath, err = Unpack(sourceDocPath, tmpDir)
 		if err != nil {

diff --git a/shell/mget.go b/shell/mget.go
@@ -12,6 +12,7 @@ import (
 	"github.com/abiosoft/ishell"
 	"github.com/juruen/rmapi/filetree"
 	"github.com/juruen/rmapi/model"
+	"github.com/juruen/rmapi/util"
 )
 
 func mgetCmd(ctx *ShellCtxt) *ishell.Cmd {
@@ -62,7 +63,7 @@ func mgetCmd(ctx *ShellCtxt) *ishell.Cmd {
 						idxDir = 1
 					}
 
-					fileName := currentNode.Name() + ".zip"
+					fileName := fmt.Sprintf("%s.%s",currentNode.Name(), util.RMDOC)
 
 					dst := path.Join(target, filetree.BuildPath(currentPath[idxDir:], fileName))
 					fileMap[dst] = struct{}{}

diff --git a/shell/mput.go b/shell/mput.go
@@ -10,7 +10,7 @@ import (
 	"github.com/abiosoft/ishell"
 	"github.com/juruen/rmapi/log"
 	"github.com/juruen/rmapi/util"
-	flag "github.com/ogier/pflag"
+	"flag"
 )
 
 func mputCmd(ctx *ShellCtxt) *ishell.Cmd {
@@ -20,7 +20,7 @@ func mputCmd(ctx *ShellCtxt) *ishell.Cmd {
 		Completer: createFsEntryCompleter(),
 		Func: func(c *ishell.Context) {
 			flagSet := flag.NewFlagSet("mput", flag.ContinueOnError)
-			src := flagSet.StringP("src", "s", "", "source dir")
+			src := flagSet.String("src", "", "source dir")
 
 			if err := flagSet.Parse(c.Args); err != nil {
 				if err != flag.ErrHelp {
@@ -41,6 +41,7 @@ func mputCmd(ctx *ShellCtxt) *ishell.Cmd {
 			}
 
 			dst := argRest[0]
+			fmt.Println("dest:", dst)
 
 			// Past this point, the number of arguments is 1.