Migrate CLI to python

author: Joris 2023-09-16 18:28:16 +0200
committer: Joris 2023-09-16 18:31:24 +0200
commit: 06f045e90bb57c36738e58ee6830e2a2391bc6a3 (patch)
tree: a5b65b048c103b4ea0e5d3c0fa5e115cbaf3cf5f /src/view
parent: 230f2e0623d22af6e68466884bd5dea5dcb846dc (diff)
14 files changed, 776 insertions, 0 deletions
diff --git a/src/view/__init__.py b/src/view/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/view/__init__.py
diff --git a/src/view/client/book.ts b/src/view/client/book.ts
new file mode 100644
index 0000000..680cc11
--- /dev/null
+++ b/src/view/client/book.ts
@@ -0,0 +1,15 @@
+export interface Book {
+  title: string
+  subtitle?: string
+  authors: Array<string>
+  authorsSort: string
+  genres: Array<string>
+  date: number
+  summary?: string
+  read: ReadStatus,
+  cover: string
+}
+
+export type ReadStatus = 'Read' | 'Unread' | 'Reading' | 'Stopped'
+
+export const readStatuses: Array<ReadStatus> = ['Read', 'Unread', 'Reading', 'Stopped' ]
diff --git a/src/view/client/lib/functions.ts b/src/view/client/lib/functions.ts
new file mode 100644
index 0000000..21fdad9
--- /dev/null
+++ b/src/view/client/lib/functions.ts
@@ -0,0 +1,7 @@
+export function debounce(func: Function, timeout: number): any {
+  let timer: any
+  return (...args: any) => {
+    clearTimeout(timer)
+    timer = setTimeout(() => { func.apply(this, args) }, timeout)
+  }
+}
diff --git a/src/view/client/lib/i18n.ts b/src/view/client/lib/i18n.ts
new file mode 100644
index 0000000..3716367
--- /dev/null
+++ b/src/view/client/lib/i18n.ts
@@ -0,0 +1,14 @@
+export function unit(
+  n: number, 
+  singular: string, 
+  plural: string, 
+  f: (n: number, unit: string) => string = format
+): string {
+  return n > 1
+    ? f(n, plural)
+    : f(n, singular)
+}
+
+function format(n: number, unit: string): string {
+  return `${n} ${unit}`
+}
diff --git a/src/view/client/lib/rx.ts b/src/view/client/lib/rx.ts
new file mode 100644
index 0000000..bf01b6d
--- /dev/null
+++ b/src/view/client/lib/rx.ts
@@ -0,0 +1,404 @@
+// [1.0.1] 2023-02-13
+
+// Html
+
+export type Html
+  = false 
+  | undefined 
+  | string 
+  | number 
+  | Tag 
+  | WithVar<any> 
+  | Array<Html>
+  | Rx<Html> 
+
+interface Tag {
+  type: 'Tag'
+  tagName: string
+  attributes: Attributes
+  children?: Array<Html>
+  onmount?: (element: Element) => void
+  onunmount?: (element: Element) => void
+}
+
+interface WithVar<A> {
+  type: 'WithVar'
+  init: A
+  getChildren: (v: Var<A>, update: (f: (value: A) => A) => void) => Html
+}
+
+interface Attributes {
+  [key: string]: Rx<AttributeValue> | AttributeValue
+}
+
+type AttributeValue
+  = string
+  | number
+  | boolean
+  | ((event: Event) => void)
+  | ((element: Element) => void)
+
+function isHtml(x: any): x is Html {
+  return (typeof x === 'string'
+    || typeof x === 'number'
+    || isTag(x) 
+    || isWithVar(x)
+    || isRx(x)
+    || Array.isArray(x))
+}
+
+type ValueOrArray<T> = T | Array<ValueOrArray<T>>
+
+export function h(
+  tagName: string,
+  x?: Attributes | Html,
+  ...children: Array<Html>
+): Tag {
+  if (x === undefined || x === false) {
+    return {
+      type: 'Tag',
+      tagName,
+      attributes: {}
+    }
+  } else if (isHtml(x)) {
+    return {
+      type: 'Tag',
+      tagName,
+      attributes: {},
+      children: [x, ...children],
+    }
+  } else {
+    let attributes = x as Attributes
+    let onmount, onunmount
+    if ('onmount' in attributes) {
+      onmount = attributes['onmount'] as (element: Element) => void
+      delete attributes['onmount']
+    }
+    if ('onunmount' in attributes) {
+      onunmount = attributes['onunmount'] as (element: Element) => void
+      delete attributes['onunmount']
+    }
+    return {
+      type: 'Tag',
+      tagName,
+      attributes,
+      children,
+      onmount,
+      onunmount
+    }
+  }
+}
+
+export function withVar<A>(init: A, getChildren: (v: Var<A>, update: (f: (value: A) => A) => void) => Html): WithVar<A> {
+  return {
+    type: 'WithVar',
+    init,
+    getChildren
+  }
+}
+
+// Rx
+
+export type RxAble<A> = Rx<A> | A
+
+export class Rx<A> {
+  map<B>(f: (value: A) => B): Rx<B> {
+    return new Map<A, B>(this, f)
+  }
+
+  flatMap<B>(f: (value: A) => Rx<B>): Rx<B> {
+    return new FlatMap<A, B>(this, f)
+  }
+}
+
+class Var<A> extends Rx<A> {
+  readonly type: 'Var'
+  readonly id: string
+
+  constructor(id: string) {
+    super()
+    this.id = id
+    this.type = 'Var'
+  }
+}
+
+class Map<A, B> extends Rx<B> {
+  readonly type: 'Map'
+  readonly rx: Rx<A>
+  readonly f: (value: A) => B
+
+  constructor(rx: Rx<A>, f: (value: A) => B) {
+    super()
+    this.type = 'Map'
+    this.rx = rx
+    this.f = f
+  }
+}
+
+class FlatMap<A, B> extends Rx<B> {
+  readonly type: 'FlatMap'
+  readonly rx: Rx<A>
+  readonly f: (value: A) => Rx<B>
+
+  constructor(rx: Rx<A>, f: (value: A) => Rx<B>) {
+    super()
+    this.type = 'FlatMap'
+    this.rx = rx
+    this.f = f
+  }
+}
+
+// Mount
+
+export function mount(html: Html): Cancelable {
+  const state = new State()
+  let appendRes = appendChild(state, document.body, html)
+  return appendRes.cancel
+}
+
+interface StateEntry<A> {
+  value: A
+  subscribers: Array<(value: A) => void>
+}
+
+class State {
+  readonly state: {[key: string]: StateEntry<any>}
+  varCounter: bigint
+
+  constructor() {
+    this.state = {}
+    this.varCounter = BigInt(0)
+  }
+
+  register<A>(initValue: A) {
+    const v = new Var(this.varCounter.toString())
+    this.varCounter += BigInt(1)
+    this.state[v.id] = {
+      value: initValue,
+      subscribers: []
+    }
+    return v
+  }
+
+  unregister<A>(v: Var<A>) {
+    delete this.state[v.id]
+  }
+
+  get<A>(v: Var<A>) {
+    return this.state[v.id].value
+  }
+
+  update<A>(v: Var<A>, f: (value: A) => A) {
+    const value = f(this.state[v.id].value)
+    this.state[v.id].value = value
+    this.state[v.id].subscribers.forEach(notify => {
+      // Don’t notify if it has been removed from a precedent notifier
+      if (this.state[v.id].subscribers.indexOf(notify) !== -1) {
+        notify(value)
+      }
+    })
+  }
+
+  subscribe<A>(v: Var<A>, notify: (value: A) => void): Cancelable {
+    this.state[v.id].subscribers.push(notify)
+    return () => this.state[v.id].subscribers = this.state[v.id].subscribers.filter(n => n !== notify)
+  }
+}
+
+// Cancelable
+
+type Cancelable = () => void
+
+const voidCancel = () => {}
+
+// Removable
+
+type Removable = () => void
+
+const voidRemove = () => {}
+
+// Rx run
+
+function rxRun<A>(state: State, rx: Rx<A>, effect: (value: A) => void): Cancelable {
+  if (isVar(rx)) {
+    const cancel = state.subscribe(rx, effect)
+    effect(state.get(rx))
+    return cancel
+  } else if (isMap<A, any>(rx)) {
+    return rxRun(state, rx.rx, value => effect(rx.f(value)))
+  } else if (isFlatMap(rx)) {
+    let cancel1 = voidCancel
+    const cancel2 = rxRun(state, rx.rx, (value: A) => {
+      cancel1()
+      cancel1 = rxRun(state, rx.f(value), effect)
+    })
+    return () => {
+      cancel2()
+      cancel1()
+    }
+  } else {
+    throw new Error(`Unrecognized rx: ${rx}`)
+  }
+}
+
+function isRx<A>(x: any): x is Rx<A> {
+  return x !== undefined && x.type !== undefined && (x.type === "Var" || x.type === "Map" || x.type === "FlatMap")
+}
+
+function isVar<A>(x: any): x is Var<A> {
+  return x.type === "Var"
+}
+
+function isMap<A, B>(x: any): x is Map<A, B> {
+    return x.type === "Map"
+}
+
+function isFlatMap<A, B>(x: any): x is FlatMap<A, B> {
+    return x.type === "FlatMap"
+}
+
+// Append
+
+interface AppendResult {
+  cancel: Cancelable
+  remove: Removable
+  lastAdded?: Node
+}
+
+function appendChild(state: State, element: Element, child: Html, lastAdded?: Node): AppendResult {
+  if (Array.isArray(child)) {
+    let cancels: Array<Cancelable> = []
+    let removes: Array<Removable> = []
+    child.forEach((o) => {
+      const appendResult = appendChild(state, element, o, lastAdded)
+      cancels.push(appendResult.cancel)
+      removes.push(appendResult.remove)
+      lastAdded = appendResult.lastAdded
+    })
+    return {
+      cancel: () => cancels.forEach((o) => o()),
+      remove: () => removes.forEach((o) => o()),
+      lastAdded
+    }
+  } else if (typeof child == "string") {
+    const node = document.createTextNode(child)
+    appendNode(element, node, lastAdded)
+    return {
+      cancel: voidCancel,
+      remove: () => element.removeChild(node),
+      lastAdded: node
+    }
+  } else if (typeof child == "number") {
+    return appendChild(state, element, child.toString(), lastAdded)
+  } else if (isTag(child)) {
+    const { tagName, attributes, children, onmount, onunmount } = child
+
+    const childElement = document.createElement(tagName)
+    const cancelAttributes = Object.entries(attributes).map(([key, value]) => {
+      if (isRx<AttributeValue>(value)) {
+        return rxRun(state, value, newValue => setAttribute(state, childElement, key, newValue))
+      } else {
+        setAttribute(state, childElement, key, value)
+      }
+    })
+
+    const appendChildrenRes = appendChild(state, childElement, children)
+
+    appendNode(element, childElement, lastAdded)
+
+    if (onmount !== undefined) {
+      onmount(childElement)
+    }
+
+    return {
+      cancel: () => {
+        cancelAttributes.forEach(cancel => cancel !== undefined ? cancel() : {})
+        appendChildrenRes.cancel()
+        if (onunmount !== undefined) {
+          onunmount(childElement)
+        }
+      },
+      remove: () => element.removeChild(childElement),
+      lastAdded: childElement,
+    }
+  } else if (isWithVar(child)) {
+    const { init, getChildren } = child
+    const v = state.register(init)
+    const children = getChildren(v, f => state.update(v, f))
+    const appendRes = appendChild(state, element, children)
+    return {
+      cancel: () => {
+        appendRes.cancel()
+        state.unregister(v)
+      },
+      remove: () => appendRes.remove(),
+      lastAdded: appendRes.lastAdded
+    }
+  } else if (isRx(child)) {
+    const rxBase = document.createTextNode('')
+    appendNode(element, rxBase, lastAdded)
+    let appendRes: AppendResult = {
+      cancel: voidCancel,
+      remove: voidRemove,
+      lastAdded: rxBase
+    }
+    const cancelRx = rxRun(state, child, (value: Html) => {
+      appendRes.cancel()
+      appendRes.remove()
+      appendRes = appendChild(state, element, value, rxBase)
+    })
+    return {
+      cancel: () => {
+        appendRes.cancel()
+        cancelRx()
+      },
+      remove: () => {
+        appendRes.remove()
+        element.removeChild(rxBase)
+      },
+      lastAdded: appendRes.lastAdded,
+    }
+  } else if (child === undefined || child === false) {
+    return {
+      cancel: voidCancel,
+      remove: voidRemove,
+      lastAdded
+    }
+  } else {
+    throw new Error(`Unrecognized child: ${child}`)
+  }
+}
+
+function isTag<A>(x: any): x is Tag {
+  return x !== undefined && x.type === "Tag"
+}
+
+function isWithVar<A>(x: any): x is WithVar<A> {
+  return x !== undefined && x.type === "WithVar"
+}
+
+function appendNode(base: Element, node: Node, lastAdded?: Node) {
+  if (lastAdded !== undefined) {
+    base.insertBefore(node, lastAdded.nextSibling)
+  } else {
+    base.append(node)
+  }
+}
+
+function setAttribute(state: State, element: Element, key: string, attribute: AttributeValue) {
+  if (typeof attribute == "boolean") {
+    if (attribute) {
+      // @ts-ignore
+      element[key] = "true"
+    }
+  } else if (typeof attribute == "number") {
+    // @ts-ignore
+    element[key] = attribute.toString()
+  } else if (typeof attribute == "string") {
+    // @ts-ignore
+    element[key] = attribute
+  } else {
+    // @ts-ignore
+    element[key] = (event: Event) => attribute(event)
+  }
+}
diff --git a/src/view/client/lib/search.ts b/src/view/client/lib/search.ts
new file mode 100644
index 0000000..026cb94
--- /dev/null
+++ b/src/view/client/lib/search.ts
@@ -0,0 +1,17 @@
+export function match(search: string, ...targets: Array<string | undefined>): boolean {
+  const formattedTargets = targets
+    .filter(t => t !== undefined)
+    .map(format)
+
+  return search.split(/\s+/).every(subSearch =>
+    formattedTargets.some(target => target.includes(format(subSearch)))
+  )
+}
+
+export function format(str: string): string {
+  return unaccent(str.toLowerCase())
+}
+
+function unaccent(str: string): string {
+  return str.normalize("NFD").replace(/[\u0300-\u036f]/g, "")
+}
diff --git a/src/view/client/main.ts b/src/view/client/main.ts
new file mode 100644
index 0000000..5885871
--- /dev/null
+++ b/src/view/client/main.ts
@@ -0,0 +1,46 @@
+import { h, withVar, mount, Html } from 'lib/rx'
+import * as Search from 'lib/search'
+import * as Functions from 'lib/functions'
+import * as I18n from 'lib/i18n'
+import * as Filters from 'view/filters'
+import * as Books from 'view/books'
+import * as Book from 'book'
+
+// @ts-ignore
+const sortedBookLibrary: Array<Book> = (bookLibrary as Array<Book.Book>).sort((a, b) =>
+  a.authorsSort == b.authorsSort
+    ? a.date > b.date
+    : a.authorsSort > b.authorsSort)
+
+mount(withVar<Filters.Model>({}, (filters, updateFilters) =>
+  withVar('', (search, updateSearch) => {
+    const filteredBooks = filters.flatMap(f => search.map(s =>
+      sortedBookLibrary.filter(book =>
+        (f.read === undefined || book.read === f.read)
+        && (s === '' || matchSearch(book, s))
+      )
+    ))
+
+    return [
+      h('aside', Filters.view({ filteredBooks, filters, updateFilters })),
+      h('main',
+        h('header',
+          h('input',
+            { className: 'g-Search',
+              oninput: Functions.debounce(
+                (event: Event) => updateSearch(_ => (event.target as HTMLInputElement).value),
+                500
+              )
+            }
+          ),
+          filteredBooks.map(fb => I18n.unit(fb.length, 'livre', 'livres'))
+        ),
+        Books.view(filteredBooks)
+      )
+    ]
+  })
+))
+
+function matchSearch(book: Book.Book, search: string): boolean {
+  return Search.match(search, book.title, book.subtitle, ...book.authors)
+}
diff --git a/src/view/books.ts b/src/view/client/view/books.ts
index 5ec019a..aba55c1 100644
--- a/src/view/books.ts
+++ b/src/view/client/view/books.ts
@@ -66,6 +66,7 @@ function viewBook({ book, onSelect }: ViewBookParams): Html {
     { className: 'g-Book' },
     h('img',
       { src: book.cover,
+        alt: book.title,
         className: 'g-Book__Image',
         onclick: () => onSelect(book)
       }
diff --git a/src/view/components/modal.ts b/src/view/client/view/components/modal.ts
index 5e845e1..5e845e1 100644
--- a/src/view/components/modal.ts
+++ b/src/view/client/view/components/modal.ts
diff --git a/src/view/filters.ts b/src/view/client/view/filters.ts
index efe4115..efe4115 100644
--- a/src/view/filters.ts
+++ b/src/view/client/view/filters.ts
diff --git a/src/view/command.py b/src/view/command.py
new file mode 100644
index 0000000..e50027f
--- /dev/null
+++ b/src/view/command.py
@@ -0,0 +1,17 @@
+import os
+import shutil
+import subprocess
+import tempfile
+import time
+
+import library.command
+
+def run(book_library, browser_cmd):
+    tmp_dir = tempfile.mkdtemp()
+    directory = os.path.dirname(os.path.realpath(__file__))
+    shutil.copytree(f'{directory}/public', tmp_dir, dirs_exist_ok=True)
+    with open(f'{tmp_dir}/books.js', 'w') as f:
+        json = library.command.get(book_library)
+        f.write(f'const bookLibrary = {json}')
+    browser_cmd = f'{browser_cmd} {tmp_dir}/index.html'
+    subprocess.run(browser_cmd.split(' '))
diff --git a/src/view/public/index.html b/src/view/public/index.html
new file mode 100644
index 0000000..ce4d568
--- /dev/null
+++ b/src/view/public/index.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<meta charset="UTF-8">
+<link rel="stylesheet" href="main.css">
+<title>Bibliothèque</title>
+<body></body>
+<script src="books.js"></script>
+<script src="main.js"></script>
diff --git a/src/view/public/main.css b/src/view/public/main.css
new file mode 100644
index 0000000..f361cbe
--- /dev/null
+++ b/src/view/public/main.css
@@ -0,0 +1,235 @@
+/* Variables */
+
+:root {
+  --color-focus: #888833;
+
+  --font-size-dog: 1.5rem;
+
+  --spacing-mouse: 0.25rem;
+  --spacing-cat: 0.5rem;
+  --spacing-dog: 1rem;
+  --spacing-horse: 2rem;
+
+  --width-close-button: 3rem;
+  --width-book: 13rem;
+}
+
+/* Top level */
+
+html {
+  height: 100%;
+}
+
+body {
+  margin: 0;
+  display: flex;
+  height: 100%;
+  font-family: sans-serif;
+}
+
+dl {
+  margin: 0;
+}
+
+dd {
+  margin-left: 0;
+}
+
+p {
+  margin: 0;
+}
+
+/* Modal */
+
+.g-Modal {
+  width: 100vw;
+  height: 100vh;
+  position: fixed;
+  top: 0;
+  left: 0;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background-color: rgba(0, 0, 0, 0.5);
+  z-index: 1;
+}
+
+.g-Modal__Content {
+  position: relative;
+  background-color: white;
+  width: 50%;
+  border-radius: 0.2rem;
+  border: 1px solid #EEE;
+}
+
+.g-Modal__Header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: var(--spacing-dog) var(--spacing-horse);
+  border-bottom: 1px solid #EEE;
+}
+
+.g-Modal__Body {
+  padding: var(--spacing-horse);
+  max-height: 50vh;
+  overflow-y: scroll;
+}
+
+.g-Modal__Close {
+  cursor: pointer;
+  font-weight: bold;
+  border-radius: 50%;
+  border: 1px solid #EEE;
+  background-color: transparent;
+  width: var(--width-close-button);
+  height: var(--width-close-button);
+  font-size: 1.7rem;
+  flex-shrink: 0;
+}
+
+.g-Modal__Close:hover, .g-Modal__Close:focus {
+  background-color: #EEE;
+}
+
+/* Filters */
+
+aside {
+  background-color: #333;
+  color: white;
+  width: 200px;
+  overflow-y: auto;
+}
+
+ul {
+  margin: 0;
+  padding: 0;
+  list-style-type: none;
+}
+
+.g-FilterTitle {
+  padding: 0.5rem 1rem;
+  background-color: #555;
+  border-left: 8px solid transparent;
+  font-weight: bold;
+}
+
+.g-Filter--Unselected {
+  border-left: 8px solid #555;
+}
+
+.g-Filter--Selected {
+  border-left: 8px solid #883333;
+}
+
+.g-Filter button {
+  border: none;
+  background-color: transparent;
+  color: inherit;
+  cursor: pointer;
+  padding: 0.5rem 1rem;
+  width: 100%;
+  text-align: left;
+}
+
+.g-Filter button:hover {
+  background-color: var(--color-focus);
+}
+
+/* Books */
+
+main {
+  width: 100%;
+  padding: 1rem;
+  overflow-y: auto;
+}
+
+header {
+  display: flex;
+  font-size: 120%;
+  margin-bottom: 1rem;
+}
+
+.g-Search {
+  margin-right: 1rem;
+}
+
+.g-Books {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(var(--width-book), 1fr));
+  grid-gap: 1rem;
+}
+
+.g-Book {
+  align-self: center;
+  border: 1px solid #DDDDDD;
+  padding: 0;
+  width: fit-content;
+}
+
+.g-Book:hover {
+  cursor: pointer;
+  outline: none;
+}
+
+.g-Book:hover .g-Book__Image {
+  transform: scale(105%);
+  opacity: 0.9;
+}
+
+.g-Book__Image {
+  display: flex;
+  width: var(--width-book);
+  transition: all 0.2s ease-in-out;
+}
+
+/* Book detail */
+
+.g-BookDetail {
+  display: flex;
+  align-items: flex-start;
+}
+
+.g-BookDetail img {
+  width: var(--width-book);
+  margin-right: var(--spacing-horse);
+  border: 1px solid #EEE;
+}
+
+.g-BookDetail__Title {
+  font-size: var(--font-size-dog);
+  margin-bottom: var(--spacing-mouse);
+}
+
+.g-BookDetail__Subtitle {
+  font-style: italic;
+  margin-bottom: var(--spacing-mouse);
+}
+
+.g-BookDetail dl {
+  display: flex;
+  flex-direction: column;
+  gap: var(--spacing-cat);
+  margin-bottom: var(--spacing-dog);
+}
+
+.g-BookDetail dt {
+  display: inline;
+  text-decoration: underline;
+}
+
+.g-BookDetail dd {
+  display: inline;
+}
+
+.g-BookDetail p {
+  font-family: serif;
+  text-align: justify;
+  line-height: 1.4rem;
+  font-size: 1.1rem;
+  text-indent: 1.5rem;
+}
+
+.g-BookDetail p:not(:last-child) {
+  margin-bottom: var(--spacing-dog);
+}
diff --git a/src/view/tsconfig.json b/src/view/tsconfig.json
new file mode 100644
index 0000000..1e07c37
--- /dev/null
+++ b/src/view/tsconfig.json
@@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "module": "amd",
+    "target": "es2020",
+    "baseUrl": "client",
+    "outFile": "public/main.js",
+    "noImplicitAny": true,
+    "strictNullChecks": true,
+    "removeComments": true,
+    "preserveConstEnums": true
+  },
+  "include": ["client/**/*"]
+}
author	Joris	2023-09-16 18:28:16 +0200
committer	Joris	2023-09-16 18:31:24 +0200
commit	06f045e90bb57c36738e58ee6830e2a2391bc6a3 (patch)
tree	a5b65b048c103b4ea0e5d3c0fa5e115cbaf3cf5f /src/view
parent	230f2e0623d22af6e68466884bd5dea5dcb846dc (diff)