fix: return errors from fetchAniSkipSegments instead of swallowing them

This commit is contained in:
2026-06-16 01:09:22 +02:00
committed by Milas Holsting
parent 941a282d3f
commit eaabdc5475
2 changed files with 20 additions and 11 deletions

View File

@@ -56,39 +56,42 @@ func (s *playbackService) UpsertSkipSegmentOverride(ctx context.Context, userID
}) })
} }
func (s *playbackService) fetchSkipSegments(ctx context.Context, userID string, malID int, episode string) []domain.SkipSegment { func (s *playbackService) fetchSkipSegments(ctx context.Context, userID string, malID int, episode string) ([]domain.SkipSegment, error) {
if malID <= 0 || strings.TrimSpace(episode) == "" { if malID <= 0 || strings.TrimSpace(episode) == "" {
return []domain.SkipSegment{} return []domain.SkipSegment{}, nil
} }
segments := s.fetchAniSkipSegments(ctx, malID, episode) segments, err := s.fetchAniSkipSegments(ctx, malID, episode)
return s.applySkipSegmentOverrides(ctx, segments, userID, malID, episode) if err != nil {
return nil, fmt.Errorf("aniskip: %w", err)
}
return s.applySkipSegmentOverrides(ctx, segments, userID, malID, episode), nil
} }
func (s *playbackService) fetchAniSkipSegments(ctx context.Context, malID int, episode string) []domain.SkipSegment { func (s *playbackService) fetchAniSkipSegments(ctx context.Context, malID int, episode string) ([]domain.SkipSegment, error) {
endpoint := fmt.Sprintf("https://api.aniskip.com/v1/skip-times/%s/%s?types=op&types=ed", url.PathEscape(strconv.Itoa(malID)), url.PathEscape(episode)) endpoint := fmt.Sprintf("https://api.aniskip.com/v1/skip-times/%s/%s?types=op&types=ed", url.PathEscape(strconv.Itoa(malID)), url.PathEscape(episode))
req, err := http.NewRequestWithContext(ctx, http.MethodGet, endpoint, nil) req, err := http.NewRequestWithContext(ctx, http.MethodGet, endpoint, nil)
if err != nil { if err != nil {
return nil return nil, fmt.Errorf("build request: %w", err)
} }
req.Header.Set("User-Agent", netutil.Generic) req.Header.Set("User-Agent", netutil.Generic)
resp, err := s.httpClient.Do(req) resp, err := s.httpClient.Do(req)
if err != nil { if err != nil {
return nil return nil, fmt.Errorf("http request: %w", err)
} }
defer func() { _ = resp.Body.Close() }() defer func() { _ = resp.Body.Close() }()
if resp.StatusCode != http.StatusOK { if resp.StatusCode != http.StatusOK {
return nil return nil, fmt.Errorf("unexpected status: %d", resp.StatusCode)
} }
body, err := io.ReadAll(io.LimitReader(resp.Body, netutil.KiB512)) body, err := io.ReadAll(io.LimitReader(resp.Body, netutil.KiB512))
if err != nil { if err != nil {
return nil return nil, fmt.Errorf("read body: %w", err)
} }
return parseAniSkipSegments(body) return parseAniSkipSegments(body), nil
} }
func parseAniSkipSegments(body []byte) []domain.SkipSegment { func parseAniSkipSegments(body []byte) []domain.SkipSegment {

View File

@@ -49,7 +49,13 @@ func (s *playbackService) BuildWatchData(ctx context.Context, animeID int, title
startTime, watchlistStatus, watchlistIDs := s.loadWatchProgress(ctx, userID, animeID, anime.Episodes, episode) startTime, watchlistStatus, watchlistIDs := s.loadWatchProgress(ctx, userID, animeID, anime.Episodes, episode)
go s.warmStreamURL(result.URL, result.Referer) go s.warmStreamURL(result.URL, result.Referer)
seasons := s.loadSeasons(ctx, animeID) seasons := s.loadSeasons(ctx, animeID)
segments := s.fetchSkipSegments(ctx, userID, animeID, episode) segments, err := s.fetchSkipSegments(ctx, userID, animeID, episode)
if err != nil {
observability.Warn("fetch_skip_segments_failed", "playback", "",
map[string]any{"anime_id": animeID, "episode": episode},
err,
)
}
watchData := buildWatchDataPayload(animeData, animeID, episode, startTime, canonicalEpisodes.Episodes, modeSources, mode, modeSwitchedFrom, segments) watchData := buildWatchDataPayload(animeData, animeID, episode, startTime, canonicalEpisodes.Episodes, modeSources, mode, modeSwitchedFrom, segments)
return buildWatchPageData(animeData, canonicalEpisodes.Episodes, episode, watchlistStatus, watchlistIDs, seasons, watchData), nil return buildWatchPageData(animeData, canonicalEpisodes.Episodes, episode, watchlistStatus, watchlistIDs, seasons, watchData), nil
} }