Merge pull request #3 from ganhao2001/main

Add some environment variables during local development

Author: ganhao2001

Makefile

@@ -1,4 +1,3 @@
-PORT := $(shell if [ -f .env ]; then grep PORT .env | cut -d '=' -f2; else echo "7320"; fi)
 
 BINARY=mywebdav
 MAIN_FILE=main.go
@@ -13,8 +12,8 @@ help:
 
 .PHONY: run
 run: fmt
-	@echo "Running application on port ${PORT}..."
-	go run $(MAIN_FILE) -port=$(PORT)
+	@echo "Running application "
+	go run $(MAIN_FILE)
 
 .PHONY: fmt
 fmt:

README.md

@@ -78,15 +78,6 @@ This project supports two ways to run: **Local Development** and **Deployment on
 
 > Suitable for quick testing and development phases.
 
-#### 📁 Directory Setup:
-
-**Create a folder named `crater` in the project root directory to simulate file handling behavior:**
-
-```bash
-mkdir crater
-```
-
-This directory will act as the root for file uploads and processing.
 
 #### 📄 Configuration:
 
@@ -96,8 +87,22 @@ Create a `.env` file at the root directory to customize local ports. This file i
 
 ```env
 PORT=xxxx
+ROOTDIR="/crater"
 ```
 
+#### 📁 Directory Setup:
+
+**Create a folder named `crater` in the project root directory to simulate file handling behavior.**
+
+**Alternatively, you can modify the `ROOTDIR` in the .env file and use it as the root directory for your testing.**
+
+```bash
+mkdir crater
+```
+
+This directory will act as the root for file processing.
+
+
 #### 🚀 Run the Application:
 
 ```bash

go.mod

@@ -53,6 +53,7 @@ require (
 	github.com/jackc/pgx/v5 v5.3.0 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
+	github.com/joho/godotenv v1.5.1
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect

go.sum

@@ -71,6 +71,8 @@ github.com/jinzhu/now v1.1.2/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/
 github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
+github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
+github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=

main.go

@@ -8,6 +8,7 @@ import (
 	"webdav/service"
 
 	"github.com/gin-gonic/gin"
+	"github.com/joho/godotenv"
 )
 
 func main() {
@@ -19,6 +20,16 @@ func main() {
 	}
 
 	query.SetDefault(query.DB)
+	if gin.Mode() == gin.DebugMode {
+		err = godotenv.Load(".env")
+		if err != nil {
+			logutils.Log.Info("can't load env,err:", err)
+		}
+	}
+	port := os.Getenv("PORT")
+	if port == "" {
+		port = "7320" // 默认端口
+	}
 
 	go service.StartCheckSpace()
 	methods := []string{
@@ -35,10 +46,7 @@ func main() {
 	webdavGroup := r.Group("api/ss", service.WebDAVMiddleware())
 	service.RegisterDataset(webdavGroup)
 	service.RegisterFile(webdavGroup)
-	port := os.Getenv("PORT")
-	if port == "" {
-		port = "7320" // 默认端口
-	}
+
 	err = r.Run(":" + port)
 	if err != nil {
 		logutils.Log.Fatal(err)

service/file.go

@@ -41,9 +41,16 @@ type Permissions struct {
 
 func checkfs() {
 	fsonce.Do(func() {
+		rootDir := "/crater"
+		if gin.Mode() == gin.DebugMode {
+			if envDir := os.Getenv("ROOTDIR"); envDir != "" {
+				rootDir = envDir
+				logutils.Log.Infof("WebDAV root set from ROOTDIR: %s", rootDir)
+			}
+		}
 		fs = &webdav.Handler{
 			Prefix:     "/api/ss",
-			FileSystem: webdav.Dir("/crater"),
+			FileSystem: webdav.Dir(rootDir),
 			LockSystem: webdav.NewMemLS(),
 		}
 	})