Import: Allow directory names with dots #2807

Signed-off-by: Michael Mayer <michael@photoprism.app>

internal/api/folders_search.go

@@ -67,7 +67,7 @@ func SearchFolders(router *gin.RouterGroup, urlPath, rootName, rootPath string)
 		listFiles := f.Files
 		uncached := listFiles || f.Uncached
 		resp := FoldersResponse{Root: rootName, Recursive: recursive, Cached: !uncached}
-		path := clean.Path(c.Param("path"))
+		path := clean.UserPath(c.Param("path"))
 
 		cacheKey := fmt.Sprintf("folder:%s:%t:%t", filepath.Join(rootName, path), recursive, listFiles)
 

internal/api/import.go

@@ -58,10 +58,10 @@ func StartImport(router *gin.RouterGroup) {
 		importPath := conf.ImportPath()
 
 		// Import from sub-folder?
-		if srcFolder = clean.Path(c.Param("path")); srcFolder != "" && srcFolder != "/" {
-			srcFolder = strings.Replace(srcFolder, ".", "", -1)
+		if srcFolder = c.Param("path"); srcFolder != "" && srcFolder != "/" {
+			srcFolder = clean.UserPath(srcFolder)
 		} else if f.Path != "" {
-			srcFolder = strings.Replace(f.Path, ".", "", -1)
+			srcFolder = clean.UserPath(f.Path)
 		}
 
 		// To avoid conflicts, uploads are imported from "import_path/upload/session_ref/timestamp".

internal/form/user.go

@@ -33,8 +33,8 @@ func NewUserFromCli(ctx *cli.Context) User {
 		CanLogin:    !ctx.Bool("no-login"),
 		WebDAV:      ctx.Bool("webdav"),
 		UserAttr:    clean.Attr(ctx.String("attr")),
-		BasePath:    clean.Path(ctx.String("base-path")),
-		UploadPath:  clean.Path(ctx.String("upload-path")),
+		BasePath:    clean.UserPath(ctx.String("base-path")),
+		UploadPath:  clean.UserPath(ctx.String("upload-path")),
 		Password:    clean.Password(ctx.String("password")),
 	}
 }

pkg/clean/path.go

@@ -32,7 +32,7 @@ func Path(s string) string {
 	return s
 }
 
-// UserPath sanitizes and normalizes a user provided path so it can be used
+// UserPath sanitizes and normalizes a user provided path, so it can be used.
 func UserPath(dir string) string {
 	if dir == "" {
 		return dir