Attemping to fix bulk upload problem

This commit is contained in:
2026-07-12 16:11:02 -04:00
parent 119d4100b5
commit b075433e6e
6 changed files with 68 additions and 13 deletions
+3
View File
@@ -0,0 +1,3 @@
uploads
podstalk.db
podstalk
+37 -3
View File
@@ -1,6 +1,7 @@
package handler package handler
import ( import (
"context"
"encoding/xml" "encoding/xml"
"fmt" "fmt"
"io" "io"
@@ -126,8 +127,20 @@ func (h *ImportHandler) ServeImport(w http.ResponseWriter, r *http.Request) {
}) })
} }
var rssHTTPClient = &http.Client{
Timeout: 30 * time.Second,
}
func (h *ImportHandler) fetchRSS(rssURL string) ([]ImportEpisodeView, error) { func (h *ImportHandler) fetchRSS(rssURL string) ([]ImportEpisodeView, error) {
resp, err := http.Get(rssURL) ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
defer cancel()
req, err := http.NewRequestWithContext(ctx, http.MethodGet, rssURL, nil)
if err != nil {
return nil, err
}
resp, err := rssHTTPClient.Do(req)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -180,7 +193,16 @@ func (h *ImportHandler) importSelected(w http.ResponseWriter, r *http.Request, r
} }
} }
resp, err := http.Get(rssURL) ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
defer cancel()
req, err := http.NewRequestWithContext(ctx, http.MethodGet, rssURL, nil)
if err != nil {
http.Redirect(w, r, "/import?error=failed+to+fetch+rss", http.StatusSeeOther)
return
}
resp, err := rssHTTPClient.Do(req)
if err != nil { if err != nil {
http.Redirect(w, r, "/import?error=failed+to+fetch+rss", http.StatusSeeOther) http.Redirect(w, r, "/import?error=failed+to+fetch+rss", http.StatusSeeOther)
return return
@@ -255,8 +277,20 @@ func (h *ImportHandler) episodeImageURL(item *importItem, channel *importChannel
return "" return ""
} }
var importHTTPClient = &http.Client{
Timeout: 5 * time.Minute,
}
func (h *ImportHandler) downloadFile(url, category string) (string, error) { func (h *ImportHandler) downloadFile(url, category string) (string, error) {
resp, err := http.Get(url) ctx, cancel := context.WithTimeout(context.Background(), 10*time.Minute)
defer cancel()
req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
if err != nil {
return "", err
}
resp, err := importHTTPClient.Do(req)
if err != nil { if err != nil {
return "", err return "", err
} }
+8 -3
View File
@@ -1,9 +1,10 @@
package handler package handler
import ( import (
"bytes"
"html/template" "html/template"
"io"
"log" "log"
"net/http"
) )
type Templates struct { type Templates struct {
@@ -13,8 +14,12 @@ type Templates struct {
func NewTemplates(tmpl *template.Template) *Templates { func NewTemplates(tmpl *template.Template) *Templates {
return &Templates{tmpl: tmpl} return &Templates{tmpl: tmpl}
} }
func (t *Templates) Render(w io.Writer, name string, data any) { func (t *Templates) Render(w http.ResponseWriter, name string, data any) {
if err := t.tmpl.ExecuteTemplate(w, name+".html", data); err != nil { var buf bytes.Buffer
if err := t.tmpl.ExecuteTemplate(&buf, name+".html", data); err != nil {
log.Printf("template error: %s: %v", name, err) log.Printf("template error: %s: %v", name, err)
http.Error(w, "Internal server error", http.StatusInternalServerError)
return
} }
w.Write(buf.Bytes())
} }
+20 -7
View File
@@ -7,6 +7,7 @@ import (
"log" "log"
"net/http" "net/http"
"os" "os"
"runtime/debug"
"golang.org/x/crypto/bcrypt" "golang.org/x/crypto/bcrypt"
@@ -83,13 +84,13 @@ func main() {
http.HandleFunc("/signin", authMid.RedirectIfAuthed(authH.ServeSignin)) http.HandleFunc("/signin", authMid.RedirectIfAuthed(authH.ServeSignin))
http.HandleFunc("/signout", authH.ServeSignout) http.HandleFunc("/signout", authH.ServeSignout)
// Protected routes. // Protected routes with panic recovery.
http.HandleFunc("/", authMid.RequireAuth(epH.ServeDashboard)) http.HandleFunc("/", recovery(authMid.RequireAuth(epH.ServeDashboard)))
http.HandleFunc("/episodes/new", authMid.RequireAuth(epH.ServeNew)) http.HandleFunc("/episodes/new", recovery(authMid.RequireAuth(epH.ServeNew)))
http.HandleFunc("/episodes/edit", authMid.RequireAuth(epH.ServeEdit)) http.HandleFunc("/episodes/edit", recovery(authMid.RequireAuth(epH.ServeEdit)))
http.HandleFunc("/episodes/delete", authMid.RequireAuth(epH.ServeDelete)) http.HandleFunc("/episodes/delete", recovery(authMid.RequireAuth(epH.ServeDelete)))
http.HandleFunc("/settings", authMid.RequireAuth(setH.ServeSettings)) http.HandleFunc("/settings", recovery(authMid.RequireAuth(setH.ServeSettings)))
http.HandleFunc("/import", authMid.RequireAuth(importH.ServeImport)) http.HandleFunc("/import", recovery(authMid.RequireAuth(importH.ServeImport)))
// Public RSS: /rss/my-slug or /rss?slug=my-slug or /rss?user=N (legacy) // Public RSS: /rss/my-slug or /rss?slug=my-slug or /rss?user=N (legacy)
http.HandleFunc("/rss", rssH.ServeRSS) http.HandleFunc("/rss", rssH.ServeRSS)
@@ -106,6 +107,18 @@ func main() {
log.Fatal(http.ListenAndServe(addr, nil)) log.Fatal(http.ListenAndServe(addr, nil))
} }
func recovery(next http.HandlerFunc) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
defer func() {
if err := recover(); err != nil {
log.Printf("panic: %v\n%s", err, debug.Stack())
http.Error(w, "Internal server error", http.StatusInternalServerError)
}
}()
next(w, r)
}
}
func runAddUser() { func runAddUser() {
if len(os.Args) != 4 { if len(os.Args) != 4 {
log.Fatalf("Usage: podstalk adduser <email> <password>") log.Fatalf("Usage: podstalk adduser <email> <password>")
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.