rename and move related codes together
This commit is contained in:
parent
9f69ba7a0b
commit
63e4038a28
3 changed files with 45 additions and 51 deletions
|
|
@ -47,7 +47,7 @@ var serveCmd = &cobra.Command{
|
|||
Branch: branch,
|
||||
}
|
||||
|
||||
s, err := lib.Run(bind, f)
|
||||
s, err := lib.UseAPI(bind, f)
|
||||
if err != nil {
|
||||
fmt.Println("cannot create server: ", err)
|
||||
return
|
||||
|
|
|
|||
|
|
@ -1,49 +0,0 @@
|
|||
package lib
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"net/http"
|
||||
"net/url"
|
||||
)
|
||||
|
||||
type Forgejo struct {
|
||||
Server url.URL
|
||||
Token string
|
||||
Branch string
|
||||
}
|
||||
|
||||
var ErrNotFound = errors.New("404 not found")
|
||||
|
||||
// headers must ot be nil
|
||||
func (f *Forgejo) GetFile(ctx context.Context, headers map[string]string, user, repo, branch, file string) (ret *http.Response, err error) {
|
||||
u := f.Server
|
||||
u.Path = "/api/v1/repos/" + user + "/" + repo + "/raw/" + file
|
||||
p := u.Query()
|
||||
p.Set("ref", branch)
|
||||
u.RawQuery = p.Encode()
|
||||
fmt.Println(u.String())
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodGet, u.String(), nil)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
for k, v := range headers {
|
||||
if v == "" {
|
||||
continue
|
||||
}
|
||||
req.Header.Set(k, v)
|
||||
}
|
||||
req.Header.Set("Authorization", "token "+f.Token)
|
||||
resp, err := http.DefaultClient.Do(req)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
if resp.StatusCode == http.StatusNotFound {
|
||||
err = ErrNotFound
|
||||
return
|
||||
}
|
||||
|
||||
return resp, nil
|
||||
}
|
||||
45
lib/web.go
45
lib/web.go
|
|
@ -1,13 +1,56 @@
|
|||
package lib
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"net/url"
|
||||
"strings"
|
||||
)
|
||||
|
||||
func Run(bind string, f *Forgejo) (*http.Server, error) {
|
||||
type Forgejo struct {
|
||||
Server url.URL
|
||||
Token string
|
||||
Branch string
|
||||
}
|
||||
|
||||
var ErrNotFound = errors.New("404 not found")
|
||||
|
||||
// headers must ot be nil
|
||||
func (f *Forgejo) GetFile(ctx context.Context, headers map[string]string, user, repo, branch, file string) (ret *http.Response, err error) {
|
||||
u := f.Server
|
||||
u.Path = "/api/v1/repos/" + user + "/" + repo + "/raw/" + file
|
||||
p := u.Query()
|
||||
p.Set("ref", branch)
|
||||
u.RawQuery = p.Encode()
|
||||
fmt.Println(u.String())
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodGet, u.String(), nil)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
for k, v := range headers {
|
||||
if v == "" {
|
||||
continue
|
||||
}
|
||||
req.Header.Set(k, v)
|
||||
}
|
||||
req.Header.Set("Authorization", "token "+f.Token)
|
||||
resp, err := http.DefaultClient.Do(req)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
if resp.StatusCode == http.StatusNotFound {
|
||||
err = ErrNotFound
|
||||
return
|
||||
}
|
||||
|
||||
return resp, nil
|
||||
}
|
||||
|
||||
func UseAPI(bind string, f *Forgejo) (*http.Server, error) {
|
||||
if f == nil {
|
||||
return nil, errors.New("forgejo is nil")
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue