Commit `ff4f1a2422`

ff4f1a2422b3e02917af1f1786ff5b3ac09565ef

parent: 7f1ab1b73d

Unsigned

lost+skunk <skunky@ebloid.ru> · 2024-07-06 17:06 UTC

Реки и копирование темплейтов в озу

Layout: unified · split

app/config.go +18 −14

	@@ -7,19 +7,21 @@ import (
7	)	7	)
8		8
9	type cache_config struct {	9	type cache_config struct {
10	Enabled bool	10	Enabled bool
11	Path string	11	Path string
12	MaxSize int64 `json:"max-size"`	12	MaxSize int64 `json:"max-size"`
13	Lifetime int64	13	Lifetime int64
		14	UpdateInterval int64 `json:"update-interval"`
14	}	15	}
15		16
16	type config struct {	17	type config struct {
17	cfg string	18	cfg string
18	Listen string	19	Listen string
19	BasePath string `json:"base-path"`	20	BasePath string `json:"base-path"`
20	Cache cache_config	21	Cache cache_config
21	Proxy, Nsfw bool	22	Proxy, Nsfw bool
22	WixmpProxy string `json:"wixmp-proxy"`	23	WixmpProxy string `json:"wixmp-proxy"`
		24	TemplatesDir string `json:"templates-dir"`
23	}	25	}
24		26
25	var CFG = config{	27	var CFG = config{
	@@ -27,11 +29,13 @@ var CFG = config{
27	Listen: "127.0.0.1:3003",	29	Listen: "127.0.0.1:3003",
28	BasePath: "/",	30	BasePath: "/",
29	Cache: cache_config{	31	Cache: cache_config{
30	Enabled: true,	32	Enabled: true,
31	Path: "cache",	33	Path: "cache",
		34	UpdateInterval: 1,
32	},	35	},
33	Proxy: true,	36	TemplatesDir: "html",
34	Nsfw: true,	37	Proxy: true,
		38	Nsfw: true,
35	}	39	}
36		40
37	func ExecuteConfig() {	41	func ExecuteConfig() {

app/util.go +34 −7

 // парсинг темплейтов
 func (s skunkyart) ExecuteTemplate(file string, data any) {
 	var buf strings.Builder
-	tmp, e := template.ParseFiles(file)
+	tmp := template.New(file)
+	tmp, e := tmp.Parse(Templates[file])
 	err(e)
 	err(tmp.Execute(&buf, &data))
 	wr(s.Writer, buf.String())
 	if len(url) > 32 && url[27:32] != "stash" {
 		url = url[27:]
 		toart := strings.Index(url, "/art/")
-		output = UrlBuilder("post", url[:toart], url[toart+5:])
+		if toart != -1 {
+			output = UrlBuilder("post", url[:toart], url[toart+5:])
+		}
 	}
 	return
 }
 				if url != "" {
 					list.WriteString(`<a title="open/download" href="`)
 					list.WriteString(url)
-					list.WriteString(`"><img src="`)
+					list.WriteString(`"><img loading="lazy" src="`)
 					list.WriteString(url)
 					list.WriteString(`" width="15%"></a>`)
 				} else {
 		return ""
 	} else {
 		list.WriteString("</div>")
-		list.WriteString(s.NavBase(content[0]))
+		if content != nil {
+			list.WriteString(s.NavBase(content[0]))
+		}
 	}
 	return list.String()
 		b, _, _ := download()
 		s.Writer.Write(b)
 	} else {
+		s.Writer.WriteHeader(403)
 		s.Writer.Write([]byte("Sorry, butt proxy on this instance disabled."))
 	}
 }
 		err(e)
 		for _, a := range dirnames {
 			a = c.Path + "/" + a
+			rm := func() {
+				err(os.RemoveAll(a))
+			}
 			if c.Lifetime != 0 {
 				now := time.Now().UnixMilli()
 				time := time.Unix(stat.Ctim.Unix()).UnixMilli()
 				if time+c.Lifetime <= now {
-					os.RemoveAll(a)
+					rm()
 				}
 			}
 			if c.MaxSize != 0 && stat.Size() > c.MaxSize {
-				os.RemoveAll(a)
+				rm()
 			}
 		}
 		dir.Close()
-		time.Sleep(time.Second)
+		time.Sleep(time.Second * time.Duration(CFG.Cache.UpdateInterval))
+	}
+}
+func CopyTemplatesToMemory() {
+	try := func(e error) {
+		if e != nil {
+			panic(e.Error())
+		}
+	}
+	dir, e := os.ReadDir(CFG.TemplatesDir)
+	try(e)
+	for _, x := range dir {
+		n := CFG.TemplatesDir + "/" + x.Name()
+		file, e := os.ReadFile(n)
+		try(e)
+		Templates[n] = string(file)
 	}
 }

app/wraper.go → app/wrapper.go renamed +8 −13

 )
 var wr = io.WriteString
+var Templates = make(map[string]string)
 type skunkyart struct {
 	Writer          http.ResponseWriter
 		SomeList  string
 		Deviation struct {
 			Post       devianter.Post
+			Related    string
 			StringTime string
 			Tags       string
 			Comments   string
 	}
 }
-// var Templates struct {
-//	Index string
-//	About string
-//
-//	GRuser string
-//	Deviation string
-//	List string
-//	Search string
-// }
-// //go:embed ../html/*
-// var Templates embed.FS
 func (s skunkyart) GRUser() {
 	if len(s.Query) < 1 {
 		s.ReturnHTTPError(400)
 		post.Post.Description = ParseDescription(post.Post.Deviation.TextContent)
 		// время публикации
 		post.StringTime = post.Post.Deviation.PublishedTime.UTC().String()
+		post.Post.IMG = s.ParseMedia(post.Post.Deviation.Media)
+		for _, x := range post.Post.Deviation.Extended.RelatedContent {
+			if len(x.Deviations) != 0 {
+				post.Related = s.DeviationList(x.Deviations)
+			}
+		}
 		// хештэги
 		for _, x := range post.Post.Deviation.Extended.Tags {

config.example.json +5 −3

 {
     "listen": "0.0.0.0:3003",
-    "base-path": "/skunky/",
+    "base-path": "/",
     "cache": {
         "enabled": true,
         "path": "cache",
         "lifetime": null,
-        "max-size": 100000
+        "max-size": 100000,
+        "update-interval": 5
     },
-    "proxy": true,
+    "templates-dir": "html",
     "wixmp-proxy": "http://127.0.0.1:8080",
+    "proxy": true,
     "nsfw": false
 }\ No newline at end of file

html/deviantion.htm +6

             {{.Templates.Deviation.Post.Description}}
             </figcaption>
             {{end}}
+            {{if ne .Templates.Deviation.Related ""}}
+            <details>
+                <summary>Related content</summary>
+                {{.Templates.Deviation.Related}}
+            </details>
+            {{end}}
             {{if (ne .Templates.Deviation.Comments "")}}
             {{.Templates.Deviation.Comments}}
             {{end}}

html/search.htm +1 −1

	@@ -18,7 +18,7 @@
18	</header>	18	</header>
19	{{if ne .Templates.Search.List ""}}	19	{{if ne .Templates.Search.List ""}}
20	{{if ne .Templates.Search.Content.Total 0}}	20	{{if ne .Templates.Search.Content.Total 0}}
21	<h1>Total resuls: {{.Templates.Search.Content.Total}}</h1>	21	<h1>Results by request '{{.QueryRaw}}': {{.Templates.Search.Content.Total}}</h1>
22	{{end}}	22	{{end}}
23	{{.Templates.Search.List}}	23	{{.Templates.Search.List}}
24	{{else}}	24	{{else}}

main.go +1

	@@ -8,6 +8,7 @@ import (
8		8
9	func main() {	9	func main() {
10	app.ExecuteConfig()	10	app.ExecuteConfig()
		11	app.CopyTemplatesToMemory()
11	err := devianter.UpdateCSRF()	12	err := devianter.UpdateCSRF()
12	if err != nil {	13	if err != nil {
13	println(err.Error())	14	println(err.Error())

Commit ff4f1a2422

Commit `ff4f1a2422`