Rumperuu/Cataloguer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: citations, TV views

Browse source
This commit is contained in:
Ben Goldsworthy 2025-02-23 01:27:07 +01:00
parent 0e396ed69d
commit 3374a5ea2a
Signed by: Rumperuu
SSH key fingerprint: SHA256:v3uompaUiPqV2w1/AIRWBSQOxr2dntH9Xs/y8fDnUPU
5 changed files with 61 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
layouts/partials/books/rows/read-dates.html
View file

@ -1,11 +1,10 @@
{{- with .date_started -}} {{- with .date_started -}}
{{- time.Format "Jan 2, 2006" . -}} {{ if not $.date_finished }}Since{{ end }}
{{ time.Format "Jan 2, 2006" . -}}
{{- else -}} {{- else -}}
Unknown Unknown
{{- end }} {{- end }}
to<br /> {{- with .date_finished }}
{{ with .date_finished -}} to
{{- time.Format "Jan 2, 2006" . -}} {{ time.Format "Jan 2, 2006" . -}}
{{- else -}}
Unknown
{{- end -}} {{- end -}}

4
layouts/partials/cite.html
View file

@ -9,11 +9,11 @@
itemscope itemscope
itemprop="citation" itemprop="citation"
itemtype="https://schema.org/{{- $itemType -}}" itemtype="https://schema.org/{{- $itemType -}}"
{{- if .titleTrans -}} {{- if $.titleTrans -}}
lang="{{- $.titleLang -}}" lang="{{- $.titleLang -}}"
title="{{- $.titleTrans -}}" title="{{- $.titleTrans -}}"
{{- end -}}> {{- end -}}>
{{- .title -}} {{- $.title -}}
</cite> </cite>
{{- with $pages -}}</a>{{- end -}} {{- with $pages -}}</a>{{- end -}}

22
layouts/partials/series_by_id.html
View file

@ -1,22 +1,26 @@
{{- $series_tmdb_id := .tmdb_id -}} {{- $series_tmdb_id := .tmdb_id -}}
{{- $series := "" -}} {{- $series := "" -}}
{{ warnf "%v" $series_tmdb_id }}
{{- range ( index .g.Site.Data.tv_series.current ) -}} {{- range ( index .g.Site.Data.tv_series.current ) -}}
{{- if ( eq .tmdb_id $series_tmdb_id ) -}} {{- if ( and ( isset . "tmdb_id" ) ( eq .tmdb_id $series_tmdb_id ) ) -}}
{{- $series = . -}} {{- $series = . -}}
{{- end -}} {{ warnf "%v" $series }}
{{- end -}}
{{- end -}} {{- end -}}
{{- range ( index .g.Site.Data.tv_series.log ) -}} {{- range ( index .g.Site.Data.tv_series.log ) -}}
{{- if ( eq .tmdb_id $series_tmdb_id ) -}} {{- if ( and ( isset . "tmdb_id" ) ( eq .tmdb_id $series_tmdb_id ) ) -}}
{{- $series = . -}} {{- $series = . -}}
{{- end -}} {{ warnf "%v" $series }}
{{- end -}}
{{- end -}} {{- end -}}
{{- range ( index .g.Site.Data.tv_series.wishlist ) -}} {{- range ( index .g.Site.Data.tv_series.wishlist ) -}}
{{- if ( eq .tmdb_id $series_tmdb_id ) -}} {{- if ( and ( isset . "tmdb_id" ) ( eq .tmdb_id $series_tmdb_id ) ) -}}
{{- $series = . -}} {{- $series = . -}}
{{- end -}} {{ warnf "%v" $series }}
{{- end -}}
{{- end -}} {{- end -}}
{{- return $series -}} {{- return $series -}}

67
layouts/partials/tv/episodes/table-body.html
View file

@ -5,42 +5,49 @@
{{ end }} {{ end }}
{{ range ( sort ( index $.Site.Data.tv_episodes ( .Scratch.Get "listMode" ) ) ( .Scratch.Get "filterCol" ) ( .Scratch.Get "filterDir" ) ) }} {{ range ( sort ( index $.Site.Data.tv_episodes ( .Scratch.Get "listMode" ) ) ( .Scratch.Get "filterCol" ) ( .Scratch.Get "filterDir" ) ) }}
<tr> <tr>
<td> <td>
{{- with ( index . "Series Title" ) -}} {{- with ( index . "Series Title" ) -}}
<cite class="cite" itemscope itemtype="TVSeries">{{ . }}</cite> <cite
{{- else -}} class="cite"
{{- $series := partialCached "series_by_id" ( dict "g" $ "tmdb_id" .series.tmdb_id ) .series.tmdb_id -}} itemscope
{{- if ( not ( eq $series "" ) ) -}} itemtype="TVSeries"
{{- partial "cite" ( dict "c" . "g" $ "section" "tv" "schemaType" "TVSeries" "title" $series.name "titleLang" $series.original_language "titleTrans" $series.original_name ) -}} >{{ . }}</cite
>
{{- else -}} {{- else -}}
Unknown series {{- $series := partial "series_by_id" ( dict "g" $ "tmdb_id" .series.tmdb_id ) .series.tmdb_id -}}
{{- if ( not ( eq $series "" ) ) -}}
{{- partial "cite" ( dict "c" . "g" $ "section" "tv/series" "schemaType" "TVSeries" "title" $series.title "titleLang" $series.original_language "titleTrans" $series.original_name ) -}}
{{- else -}}
Unknown series
{{- end -}}
{{- end -}} {{- end -}}
{{- end -}} </td>
</td>
<td> <td>
{{- if ( index . "Episode Title" ) -}} {{- if ( index . "Episode Title" ) -}}
{{- partial "cite" ( dict "c" . "g" $ "section" "tv" "schemaType" "TVEpisode" "title" ( index . "Episode Title" ) ) -}} {{- partial "cite" ( dict "c" . "g" $ "section" "tv/episodes" "schemaType" "TVEpisode" "title" ( index . "Episode Title" ) ) -}}
<span class="episode-number">({{ index . "Episode Number" }})</span> <span class="episode-number">({{ index . "Episode Number" }})</span>
{{- else -}} {{- else -}}
{{- partial "cite" ( dict "c" . "g" $ "section" "tv" "schemaType" "TVEpisode" "title" .name ) -}} {{- partial "cite" ( dict "c" . "g" $ "section" "tv/episodes" "schemaType" "TVEpisode" "title" .title ) -}}
<span class="episode-number">(S{{ .season_number }}E{{ .episode_number }})</span> <span class="episode-number"
{{- end -}} >({{ printf "S%vE%v" .season_number .episode_number }})</span
</td> >
{{- end -}}
</td>
<td> <td>
{{- if ( or ( index . "Date Watched" ) .date_finished ) -}} {{- if ( or ( index . "Date Watched" ) .date_finished ) -}}
{{- with ( index . "Date Watched" ) -}} {{- with ( index . "Date Watched" ) -}}
{{- time.Format "Jan 2, 2006" . -}} {{- time.Format "Jan 2, 2006" . -}}
{{- else -}}
{{- time.Format "Jan 2, 2006" .date_finished -}}
{{- end -}}
{{- if ( or .is_rewatch .Rewatch ) }}&#x21BB;{{ end -}}
{{- else -}} {{- else -}}
{{- time.Format "Jan 2, 2006" .date_finished -}} n/a
{{- end -}} {{- end -}}
{{- if ( or .is_rewatch .Rewatch ) }} &#x21BB;{{ end -}} </td>
{{- else -}} </tr>
n/a
{{- end -}}
</td>
</tr>
{{ end }} {{ end }}
{{ end }} {{ end }}

8
layouts/partials/tv/series/table-body.html
View file

@ -11,7 +11,7 @@
</td> </td>
<td> <td>
{{- with ( index . "name" ) -}} {{- with ( index . "title" ) -}}
<cite <cite
class="cite" class="cite"
itemscope itemscope
@ -44,7 +44,7 @@
</td> </td>
<td> <td>
{{- with ( index . "name" ) -}} {{- with ( index . "title" ) -}}
<cite <cite
class="cite" class="cite"
itemscope itemscope
@ -60,7 +60,7 @@
</tr> </tr>
{{ end }} {{ end }}
{{ else if ( eq ( .Scratch.Get "listMode" ) "wishlist" ) }} {{ else if ( eq ( .Scratch.Get "listMode" ) "wishlist" ) }}
{{ range ( sort $.Site.Data.tv_series.wishlist "name" "asc" ) }} {{ range ( sort $.Site.Data.tv_series.wishlist "title" "asc" ) }}
<tr> <tr>
<td> <td>
{{ with .date_added }} {{ with .date_added }}
@ -72,7 +72,7 @@
</td> </td>
<td> <td>
{{- with ( index . "name" ) -}} {{- with ( index . "title" ) -}}
<cite <cite
class="cite" class="cite"
itemscope itemscope