Add uuiddir as variable. fix #14

Author: git001

.github/workflows/go.yml

@@ -16,13 +16,13 @@ jobs:
     - name: Set up Go
       uses: actions/setup-go@v3
       with:
-        go-version: 1.20.7
+        go-version: 1.20.10
 
     - name: Download xcaddy
-      run: curl -vLO https://github.com/caddyserver/xcaddy/releases/download/v0.3.4/xcaddy_0.3.4_linux_amd64.tar.gz
+      run: curl -vLO https://github.com/caddyserver/xcaddy/releases/download/v0.3.4/xcaddy_0.3.5_linux_amd64.tar.gz
 
     - name: Extract xcaddy
-      run: tar xfvz xcaddy_0.3.4_linux_amd64.tar.gz
+      run: tar xfvz xcaddy_0.3.5_linux_amd64.tar.gz
 
     - name: Build
       run: ./xcaddy build --with github.com/kirsch33/realip --with github.com/caddyserver/jsonc-adapter --with github.com/git001/caddyv2-upload

Dockerfile

@@ -1,9 +1,9 @@
 FROM ubuntu:latest
 
-ENV XCADDY_VERSION=0.3.4 \
-    GOLANG_VERSION=20.7 \
+ENV XCADDY_VERSION=0.3.5 \
+    GOLANG_VERSION=20.10 \
     APPPORT=:2011 \
-    UPLOADER_VERSION=0.14
+    UPLOADER_VERSION=0.15
 
 COPY docker-files /
 

README.adoc

@@ -101,6 +101,9 @@ The following Variables will be added to the request flow
 |**http.upload.directory**
 |The directory where the file is uploaded
 
+|**http.upload.uuiddir**
+|The name of the random directory created if `create_uuid_dir` is enabled
+
 |===
 
 === JSON

docker-files/opt/webroot/templates/upload-resp-template.txt

@@ -8,3 +8,5 @@ http.upload.filename: {{placeholder "http.upload.filename"}}
 http.upload.filesize: {{placeholder "http.upload.filesize"}}
 http.upload.directory: {{placeholder "http.upload.directory"}}
 
+http.upload.uuiddir: {{placeholder "http.upload.uuiddir"}}
+

upload.go

@@ -16,7 +16,7 @@ import (
 )
 
 const (
-	Version = "0.14"
+	Version = "0.15"
 )
 
 func init() {
@@ -235,18 +235,19 @@ func (u Upload) ServeHTTP(w http.ResponseWriter, r *http.Request, next caddyhttp
 	concatDir := caddyhttp.SanitizedPathJoin(u.RootDir, u.DestDir)
 
 	if u.CreateUuidDir {
-		uuidDir := uuid.New()
+		uuidDir := uuid.New().String()
 
 		// It's very unlikely that the uuidDir already exists, but just in case
 		for {
-			if _, err := os.Stat(caddyhttp.SanitizedPathJoin(concatDir, uuidDir.String())); os.IsNotExist(err) {
+			if _, err := os.Stat(caddyhttp.SanitizedPathJoin(concatDir, uuidDir)); os.IsNotExist(err) {
 				break
 			} else {
-				uuidDir = uuid.New()
+				uuidDir = uuid.New().String()
 			}
 		}
 
-		concatDir = caddyhttp.SanitizedPathJoin(concatDir, uuidDir.String())
+		concatDir = caddyhttp.SanitizedPathJoin(concatDir, uuidDir)
+		repl.Set("http.upload.uuiddir", uuidDir)
 	}
 
 	if err := os.MkdirAll(concatDir, 0755); err != nil {