Skip to content

Commit 0f5d1e8

Browse files
markus621markus621
authored
Develop (#11)
* fix error page * upgrade dependencies
1 parent f85d065 commit 0f5d1e8

File tree

11 files changed

+70
-36
lines changed

11 files changed

+70
-36
lines changed

‎.deb.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package: jasta
22
source: jasta
3-
version: 1:0.3.0
3+
version: 1:0.3.2
44
architecture:
55
- amd64
66
- arm64

‎cmd/jasta/main.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/osspkg/jasta/internal/command"
1010
"github.com/osspkg/jasta/internal/jasta"
1111
"go.osspkg.com/goppy"
12-
"go.osspkg.com/goppy/plugins/web"
12+
"go.osspkg.com/goppy/web"
1313
)
1414

1515
func main() {

‎go.mod‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,27 @@ module github.com/osspkg/jasta
33
go 1.20
44

55
require (
6-
go.osspkg.com/goppy v0.14.0
6+
go.osspkg.com/goppy v0.15.8
7+
go.osspkg.com/goppy/app v0.1.4
8+
go.osspkg.com/goppy/console v0.1.0
9+
go.osspkg.com/goppy/errors v0.1.0
10+
go.osspkg.com/goppy/iofile v0.1.3
11+
go.osspkg.com/goppy/plugins v0.1.1
12+
go.osspkg.com/goppy/shell v0.1.0
13+
go.osspkg.com/goppy/syscall v0.1.0
14+
go.osspkg.com/goppy/web v0.1.4
15+
go.osspkg.com/goppy/xlog v0.1.4
716
go.osspkg.com/static v1.4.0
8-
golang.org/x/image v0.13.0
17+
golang.org/x/image v0.14.0
918
)
1019

1120
require (
12-
github.com/gorilla/websocket v1.5.0 // indirect
1321
github.com/josharian/intern v1.0.0 // indirect
14-
github.com/kr/text v0.2.0 // indirect
1522
github.com/mailru/easyjson v0.7.7 // indirect
16-
github.com/rogpeppe/go-internal v1.11.0 // indirect
1723
go.osspkg.com/algorithms v1.3.0 // indirect
24+
go.osspkg.com/goppy/iosync v0.1.2 // indirect
25+
go.osspkg.com/goppy/ioutil v0.1.0 // indirect
26+
go.osspkg.com/goppy/xc v0.1.0 // indirect
27+
go.osspkg.com/goppy/xnet v0.1.1 // indirect
1828
gopkg.in/yaml.v3 v3.0.1 // indirect
1929
)

‎go.sum‎

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,48 @@
1-
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
21
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
3-
github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
4-
github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
52
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
63
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
74
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
85
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
9-
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
106
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
117
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
128
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
139
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
14-
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
1510
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
1611
go.osspkg.com/algorithms v1.3.0 h1:rrKO440aNTofYJwGnOVsW00w0VRtZtu+BQrgXMXw7j4=
1712
go.osspkg.com/algorithms v1.3.0/go.mod h1:J2SXxHdqBK9ALGYJomA9XGvTOhIwMK0fvVw+KusYyoo=
18-
go.osspkg.com/goppy v0.14.0 h1:7YoNaSA+XIAy+lbIMEdmMIXH9Em+keNRMVvqP4+4jiE=
19-
go.osspkg.com/goppy v0.14.0/go.mod h1:NAWYk3WylEMTTcEgFiFEQsL69T/ox614gpuzlWyxlzg=
13+
go.osspkg.com/goppy v0.15.8 h1:VNxG/pJLRNuo7cvab1UF5kC2Tr7KguwyBpQau32lqzA=
14+
go.osspkg.com/goppy v0.15.8/go.mod h1:0dUVSEiLjrWD0IuGKTHKWA6vV3VUrz4u4CGBwCKffS4=
15+
go.osspkg.com/goppy/app v0.1.4 h1:Los8E/6/PNiD4pLy22RDJUc98h69MCDQv/Mn0q2idc8=
16+
go.osspkg.com/goppy/app v0.1.4/go.mod h1:3pBd9xeqxcAlWScY6A9uoK87XGx5+9hVP9U9KQRoF/o=
17+
go.osspkg.com/goppy/console v0.1.0 h1:ksQzyPFJlp9EY48tyAU6fOzKLfKkGa0KIB+fPkhTnJE=
18+
go.osspkg.com/goppy/console v0.1.0/go.mod h1:x4MxAqsjTygGXyu1QkDLTvRaeQVU3/0euCxSQjtXzic=
19+
go.osspkg.com/goppy/errors v0.1.0 h1:2q8gdRZMEEDk7y/sneblQxpHhsi3pqF1BbFFHS7+FnE=
20+
go.osspkg.com/goppy/errors v0.1.0/go.mod h1:SvA8dgErO9e2i3TR8hgJV4uMAzs4TkL4FxXBSnw2UG4=
21+
go.osspkg.com/goppy/iofile v0.1.3 h1:JxKOeysFUCB9JDvqgwQTBrQz4mISdSE2ouRxX8RJrKA=
22+
go.osspkg.com/goppy/iofile v0.1.3/go.mod h1:bJTlDCHoZ3rENuu7ZE4KzzJJNv1CVq1TRZmj9phhXC8=
23+
go.osspkg.com/goppy/iosync v0.1.2 h1:w0BxqBa7PAdxFM2P8pZn3ToHK6ilX5IG+1nwIXJEoGg=
24+
go.osspkg.com/goppy/iosync v0.1.2/go.mod h1:huJpHhpIQ2DgzY3wVt72RUsJaje0uqYiUvMRovb1/Dg=
25+
go.osspkg.com/goppy/ioutil v0.1.0 h1:Z9CF1nzrjbcHJV1EIcLqOPAotePScuCjmTSyU7BoLzk=
26+
go.osspkg.com/goppy/ioutil v0.1.0/go.mod h1:WpZGj1HpuBlDDH5k8mn+2QwPssMP83jKj59U8qLsBoU=
27+
go.osspkg.com/goppy/plugins v0.1.1 h1:ly/g8LyGQNhT9BLKLbhHejUuPho5atd4uJmitorQyvM=
28+
go.osspkg.com/goppy/plugins v0.1.1/go.mod h1:oolaNTq9VCWBAApLUFCHvWZ/7tMUhzLaqQEIxmLviNQ=
29+
go.osspkg.com/goppy/shell v0.1.0 h1:L/28FTiO+Mo+YxjKj1dwYI+1oJWgMq4RAfgS6aDSA1Q=
30+
go.osspkg.com/goppy/shell v0.1.0/go.mod h1:K6EnrxB2vD2Hpg1mJIkeQKcZ9VEAnX5pBWhMgUBBds0=
31+
go.osspkg.com/goppy/syscall v0.1.0 h1:qOkgnjRo4RlSyYDQiYzZqfmGUIO9tuIZZ/OKsvfC3+s=
32+
go.osspkg.com/goppy/syscall v0.1.0/go.mod h1:8MsNFOYAzNzGI6FE+0hmqLINQ5cxVkhqHUyirzENG9A=
33+
go.osspkg.com/goppy/web v0.1.4 h1:rvAU2nVLn5m37A8LgWvJcSC1xTkVgPruVm7BLAiyCE0=
34+
go.osspkg.com/goppy/web v0.1.4/go.mod h1:fHCxV/5F6ulR5FmCr3csDXI9D1tGVC0CZr5K7DGvsmQ=
35+
go.osspkg.com/goppy/xc v0.1.0 h1:e2231FumnLEf1OjqEtbRaUxz3FT9M8pZVKg0C0aTf7g=
36+
go.osspkg.com/goppy/xc v0.1.0/go.mod h1:ocKrJbO+EADhuClTbOqzDfCqnUO9+ikEW0M7pqLl1Y4=
37+
go.osspkg.com/goppy/xlog v0.1.4 h1:3+o71O3Jb8UgfSA6nfpfQHfhHLIploHhlQ4p+Yfj5So=
38+
go.osspkg.com/goppy/xlog v0.1.4/go.mod h1:AtYBxgKaxQxFWmb/SbmLvYp7ysuE2i1YYSE3Pu29nNQ=
39+
go.osspkg.com/goppy/xnet v0.1.1 h1:nysNyS5O7nHXIN/IjP9HGfa6Qh5BTTSYLULijk+Sv9M=
40+
go.osspkg.com/goppy/xnet v0.1.1/go.mod h1:eB5pFfZTCrcaIOHzt4RlTgBVF5dRUV/u52qz/2hY3qk=
41+
go.osspkg.com/goppy/xtest v0.1.2 h1:rbUzEnWZW9vkGa24owydA9icQcfOaROJWSym1l0mCtU=
2042
go.osspkg.com/static v1.4.0 h1:2uy4/11c0QP+QLMucKQZbAU+e6lhVHKw5dWJPTk/DBg=
2143
go.osspkg.com/static v1.4.0/go.mod h1:94YydVU3qUtb1J534486lpm+qg6CviQjqtxKlkpSppM=
22-
golang.org/x/image v0.13.0 h1:3cge/F/QTkNLauhf2QoE9zp+7sr+ZcL4HnoZmdwg9sg=
23-
golang.org/x/image v0.13.0/go.mod h1:6mmbMOeV28HuMTgA6OSRkdXKYw/t5W9Uwn2Yv1r3Yxk=
44+
golang.org/x/image v0.14.0 h1:tNgSxAFe3jC4uYqvZdTr84SZoM1KfwdC9SKIFrLjFn4=
45+
golang.org/x/image v0.14.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
2446
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
2547
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
2648
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

‎internal/command/prerender.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package command
77

88
import (
99
"github.com/osspkg/jasta/internal/spiderweb"
10-
"go.osspkg.com/goppy/sdk/console"
10+
"go.osspkg.com/goppy/console"
1111
)
1212

1313
func PreRenderStaticWebsites() {

‎internal/jasta/config.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package jasta
88
import (
99
"fmt"
1010

11-
"go.osspkg.com/goppy/sdk/iofile"
11+
"go.osspkg.com/goppy/iofile"
1212
)
1313

1414
type Config struct {

‎internal/jasta/jasta.go‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ import (
1212
"path/filepath"
1313
"strings"
1414

15-
"go.osspkg.com/goppy/plugins/web"
16-
"go.osspkg.com/goppy/sdk/app"
17-
"go.osspkg.com/goppy/sdk/log"
15+
"go.osspkg.com/goppy/web"
16+
"go.osspkg.com/goppy/xlog"
1817
"go.osspkg.com/static"
1918
)
2019

@@ -43,7 +42,7 @@ func New(c WebsiteConfigs, r web.RouterPool) *Jasta {
4342
}
4443
}
4544

46-
func (v *Jasta) Up(_ app.Context) error {
45+
func (v *Jasta) Up() error {
4746
v.router.Get("/", v.handler)
4847
v.router.Get("#", v.handler)
4948
return nil
@@ -65,7 +64,7 @@ func (v *Jasta) handler(ctx web.Context) {
6564
conf, ok := v.settings[host]
6665
if !ok {
6766
ctx.Response().WriteHeader(403)
68-
log.WithFields(log.Fields{
67+
xlog.WithFields(xlog.Fields{
6968
"host": host,
7069
}).Warnf("Host not found")
7170
return
@@ -94,6 +93,10 @@ func prepareSettings(c []*WebsiteConfig) map[string]Setting {
9493
result := make(map[string]Setting, 10)
9594
for _, item := range c {
9695
for _, domain := range item.Domains {
96+
xlog.WithFields(xlog.Fields{
97+
"domain": domain,
98+
"root": item.Root,
99+
}).Infof("Load config")
97100
result[domain] = Setting{
98101
Root: item.Root,
99102
Assets: item.AssetsFolder,
@@ -119,7 +122,7 @@ func doResponse(w http.ResponseWriter, root string, page string, page404 string,
119122
return
120123
}
121124
if b, err = os.ReadFile(root + "/" + page404); err != nil {
122-
w.WriteHeader(500)
125+
w.WriteHeader(404)
123126
return
124127
}
125128
code = 404

‎internal/jasta/plugin.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import (
99
"fmt"
1010

1111
"github.com/osspkg/jasta/internal/utils"
12+
"go.osspkg.com/goppy/app"
1213
"go.osspkg.com/goppy/plugins"
13-
"go.osspkg.com/goppy/sdk/app"
1414
)
1515

16-
var Plugins = plugins.Plugins{}.Inject(
16+
var Plugins = plugins.Inject(
1717
plugins.Plugin{
1818
Config: &Config{},
1919
Inject: WebsiteConfigDecode,

‎internal/spiderweb/spider.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ import (
1616
"time"
1717

1818
"github.com/osspkg/jasta/internal/utils"
19-
"go.osspkg.com/goppy/sdk/iofile"
20-
"go.osspkg.com/goppy/sdk/shell"
21-
"go.osspkg.com/goppy/sdk/syscall"
19+
"go.osspkg.com/goppy/iofile"
20+
"go.osspkg.com/goppy/shell"
21+
"go.osspkg.com/goppy/syscall"
2222
)
2323

2424
type Spider struct {

‎internal/utils/images.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import (
1717
"strings"
1818
"sync"
1919

20-
"go.osspkg.com/goppy/sdk/errors"
21-
"go.osspkg.com/goppy/sdk/log"
20+
"go.osspkg.com/goppy/errors"
21+
"go.osspkg.com/goppy/xlog"
2222
"golang.org/x/image/bmp"
2323
"golang.org/x/image/draw"
2424
"golang.org/x/image/tiff"
@@ -129,7 +129,7 @@ func (v *Images) writeFile(filename string, img image.Image) error {
129129
}
130130
defer func() {
131131
if err0 := file.Close(); err0 != nil {
132-
log.WithFields(log.Fields{
132+
xlog.WithFields(xlog.Fields{
133133
"err": err0.Error(),
134134
"file": filename,
135135
}).Errorf("Close image file")
@@ -154,7 +154,7 @@ func (v *Images) readFile(filename string) (image.Image, string, error) {
154154
}
155155
defer func() {
156156
if err0 := file.Close(); err0 != nil {
157-
log.WithFields(log.Fields{
157+
xlog.WithFields(xlog.Fields{
158158
"err": err0.Error(),
159159
"file": filename,
160160
}).Errorf("Close image file")
@@ -179,7 +179,7 @@ func (v *Images) getHash(filename string) (string, error) {
179179
}
180180
defer func() {
181181
if err0 := file.Close(); err0 != nil {
182-
log.WithFields(log.Fields{
182+
xlog.WithFields(xlog.Fields{
183183
"err": err0.Error(),
184184
"file": filename,
185185
}).Errorf("Close image file")

0 commit comments

Comments
 (0)