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/search-helpers.hl

6.8 KB

  1. // lib/search-helpers.hl — the search's text work (search.hl), also used by the people, the merge and the franchises: a text as
  2. // words (lower case, accents folded, punctuation a break), bucket keys, the query from the address (decoded only when it is
  3. // valid), the ranking of hits, years, and SLUGS ("Grey's Anatomy" → "Greys-Anatomy"). Mission 028: out of search.hl.
  4. import { hexDigits, textOr } from './util.hl'
  5. // ---- text → words ---------------------------------------------------------------------------------
  6. // lower case, apostrophes dropped ("Grey's" → "greys"), every other punctuation mark a word break, the common Latin
  7. // accents folded ("Amélie" → "amelie") — the same for the titles and the query
  8. static apostrophes = ["'", '’', '`', '´']
  9. static breaks = ['.', ',', ':', ';', '!', '?', '(', ')', '[', ']', '{', '}', '"', '“', '”', '„', '-', '–', '—', '/', '&', '+', '*', '#', '_', '|', '…', '·', '@', '=', '~', '<', '>']
  10. static folds = [['á', 'a'], ['à', 'a'], ['â', 'a'], ['ä', 'a'], ['ã', 'a'], ['å', 'a'], ['æ', 'ae'], ['ç', 'c'], ['é', 'e'], ['è', 'e'], ['ê', 'e'], ['ë', 'e'],
  11. ['í', 'i'], ['ì', 'i'], ['î', 'i'], ['ï', 'i'], ['ñ', 'n'], ['ó', 'o'], ['ò', 'o'], ['ô', 'o'], ['ö', 'o'], ['õ', 'o'], ['ø', 'o'], ['œ', 'oe'],
  12. ['ú', 'u'], ['ù', 'u'], ['û', 'u'], ['ü', 'u'], ['ý', 'y'], ['ÿ', 'y'], ['ß', 'ss'], ['š', 's'], ['ž', 'z'], ['č', 'c'], ['ł', 'l']]
  13. static normalize = (&s) => {
  14. if (s == null) { return '' }
  15. let t = ('' + s).toLowerCase()
  16. for (p of apostrophes) { if (t.includes(p)) { t = t.replaceAll(p, '') } }
  17. for (p of breaks) { if (t.includes(p)) { t = t.replaceAll(p, ' ') } }
  18. for (f of folds) { if (t.includes(f[0])) { t = t.replaceAll(f[0], f[1]) } }
  19. return t
  20. }
  21. static wordsOf = (&s) => {
  22. out = []
  23. for (w of normalize(s).split(' ')) { if (w != '') { out.push(w) } }
  24. return out
  25. }
  26. static bucketKeys = (&words) => {
  27. seen = {}
  28. out = []
  29. for (w of words) {
  30. let n = 2
  31. while (n <= 3) {
  32. if (w.length >= n) {
  33. let k = w.slice(0, n)
  34. if (seen[k] != true) { seen[k] = true out.push(k) }
  35. }
  36. n = n + 1
  37. }
  38. }
  39. return out
  40. }
  41. static tmdbKeyOf = (&type, &tmdbId) => { return (type == 'movie' ? 'movie:' : 'series:') + tmdbId }
  42. static yearWordOf = (&show) => {
  43. if (show.year != null) { return '' + show.year }
  44. if (show.release != null && hlTypeName(show.release) == 'String' && show.release.length >= 4) { return show.release.slice(0, 4) }
  45. return ''
  46. }
  47. // ---- the query as it comes in the address ------------------------------------------------------------
  48. // `/search/<text>`: a full page load hands the page the path segment already DECODED by the server (measured: `%2F` splits
  49. // the segment → 404, so the page never puts one in the address), a client-side navigation the RAW one — decoded here.
  50. // decodeURIComponent stops the request on a malformed one ('%zz', a broken UTF-8 run), so every %-run is checked first; a
  51. // bad one is taken literally. (A text that itself looks like an escape, '%41', is decoded twice on a reload — accepted.)
  52. static hexAt = (&s, &i) => {
  53. if (i + 3 > s.length) { return -1 }
  54. a = hexDigits.indexOf(s.slice(i + 1, i + 2).toLowerCase())
  55. b = hexDigits.indexOf(s.slice(i + 2, i + 3).toLowerCase())
  56. if (a < 0 || b < 0) { return -1 }
  57. return a * 16 + b
  58. }
  59. // the bytes of one run of %XX are valid UTF-8 (the rules decodeURIComponent applies)
  60. static utf8Ok = (&bytes) => {
  61. let i = 0
  62. while (i < bytes.length) {
  63. let b = bytes[i]
  64. let need = 0
  65. let lo = 128
  66. let hi = 191
  67. if (b < 128) { need = 0 } else if (b >= 194 && b <= 223) { need = 1 } else if (b >= 224 && b <= 239) {
  68. need = 2
  69. if (b == 224) { lo = 160 }
  70. if (b == 237) { hi = 159 }
  71. } else if (b >= 240 && b <= 244) {
  72. need = 3
  73. if (b == 240) { lo = 144 }
  74. if (b == 244) { hi = 143 }
  75. } else { return false }
  76. if (i + need > bytes.length - 1) { return false }
  77. let k = 1
  78. while (k <= need) {
  79. let c = bytes[i + k]
  80. if (k == 1 && (c < lo || c > hi)) { return false }
  81. if (k > 1 && (c < 128 || c > 191)) { return false }
  82. k = k + 1
  83. }
  84. i = i + need + 1
  85. }
  86. return true
  87. }
  88. static decodableUri = (&s) => {
  89. let i = 0
  90. while (i < s.length) {
  91. if (s.slice(i, i + 1) == '%') {
  92. let run = []
  93. while (i < s.length && s.slice(i, i + 1) == '%') {
  94. let v = hexAt(s, i)
  95. if (v < 0) { return false }
  96. run.push(v)
  97. i = i + 3
  98. }
  99. if (!utf8Ok(run)) { return false }
  100. } else {
  101. i = i + 1
  102. }
  103. }
  104. return true
  105. }
  106. static maxQuery = 100
  107. static queryOfParam = (&raw) => {
  108. if (raw == null || hlTypeName(raw) != 'String' || raw == '') { return '' }
  109. t = raw.includes('%') && decodableUri(raw) ? decodeURIComponent(raw) : raw
  110. return t.length > maxQuery ? t.slice(0, maxQuery) : t
  111. }
  112. // lower is better: the whole name (0), the name starts with the query (1), its first word does (2), anything else (3);
  113. // then the shorter name
  114. static scoreOf = (&e, &qw, &qtext) => {
  115. if (e.text == qtext) { return 0 }
  116. if (e.text.startsWith(qtext)) { return 1 }
  117. if (e.words[0].startsWith(qw[0])) { return 2 }
  118. return 3
  119. }
  120. static matchesAll = (&e, &qw) => {
  121. for (q of qw) {
  122. let hit = false
  123. for (w of e.words) { if (!hit && w.startsWith(q)) { hit = true } }
  124. if (!hit) { return false }
  125. }
  126. return true
  127. }
  128. // keeps the best `limit` of { score, len, tie, i } in order (hand-written: no list sort(), hybriel#1)
  129. static insertTop = (&top, &item, &limit) => {
  130. out = []
  131. let inserted = false
  132. for (x of top) {
  133. if (!inserted && (item.score < x.score || (item.score == x.score && (item.len < x.len || (item.len == x.len && item.tie < x.tie))))) { out.push(item) inserted = true }
  134. if (out.length < limit) { out.push(x) }
  135. }
  136. if (!inserted && out.length < limit) { out.push(item) }
  137. return out
  138. }
  139. static yearOfDate = (&d) => { return textOr(d) != null && d.length >= 4 ? d.slice(0, 4) : '' }
  140. // ---- slugs ------------------------------------------------------------------------------------------
  141. static slugChars = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
  142. // the slug of a text without the "in use" check — `fallback` when it has no Latin letter at all (people.hl personSlugOf
  143. // uses it for new people, tracker#26)
  144. static slugBaseOf = (&title, fallback) => {
  145. t = normalizeSlugText(title)
  146. let out = ''
  147. let dash = false
  148. let i = 0
  149. while (i < t.length) {
  150. let c = t.slice(i, i + 1)
  151. if (slugChars.includes(c)) {
  152. if (dash && out != '') { out = out + '-' }
  153. out = out + c
  154. dash = false
  155. } else {
  156. dash = true
  157. }
  158. i = i + 1
  159. }
  160. if (out == '') { out = fallback }
  161. if (out.length > 80) { out = out.slice(0, 80) }
  162. return out
  163. }
  164. // the accents folded (keeping the case) and apostrophes dropped, so "Grey's Anatomy" → "Greys-Anatomy"
  165. static normalizeSlugText = (&s) => {
  166. let t = '' + s
  167. for (p of apostrophes) { if (t.includes(p)) { t = t.replaceAll(p, '') } }
  168. for (f of folds) {
  169. if (t.includes(f[0])) { t = t.replaceAll(f[0], f[1]) }
  170. let up = f[0].toUpperCase()
  171. if (up != f[0] && t.includes(up)) { t = t.replaceAll(up, f[1].toUpperCase()) }
  172. }
  173. return t
  174. }

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