diff --git a/api/playback/handler.go b/api/playback/handler.go index 32be3ce..a4c78a2 100644 --- a/api/playback/handler.go +++ b/api/playback/handler.go @@ -12,6 +12,7 @@ import ( "strconv" "strings" "sync" + "time" "mal/integrations/jikan" database "mal/internal/db" @@ -57,32 +58,36 @@ func (h *Handler) HandleWatchPage(w http.ResponseWriter, r *http.Request) { return } - // Try to get video episodes first (for thumbnails) - episodes, err := h.jikanClient.GetVideoEpisodes(r.Context(), id, 1) - if err != nil || len(episodes.Data) == 0 { - // Fallback to standard episodes if no video episodes - episodes, err = h.jikanClient.GetEpisodes(r.Context(), id, 1) - if err != nil { - log.Printf("watch error: %v", err) + // Get essential episodes (first and last pages) + allEpisodes, err := h.jikanClient.GetAllEpisodes(r.Context(), id) + if err != nil { + log.Printf("watch error fetching episodes: %v", err) + } + + // Fetch any metadata overlays (thumbnails) + videoEpisodes, _ := h.jikanClient.GetVideoEpisodes(r.Context(), id, 1) + videoMeta := make(map[int]jikan.Episode) + for _, ve := range videoEpisodes.Data { + videoMeta[ve.MalID] = ve + } + + for i, ep := range allEpisodes { + if ve, ok := videoMeta[ep.MalID]; ok { + if ve.Images != nil && ve.Images.Jpg.ImageURL != "" { + allEpisodes[i].Images = ve.Images + } } } - var wg sync.WaitGroup - for i := range episodes.Data { - if episodes.Data[i].Images == nil { - episodes.Data[i].Images = &jikan.EpisodeImages{} + // Deduplicate and prep the list + seen := make(map[int]bool) + unique := make([]jikan.Episode, 0) + for _, ep := range allEpisodes { + if !seen[ep.MalID] { + seen[ep.MalID] = true + unique = append(unique, ep) } - wg.Add(1) - go func(idx int) { - defer wg.Done() - episodes.Data[idx].Images.Jpg.ImageURL = episodes.Data[idx].GetFallbackImage(id) - }(i) } - wg.Wait() - - sort.Slice(episodes.Data, func(i, j int) bool { - return episodes.Data[i].MalID < episodes.Data[j].MalID - }) user := middleware.GetUser(r.Context()) @@ -131,52 +136,75 @@ func (h *Handler) HandleWatchPage(w http.ResponseWriter, r *http.Request) { } } - if maxCount > len(episodes.Data) { - // Fetch metadata for the missing episodes - start := len(episodes.Data) + 1 - for i := start; i <= maxCount; i++ { - epStr := strconv.Itoa(i) - meta, err := h.svc.GetEpisodeMetadata(r.Context(), id, epStr) + epMap := make(map[int]jikan.Episode) + for _, ep := range unique { + epMap[ep.MalID] = ep + } - title := fmt.Sprintf("Episode %d", i) - imgURL := "" - - if err == nil && meta != nil { - if info, ok := meta["episodeInfo"].(map[string]any); ok { - if thumbs, ok := info["thumbnails"].([]any); ok && len(thumbs) > 0 { - if firstThumb, ok := thumbs[0].(string); ok { - imgURL = firstThumb - } - } - } - if notes, ok := meta["notes"].(string); ok && notes != "" { - title = notes - } + if maxCount > 0 { + var fullList []jikan.Episode + for i := 1; i <= maxCount; i++ { + if ep, ok := epMap[i]; ok { + fullList = append(fullList, ep) + } else { + fullList = append(fullList, jikan.Episode{ + MalID: i, + Episode: fmt.Sprintf("Episode %d", i), + Title: fmt.Sprintf("Episode %d", i), + }) } - - if imgURL == "" { - // Last resort fallback - tmpEp := jikan.Episode{MalID: i} - imgURL = tmpEp.GetFallbackImage(id) - } - - episodes.Data = append(episodes.Data, jikan.Episode{ - MalID: i, - Episode: fmt.Sprintf("Episode %d", i), - Title: title, - Images: &jikan.EpisodeImages{ - Jpg: struct { - ImageURL string `json:"image_url"` - }{ImageURL: imgURL}, - }, - }) } + unique = fullList } } + // Update episodes list if fallback has more + if watchData.FallbackEpisodes != nil { + maxCount := 0 + for _, count := range watchData.FallbackEpisodes { + if count > maxCount { + maxCount = count + } + } + + // Ensure we don't have duplicates or missing episodes in the sequence + epMap := make(map[int]jikan.Episode) + for _, ep := range unique { + epMap[ep.MalID] = ep + } + + if maxCount > 0 { + var newEpisodes []jikan.Episode + // We build the list from 1 to maxCount to ensure order and completeness + // If we have data from Jikan, we use it. Otherwise we generate a placeholder. + for i := 1; i <= maxCount; i++ { + if ep, ok := epMap[i]; ok { + newEpisodes = append(newEpisodes, ep) + } else { + title := fmt.Sprintf("Episode %d", i) + newEpisodes = append(newEpisodes, jikan.Episode{ + MalID: i, + Episode: fmt.Sprintf("Episode %d", i), + Title: title, + Images: &jikan.EpisodeImages{ + Jpg: struct { + ImageURL string `json:"image_url"` + }{ImageURL: ""}, + }, + }) + } + } + unique = newEpisodes + } + } + + sort.Slice(unique, func(i, j int) bool { + return unique[i].MalID < unique[j].MalID + }) + if err := templates.GetRenderer().ExecuteTemplate(r.Context(), w, "watch.gohtml", map[string]any{ "Anime": anime, - "Episodes": episodes.Data, + "Episodes": unique, "WatchData": watchData, "User": user, "CurrentPath": r.URL.Path, @@ -375,3 +403,119 @@ func (h *Handler) HandleEpisodeData(w http.ResponseWriter, r *http.Request) { "episode_title": "", // Find episode title if possible }) } + +func (h *Handler) HandleEpisodeThumbnails(w http.ResponseWriter, r *http.Request) { + parts := strings.Split(r.URL.Path, "/") + // /api/watch/thumbnails/{animeId} + if len(parts) < 5 { + http.Error(w, "invalid path", http.StatusBadRequest) + return + } + + id, err := strconv.Atoi(parts[4]) + if err != nil { + http.Error(w, "invalid animeId", http.StatusBadRequest) + return + } + + // Get essential episodes (first and last pages) + allEpisodes, err := h.jikanClient.GetAllEpisodes(r.Context(), id) + if err != nil { + http.Error(w, "failed to get episodes", http.StatusInternalServerError) + return + } + + // Also get video episodes for richer metadata (thumbnails) on recent episodes + videoEpisodes, _ := h.jikanClient.GetVideoEpisodes(r.Context(), id, 1) + + // Merge metadata + videoMeta := make(map[int]jikan.Episode) + for _, ve := range videoEpisodes.Data { + videoMeta[ve.MalID] = ve + } + + for i, ep := range allEpisodes { + if ve, ok := videoMeta[ep.MalID]; ok { + if ve.Images != nil && ve.Images.Jpg.ImageURL != "" { + allEpisodes[i].Images = ve.Images + } + } + } + + // Dedup and sort + seen := make(map[int]bool) + unique := make([]jikan.Episode, 0, len(allEpisodes)) + for _, ep := range allEpisodes { + if !seen[ep.MalID] { + seen[ep.MalID] = true + unique = append(unique, ep) + } + } + + // Calculate total count from anime info for complete list + anime, _ := h.jikanClient.GetAnimeByID(r.Context(), id) + maxCount := anime.Episodes + + epMap := make(map[int]jikan.Episode) + for _, ep := range unique { + epMap[ep.MalID] = ep + } + + if maxCount > 0 { + var fullList []jikan.Episode + for i := 1; i <= maxCount; i++ { + if ep, ok := epMap[i]; ok { + fullList = append(fullList, ep) + } else { + fullList = append(fullList, jikan.Episode{ + MalID: i, + Episode: fmt.Sprintf("Episode %d", i), + Title: fmt.Sprintf("Episode %d", i), + }) + } + } + unique = fullList + } + + sort.Slice(unique, func(i, j int) bool { + return unique[i].MalID < unique[j].MalID + }) + + type ThumbResult struct { + MalID int `json:"mal_id"` + URL string `json:"url"` + Title string `json:"title,omitempty"` + } + + results := make([]ThumbResult, len(unique)) + + // Use a semaphore to limit concurrent scraping requests to avoid MAL bans + sem := make(chan struct{}, 2) + var wg sync.WaitGroup + + for i := range unique { + wg.Add(1) + go func(idx int) { + defer wg.Done() + + sem <- struct{}{} // Acquire + + // Add a small jittered delay between requests to avoid 405/429 + time.Sleep(time.Duration(200+idx%300) * time.Millisecond) + + defer func() { <-sem }() // Release + + ep := unique[idx] + imgURL := ep.GetFallbackImage(id) + results[idx] = ThumbResult{ + MalID: ep.MalID, + URL: imgURL, + Title: ep.Title, + } + }(i) + } + wg.Wait() + + w.Header().Set("Content-Type", "application/json") + json.NewEncoder(w).Encode(results) +} diff --git a/integrations/jikan/episodes.go b/integrations/jikan/episodes.go index 04eda5d..a1978e3 100644 --- a/integrations/jikan/episodes.go +++ b/integrations/jikan/episodes.go @@ -4,6 +4,7 @@ import ( "context" "fmt" "io" + "log" "net/http" "regexp" "strconv" @@ -40,8 +41,9 @@ func (e *Episode) GetFallbackImage(animeID int) string { // Always trigger scraping if we encounter the banned icon OR the generic placeholder // OR if there is no image URL at all if imageUrl == bannedImageURL || imageUrl == placeholderImageURL || imageUrl == "" { - // MAL URLs usually follow this format, and it redirects to the slug version - episodeURL := fmt.Sprintf("https://myanimelist.net/anime/%d/_/episode/%d", animeID, episodeNum) + // MAL URLs follow this format: https://myanimelist.net/anime/20/Naruto/episode/1 + // The previous format used /_/ which is sometimes rejected with 405 + episodeURL := fmt.Sprintf("https://myanimelist.net/anime/%d/slug/episode/%d", animeID, episodeNum) fallbackURL := scrapeAnimeImageFromEpisodePage(episodeURL, episodeNum) if fallbackURL != "" { @@ -68,7 +70,7 @@ func scrapeAnimeImageFromEpisodePage(episodeURL string, episodeNum int) string { // Log the status code for debugging if resp.StatusCode != 200 { - // fmt.Printf("[DEBUG] Failed to fetch %s: Status %d\n", episodeURL, resp.StatusCode) + log.Printf("[DEBUG] Scraper failed to fetch %s: Status %d", episodeURL, resp.StatusCode) return "" } @@ -80,8 +82,9 @@ func scrapeAnimeImageFromEpisodePage(episodeURL string, episodeNum int) string { html := string(body) // MAL sometimes redirects to a URL with a slug. - // The JSON object is very likely to be present in the full page. - // We extract the object {} containing "episode_number":X + // We look for the "thumbnail" field in the page source. + + // Pattern 1: Look for the specific episode object in the JSON data episodeStr := strconv.Itoa(episodeNum) objPattern := regexp.MustCompile(`\{[^{}]*"episode_number":\s*` + episodeStr + `[^{}]*\}`) match := objPattern.FindString(html) @@ -95,10 +98,19 @@ func scrapeAnimeImageFromEpisodePage(episodeURL string, episodeNum int) string { thumbRe := regexp.MustCompile(`"thumbnail":\s*"([^"]+)"`) thumbMatch := thumbRe.FindStringSubmatch(match) if len(thumbMatch) > 1 { - // Unescape backslashes in URL return strings.ReplaceAll(thumbMatch[1], `\/`, `/`) } } + + // Pattern 2: Fallback to og:image if it's the specific episode page + ogRe := regexp.MustCompile(` 1 { + // Only use if it looks like an episode thumbnail (contains /episodes/) + if strings.Contains(ogMatch[1], "/episodes/") { + return ogMatch[1] + } + } return "" } @@ -137,3 +149,62 @@ func (c *Client) GetEpisode(ctx context.Context, animeID int, episode int) (Epis err := c.getWithCache(ctx, cacheKey, 24*time.Hour, reqURL, &result) return result, err } + +func (c *Client) GetAllEpisodes(ctx context.Context, animeID int) ([]Episode, error) { + // First fetch the anime to get total episodes count + anime, err := c.GetAnimeByID(ctx, animeID) + if err != nil { + return nil, err + } + + totalEpisodes := anime.Episodes + if totalEpisodes <= 0 { + // Fallback to simple page 1 fetch if count is unknown + resp, err := c.GetEpisodes(ctx, animeID, 1) + if err != nil { + return nil, err + } + return resp.Data, nil + } + + // Jikan /episodes returns 100 per page + lastPage := (totalEpisodes + 99) / 100 + var allEpisodes []Episode + + // Fetch last page first (to get most recent episodes immediately) + lastResp, err := c.GetEpisodes(ctx, animeID, lastPage) + if err == nil { + allEpisodes = append(allEpisodes, lastResp.Data...) + } + + // Fetch first page + if lastPage > 1 { + firstResp, err := c.GetEpisodes(ctx, animeID, 1) + if err == nil { + allEpisodes = append(allEpisodes, firstResp.Data...) + } + } + + // Background fetching for intermediate pages + if lastPage > 2 { + go func() { + // Create a fresh context for background work + bgCtx, cancel := context.WithTimeout(context.Background(), 2*time.Minute) + defer cancel() + + for p := 2; p < lastPage; p++ { + // We don't need to store the result here if the client has an internal cache, + // but calling it ensures the data is ready for the next request. + _, _ = c.GetEpisodes(bgCtx, animeID, p) + + select { + case <-bgCtx.Done(): + return + case <-time.After(500 * time.Millisecond): // Rate limit buffer + } + } + }() + } + + return allEpisodes, nil +} diff --git a/integrations/jikan/types.go b/integrations/jikan/types.go index 41551f6..d45c06c 100644 --- a/integrations/jikan/types.go +++ b/integrations/jikan/types.go @@ -76,6 +76,10 @@ type Anime struct { URL string `json:"url"` } `json:"streaming"` Relations []JikanRelationGroup `json:"relations"` + External []struct { + Name string `json:"name"` + URL string `json:"url"` + } `json:"external"` } func (a Anime) ImageURL() string { diff --git a/internal/server/routes.go b/internal/server/routes.go index 7c5b3f9..1905dea 100644 --- a/internal/server/routes.go +++ b/internal/server/routes.go @@ -87,6 +87,7 @@ func NewRouter(cfg Config) http.Handler { mux.HandleFunc("/api/watch-progress", playbackHandler.HandleSaveProgress) mux.HandleFunc("/api/watch-complete", playbackHandler.HandleCompleteAnime) mux.HandleFunc("/api/watch/episode/", playbackHandler.HandleEpisodeData) + mux.HandleFunc("/api/watch/thumbnails/", playbackHandler.HandleEpisodeThumbnails) // Auth Endpoints mux.HandleFunc("/login", func(w http.ResponseWriter, r *http.Request) { diff --git a/static/player.ts b/static/player.ts index 31e2beb..6259fbc 100644 --- a/static/player.ts +++ b/static/player.ts @@ -1113,6 +1113,42 @@ const initPlayer = (): void => { showControls() playerInitialized = true + + // Fetch thumbnails and metadata in the background + fetch(`/api/watch/thumbnails/${malID}`) + .then((res) => res.json()) + .then((data: Array<{ mal_id: number, url: string, title?: string }>) => { + const episodeList = document.querySelector('[data-episode-list]') + if (!episodeList) return + + data.forEach((item) => { + const epCard = episodeList.querySelector(`[data-episode-id="${item.mal_id}"]`) + if (!epCard) return + + if (item.url) { + const imgContainer = epCard.querySelector('.relative.aspect-video') + if (imgContainer) { + let img = imgContainer.querySelector('img') + if (!img) { + img = document.createElement('img') + img.className = 'h-full w-full object-cover transition-transform group-hover:scale-105' + img.loading = 'lazy' + const placeholder = imgContainer.querySelector('.flex.h-full.w-full.items-center.justify-center') + if (placeholder) placeholder.remove() + imgContainer.prepend(img) + } + img.src = item.url + img.alt = item.title || `Episode ${item.mal_id}` + } + } + + if (item.title) { + const titleSpan = epCard.querySelector('[data-episode-title]') + if (titleSpan) titleSpan.textContent = item.title + } + }) + }) + .catch((err) => console.error('Failed to fetch thumbnails:', err)) } document.addEventListener('DOMContentLoaded', initPlayer) diff --git a/templates/anime.gohtml b/templates/anime.gohtml index bacaa88..f8c0bd5 100644 --- a/templates/anime.gohtml +++ b/templates/anime.gohtml @@ -28,7 +28,15 @@ {{template "watchlist_actions" dict "Anime" $anime "User" .User "Status" .Status}} -
+
+ {{range $anime.External}} + + {{.Name}} + + {{end}} +
+ +

Synopsis

diff --git a/templates/watch.gohtml b/templates/watch.gohtml index e577294..52c59ab 100644 --- a/templates/watch.gohtml +++ b/templates/watch.gohtml @@ -21,13 +21,19 @@ {{$totalEps = $fallbackSub}} {{end}} -

+
{{range $episodes}} {{$isCurrent := eq (printf "%v" .MalID) $currentEpID}} - +
- {{if .Images.Jpg.ImageURL}} - {{.Title}} + {{if .Images}} + {{if .Images.Jpg.ImageURL}} + {{.Title}} + {{else}} +
+ +
+ {{end}} {{else}}
@@ -41,7 +47,7 @@
Episode {{.MalID}} - {{.Title}} + {{.Title}}
{{end}}