Fix sorting

data/books/current.json

@@ -1,4 +1,19 @@
 [
+ {
+   "Title": "Voices from the Other Side: An Oral History of Terrorism Against Cuba",
+   "Author": "Keith Bolender",
+   "ISBN": null,
+   "ISBN13": "9781783710942",
+   "Publisher": "Pluto Press",
+   "Binding": "Ebook",
+   "Number of Pages": 264,
+   "Year Published": "2010",
+   "Original Publication Year": "2010",
+   "Date Added": "2023-02-28",
+   "Date Started": "2023-02-17",
+   "Date Finished": null,
+   "Read Count": 1
+ },
  {
    "Title": "Spanish Made Simple",
    "Edition": "Revised Edition",

data/books/log.json

@@ -215,7 +215,8 @@
    "Read Count": 1
  },
  {
-   "Title": "Martin Monath: A Jewish Resistance Fighter Among Nazi Soldiers (Revolutionary Lives)",
+   "Title": "Martin Monath: A Jewish Resistance Fighter Among Nazi Soldiers",
+   "Series": "Revolutionary Lives",
    "Author": "Nathaniel Flakin",
    "ISBN": null,
    "ISBN13": null,
@@ -363,7 +364,9 @@
    "Read Count": 1
  },
  {
-   "Title": "Manifesto for a Democratic Civilization, Volume I - Civilization: The Age of Masked Gods and Disguised Kings (Manifesto for a Democratic Civilization, #1)",
+   "Title": "Manifesto for a Democratic Civilization, Volume I - Civilization: The Age of Masked Gods and Disguised Kings",
+   "Series": "Manifesto for a Democratic Civilization",
+   "Series Number": 1,
    "Author": "Abdullah Öcalan",
    "Additional Authors": "David Graeber",
    "ISBN": "8293064420",

data/films/log.json

@@ -1,9 +1,17 @@
 [
+ {
+   "Date Added": "2023-02-28",
+   "Title": "O, Persecuted",
+   "Release Year": "2014",
+   "Letterboxd URI": "https://letterboxd.com/film/o-persecuted/",
+   "Rewatch": false,
+   "Date Watched": "2023-02-28"
+ },
  {
    "Date Added": "2023-02-17",
    "Title": "Handsworth Songs",
-   "Release Year": "",
+   "Release Year": "1986",
-   "Letterboxd URI": "",
+   "Letterboxd URI": "https://letterboxd.com/film/handsworth-songs/",
    "Rewatch": false,
    "Date Watched": "2023-02-17"
  },
@@ -18,32 +26,32 @@
  {
    "Date Added": "2023-02-17",
    "Title": "The Heart of Raqqa",
-   "Release Year": "",
+   "Release Year": "2019",
-   "Letterboxd URI": "",
+   "Letterboxd URI": "https://letterboxd.com/film/the-heart-of-raqqa/",
    "Rewatch": false,
    "Date Watched": "2023-02-17"
  },
  {
    "Date Added": "2023-02-17",
    "Title": "Baghdad Messi",
-   "Release Year": "",
+   "Release Year": "2012",
-   "Letterboxd URI": "",
+   "Letterboxd URI": "https://letterboxd.com/film/baghdad-messi/",
    "Rewatch": false,
    "Date Watched": "2023-02-17"
  },
  {
    "Date Added": "2023-02-17",
-   "Title": "Well",
+   "Title": "The Well",
-   "Release Year": "",
+   "Release Year": "2016",
-   "Letterboxd URI": "",
+   "Letterboxd URI": "https://www.lkff.co.uk/10thlkff-2018/the-well/",
    "Rewatch": false,
    "Date Watched": "2023-02-17"
  },
  {
    "Date Added": "2023-02-17",
    "Title": "Azad",
-   "Release Year": "",
+   "Release Year": "2016",
-   "Letterboxd URI": "",
+   "Letterboxd URI": "https://letterboxd.com/film/azad/",
    "Rewatch": false,
    "Date Watched": "2023-02-17"
  },

data/tv/log.json

@@ -1,4 +1,64 @@
 [
+    {
+        "Series Title": "Deutschland 83",
+        "Episode Title": "Brave Guy",
+        "Episode Number": "1x2",
+        "Date Watched": "2023-02-27"
+    },
+    {
+        "Series Title": "Deutschland 83",
+        "Episode Title": "Quantum Jump",
+        "Episode Number": "1x1",
+        "Date Watched": "2023-02-26"
+    },
+    {
+        "Series Title": "The Simpsons",
+        "Episode Title": "Brother, Can You Spare Two Dimes",
+        "Episode Number": "3x24",
+        "Date Watched": "2023-02-20"
+    },
+    {
+        "Series Title": "The Simpsons",
+        "Episode Title": "Bart's Friend Falls in Love",
+        "Episode Number": "3x23",
+        "Date Watched": "2023-02-20"
+    },
+    {
+        "Series Title": "The Simpsons",
+        "Episode Title": "The Otto Show",
+        "Episode Number": "3x22",
+        "Date Watched": "2023-02-20"
+    },
+    {
+        "Series Title": "The Simpsons",
+        "Episode Title": "Black Widower",
+        "Episode Number": "3x21",
+        "Date Watched": "2023-02-20"
+    },
+    {
+        "Series Title": "The Simpsons",
+        "Episode Title": "Colonel Homer",
+        "Episode Number": "3x20",
+        "Date Watched": "2023-02-19"
+    },
+    {
+        "Series Title": "The Simpsons",
+        "Episode Title": "Dog of Death",
+        "Episode Number": "3x19",
+        "Date Watched": "2023-02-17"
+    },
+    {
+        "Series Title": "The Simpsons",
+        "Episode Title": "Separate Vocations",
+        "Episode Number": "3x18",
+        "Date Watched": "2023-02-17"
+    },
+    {
+        "Series Title": "The Simpsons",
+        "Episode Title": "Homer at the Bat",
+        "Episode Number": "3x17",
+        "Date Watched": "2023-02-17"
+    },
     {
         "Series Title": "The Simpsons",
         "Episode Title": "Bart the Lover",

layouts/partials/films/table-body.html

@@ -1,12 +1,8 @@
 {{ if ( eq ( .Scratch.Get "listMode" ) "log" ) }}
-  {{ .Scratch.Set "filterCol" "Date Watched" }}
+  <tr>
-  {{ .Scratch.Set "filterDir" "desc" }}
+    <td colspan=4><h3>Diary</h3></td>
-{{ else }}
+  </tr>
-  {{ .Scratch.Set "filterCol" "Title" }}
+  {{ range ( sort ( where $.Site.Data.films.log "Date Watched" "!=" "" ) "Date Watched" "desc" ) }}
-  {{ .Scratch.Set "filterDir" "asc" }}
-{{ end }}
-
-{{ range ( sort ( sort ( index $.Site.Data.films ( .Scratch.Get "listMode" ) ) "Title" "asc" ) ( .Scratch.Get "filterCol" ) ( .Scratch.Get "filterDir" ) ) }}
   <tr>
     <td>{{ time.Format "Jan 2, 2006" ( index . "Date Added" ) }}</td>
     <td>
@@ -31,3 +27,58 @@
     </td>
   </tr>  
   {{ end }}
+  <tr>
+    <td colspan=4><h3>Assorted</h3></td>
+  </tr>
+  {{ range ( sort ( where $.Site.Data.films.log "Date Watched" "" ) "Title" "asc" ) }}
+  <tr>
+    <td>{{ time.Format "Jan 2, 2006" ( index . "Date Added" ) }}</td>
+    <td>
+      {{- with ( where ( where $.Site.Pages "Section" "films" ) "Title" .Title ) -}}
+      {{ range . }}
+      <a href="{{ .RelPermalink }}">
+        {{ end }}
+      {{- end -}}
+      <cite class="film">{{ .Title }}</cite>
+      {{- with ( where ( where $.Site.Pages "Section" "films" ) "Title" .Title ) -}}
+      </a>
+      {{- end -}}
+    </td>
+    <td>{{ index . "Release Year" }}</td>
+    <td>
+    {{- if ( index . "Date Watched" ) -}}
+      {{- time.Format "Jan 2, 2006" ( index . "Date Watched" ) -}}
+      {{- if .Rewatch }} &#x21BB;{{ end -}}
+    {{- else -}}
+      n/a
+    {{- end -}}
+    </td>
+  </tr>  
+  {{ end }}
+{{ else if ( eq ( .Scratch.Get "listMode" ) "wishlist" ) }}
+  {{ range ( sort $.Site.Data.films.wishlist "Title" "asc" ) }}
+  <tr>
+    <td>{{ time.Format "Jan 2, 2006" ( index . "Date Added" ) }}</td>
+    <td>
+      {{- with ( where ( where $.Site.Pages "Section" "films" ) "Title" .Title ) -}}
+      {{ range . }}
+      <a href="{{ .RelPermalink }}">
+        {{ end }}
+      {{- end -}}
+      <cite class="film">{{ .Title }}</cite>
+      {{- with ( where ( where $.Site.Pages "Section" "films" ) "Title" .Title ) -}}
+      </a>
+      {{- end -}}
+    </td>
+    <td>{{ index . "Release Year" }}</td>
+    <td>
+    {{- if ( index . "Date Watched" ) -}}
+      {{- time.Format "Jan 2, 2006" ( index . "Date Watched" ) -}}
+      {{- if .Rewatch }} &#x21BB;{{ end -}}
+    {{- else -}}
+      n/a
+    {{- end -}}
+    </td>
+  </tr>  
+  {{ end }}
+{{ end }}