scip/ephemerup
1
0
Fork 0
mirror of https://codeberg.org/scip/ephemerup.git synced 2025-12-17 20:50:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

update mods

Browse Source
This commit is contained in:
Thomas von Dein
2025-12-02 21:17:12 +01:00
parent 513b7b726e
commit ce8a14cc91
9 changed files with 214 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
upctl/lib/client.go
View File

@@ -20,18 +20,20 @@ import (
"encoding/json"
"errors"
"fmt"
//"github.com/alecthomas/repr"
"github.com/imroc/req/v3"
"github.com/jarcoal/httpmock"
"github.com/schollz/progressbar/v3"
"codeberg.org/scip/ephemerup/common"
"codeberg.org/scip/ephemerup/upctl/cfg"
"io"
"mime"
"os"
"path/filepath"
"regexp"
"time"
"codeberg.org/scip/ephemerup/common"
"codeberg.org/scip/ephemerup/upctl/cfg"
"github.com/imroc/req/v3"
"github.com/jarcoal/httpmock"
"github.com/schollz/progressbar/v3"
)
type Response struct {
@@ -53,7 +55,7 @@ type ListParams struct {
const Maxwidth = 12
/*
Create a new request object for outgoing queries
Create a new request object for outgoing queries
*/
func Setup(c *cfg.Config, path string) *Request {
client := req.C()
@@ -93,8 +95,8 @@ func Setup(c *cfg.Config, path string) *Request {
}
/*
Iterate over args, considering the elements are filenames, and add
them to the request.
Iterate over args, considering the elements are filenames, and add
them to the request.
*/
func GatherFiles(rq *Request, args []string) error {
for _, file := range args {
@@ -128,8 +130,8 @@ func GatherFiles(rq *Request, args []string) error {
}
/*
Check HTTP Response Code and validate JSON status output, if
any. Turns'em into a regular error
Check HTTP Response Code and validate JSON status output, if
any. Turns'em into a regular error
*/
func HandleResponse(c *cfg.Config, resp *req.Response) error {
// we expect a json response, extract the error, if any
@@ -348,7 +350,7 @@ func Download(w io.Writer, c *cfg.Config, args []string) error {
if err := os.Rename(id, cleanfilename); err != nil {
os.Remove(id)
return fmt.Errorf("\nUnable to rename file: " + err.Error())
return fmt.Errorf("\nUnable to rename file: %s", err.Error())
}
fmt.Fprintf(w, "%s successfully downloaded to file %s.", id, cleanfilename)

18
upctl/lib/output.go
View File

@@ -20,14 +20,15 @@ import (
"encoding/json"
"errors"
"fmt"
//"github.com/alecthomas/repr"
"github.com/imroc/req/v3"
"github.com/olekukonko/tablewriter"
"codeberg.org/scip/ephemerup/common"
"io"
"sort"
"strings"
"time"
"codeberg.org/scip/ephemerup/common"
req "github.com/imroc/req/v3"
"github.com/olekukonko/tablewriter"
)
// make a human readable version of the expire setting
@@ -66,11 +67,12 @@ func WriteTable(w io.Writer, headers []string, data [][]string) {
fmt.Fprintln(w, tableString.String())
}
/* Print output like psql \x
/*
Print output like psql \x
Prints all Uploads and Forms which exist in common.Response,
however, we expect only one kind of them to be actually filled, so
the function can be used for forms and uploads.
Prints all Uploads and Forms which exist in common.Response,
however, we expect only one kind of them to be actually filled, so
the function can be used for forms and uploads.
*/
func WriteExtended(w io.Writer, response *common.Response) {
format := fmt.Sprintf("%%%ds: %%s\n", Maxwidth)