FloralExMachina/itd
1
0
Fork 0
forked from Elara6331/itd
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to autogenerated DRPC framework

Browse Source
This commit is contained in:
Elara
2023-01-02 22:30:17 -08:00
parent 5f5c67f7cc
commit b757af7fed
21 changed files with 3600 additions and 616 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/itctl/firmware.go
View File

@@ -54,6 +54,10 @@ func fwUpgrade(c *cli.Context) error {
bar := pb.ProgressBarTemplate(barTmpl).Start(0)
// Create new scanner of connection
for event := range progress {
if event.Err != nil {
return event.Err
}
// Set total bytes in progress bar
bar.SetTotal(event.Total)
// Set amount of bytes received in progress bar

29
cmd/itctl/fs.go
View File

@@ -3,7 +3,6 @@ package main
import (
"fmt"
"io"
"io/ioutil"
"os"
"path/filepath"
@@ -17,7 +16,7 @@ func fsList(c *cli.Context) error {
dirPath = c.Args().Get(0)
}
listing, err := client.ReadDir(c.Context, dirPath)
listing, err := client.FS().ReadDir(c.Context, dirPath)
if err != nil {
return err
}
@@ -36,9 +35,9 @@ func fsMkdir(c *cli.Context) error {
var err error
if c.Bool("parents") {
err = client.MkdirAll(c.Context, c.Args().Slice()...)
err = client.FS().MkdirAll(c.Context, c.Args().Slice()...)
} else {
err = client.Mkdir(c.Context, c.Args().Slice()...)
err = client.FS().Mkdir(c.Context, c.Args().Slice()...)
}
if err != nil {
return err
@@ -52,7 +51,7 @@ func fsMove(c *cli.Context) error {
return cli.Exit("Command move requires two arguments", 1)
}
err := client.Rename(c.Context, c.Args().Get(0), c.Args().Get(1))
err := client.FS().Rename(c.Context, c.Args().Get(0), c.Args().Get(1))
if err != nil {
return err
}
@@ -69,7 +68,7 @@ func fsRead(c *cli.Context) error {
var path string
var err error
if c.Args().Get(1) == "-" {
tmpFile, err = ioutil.TempFile("/tmp", "itctl.*")
tmpFile, err = os.CreateTemp("/tmp", "itctl.*")
if err != nil {
return err
}
@@ -81,7 +80,7 @@ func fsRead(c *cli.Context) error {
}
}
progress, err := client.Download(c.Context, path, c.Args().Get(0))
progress, err := client.FS().Download(c.Context, path, c.Args().Get(0))
if err != nil {
return err
}
@@ -92,6 +91,10 @@ func fsRead(c *cli.Context) error {
bar := pb.ProgressBarTemplate(barTmpl).Start(0)
// Get progress events
for event := range progress {
if event.Err != nil {
return event.Err
}
// Set total bytes in progress bar
bar.SetTotal(int64(event.Total))
// Set amount of bytes sent in progress bar
@@ -116,9 +119,9 @@ func fsRemove(c *cli.Context) error {
var err error
if c.Bool("recursive") {
err = client.RemoveAll(c.Context, c.Args().Slice()...)
err = client.FS().RemoveAll(c.Context, c.Args().Slice()...)
} else {
err = client.Remove(c.Context, c.Args().Slice()...)
err = client.FS().Remove(c.Context, c.Args().Slice()...)
}
if err != nil {
return err
@@ -136,7 +139,7 @@ func fsWrite(c *cli.Context) error {
var path string
var err error
if c.Args().Get(0) == "-" {
tmpFile, err = ioutil.TempFile("/tmp", "itctl.*")
tmpFile, err = os.CreateTemp("/tmp", "itctl.*")
if err != nil {
return err
}
@@ -154,7 +157,7 @@ func fsWrite(c *cli.Context) error {
defer os.Remove(path)
}
progress, err := client.Upload(c.Context, c.Args().Get(1), path)
progress, err := client.FS().Upload(c.Context, c.Args().Get(1), path)
if err != nil {
return err
}
@@ -165,6 +168,10 @@ func fsWrite(c *cli.Context) error {
bar := pb.ProgressBarTemplate(barTmpl).Start(0)
// Get progress events
for event := range progress {
if event.Err != nil {
return event.Err
}
// Set total bytes in progress bar
bar.SetTotal(int64(event.Total))
// Set amount of bytes sent in progress bar

2
cmd/itctl/resources.go
View File

@@ -29,7 +29,7 @@ func resLoad(ctx context.Context, args []string) error {
return err
}
progCh, err := client.LoadResources(ctx, path)
progCh, err := client.FS().LoadResources(ctx, path)
if err != nil {
return err
}

21
cmd/itgui/fs.go
View File

@@ -36,7 +36,7 @@ func fsTab(ctx context.Context, client *api.Client, w fyne.Window, opened chan s
loading.Show()
// Read root directory
ls, err := client.ReadDir(ctx, "/")
ls, err := client.FS().ReadDir(ctx, "/")
if err != nil {
guiErr(err, "Error reading directory", false, w)
return
@@ -69,18 +69,13 @@ func fsTab(ctx context.Context, client *api.Client, w fyne.Window, opened chan s
progressDlg := newProgress(w)
progressDlg.Show()
progCh, err := client.LoadResources(ctx, resPath)
progCh, err := client.FS().LoadResources(ctx, resPath)
if err != nil {
guiErr(err, "Error loading resources", false, w)
return
}
for evt := range progCh {
if evt.Err != nil {
guiErr(evt.Err, "Error loading resources", false, w)
return
}
switch evt.Operation {
case infinitime.ResourceOperationRemoveObsolete:
progressDlg.SetText("Removing " + evt.Name)
@@ -135,7 +130,7 @@ func fsTab(ctx context.Context, client *api.Client, w fyne.Window, opened chan s
progressDlg.Show()
// Upload file
progressCh, err := client.Upload(ctx, remotePath, localPath)
progressCh, err := client.FS().Upload(ctx, remotePath, localPath)
if err != nil {
guiErr(err, "Error uploading file", false, w)
return
@@ -182,7 +177,7 @@ func fsTab(ctx context.Context, client *api.Client, w fyne.Window, opened chan s
remotePath := filepath.Join(cwd, filenameEntry.Text)
// Make directory
err := client.Mkdir(ctx, remotePath)
err := client.FS().Mkdir(ctx, remotePath)
if err != nil {
guiErr(err, "Error creating directory", false, w)
return
@@ -282,7 +277,7 @@ func makeItems(
progressDlg.Show()
// Download file
progressCh, err := client.Download(ctx, localPath, remotePath)
progressCh, err := client.FS().Download(ctx, localPath, remotePath)
if err != nil {
guiErr(err, "Error downloading file", false, w)
return
@@ -323,7 +318,7 @@ func makeItems(
oldPath := filepath.Join(cwd, item.Name)
// Rename file
err := client.Rename(ctx, oldPath, moveEntry.Text)
err := client.FS().Rename(ctx, oldPath, moveEntry.Text)
if err != nil {
guiErr(err, "Error renaming file", false, w)
return
@@ -342,7 +337,7 @@ func makeItems(
path := filepath.Join(cwd, item.Name)
// Remove file
err := client.Remove(ctx, path)
err := client.FS().Remove(ctx, path)
if err != nil {
guiErr(err, "Error removing file", false, w)
return
@@ -381,7 +376,7 @@ func refresh(
// Get current directory
cwd, _ := cwdData.Get()
// Read directory
ls, err := client.ReadDir(ctx, cwd)
ls, err := client.FS().ReadDir(ctx, cwd)
if err != nil {
guiErr(err, "Error reading directory", false, w)
return