tigor/Redmage
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

events: implemented in download section

Browse source
This commit is contained in:
Tigor Hutasuhut 2024-06-11 15:13:56 +07:00
parent f13b54d549
commit ca96d4a805
5 changed files with 66 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
api/download_subreddit_images.go
View file

@ -139,7 +139,7 @@ func (api *API) downloadSubredditImage(ctx context.Context, post reddit.Post, su
ctx, span := tracer.Start(ctx, "*API.downloadSubredditImage")
defer span.End()
imageHandler, err := api.reddit.DownloadImage(ctx, post, api.downloadBroadcast)
imageHandler, err := api.reddit.DownloadImage(ctx, post, api.eventBroadcast)
if err != nil {
return errs.Wrapw(err, "failed to download image")
}

4
api/events/image_download.go
View file

@ -44,6 +44,10 @@ type ImageDownload struct {
Device string `json:"device,omitempty"`
}
func (id ImageDownload) Clone() ImageDownload {
return id
}
// Render the template.
func (im ImageDownload) Render(ctx context.Context, w io.Writer) error {
switch im.EventKind {

82
api/reddit/download_images.go
View file

@ -7,7 +7,9 @@ import (
"net/http"
"github.com/alecthomas/units"
"github.com/teivah/broadcast"
"github.com/tigorlazuardi/redmage/api/bmessage"
"github.com/tigorlazuardi/redmage/api/events"
"github.com/tigorlazuardi/redmage/pkg/errs"
)
@ -35,7 +37,7 @@ func (po *PostImage) Close() error {
// DownloadImage downloades the image.
//
// If downloading image or thumbnail fails
func (reddit *Reddit) DownloadImage(ctx context.Context, post Post, broadcaster DownloadStatusBroadcaster) (image PostImage, err error) {
func (reddit *Reddit) DownloadImage(ctx context.Context, post Post, broadcaster *broadcast.Relay[events.Event]) (image PostImage, err error) {
ctx, span := tracer.Start(ctx, "*Reddit.DownloadImage")
defer span.End()
imageUrl := post.GetImageURL()
@ -45,7 +47,7 @@ func (reddit *Reddit) DownloadImage(ctx context.Context, post Post, broadcaster
return image, err
}
func (reddit *Reddit) DownloadThumbnail(ctx context.Context, post Post, broadcaster DownloadStatusBroadcaster) (image PostImage, err error) {
func (reddit *Reddit) DownloadThumbnail(ctx context.Context, post Post, broadcaster *broadcast.Relay[events.Event]) (image PostImage, err error) {
ctx, span := tracer.Start(ctx, "*Reddit.DownloadThumbnail")
defer span.End()
imageUrl := post.GetThumbnailURL()
@ -55,7 +57,7 @@ func (reddit *Reddit) DownloadThumbnail(ctx context.Context, post Post, broadcas
return image, err
}
func (reddit *Reddit) downloadImage(ctx context.Context, post Post, kind bmessage.ImageKind, broadcaster DownloadStatusBroadcaster) (io.ReadCloser, error) {
func (reddit *Reddit) downloadImage(ctx context.Context, post Post, kind bmessage.ImageKind, broadcaster *broadcast.Relay[events.Event]) (io.ReadCloser, error) {
var (
url string
height int64
@ -87,45 +89,46 @@ func (reddit *Reddit) downloadImage(ctx context.Context, post Post, kind bmessag
if metricSpeed == 0 {
metricSpeed = 10 * units.KB
}
metadata := bmessage.ImageMetadata{
URL: url,
Height: height,
Width: width,
Kind: kind,
eventData := events.ImageDownload{
ImageURL: post.GetImageURL(),
ImageHeight: int32(height),
ImageWidth: int32(width),
Subreddit: post.GetSubreddit(),
PostURL: post.GetPostURL(),
PostName: post.GetPostName(),
PostTitle: post.GetPostTitle(),
PostCreated: post.GetPostCreated(),
PostAuthor: post.GetAuthor(),
PostAuthorURL: post.GetAuthorURL(),
ImageOriginalURL: post.GetImageURL(),
NSFW: int32(post.IsNSFWInt()),
}
idr := &ImageDownloadReader{
OnProgress: func(downloaded int64, contentLength int64, err error) {
var event bmessage.DownloadEvent
var kind events.ImageDownloadEvent
if errors.Is(err, io.EOF) {
err = nil
}
if err != nil {
event = bmessage.DownloadError
kind = events.ImageDownloadError
} else {
event = bmessage.DownloadProgress
kind = events.ImageDownloadProgress
}
broadcaster.Broadcast(bmessage.ImageDownloadMessage{
Event: event,
Metadata: metadata,
ContentLength: units.MetricBytes(resp.ContentLength),
Downloaded: units.MetricBytes(downloaded),
Subreddit: post.GetSubreddit(),
PostURL: post.GetPermalink(),
PostID: post.GetID(),
Error: err,
})
ev := eventData.Clone()
ev.EventKind = kind
ev.Downloaded = downloaded
ev.ImageSize = contentLength
ev.ContentLength = contentLength
events.PublishImageDownloadEvent(broadcaster, ev)
},
OnClose: func(downloaded, contentLength int64, closeErr error) {
broadcaster.Broadcast(bmessage.ImageDownloadMessage{
Event: bmessage.DownloadEnd,
Metadata: metadata,
ContentLength: units.MetricBytes(resp.ContentLength),
Downloaded: units.MetricBytes(downloaded),
Subreddit: post.GetSubreddit(),
PostURL: post.GetPostURL(),
PostID: post.GetID(),
Error: closeErr,
})
ev := eventData.Clone()
ev.EventKind = events.ImageDownloadEnd
ev.Downloaded = downloaded
ev.ImageSize = contentLength
ev.ContentLength = contentLength
ev.Error = closeErr
events.PublishImageDownloadEvent(broadcaster, ev)
},
IdleTimeout: reddit.Config.Duration("download.timeout.idle"),
IdleSpeedThreshold: metricSpeed,
@ -135,18 +138,11 @@ func (reddit *Reddit) downloadImage(ctx context.Context, post Post, kind bmessag
reader, writer := io.Pipe()
go func() {
defer resp.Body.Close()
broadcaster.Broadcast(bmessage.ImageDownloadMessage{
Event: bmessage.DownloadStart,
Metadata: bmessage.ImageMetadata{
URL: url,
Height: height,
Width: width,
Kind: kind,
},
Subreddit: post.GetSubreddit(),
PostURL: post.GetPostURL(),
PostID: post.GetID(),
})
ev := eventData.Clone()
ev.EventKind = events.ImageDownloadStart
ev.ImageSize = resp.ContentLength
ev.ContentLength = resp.ContentLength
events.PublishImageDownloadEvent(broadcaster, ev)
_, err := io.Copy(writer, resp.Body)
_ = writer.CloseWithError(err)
}()

19
api/reddit/post.go
View file

@ -225,6 +225,13 @@ func (post *Post) IsNSFW() bool {
return post.Data.Over18
}
func (post *Post) IsNSFWInt() int {
if post.IsNSFW() {
return 1
}
return 0
}
func (post *Post) IsImagePost() bool {
return post.Data.PostHint == "image"
}
@ -375,6 +382,18 @@ func (post *Post) GetPostURL() string {
return fmt.Sprintf("https://reddit.com%s", post.Data.Permalink)
}
func (post *Post) GetPostName() string {
return post.Data.Name
}
func (post *Post) GetPostTitle() string {
return post.Data.Title
}
func (post *Post) GetPostCreated() int64 {
return int64(post.Data.Created)
}
func (post *Post) GetID() string {
return post.Data.ID
}

4
api/reddit/reddit.go
View file

@ -1,6 +1,8 @@
package reddit
import "github.com/tigorlazuardi/redmage/config"
import (
"github.com/tigorlazuardi/redmage/config"
)
type Reddit struct {
Client Client