gitoriaLog in with ident

tracker

All repositories: gitoria

ReadmeCodePull requestsReleasesTicketsSettings
Commit4ecc67b24ecc67b2tracker: STATUS/LOG for the t38 + t40 merge (gates 374/0, 32/0, 53/0, 229/0, 26/0, check-theme 0; live copy checks)mre4ecc67b2/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

  • 4ecc67b2tracker: STATUS/LOG for the t38 + t40 merge (gates 374/0, 32/0, 53/0, 229/0, 26/0, check-theme 0; live copy checks)mre
  • e5945d2fMerge t40 (tracker#40 curated franchises, Franchises menu, superseded collections) into main: deploy.sh lists all six gates (browser, kinds, franchises, pager, franchiseseed, check-theme); search.hl keeps #37's personPhotoOf + #40's importWithCredits; pager gate runs with TRACKER_FRANCHISE_SEED=0; gates 374/0, 32/0, 53/0, 229/0, 26/0, check-theme 0mre
  • b638e99dMerge t38 (tracker#38 pagination, #35 Returning/Airing label) into main: LOG/STATUS keep both sides; pager gate follows #37's /people (everyone, last updated first: seed updatedAt); gates pager 229/0, browser 374/0mre
  • f8ffa4dbtracker: report 032 + The Remaining + #39mre
  • 7565a863tracker: LOG timemre
  • b10f00c8tracker#39: double episodes — migrated episodes whose TMDB id TMDB replaced are adopted by their number in the sync (old id -> migratedTmdbId); merge.hl step 3 merges each season's doubles at start (keeper: most watches > synced > first; watches moved/parked; tombstones into mergedEpisodes, nothing deleted); tools/count-duplicate-episodes.hl; gate fixture + paths-m039; live copy 850 -> 0 in 64 s; gates 373/0, 32/0, 52/0mre
  • 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
  • 9448d643tracker#35 follow-up (mission 033): TVmaze 'Running' is labelled 'Returning', or 'Airing' while a non-special episode of the two newest seasons is released within today +-7 days (data unchanged); gate fixtures Running/Airing/Aired + a special; browser 366/0, kinds 32/0, franchises 52/0, pager 229/0, check-theme 0mre
  • 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
  • 8751adb8tracker: report 032mre
  • 9bce1f65tracker mission 032: STATUS gate files + the hour-boundary flakemre
  • 718bfb89tracker#37 (mission 032): /people = everyone, last updated first (updatedAt stamped by the person fill; view built at boot, touched people first at once), photo + name tiles (person colour) with the /movies pagination, /people/<letter> removed; photo = our file, tmdbProfile, a cast/crew entry's profile (in-memory map at boot), else the new 'no photo' placeholder; new cast/crew/created_by people keep tmdbProfile; search people rows with the photo; /settings = the heading only; util.hl sortDesc starts from sorted runs (same result, 105k: 1.6 s -> 0.15 s); gates 369/0, 32/0, 52/0, check-theme 0; README/STATUS/LOGmre
  • 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
  • 03ec792ftracker#38 (mission 033): pagination goes exactly to the clicked page — tilelist read the clicked button's text after pagination.hl's own handler had rebuilt the buttons (real clicks only); now li.current, else the button's own text; new gate tests/pager.mjs (5 lists x 11 pages, 390/1280, real + script clicks, Back/Forward) 229/0; browser 365/0, kinds 32/0, franchises 52/0, check-theme 0mre
  • 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