From 38127948bd599ffed4d76729396598382e8f9d20 Mon Sep 17 00:00:00 2001 From: restitux Date: Wed, 4 Jan 2023 21:34:26 -0700 Subject: [PATCH] Refactor into client + server backends --- client_api/describe.go | 25 +++++ .../get_episodes.go => client_api/episodes.go | 18 ++-- client_api/in_progress.go | 23 +++++ client_api/recently_added.go | 23 +++++ client_api/server.go | 24 +++++ client_api/shows.go | 60 +++++++++++ database/db.go | 24 ++--- database/scan.go | 13 ++- filesystem/filesystem.go | 99 +++++++++++++++++++ go.mod | 8 +- go.sum | 12 +-- main.go | 18 ++-- rest/get_shows.go | 51 ---------- rest/rest.go | 24 +++++ rest/server.go | 27 ----- server_api/server.go | 32 ++++++ 16 files changed, 361 insertions(+), 120 deletions(-) create mode 100644 client_api/describe.go rename rest/get_episodes.go => client_api/episodes.go (71%) create mode 100644 client_api/in_progress.go create mode 100644 client_api/recently_added.go create mode 100644 client_api/server.go create mode 100644 client_api/shows.go create mode 100644 filesystem/filesystem.go delete mode 100644 rest/get_shows.go create mode 100644 rest/rest.go delete mode 100644 rest/server.go create mode 100644 server_api/server.go diff --git a/client_api/describe.go b/client_api/describe.go new file mode 100644 index 0000000..f51ad98 --- /dev/null +++ b/client_api/describe.go @@ -0,0 +1,25 @@ +package client_api + +import ( + "encoding/json" + "net/http" +) + +type Describe struct { + Name string `json:"name"` + Icon string `json:"icon"` +} + +func describeHandler(data_dir string, w http.ResponseWriter, r *http.Request) { + log.Debugf("/describe called\n") + return_json := Describe{ + Name: "mediasrv-server", + Icon: "", + } + data, err := json.Marshal(return_json) + if err != nil { + log.Errorf("Could not marshal data: %v\n", err) + return + } + w.Write(data) +} diff --git a/rest/get_episodes.go b/client_api/episodes.go similarity index 71% rename from rest/get_episodes.go rename to client_api/episodes.go index ceec074..52cf6d7 100644 --- a/rest/get_episodes.go +++ b/client_api/episodes.go @@ -1,22 +1,22 @@ -package rest +package client_api import ( "encoding/json" "net/http" + "git.ohea.xyz/mediasrv/server/database" "github.com/op/go-logging" - "github.com/restitux/ikinuki-server/database" ) -var log = logging.MustGetLogger("ikinuki-server") +var log = logging.MustGetLogger("mediasrv-server") -type GetEpisodes struct { - Episodes []database.Episode +type Episodes struct { + Episodes []database.Episode `json:"episodes"` } -func getEpisodesHandler(data_dir string, w http.ResponseWriter, r *http.Request) { - log.Debugf("/get_episodes called\n") - db, err := database.OpenDatabase(data_dir) +func episodesHandler(data_dir string, w http.ResponseWriter, r *http.Request) { + log.Debugf("/episodes called\n") + db, _, err := database.OpenDatabase(data_dir) if err != nil { log.Errorf("Could not open database: %v\n", err) return @@ -28,7 +28,7 @@ func getEpisodesHandler(data_dir string, w http.ResponseWriter, r *http.Request) } defer rows.Close() - var return_json GetEpisodes + var return_json Episodes for { if !rows.Next() { diff --git a/client_api/in_progress.go b/client_api/in_progress.go new file mode 100644 index 0000000..c663c10 --- /dev/null +++ b/client_api/in_progress.go @@ -0,0 +1,23 @@ +package client_api + +import ( + "encoding/json" + "net/http" +) + +type InProgress struct { + Data []int `json:"data"` +} + +func inProgressHandler(data_dir string, w http.ResponseWriter, r *http.Request) { + log.Debugf("/in_progress called\n") + return_json := InProgress{ + Data: []int{1, 2, 3}, + } + data, err := json.Marshal(return_json) + if err != nil { + log.Errorf("Could not marshal data: %v\n", err) + return + } + w.Write(data) +} diff --git a/client_api/recently_added.go b/client_api/recently_added.go new file mode 100644 index 0000000..e1c6224 --- /dev/null +++ b/client_api/recently_added.go @@ -0,0 +1,23 @@ +package client_api + +import ( + "encoding/json" + "net/http" +) + +type RecentlyAdded struct { + Data []int `json:"data"` +} + +func recentlyAddedHandler(data_dir string, w http.ResponseWriter, r *http.Request) { + log.Debugf("/recently_added called\n") + return_json := RecentlyAdded{ + Data: []int{4, 5, 6}, + } + data, err := json.Marshal(return_json) + if err != nil { + log.Errorf("Could not marshal data: %v\n", err) + return + } + w.Write(data) +} diff --git a/client_api/server.go b/client_api/server.go new file mode 100644 index 0000000..df13ce6 --- /dev/null +++ b/client_api/server.go @@ -0,0 +1,24 @@ +package client_api + +import ( + "net/http" +) + +func SetupHTTPServer(mux *http.ServeMux, data_dir string) { + mux.HandleFunc("/client/episodes", func(w http.ResponseWriter, r *http.Request) { + episodesHandler(data_dir, w, r) + }) + mux.HandleFunc("/client/shows", func(w http.ResponseWriter, r *http.Request) { + showsHandler(data_dir, w, r) + }) + mux.HandleFunc("/client/describe", func(w http.ResponseWriter, r *http.Request) { + describeHandler(data_dir, w, r) + }) + mux.HandleFunc("/client/recently_added", func(w http.ResponseWriter, r *http.Request) { + recentlyAddedHandler(data_dir, w, r) + }) + mux.HandleFunc("/client/in_progress", func(w http.ResponseWriter, r *http.Request) { + inProgressHandler(data_dir, w, r) + }) + +} diff --git a/client_api/shows.go b/client_api/shows.go new file mode 100644 index 0000000..ed8ceaa --- /dev/null +++ b/client_api/shows.go @@ -0,0 +1,60 @@ +package client_api + +import ( + "encoding/json" + "net/http" + + "git.ohea.xyz/mediasrv/server/database" +) + +type TVShow struct { + Id int `json:"id"` + Title string `json:"title"` + Year int `json:"year"` + Description string `json:"description"` + Poster string `json:"poster"` +} + +type Shows struct { + Data []TVShow `json:"data"` +} + +func showsHandler(data_dir string, w http.ResponseWriter, r *http.Request) { + log.Debugf("/shows called\n") + db, _, err := database.OpenDatabase(data_dir) + if err != nil { + log.Errorf("Could not open database: %v\n", err) + return + } + + rows, err := db.Query("SELECT id, title, year, description, poster FROM tvshows") + if err != nil { + log.Errorf("Could not check if database was new: %v", err) + } + defer rows.Close() + + var return_json Shows + + for { + if !rows.Next() { + err = rows.Err() + if err != nil { + log.Fatalf("Could not get row from database: %v\n", err) + return + } else { + log.Debugf("%v rows processed\n", len(return_json.Data)) + break + } + } + var show TVShow + rows.Scan(&show.Id, &show.Title, &show.Year, &show.Description, &show.Poster) + + return_json.Data = append(return_json.Data, show) + } + data, err := json.Marshal(return_json) + if err != nil { + log.Errorf("Could not marshal episode data: %v\n", err) + return + } + w.Write(data) +} diff --git a/database/db.go b/database/db.go index 30c2e22..eec7ba8 100644 --- a/database/db.go +++ b/database/db.go @@ -9,22 +9,21 @@ import ( "github.com/op/go-logging" ) +var log = logging.MustGetLogger("mediasrv-server") -var log = logging.MustGetLogger("ikinuki-server") - -func OpenDatabase(data_dir string) (*sql.DB, error) { +func OpenDatabase(data_dir string) (*sql.DB, bool, error) { // create data directory err := os.MkdirAll(data_dir, 0755) if err != nil { - return nil, fmt.Errorf("Could not create data directory: %v", err) + return nil, false, fmt.Errorf("Could not create data directory: %v", err) } // open database - db_path := filepath.Join(data_dir, "ikinuki-server.db") + db_path := filepath.Join(data_dir, "server.db") db, err := sql.Open("sqlite3", db_path) if err != nil { - return nil, fmt.Errorf("Could not open database: %v", err) + return nil, false, fmt.Errorf("Could not open database: %v", err) } // check if the database is new @@ -37,7 +36,9 @@ CREATE TABLE tvshows( title TEXT, original_title TEXT, show_title TEXT, - year INTEGER + year INTEGER, + description TEXT, + poster TEXT ); CREATE TABLE episodes( id INTEGER PRIMARY KEY AUTOINCREMENT, @@ -52,14 +53,14 @@ CREATE TABLE episodes( // transaction new check isn't racy tx, err := db.Begin() if err != nil { - return nil, fmt.Errorf("Could not begin db transaction: %v", err) + return nil, false, fmt.Errorf("Could not begin db transaction: %v", err) } defer tx.Commit() // check if the database is new rows, err := tx.Query(is_db_new) if err != nil { - return nil, fmt.Errorf("Could not check if database was new: %v", err) + return nil, false, fmt.Errorf("Could not check if database was new: %v", err) } defer rows.Close() @@ -73,11 +74,12 @@ CREATE TABLE episodes( // initalize database _, err = tx.Exec(db_init) if err != nil { - return nil, fmt.Errorf("Could not initalize database: %v", err) + return nil, false, fmt.Errorf("Could not initalize database: %v", err) } + return db, true, nil } else { log.Infof("Existing database found at %v", db_path) + return db, false, nil } - return db, nil } diff --git a/database/scan.go b/database/scan.go index e67bfb2..e12b4c4 100644 --- a/database/scan.go +++ b/database/scan.go @@ -15,6 +15,15 @@ type TVShow struct { OriginalTile string `xml:"originaltitle"` ShowTitle string `xml:"showtitle"` Year int `xml:"year"` + Description string `xml:"plot"` + Thumb []Thumb `xml:"thumb"` +} + +type Thumb struct { + Aspect string `xml:"aspect,attr"` + Season string `xml:"season,attr"` + Type string `xml:"type,attr"` + Value string `xml:",chardata"` } func ScanTvshowRoot(root string, db *sql.DB) error { @@ -31,7 +40,7 @@ func ScanTvshowRoot(root string, db *sql.DB) error { } defer tx.Commit() - stmt, err := tx.Prepare("insert into tvshows(title, original_title, show_title, year) values(?, ?, ?, ?)") + stmt, err := tx.Prepare("insert into tvshows(title, original_title, show_title, year, description, poster) values(?, ?, ?, ?, ?, ?)") if err != nil { return fmt.Errorf("Could not prepare statement: %v", err) } @@ -81,7 +90,7 @@ func insert_tvshow_nfo(show_dir string, stmt *sql.Stmt) bool { log.Debugf(" Original Title: %v\n", tvshow.OriginalTile) log.Debugf(" Show Title: %v\n", tvshow.ShowTitle) - _, err = stmt.Exec(tvshow.Title, tvshow.OriginalTile, tvshow.ShowTitle, tvshow.Year) + _, err = stmt.Exec(tvshow.Title, tvshow.OriginalTile, tvshow.ShowTitle, tvshow.Year, tvshow.Description, tvshow.Thumb[0].Value) if err != nil { log.Debugf("Could not insert tvshow \"%v\" into database: %v\n", tvshow.Title, err) return false diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go new file mode 100644 index 0000000..f321b12 --- /dev/null +++ b/filesystem/filesystem.go @@ -0,0 +1,99 @@ +package filesystem + +import ( + "fmt" + "io/fs" + "os" + "path/filepath" + + "github.com/op/go-logging" +) + +var log = logging.MustGetLogger("mediasrv-server") + +type File struct { + Path string `json:"path"` + Name string `json:"name"` +} + +type Dir struct { + Path string `json:"path"` + Name string `json:"name"` + SubDirs []Dir `json:"subDirs,omitempty"` + SubFiles []File `json:"subFiles,omitempty"` +} + +func printDir(d Dir, offset int) { + for i := 0; i < offset; i++ { + fmt.Print(" ") + } + fmt.Printf("%v\n", d.Name) + for _, subFile := range d.SubFiles { + for i := 0; i < offset+1; i++ { + fmt.Print(" ") + } + fmt.Printf("%v\n", subFile.Name) + } + for _, subDir := range d.SubDirs { + printDir(subDir, offset+1) + } +} + +func GetFilesystem(dir string) (Dir, error) { + + var err error + + root := Dir{ + Path: dir, + Name: filepath.Base(dir), + } + + currentDir := &root + dirStack := make([]*Dir, 1000) + subStack := make([][]fs.DirEntry, 1000) + ind := 0 + +outer: + for { + var subDirs []fs.DirEntry + if len(currentDir.SubDirs) > 0 { + subDirs = subStack[ind] + } else { + subDirs, err = os.ReadDir(currentDir.Path) + if err != nil { + return Dir{}, err + } + } + + for i, subDir := range subDirs { + subPath := filepath.Join(currentDir.Path, subDir.Name()) + if subDir.IsDir() { + dirStack[ind] = currentDir + subStack[ind] = subDirs[i+1:] + ind++ + newDir := Dir{ + Path: subPath, + Name: subDir.Name(), + } + currentDir.SubDirs = append(currentDir.SubDirs, newDir) + currentDir = ¤tDir.SubDirs[len(currentDir.SubDirs)-1] + + continue outer + } else { + currentDir.SubFiles = append(currentDir.SubFiles, File{ + Path: subPath, + Name: subDir.Name(), + }) + } + } + if ind == 0 { + break + } + ind-- + currentDir = dirStack[ind] + } + + //printDir(root, 0) + + return root, nil +} diff --git a/go.mod b/go.mod index 995f455..1ce1742 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,11 @@ -module github.com/restitux/ikinuki-server +module git.ohea.xyz/mediasrv/server -go 1.18 +go 1.19 require ( - github.com/mattn/go-sqlite3 v1.14.15 + git.ohea.xyz/golang/config v0.0.0-20221002005232-8a901413a8b0 + github.com/mattn/go-sqlite3 v1.14.16 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 - gitlab.com/ohea/golang/config v0.0.0-20220915002456-b07c13508f07 ) require github.com/pelletier/go-toml/v2 v2.0.5 // indirect diff --git a/go.sum b/go.sum index a8b1ba4..ec23753 100644 --- a/go.sum +++ b/go.sum @@ -1,8 +1,10 @@ +git.ohea.xyz/golang/config v0.0.0-20221002005232-8a901413a8b0 h1:a8ygEuzmqFDxXmf+e1IseDKBcAtkaIwfL3k4PIVVVr8= +git.ohea.xyz/golang/config v0.0.0-20221002005232-8a901413a8b0/go.mod h1:86PbXJ2WdqQ+3hYqrnv3ukgKNRK9nQfThnlY03FAO0g= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI= -github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= +github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y= +github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 h1:lDH9UUVJtmYCjyT0CI4q8xvlXPxeZ0gYCVvWbmPlp88= github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk= github.com/pelletier/go-toml/v2 v2.0.5 h1:ipoSadvV8oGUjnUbMub59IDPPwfxF694nG/jwbMiyQg= @@ -14,12 +16,6 @@ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSS github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -gitlab.com/ohea/golang/config v0.0.0-20220914234236-03c9ea3081fa h1:oRAlBWnguYVME4HD5rw2iVFzyfbp2WiBlYc3vEx81yU= -gitlab.com/ohea/golang/config v0.0.0-20220914234236-03c9ea3081fa/go.mod h1:nAge7Tiz8q6mbHDGMEG8gIPqCjfCLnHAM8H7EjxoHoI= -gitlab.com/ohea/golang/config v0.0.0-20220915000847-ec118318b5b8 h1:Dfq2kxPHMqF3rciatF2fIuAKngINe4PFg0K1BgqT0KI= -gitlab.com/ohea/golang/config v0.0.0-20220915000847-ec118318b5b8/go.mod h1:nAge7Tiz8q6mbHDGMEG8gIPqCjfCLnHAM8H7EjxoHoI= -gitlab.com/ohea/golang/config v0.0.0-20220915002456-b07c13508f07 h1:4rc2sNX5t4PYVs9Ev7+crvID031ZHKdfXAxbT9X/zC0= -gitlab.com/ohea/golang/config v0.0.0-20220915002456-b07c13508f07/go.mod h1:nAge7Tiz8q6mbHDGMEG8gIPqCjfCLnHAM8H7EjxoHoI= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= diff --git a/main.go b/main.go index 33fde91..b4644df 100644 --- a/main.go +++ b/main.go @@ -7,9 +7,10 @@ import ( _ "github.com/mattn/go-sqlite3" "github.com/op/go-logging" - "github.com/restitux/ikinuki-server/database" - "github.com/restitux/ikinuki-server/rest" - "gitlab.com/ohea/golang/config" + "git.ohea.xyz/golang/config" + + "git.ohea.xyz/mediasrv/server/database" + "git.ohea.xyz/mediasrv/server/rest" ) func get_data_dir() string { @@ -19,14 +20,14 @@ func get_data_dir() string { xdg_data_home := os.Getenv("XDG_DATA_HOME") if xdg_data_home != "" { - return filepath.Join(xdg_data_home, "ikinuki") + return filepath.Join(xdg_data_home, "mediasrv") } else { home := os.Getenv("HOME") - return filepath.Join(home, ".local", "share", "ikinuki") + return filepath.Join(home, ".local", "share", "mediasrv") } } -var log = logging.MustGetLogger("ikinuki-server") +var log = logging.MustGetLogger("mediasrv-server") type Config struct { Address string @@ -47,7 +48,7 @@ func main() { logging.SetBackend(backendLeveled) configData := config.Config[Config]{ - Name: "ikinuki", + Name: "mediasrv", Filename: "server", Config: Config{ Address: "127.0.0.1", @@ -59,6 +60,7 @@ func main() { ret, err := configData.Get() if ret == true { log.Warningf("Created config file at %v, please edit and launch again\n", *configData.ConfigFile) + return } data_dir := get_data_dir() @@ -76,6 +78,6 @@ func main() { } } - rest.RunHTTPServer(configData.Config.Address, configData.Config.Port, data_dir) + rest.RunServer(configData.Config.Address, configData.Config.Port, data_dir, configData.Config.ScanDirectory) } diff --git a/rest/get_shows.go b/rest/get_shows.go deleted file mode 100644 index ee6c43d..0000000 --- a/rest/get_shows.go +++ /dev/null @@ -1,51 +0,0 @@ -package rest - -import ( - "encoding/json" - "net/http" - - "github.com/restitux/ikinuki-server/database" -) -type GetShows struct { - Shows []database.TVShow -} - -func getShowsHandler(data_dir string, w http.ResponseWriter, r *http.Request) { - log.Debugf("/get_shows called\n") - db, err := database.OpenDatabase(data_dir) - if err != nil { - log.Errorf("Could not open database: %v\n", err) - return - } - - rows, err := db.Query("SELECT title, original_title, show_title, year FROM tvshows") - if err != nil { - log.Errorf("Could not check if database was new: %v", err) - } - defer rows.Close() - - var return_json GetShows - - for { - if !rows.Next() { - err = rows.Err() - if err != nil { - log.Fatalf("Could not get row from database: %v\n", err) - return - } else { - log.Debugf("%v rows processed\n", len(return_json.Shows)) - break - } - } - var show database.TVShow - rows.Scan(&show.Title, &show.OriginalTile, &show.ShowTitle, &show.Year) - - return_json.Shows = append(return_json.Shows, show) - } - data, err := json.Marshal(return_json) - if err != nil { - log.Errorf("Could not marshal episode data: %v\n", err) - return - } - w.Write(data) -} diff --git a/rest/rest.go b/rest/rest.go new file mode 100644 index 0000000..dfeb4ef --- /dev/null +++ b/rest/rest.go @@ -0,0 +1,24 @@ +package rest + +import ( + "fmt" + "net/http" + + "git.ohea.xyz/mediasrv/server/client_api" + "git.ohea.xyz/mediasrv/server/server_api" + "github.com/op/go-logging" +) + +var log = logging.MustGetLogger("mediasrv-server") + +func RunServer(address string, port int, dataDir string, scanDir string) { + mux := http.NewServeMux() + + client_api.SetupHTTPServer(mux, dataDir) + server_api.SetupHTTPServer(mux, scanDir) + + connect_string := fmt.Sprintf("%v:%v", address, port) + log.Noticef("Launching HTTP server on %v\n", connect_string) + log.Fatal(http.ListenAndServe(connect_string, mux)) + +} diff --git a/rest/server.go b/rest/server.go deleted file mode 100644 index 89022bf..0000000 --- a/rest/server.go +++ /dev/null @@ -1,27 +0,0 @@ -package rest - -import ( - "fmt" - "net/http" -) - -func setupHTTPServer(data_dir string) { - http.HandleFunc("/get_episodes", func(w http.ResponseWriter, r *http.Request) { - getEpisodesHandler(data_dir, w, r) - }) - http.HandleFunc("/get_shows", func(w http.ResponseWriter, r *http.Request) { - getShowsHandler(data_dir, w, r) - }) - - -} - -func RunHTTPServer(address string, port int, data_dir string) { - - setupHTTPServer(data_dir) - - connect_string := fmt.Sprintf("%v:%v", address, port) - log.Noticef("Launching HTTP server on %v\n", connect_string) - log.Fatal(http.ListenAndServe(connect_string, nil)) - -} diff --git a/server_api/server.go b/server_api/server.go new file mode 100644 index 0000000..9baf1f8 --- /dev/null +++ b/server_api/server.go @@ -0,0 +1,32 @@ +package server_api + +import ( + "encoding/json" + "net/http" + + "git.ohea.xyz/mediasrv/server/filesystem" + "github.com/op/go-logging" +) + +var log = logging.MustGetLogger("mediasrv-server") + +func SetupHTTPServer(mux *http.ServeMux, data_dir string) { + mux.HandleFunc("/server/files", func(w http.ResponseWriter, r *http.Request) { + filesHandler(data_dir, w, r) + }) +} + +func filesHandler(rootDir string, w http.ResponseWriter, r *http.Request) { + log.Debugf("/server/files called") + return_json, err := filesystem.GetFilesystem(rootDir) + if err != nil { + log.Errorf("Could not get filsystem data: %v", err) + return + } + data, err := json.MarshalIndent(return_json, "", "\t") + if err != nil { + log.Errorf("Could not marshal data: %v\n", err) + return + } + w.Write(data) +}