Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change filesearch algorithm and interface. #8

Merged
merged 1 commit into from
May 17, 2024
Merged

Change filesearch algorithm and interface. #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
140 changes: 70 additions & 70 deletions pkg/filesystem/filesystem.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package filesystem
import (
"encoding/json"
"errors"
"fmt"
"io"
"io/fs"
"net/http"
Expand All @@ -13,6 +14,74 @@ import (
"gopkg.in/yaml.v3"
)

func SearchFilesBreadthFirst(base string, file string, depth int, n int) (paths []string, err error) {
if n == 0 {
return
}

path := filepath.Join(base, file)
if _, internalErr := os.Stat(path); !errors.Is(internalErr, os.ErrNotExist) {
pathAbsolute, err := filepath.Abs(path)
paths = append(paths, pathAbsolute)
if err != nil {
return paths, err
}
}

if depth == 0 || (len(paths) >= n && n != -1) {
return
}

nodes := make([][]string, depth+1)
nodes[0] = []string{base}
for nodedepth := 1; nodedepth <= depth; nodedepth++ {

fmt.Println(nodedepth, depth)

for _, node := range nodes[nodedepth-1] {
childnodes, err := os.ReadDir(node)
if err != nil {
return paths, err
}
for _, childnode := range childnodes {
if childnode.IsDir() {
childnodeInfo, err := childnode.Info()
if err != nil {
return paths, err
}
childnodepath := filepath.Join(node, childnodeInfo.Name())
nodes[nodedepth] = append(nodes[nodedepth], childnodepath)
}
}
}

if len(nodes[nodedepth]) == 0 {
fmt.Printf("%s - %d", "nomorenodes", nodedepth)
break
}

for _, node := range nodes[nodedepth] {
if len(paths) >= n && n != -1 {
return
}
path := filepath.Join(node, file)
if _, internalErr := os.Stat(path); !errors.Is(internalErr, os.ErrNotExist) {
pathAbsolute, err := filepath.Abs(path)
paths = append(paths, pathAbsolute)
if err != nil {
return paths, err
}
}
}
}

return
}

func SearchAllFilesDepthFirst() {

}

func DetectContentTypeOfFile(path string) (contenttype string, err error) {
file, err := os.Open(path)
if err != nil {
Expand All @@ -32,7 +101,7 @@ func DetectContentTypeOfFile(path string) (contenttype string, err error) {
func SearchFileByNameLazy(file string, directory string) (filepaths []string, err error) {
filepath.WalkDir(directory, func(path string, dirEntry fs.DirEntry, err error) error {
file = filepath.FromSlash(file)
if !dirEntry.IsDir() && strings.Split(dirEntry.Name(), ".")[0] == file {
if !dirEntry.IsDir() && (strings.Split(dirEntry.Name(), ".")[0] == file || strings.Compare(dirEntry.Name(), file) == 0) {
filepaths = append(filepaths, path)
}
return nil
Expand All @@ -45,75 +114,6 @@ func SearchFileByNameLazy(file string, directory string) (filepaths []string, er
return
}

func SearchFileByName(directory string, file string, depth int) (absolutePath string, err error) {
absolutePath, err = GetAbsolutePath(filepath.Join(directory, file))
if err == nil {
return
}
if depth == 0 {
err = os.ErrNotExist
return
}
directories := make([][]string, depth)
directories[0] = []string{directory}
for index := 0; index < depth; index++ {
for _, dir := range directories[index] {
absolutePath, childdirectories, err := searchFileByNameInChildDirectories(dir, file)
if index < depth-1 {
directories[index+1] = append(directories[index+1], childdirectories...)
}
if err == nil {
return absolutePath, nil
}
}
}
err = os.ErrNotExist
return
}

func GetAbsolutePath(file string) (absolutePath string, err error) {
_, err = os.Stat(file)
if !errors.Is(err, os.ErrNotExist) {
absolutePath, err = filepath.Abs(file)
}
return
}

func GetDirectories(directory string) (directories []string, err error) {
dirEntries, err := os.ReadDir(directory)
if err != nil {
return
}
for _, dirEntry := range dirEntries {
if !dirEntry.IsDir() {
continue
}
info, err := dirEntry.Info()
if err != nil {
return directories, err
}
directories = append(directories, filepath.Join(directory, info.Name()))
}
return directories, nil
}

func searchFileByNameInChildDirectories(directory string, file string) (absolutePath string, childdirectories []string, err error) {
childdirectories, err = GetDirectories(directory)
if err != nil {
return
}
for _, childdirectory := range childdirectories {
path := filepath.Join(childdirectory, file)
absolutePath, err = GetAbsolutePath(path)
if err == nil {
return
}
}
err = os.ErrNotExist
return

}

func WriteToFile(source io.Reader, path string, mkdir bool) (err error) {
directory := filepath.Dir(path)
if _, err = os.Stat(directory); os.IsNotExist(err) && mkdir {
Expand Down
8 changes: 4 additions & 4 deletions pkg/handler/download.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,16 @@ func NewDownloadHandler(parent *Handler) (handler *Downloadhandler) {
}

func (handler *Downloadhandler) GetDownload(w http.ResponseWriter, req *http.Request) {
file, err := filesystem.SearchFileByName(setting.CLIENT_DOWNLOAD_DIRECTORY, setting.CLIENT_DOWNLOAD_FILE, 1)
if err != nil {
files, err := filesystem.SearchFilesBreadthFirst(setting.CLIENT_DOWNLOAD_DIRECTORY, setting.CLIENT_DOWNLOAD_FILE, 0, 1)
if err != nil || len(files) < 1 {
log.Error().Err(err).Msg("failed to retrieve lanty client binary data")
w.WriteHeader(http.StatusInternalServerError)
return
}

err = network.ServeFileData(file, w, req)
err = network.ServeFileData(files[0], w, req)
if err != nil {
log.Warn().Err(err).Str("file", file).Msg("failed to serve file / provide meta-info")
log.Warn().Err(err).Str("file", files[0]).Msg("failed to serve file / provide meta-info")
}

if req.Method == http.MethodHead {
Expand Down
Loading