From b6fb1c1f08335333ed5b464c67ff3d32a7f6c188 Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Mon, 10 Jul 2017 20:39:50 +0200 Subject: [PATCH] Fixed old stuff --- jobs/sync-anime/sync-anime.go | 4 --- jobs/twist/twist.go | 9 +++--- pages/anime/anime.pixy | 10 ++++-- pages/animeepisode/animeepisode.go | 7 ++++ pages/apiview/api.pixy | 2 +- pages/newthread/newthread.pixy | 2 ++ .../add-empty-episodes/add-empty-episodes.go | 32 ------------------- .../move-anime-episodes.go | 17 ---------- scripts/DateView.ts | 10 ++++++ 9 files changed, 32 insertions(+), 61 deletions(-) create mode 100644 pages/animeepisode/animeepisode.go delete mode 100644 patches/add-empty-episodes/add-empty-episodes.go delete mode 100644 patches/move-anime-episodes/move-anime-episodes.go diff --git a/jobs/sync-anime/sync-anime.go b/jobs/sync-anime/sync-anime.go index 65002a1b..2a45a036 100644 --- a/jobs/sync-anime/sync-anime.go +++ b/jobs/sync-anime/sync-anime.go @@ -68,10 +68,6 @@ func sync(data *kitsu.Anime) *arn.Anime { anime.Mappings = []*arn.Mapping{} } - if anime.Episodes == nil { - anime.Episodes = []*arn.AnimeEpisode{} - } - // Prefer Shoboi Japanese titles over Kitsu JP titles if anime.GetMapping("shoboi/anime") != "" { // Only take Kitsu title when our JP title is empty diff --git a/jobs/twist/twist.go b/jobs/twist/twist.go index 8f56977e..43c4c42b 100644 --- a/jobs/twist/twist.go +++ b/jobs/twist/twist.go @@ -3,7 +3,6 @@ package main import ( "fmt" "os" - "sort" "strings" "time" @@ -48,10 +47,10 @@ func main() { episodes := feed.Episodes - // Sort by episode number - sort.Slice(episodes, func(a, b int) bool { - return episodes[a].Number < episodes[b].Number - }) + // // Sort by episode number + // sort.Slice(episodes, func(a, b int) bool { + // return episodes[a].Number < episodes[b].Number + // }) for _, episode := range episodes { arnEpisode := anime.EpisodeByNumber(episode.Number) diff --git a/pages/anime/anime.pixy b/pages/anime/anime.pixy index d32f2b88..c67c4ac5 100644 --- a/pages/anime/anime.pixy +++ b/pages/anime/anime.pixy @@ -156,8 +156,14 @@ component Anime(anime *arn.Anime, tracks []*arn.SoundTrack, user *arn.User, epis tbody each episode in anime.Episodes().Items tr.episode - td.episode-number= episode.Number - td.episode-title= episode.Title.Japanese + td.episode-number + if episode.Number != -1 + span= episode.Number + td.episode-title + if episode.Title.Japanese != "" + span= episode.Title.Japanese + else + span - td.episode-actions for name, link := range episode.Links a(href=link, target="_blank", rel="noopener", title="Watch episode " + toString(episode.Number) + " on " + name) diff --git a/pages/animeepisode/animeepisode.go b/pages/animeepisode/animeepisode.go new file mode 100644 index 00000000..736ac5e4 --- /dev/null +++ b/pages/animeepisode/animeepisode.go @@ -0,0 +1,7 @@ +package animeepisode + +import "github.com/aerogo/aero" + +func Get(ctx *aero.Context) string { + return ctx.HTML("") +} diff --git a/pages/apiview/api.pixy b/pages/apiview/api.pixy index 1a3e0df3..4ff6fc7d 100644 --- a/pages/apiview/api.pixy +++ b/pages/apiview/api.pixy @@ -1,5 +1,5 @@ component API(types []string) - h3 API + h1 API table //- thead diff --git a/pages/newthread/newthread.pixy b/pages/newthread/newthread.pixy index 479864bf..9ddebcbe 100644 --- a/pages/newthread/newthread.pixy +++ b/pages/newthread/newthread.pixy @@ -1,4 +1,6 @@ component NewThread(user *arn.User) + h1 New thread + .widget-form .widget input#title.widget-element(type="text", placeholder="Title") diff --git a/patches/add-empty-episodes/add-empty-episodes.go b/patches/add-empty-episodes/add-empty-episodes.go deleted file mode 100644 index 47b32a6c..00000000 --- a/patches/add-empty-episodes/add-empty-episodes.go +++ /dev/null @@ -1,32 +0,0 @@ -package main - -import ( - "github.com/animenotifier/arn" - "github.com/fatih/color" -) - -func main() { - // Get a stream of all anime - allAnime, err := arn.AllAnime() - - if err != nil { - panic(err) - } - - // Iterate over the stream - for _, anime := range allAnime { - if anime.Mappings == nil { - anime.Mappings = []*arn.Mapping{} - } - - if anime.Episodes == nil { - anime.Episodes = []*arn.AnimeEpisode{} - } - - err := anime.Save() - - if err != nil { - color.Red("Error saving anime: %v", err) - } - } -} diff --git a/patches/move-anime-episodes/move-anime-episodes.go b/patches/move-anime-episodes/move-anime-episodes.go deleted file mode 100644 index ca2dc59e..00000000 --- a/patches/move-anime-episodes/move-anime-episodes.go +++ /dev/null @@ -1,17 +0,0 @@ -package main - -import ( - "github.com/animenotifier/arn" -) - -func main() { - for anime := range arn.MustStreamAnime() { - arn.PanicOnError(arn.DB.Set("AnimeEpisodes", anime.ID, &arn.AnimeEpisodes{ - AnimeID: anime.ID, - Items: anime.Episodes, - })) - - anime.Episodes = anime.Episodes[:0] - anime.MustSave() - } -} diff --git a/scripts/DateView.ts b/scripts/DateView.ts index 270e76d4..21abfe11 100644 --- a/scripts/DateView.ts +++ b/scripts/DateView.ts @@ -60,6 +60,11 @@ function getRemainingTime(remaining: number): string { } export function displayAiringDate(element: HTMLElement, now: Date) { + if(element.dataset.startDate === "") { + element.innerText = "" + return + } + let startDate = new Date(element.dataset.startDate) let endDate = new Date(element.dataset.endDate) @@ -91,6 +96,11 @@ export function displayAiringDate(element: HTMLElement, now: Date) { } export function displayDate(element: HTMLElement, now: Date) { + if(element.dataset.date === "") { + element.innerText = "" + return + } + let startDate = new Date(element.dataset.date) let h = startDate.getHours()