- case insensitive extension comparison

- return error if file extension is not supported

Author: ddvk

api/api.go

@@ -210,11 +210,15 @@ func (ctx *ApiCtx) UploadDocument(parentId string, sourceDocPath string) (*model
 		return nil, errors.New("file name is invalid")
 	}
 
+	if !util.IsFileTypeSupported(ext) {
+		return nil, errors.New("unsupported file extension: " + ext)
+	}
+
 	id := ""
 	var err error
 
 	//restore document
-	if ext == ".zip" {
+	if ext == "zip" {
 		id, err = archive.GetIdFromZip(sourceDocPath)
 		if err != nil {
 			return nil, err

archive/zipdoc.go

@@ -8,10 +8,9 @@ import (
 	"image/jpeg"
 	"io/ioutil"
 	"os"
-	"path/filepath"
-	"strings"
 
 	"github.com/juruen/rmapi/log"
+	"github.com/juruen/rmapi/util"
 	"github.com/nfnt/resize"
 	pdfmodel "github.com/unidoc/unipdf/v3/model"
 	"github.com/unidoc/unipdf/v3/render"
@@ -52,7 +51,7 @@ func makeThumbnail(pdf []byte) ([]byte, error) {
 	return out.Bytes(), nil
 }
 
-// gets the Document UUID from an archive
+// GetIdFromZip tries to get the Document UUID from an archive
 func GetIdFromZip(srcPath string) (id string, err error) {
 	file, err := os.Open(srcPath)
 	if err != nil {
@@ -73,7 +72,8 @@ func GetIdFromZip(srcPath string) (id string, err error) {
 }
 
 func CreateZipDocument(id, srcPath string) (zipPath string, err error) {
-	ext := strings.TrimPrefix(filepath.Ext(srcPath), ".")
+	_, ext := util.DocPathToName(srcPath)
+
 	if ext == "zip" {
 		zipPath = srcPath
 		return

shell/mput.go

@@ -66,16 +66,6 @@ func mputCmd(ctx *ShellCtxt) *ishell.Cmd {
 	}
 }
 
-// Checks whether the file has a pdf, epub or zip extension.
-//
-// Input -> [string] Valid file name.
-// Returns -> true if the file is a pdf or epub, false otherwise
-func checkFileType(fName string) bool {
-	return (strings.Contains(fName, ".pdf") ||
-		strings.Contains(fName, ".epub") ||
-		strings.Contains(fName, ".zip"))
-}
-
 // Print the required spaces and characters for tree formatting.
 //
 // Input -> [*ishell.Context]
@@ -184,32 +174,33 @@ func putFilesAndDirs(pCtx *ShellCtxt, pC *ishell.Context, localDir string, depth
 
 		case mode.IsRegular():
 
-			// Is a file.
-			if checkFileType(name) {
-				// Is a pdf or epub file
+			docName, ext := util.DocPathToName(name)
+
+			if !util.IsFileTypeSupported(ext) {
+				continue
+			}
+
+			_, err := pCtx.api.Filetree.NodeByPath(docName, pCtx.node)
 
-				docName, _ := util.DocPathToName(name)
-				_, err := pCtx.api.Filetree.NodeByPath(docName, pCtx.node)
+			if err == nil {
+				// Document already exists.
+				treeFormat(pC, depth, index, lSize, tFS)
+				pC.Printf("document [%s] already exists\n", name)
+			} else {
+				// Document does not exist.
+				treeFormat(pC, depth, index, lSize, tFS)
+				pC.Printf("uploading: [%s]...", name)
+				doc, err := pCtx.api.UploadDocument(pCtx.node.Id(), name)
 
-				if err == nil {
-					// Document already exists.
-					treeFormat(pC, depth, index, lSize, tFS)
-					pC.Printf("document [%s] already exists\n", name)
+				if err != nil {
+					pC.Err(fmt.Errorf("failed to upload file %s", name))
 				} else {
-					// Document does not exist.
-					treeFormat(pC, depth, index, lSize, tFS)
-					pC.Printf("uploading: [%s]...", name)
-					doc, err := pCtx.api.UploadDocument(pCtx.node.Id(), name)
-
-					if err != nil {
-						pC.Err(fmt.Errorf("failed to upload file %s", name))
-					} else {
-						// Document uploaded successfully.
-						pC.Println(" complete")
-						pCtx.api.Filetree.AddDocument(*doc)
-					}
+					// Document uploaded successfully.
+					pC.Println(" complete")
+					pCtx.api.Filetree.AddDocument(*doc)
 				}
 			}
+
 		}
 	}
 

shell/put.go

@@ -48,7 +48,7 @@ func putCmd(ctx *ShellCtxt) *ishell.Cmd {
 			document, err := ctx.api.UploadDocument(dstDir, srcName)
 
 			if err != nil {
-				c.Err(errors.New(fmt.Sprint("Failed to upload file", srcName, err.Error())))
+				c.Err(fmt.Errorf("Failed to upload file [%s] %v", srcName, err))
 				return
 			}
 

util/util.go

@@ -11,9 +11,21 @@ import (
 	"github.com/juruen/rmapi/model"
 )
 
+var supportedExt = map[string]bool{
+	"epub": true,
+	"pdf":  true,
+	"zip":  true,
+}
+
+func IsFileTypeSupported(ext string) bool {
+	return supportedExt[ext]
+}
+
+// DocPathToName extracts the file name and file extension (without .) from a given path
 func DocPathToName(p string) (name string, ext string) {
-	ext = path.Ext(p)
-	name = strings.TrimSuffix(path.Base(p), path.Ext(p))
+	tmpExt := path.Ext(p)
+	name = strings.TrimSuffix(path.Base(p), tmpExt)
+	ext = strings.ToLower(strings.TrimPrefix(tmpExt, "."))
 	return
 }