Better fetch remote data in a way that does not add blank items to slices

This commit is contained in:
2024-05-15 16:57:46 -04:00
parent 3a03fae9ee
commit 6587bda17b
3 changed files with 13 additions and 12 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
gofmt -l -w -s ./src/cli/*.go gofmt -l -w -s ./src/cli/*.go
gofmt -l -w -s ./src/backend/*.go gofmt -l -w -s ./src/backend/*.go
git add -f extra src .gitignore commit.sh go.mod go.sum LICENSE main.go mutn.go libmuttonserver.go README.md git add -f extra src .gitignore commit.sh go.mod go.sum LICENSE mutn.go libmuttonserver.go README.md
git commit -m "$1" git commit -m "$1"
git push git push
+4 -4
View File
@@ -93,10 +93,10 @@ func getRemoteDataFromClient(manualSync bool) ([]string, []int64, []string, []st
outputSlice := strings.Split(output, "\x1f") outputSlice := strings.Split(output, "\x1f")
// re-form the lists TODO handle error for index out of bounds (occurs if reading deletions directory on server fails) // re-form the lists TODO handle error for index out of bounds (occurs if reading deletions directory on server fails)
entries := strings.Split(outputSlice[0], "\n") entries := strings.Split(outputSlice[0], "\n")[1:]
modsStrings := strings.Split(outputSlice[1], "\n") modsStrings := strings.Split(outputSlice[1], "\n")[1:]
folders := strings.Split(outputSlice[2], "\n") folders := strings.Split(outputSlice[2], "\n")[2:]
deletions := strings.Split(outputSlice[3], "\n") deletions := strings.Split(outputSlice[3], "\n")[1:]
// convert the mod times to int64 // convert the mod times to int64
var mods []int64 var mods []int64
+8 -7
View File
@@ -20,18 +20,19 @@ func GetRemoteDataFromServer() {
// print the lists to stdout // print the lists to stdout
for _, entry := range entryList { for _, entry := range entryList {
fmt.Println(entry) fmt.Print("\n" + entry)
} }
fmt.Println("\x1f") fmt.Print("\x1f")
for _, mod := range modList { for _, mod := range modList {
fmt.Println(mod) fmt.Print("\n")
fmt.Print(mod)
} }
fmt.Print("\x1f") // do not print new lines as the prior output is []int64 fmt.Print("\x1f")
for _, dir := range dirList { for _, dir := range dirList {
fmt.Println(dir) fmt.Print("\n" + dir)
} }
fmt.Println("\x1f") fmt.Print("\x1f")
for _, deletion := range deletionsList { for _, deletion := range deletionsList {
fmt.Println(deletion.Name()) fmt.Print("\n" + deletion.Name())
} }
} }