gitoriaLog in with ident

tracker

All repositories: gitoria

ReadmeCodePull requestsReleasesTicketsSettings
Commit8f1d45428f1d4542tracker#40: superseded collections — a TMDB collection timeline whose titles are all in one curated timeline is hidden (supersededBy; kept: own page + editor finder), set by the collection seed when it makes one and by the curated build (lifted when the cover is gone); partly covered ones join that franchise; no second widget (First Contact: only Star Trek — Prime); gate franchiseseed 26/0, browser 365/0, kinds 32/0, franchises 53/0, check-theme 0; real copy 24 supersededmre8f1d4542/lib/sync-helpers.hl

7.3 KB

  1. // lib/sync-helpers.hl — the small pieces of the sync (sync.hl) that need no table and no request: placeholder titles, day
  2. // numbers, TVmaze's HTML stripped, whether TVmaze numbers a show like we do, which seasons to ask, batches, changed texts,
  3. // migrated rows, and the totals of a run (mission 028: out of tmdbsync.hl).
  4. import { textOr } from './util.hl'
  5. // ---- TVmaze merge (tracker.worldapi.org#15) ------------------------------------------------------
  6. // a title that is none yet: empty, "TBA"/"TBD", or "Episode <n>" (what TMDB and TVmaze name an untitled episode; also
  7. // French/German/Spanish: real data has TVmaze "Épisode 1" where TMDB says "Episode 1")
  8. static placeholderWords = ['episode', 'épisode', 'Épisode', 'folge', 'episodio']
  9. static isPlaceholderTitle = (&v) => {
  10. t = textOr(v)
  11. if (t == null) { return true }
  12. l = t.trim().toLowerCase()
  13. if (l == 'tba' || l == 'tbd' || l == 'tba.' || l == 'to be announced') { return true }
  14. parts = l.split(' ')
  15. if (parts.length != 2 || !placeholderWords.includes(parts[0]) || parts[1].length == 0) { return false }
  16. let i = 0
  17. while (i < parts[1].length) {
  18. if (!'0123456789'.includes(parts[1][i])) { return false }
  19. i = i + 1
  20. }
  21. return true
  22. }
  23. // 'YYYY-MM-DD' → a day number (only differences matter), null when it is no such date
  24. static dayNumber = (&v) => {
  25. t = textOr(v)
  26. if (t == null || t.length < 10) { return null }
  27. y = toNumber(t.slice(0, 4))
  28. m = toNumber(t.slice(5, 7))
  29. d = toNumber(t.slice(8, 10))
  30. if (y == null || m == null || d == null || m < 1 || m > 12) { return null }
  31. before = [0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334]
  32. py = m <= 2 ? y - 1 : y
  33. leaps = (py - py % 4) / 4 - (py - py % 100) / 100 + (py - py % 400) / 400
  34. return y * 365 + leaps + before[m - 1] + d
  35. }
  36. static daysApart = (&a, &b) => {
  37. x = dayNumber(a)
  38. y = dayNumber(b)
  39. if (x == null || y == null) { return null }
  40. return x > y ? x - y : y - x
  41. }
  42. // TVmaze's text without its HTML (tracker#18: `tvmazeSummary`): tags dropped — a block tag (p, br, div, li) becomes a space —
  43. // the common entities decoded, white space collapsed; null when nothing is left
  44. static blockTags = ['p', 'br', 'div', 'li', 'ul', 'ol', 'h1', 'h2', 'h3', 'h4', 'blockquote']
  45. static entities = [['&nbsp;', ' '], ['&quot;', '"'], ['&#39;', "'"], ['&apos;', "'"], ['&lt;', '<'], ['&gt;', '>'], ['&ndash;', '–'], ['&mdash;', '—'], ['&hellip;', '…'], ['&amp;', '&']]
  46. static stripHtml = (&v) => {
  47. t = textOr(v)
  48. if (t == null) { return null }
  49. let out = ''
  50. let i = 0
  51. while (i < t.length) {
  52. if (t[i] == '<') {
  53. let close = t.indexOf('>', i)
  54. if (close < 0) { close = t.length }
  55. let name = t.slice(i + 1, close).trim().toLowerCase()
  56. if (name.startsWith('/')) { name = name.slice(1) }
  57. let sp = name.indexOf(' ')
  58. if (sp >= 0) { name = name.slice(0, sp) }
  59. if (name.endsWith('/')) { name = name.slice(0, name.length - 1) }
  60. if (blockTags.includes(name)) { out = out + ' ' }
  61. i = close + 1
  62. } else {
  63. // a line break / tab (a control character) is a space too (strings have no escapes to name them)
  64. out = out + (t.charCodeAt(i) < 32 ? ' ' : t[i])
  65. i = i + 1
  66. }
  67. }
  68. for (e of entities) { out = out.replaceAll(e[0], e[1]) }
  69. words = []
  70. for (w of out.split(' ')) { if (w != '') { words.push(w) } }
  71. return words.length > 0 ? words.join(' ') : null
  72. }
  73. // do we and TVmaze number a show the same way? Of the episodes both know (same S/E), at least 80 % must air within a day
  74. // of each other OR carry the same title (a streaming show TVmaze dates all on its release day, TMDB week by week, still
  75. // agrees by title). A show we have episodes of but TVmaze numbers none of the same (e.g. seasons by year) never agrees.
  76. // Answers { known, compared, agree, ok }.
  77. static sameTitle = (&a, &b) => { return !isPlaceholderTitle(a) && !isPlaceholderTitle(b) && a.trim().toLowerCase() == b.trim().toLowerCase() }
  78. static numberingAgrees = (&epByNumber, &list) => {
  79. out = { known = 0 compared = 0 agree = 0 ok = true }
  80. localCount = epByNumber.keys().length
  81. for (te of list) {
  82. let e = epByNumber[te.season + 'x' + te.number]
  83. if (e != null) {
  84. out.known = out.known + 1
  85. let apart = daysApart(e.release, te.airdate)
  86. let titled = !isPlaceholderTitle(e.title) && !isPlaceholderTitle(te.name)
  87. if (apart != null || titled) {
  88. out.compared = out.compared + 1
  89. if ((apart != null && apart <= 1) || sameTitle(e.title, te.name)) { out.agree = out.agree + 1 }
  90. }
  91. }
  92. }
  93. out.ok = !((localCount > 0 && out.known == 0) || (out.compared > 0 && out.agree * 5 < out.compared * 4))
  94. return out
  95. }
  96. // which TMDB seasons to sync: every numbered one with episodes; 0 only when the show has a season 0 already
  97. static wantedSeasonNumbers = (&details, &localByNumber) => {
  98. out = []
  99. if (details.seasons == null) { return out }
  100. for (s of details.seasons) {
  101. let n = s.season_number
  102. if (n != null && (n > 0 || localByNumber['' + n] != null) && (s.episode_count == null || s.episode_count > 0 || localByNumber['' + n] != null)) { out.push(n) }
  103. }
  104. return out
  105. }
  106. // the seasons in batches of 20 (TMDB's append_to_response limit)
  107. static batchesOf = (&list, &size) => {
  108. out = []
  109. let cur = []
  110. for (x of list) {
  111. cur.push(x)
  112. if (cur.length == size) { out.push(cur) cur = [] }
  113. }
  114. if (cur.length > 0) { out.push(cur) }
  115. return out
  116. }
  117. // fields of an episode/season from TMDB that differ from the stored record (null/empty never overwrites)
  118. static changedText = (stored, &fresh) => { return fresh != null && fresh != stored }
  119. // mission 070 (conductor: no step destroys migrated data): a season / episode the old tracker's migration brought (its `oldId`
  120. // is neither `tmdb-…` nor `tvmaze-…`) keeps its FIRST title / summary in `migratedTitle` / `migratedSummary` before TMDB's text
  121. // replaces it (set once; shown nowhere) — the daily delta run now also refreshes seasons of titles nobody follows
  122. static isMigratedRow = (&r) => { return r.oldId != null && ('' + r.oldId).slice(0, 5) != 'tmdb-' && ('' + r.oldId).slice(0, 7) != 'tvmaze-' }
  123. // totals of a run: the per-show counts added up
  124. static emptyTotals = () => { return { shows = 0 requests = 0 tvmazeRequests = 0 newSeasons = 0 newEpisodes = 0 updatedEpisodes = 0 updatedSeasons = 0 posters = 0 ids = 0 tvmazeEpisodes = 0 tvmazeSeasons = 0 tvmazeFilled = 0 tvmazeSkipped = 0 errors = 0 } }
  125. static addTotals = (t, &r) => {
  126. o = t
  127. o.shows = o.shows + 1
  128. o.requests = o.requests + r.requests
  129. o.tvmazeRequests = o.tvmazeRequests + r.tvmazeRequests
  130. o.ids = o.ids + r.ids
  131. o.newSeasons = o.newSeasons + r.newSeasons
  132. o.newEpisodes = o.newEpisodes + r.newEpisodes
  133. o.updatedEpisodes = o.updatedEpisodes + r.updatedEpisodes
  134. o.updatedSeasons = o.updatedSeasons + r.updatedSeasons
  135. o.posters = o.posters + r.posters
  136. o.tvmazeEpisodes = o.tvmazeEpisodes + r.tvmazeEpisodes
  137. o.tvmazeSeasons = o.tvmazeSeasons + r.tvmazeSeasons
  138. o.tvmazeFilled = o.tvmazeFilled + r.tvmazeFilled
  139. o.tvmazeSkipped = o.tvmazeSkipped + r.tvmazeSkipped
  140. o.errors = o.errors + r.errors
  141. return o
  142. }
  143. static totalsLine = (&t) => {
  144. return 'shows=' + t.shows + ' newSeasons=' + t.newSeasons + ' newEpisodes=' + t.newEpisodes + ' updatedEpisodes=' + t.updatedEpisodes
  145. + ' updatedSeasons=' + t.updatedSeasons + ' posters=' + t.posters + ' ids=' + t.ids + ' requests=' + t.requests + ' tvmazeRequests=' + t.tvmazeRequests + ' errors=' + t.errors
  146. + ' tvmazeEpisodes=' + t.tvmazeEpisodes + ' tvmazeSeasons=' + t.tvmazeSeasons + ' tvmazeFilled=' + t.tvmazeFilled + ' tvmazeSkipped=' + t.tvmazeSkipped
  147. }

Branches

Latest commits

  • 8f1d4542tracker#40: superseded collections — a TMDB collection timeline whose titles are all in one curated timeline is hidden (supersededBy; kept: own page + editor finder), set by the collection seed when it makes one and by the curated build (lifted when the cover is gone); partly covered ones join that franchise; no second widget (First Contact: only Star Trek — Prime); gate franchiseseed 26/0, browser 365/0, kinds 32/0, franchises 53/0, check-theme 0; real copy 24 supersededmre
  • 7d4b293dtracker#40: "Franchises" in the main menu (desktop header after People, phone sidebar) → /franchises, marked on franchise and timeline pages; gates 365/0, 32/0, 53/0, 24/0, check-theme 0mre
  • 93dfb0batracker#40 (mission 034): the curated franchises — data/franchises.json (17 franchises, 31 timelines, 285 TMDB titles, movies + series, in-universe/release order, 12 TMDB collections attached); lib/franchiseseed.hl + jobs.hl franchiseSeedTick (last start job, imports missing titles via details.hl importWithCredits = the search's Add, one per step paced, then one build; franchiseseed.db: editor changes win, the creator's same-name franchise adopted / timeline left alone, 404 remembered, resumable, idempotent); timeline heads 'N titles · in-universe order' (orderKind) and wrap on a phone; series pages show the widget; new gate tests/franchiseseed.mjs (5th in deploy.sh), the others run with TRACKER_FRANCHISE_SEED=0; gates 365/0, 32/0, 52/0, 24/0, check-theme 0; real copy 196 imported, 0 failed, 7 min, restart unchanged=31mre
  • 96ba683adeploy.sh: a gate without a 'passed,' line (check-theme) no longer ends the scriptmre
  • eb3b9205tracker: report 031mre
  • 9b5d2e89tracker mission 031: README (What it does, Test: four gates + the #32 checks, Files: theme/, new pages), STATUS (real copy, A/B load, how to repeat, open points), LOGmre
  • 39950e4ctracker#32 (mission 031): the WorldAPI theme (theme/ vendored verbatim from layouts.worldapi.org 85b5654; styles.hl inherits it: accent green-dark, type colours 1-6; own base/header rules, row lines, genre-pill and inverted-button frames removed, the season foldable keeps its line; check-theme 21 -> 0, 4th deploy gate; main actions class primary) and the #32 header (theme AppHeader/MainMenu/UserMenu/Sidebar/ContentFirst: desktop brand, search, Series|Shows|Movies|Genres|People, user icon with Unwatched..Settings, Logout; signed out the ident selector, phone the iD icon dropdown; phone menu in the sidebar overlay; marked entry by :has); /find -> /search/<q>, /genres, /people(/<letter>), /settings; main { ContentFirst { slot } } works around the hl:web one-line slot bug; gates 365/0, 32/0, 52/0, check-theme 0mre
  • a386dc92tracker: reports 029 + 030mre
  • 71e0fd7dtracker missions 029 + 030: README (What it does, Files, gate count), STATUS (real-copy numbers, how to repeat, open points), LOGmre
  • d36ea6eatracker#34 + #35 (mission 030): Follow directly under the poster, as wide as the poster (show.hl, styles.hl); the status pill next to a series' title — TVmaze's status (new tvmazeStatus, stored by the sync's TVmaze merge) else TMDB's, TVmaze Ended + TMDB Canceled = Canceled, inverted (filled, dark text, no border), green running / yellow pending / red canceled / muted ended (shows.hl statusOf); the daily delta asks TVmaze's status of an unfollowed series TVmaze's change list names (dailysync.hl syncRunStep, sync.hl syncTvmazeStatus); the status backfill after the details repair (backfill.hl, jobs.hl statusTick; resumable, 550 ms per TVmaze request); gates 354/0, 32/0, 52/0mre
  • 7d7d4487tracker#33 (mission 029): reduced titles — every title TMDB's details never went through this app (no detailsAt, no tmdbSync) is incomplete (shows.hl isIncomplete; the old tracker's migrated rows passed #26's test: 5,697 non-adult on the live copy, 691 series without seasons); the repair job does the visibly reduced first (shows.hl missingParts), the page completes one on open; a title TMDB has no poster for (The Remaining) shows the placeholder; tools/count-incomplete.hl; gate fixtures stand for synced titles (tmdbSync), tests/seed-reduced.hl + #33 checks; gates 347/0, 32/0, 52/0mre
  • 661c2592tracker: report 028mre
  • 27c916fatracker mission 028: README ("Code order", the new file map), STATUS (counts before/after, tests, how to repeat, open), LOGmre
  • d924f398tracker mission 028: comments name the new files (sync.hl, dailysync.hl, backfill.hl, credits.hl, jobs.hl, images.hl …); tools/ref-params.py + tools/lambda-audit.py also scan lib/ (they globbed the root only), lambda-audit counts a plain `x = p` alias like `let x = p`mre
  • 2e89b968tracker mission 028 (code order) 5/5 let: `let` only where a variable is reassigned — 667 never-reassigned lets became plain declarations (project.hl, lib/, components/, tools/, tests/); kept: 264 in loop bodies (a plain declaration there is 'Cannot reassign' on the 2nd pass), 234 reassigned, 27 whose name is also a member/outer/free name (a plain write would rebind it); tools/let-audit.py decides and fixes (README 'Code order'); tests/realdata-m028.{sh,mjs} = the page-output diff on a real copy; gates 342/0, 32/0, 52/0, real-copy pages identicalmre
  • 54796ff2tracker mission 028 (code order) 4/5 thin faces + last copies: the show page's check/follow faces call lib/watches.hl toggleWatched / toggleSeasonWatched (seasonAllWatched moved there) and lib/follows.hl toggleFollowed; both logins (header selector face, /login/callback) share lib/users.hl userOfCode; todayStr/listOf copies in components and the export readers copied into tools/migrate.hl + tools/old-short-ids.hl now once (lib/util.hl, lib/export.hl); gates 342/0, 32/0, 52/0; old-short-ids output byte-identical, migrate output identicalmre
  • 06b078e3tracker mission 028 (code order) 3/5 project.hl is the map: config, routes, wiring and a feature → file index (914 → 258 lines); the background jobs (daily sync run, backfills, details repair, credits job, merge, short ids, collection seed) moved unchanged into lib/jobs.hl (a class: their state is reassigned every step, a static cannot be; one instance made after the server), the login callback into lib/users.hl, poster/photo serving into lib/images.hl, the /shows/<slug> rule into lib/shows.hl showsMovedPath; route handlers are thin wrappers; gates 342/0, 32/0, 52/0, real-copy pages identicalmre
  • 94716fd2tracker mission 028 (code order) 2/5 util + topics: lib/util.hl holds envOr, storageDir, postersDir, profilesDir, newId, hexDigits, todayStr, dateOr, textOr, hasId, listOr, firstOf, sortDesc once (were copied into up to 5 files); tmdbsync.hl split into tmdb.hl (TMDB/TVmaze requests), sync.hl (one title's sync), sync-helpers.hl, backfill.hl; details.hl split into details.hl, credits.hl, credits-helpers.hl (isIncomplete to shows.hl); search-helpers.hl (words, query, ranking, slugs); collections.hl (the TMDB collection seed, out of franchises.hl); deltasync.hl renamed dailysync.hl; no behaviour change: gates 342/0, 32/0, 52/0, real-copy pages identicalmre
  • 186079b0tracker mission 028 (code order) 1/5 move: every root .hl except project.hl into lib/ (styles.hl into components/), import paths only; gates 342/0, 32/0, 52/0; real-copy pages identicalmre
  • 4f47f181tracker: report 027mre