james/yarr
4
0
Fork 0
mirror of https://github.com/nkanaev/yarr.git synced 2025-12-16 00:50:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add non-root url path support

Browse Source
This commit is contained in:
hcl
2021-01-25 17:52:15 +08:00
committed by nkanaev
parent 63b265fa04
commit 4f79c919f0
6 changed files with 97 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
main.go
View File

@@ -4,14 +4,15 @@ import (
"bufio"
"flag"
"fmt"
"github.com/nkanaev/yarr/platform"
"github.com/nkanaev/yarr/server"
"github.com/nkanaev/yarr/storage"
sdopen "github.com/skratchdot/open-golang/open"
"log"
"os"
"path/filepath"
"strings"
"github.com/nkanaev/yarr/platform"
"github.com/nkanaev/yarr/server"
"github.com/nkanaev/yarr/storage"
sdopen "github.com/skratchdot/open-golang/open"
)
var Version string = "0.0"
@@ -22,6 +23,7 @@ func main() {
var ver, open bool
flag.StringVar(&addr, "addr", "127.0.0.1:7070", "address to run server on")
flag.StringVar(&authfile, "auth-file", "", "path to a file containing username:password")
flag.StringVar(&server.BasePath, "base", "", "base path of the service url")
flag.StringVar(&certfile, "cert-file", "", "path to cert file for https")
flag.StringVar(&keyfile, "key-file", "", "path to key file for https")
flag.StringVar(&db, "db", "", "storage file path")
@@ -34,6 +36,16 @@ func main() {
return
}
if server.BasePath != "" && !strings.HasPrefix(server.BasePath, "/") {
server.BasePath = "/" + server.BasePath
}
if server.BasePath != "" && strings.HasSuffix(server.BasePath, "/") {
server.BasePath = strings.TrimSuffix(server.BasePath, "/")
}
server.BasePathReady <- true
logger := log.New(os.Stdout, "", log.Ldate|log.Ltime|log.Lshortfile)
configPath, err := os.UserConfigDir()