diff --git a/README.org b/README.org index 915df82..8d3e896 100644 --- a/README.org +++ b/README.org @@ -1,25 +1,20 @@ #+title: Readme * Tasques -** TODO Refactor organitzatiu +** TODO Ordenar els resultats de la cerca de temes +** TODO Suport per a diverses organitzacions (no només jam de Sant Cugat) +** TODO Usuaris i permisos granulars +** TODO Lilypond support (o similar) +*** TODO Fer cançoners "en directe" * Idees ** Jams *** Properes jams -**** Data i lloc de les properes jams **** Info dels temes que es tocaràn (a la slow jam) -*** Live jam -**** Quin tema està sonant ara -*** Historial de jams -**** Veure a cada jam passada quins temes s'han tocat ** Temes *** Navegació **** Cerca de temes ***** Per nom, tonalitat, compàs, tipus, (shazam!?!?!) ***** Per tocats recentment -**** Informació -***** Nom -***** Tonalitat i compàs -***** Vegades que s'ha tocat * Referències Fonts d'inspiració i altres materials de referència per fer la web de folkugat ** Simple Site diff --git a/build.sh b/build.sh new file mode 100755 index 0000000..b9b22f7 --- /dev/null +++ b/build.sh @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +tailwindcss -i folkugat_web/assets/static/src/tw.css -o folkugat_web/assets/static/css/main.css --minify + +docker build -t marc.sastre.cat/folkugat-web -f deploy/Dockerfile . + +docker push marc.sastre.cat/folkugat-web:latest diff --git a/deploy/Dockerfile b/deploy/Dockerfile new file mode 100644 index 0000000..e9dd7fd --- /dev/null +++ b/deploy/Dockerfile @@ -0,0 +1,11 @@ +FROM python:3.11 + +WORKDIR /folkugat + +COPY deploy/requirements.txt /folkugat/requirements.txt + +RUN pip install --no-cache-dir --upgrade -r /folkugat/requirements.txt + +COPY folkugat_web /folkugat/folkugat_web + +CMD ["uvicorn", "folkugat_web.main:app", "--proxy-headers", "--host", "0.0.0.0", "--port", "80"] diff --git a/deploy/requirements.in b/deploy/requirements.in new file mode 100644 index 0000000..86382eb --- /dev/null +++ b/deploy/requirements.in @@ -0,0 +1,11 @@ +# API +fastapi +python-multipart +jinja2 +uvicorn +# Files +python-magic +# Auth +pyjwt +# Search +levenshtein diff --git a/deploy/requirements.txt b/deploy/requirements.txt new file mode 100644 index 0000000..f9d289b --- /dev/null +++ b/deploy/requirements.txt @@ -0,0 +1,48 @@ +# +# This file is autogenerated by pip-compile with Python 3.11 +# by the following command: +# +# pip-compile --output-file=deploy/requirements.txt deploy/requirements.in +# +annotated-types==0.7.0 + # via pydantic +anyio==4.9.0 + # via starlette +click==8.1.8 + # via uvicorn +fastapi==0.115.12 + # via -r deploy/requirements.in +h11==0.14.0 + # via uvicorn +idna==3.10 + # via anyio +jinja2==3.1.6 + # via -r deploy/requirements.in +levenshtein==0.27.1 + # via -r deploy/requirements.in +markupsafe==3.0.2 + # via jinja2 +pydantic==2.10.6 + # via fastapi +pydantic-core==2.27.2 + # via pydantic +pyjwt==2.10.1 + # via -r deploy/requirements.in +python-magic==0.4.27 + # via -r deploy/requirements.in +python-multipart==0.0.20 + # via -r deploy/requirements.in +rapidfuzz==3.12.2 + # via levenshtein +sniffio==1.3.1 + # via anyio +starlette==0.46.1 + # via fastapi +typing-extensions==4.12.2 + # via + # anyio + # fastapi + # pydantic + # pydantic-core +uvicorn==0.34.0 + # via -r deploy/requirements.in diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..80760b4 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,20 @@ +services: + folkugat: + # image: "marc.sastre.cat/quinto-cua:latest" + build: + context: . + dockerfile: deploy/Dockerfile + restart: unless-stopped + environment: + - JWT_SECRET=12345 + - ADMIN_PASSWORD=prova + - DB_DIR=/folkugat/files + volumes: + - /home/marc/tmp/folkugat:/folkugat/files + ports: + - "8001:80" + networks: + - folkugat + +networks: + folkugat: diff --git a/flake.nix b/flake.nix index c3cadb8..25139e9 100644 --- a/flake.nix +++ b/flake.nix @@ -22,6 +22,8 @@ pytest setuptools ipython + # To compile requirements + pip-tools ]; projectDependencies = with pythonPackages; [ diff --git a/folkugat_web/api/tema/index.py b/folkugat_web/api/tema/index.py index d73fd19..a8bcae7 100644 --- a/folkugat_web/api/tema/index.py +++ b/folkugat_web/api/tema/index.py @@ -6,6 +6,7 @@ from fastapi.responses import HTMLResponse from folkugat_web.api import router from folkugat_web.fragments import tema, temes from folkugat_web.services import auth +from folkugat_web.services import files as files_service from folkugat_web.services.temes import links as links_service from folkugat_web.services.temes import lyrics as lyrics_service from folkugat_web.services.temes import properties as properties_service @@ -46,6 +47,7 @@ def contingut(request: Request, logged_in: auth.LoggedIn, tema_id: int): @router.delete("/api/tema/{tema_id}") def delete_tema(_: auth.RequireLogin, tema_id: int): temes_w.delete_tema(tema_id=tema_id) + files_service.clean_orphan_files() return HTMLResponse(headers={ 'HX-Redirect': '/temes' }) diff --git a/folkugat_web/api/tema/links.py b/folkugat_web/api/tema/links.py index 34b1262..0eed038 100644 --- a/folkugat_web/api/tema/links.py +++ b/folkugat_web/api/tema/links.py @@ -6,8 +6,10 @@ from fastapi.responses import HTMLResponse from folkugat_web.api import router from folkugat_web.fragments.tema import links as links_fragments from folkugat_web.model import temes as model -from folkugat_web.services import auth, files +from folkugat_web.services import auth +from folkugat_web.services import files as files_service from folkugat_web.services.temes import links as links_service +from folkugat_web.services.temes import query as temes_q @router.get("/api/tema/{tema_id}/link/{link_id}") @@ -30,7 +32,7 @@ async def set_link( upload_file: Annotated[UploadFile | None, File()] = None, ): if upload_file: - url = await files.store_file(tema_id=tema_id, upload_file=upload_file) + url = await files_service.store_file(tema_id=tema_id, upload_file=upload_file) link_type = links_service.guess_link_type(url or '') new_link = model.Link( @@ -66,6 +68,7 @@ def delete_link( link_id: int, ): links_service.delete_link(link_id=link_id, tema_id=tema_id) + files_service.clean_orphan_files() return HTMLResponse( headers={ "HX-Trigger": f"reload-tema-{tema_id}-score" @@ -102,10 +105,14 @@ def get_score( logged_in: auth.LoggedIn, tema_id: int, ): + tema = temes_q.get_tema_by_id(tema_id) + if not tema: + raise HTTPException(status_code=404, detail="Could not find tune") + tema = links_service.add_links_to_tema(tema) return links_fragments.score( request=request, logged_in=logged_in, - tema_id=tema_id, + tema=tema, ) diff --git a/folkugat_web/assets/static/css/main.css b/folkugat_web/assets/static/css/main.css index 4ed7a43..b713ca4 100644 --- a/folkugat_web/assets/static/css/main.css +++ b/folkugat_web/assets/static/css/main.css @@ -1,1064 +1 @@ -*, ::before, ::after { - --tw-border-spacing-x: 0; - --tw-border-spacing-y: 0; - --tw-translate-x: 0; - --tw-translate-y: 0; - --tw-rotate: 0; - --tw-skew-x: 0; - --tw-skew-y: 0; - --tw-scale-x: 1; - --tw-scale-y: 1; - --tw-pan-x: ; - --tw-pan-y: ; - --tw-pinch-zoom: ; - --tw-scroll-snap-strictness: proximity; - --tw-gradient-from-position: ; - --tw-gradient-via-position: ; - --tw-gradient-to-position: ; - --tw-ordinal: ; - --tw-slashed-zero: ; - --tw-numeric-figure: ; - --tw-numeric-spacing: ; - --tw-numeric-fraction: ; - --tw-ring-inset: ; - --tw-ring-offset-width: 0px; - --tw-ring-offset-color: #fff; - --tw-ring-color: rgb(59 130 246 / 0.5); - --tw-ring-offset-shadow: 0 0 #0000; - --tw-ring-shadow: 0 0 #0000; - --tw-shadow: 0 0 #0000; - --tw-shadow-colored: 0 0 #0000; - --tw-blur: ; - --tw-brightness: ; - --tw-contrast: ; - --tw-grayscale: ; - --tw-hue-rotate: ; - --tw-invert: ; - --tw-saturate: ; - --tw-sepia: ; - --tw-drop-shadow: ; - --tw-backdrop-blur: ; - --tw-backdrop-brightness: ; - --tw-backdrop-contrast: ; - --tw-backdrop-grayscale: ; - --tw-backdrop-hue-rotate: ; - --tw-backdrop-invert: ; - --tw-backdrop-opacity: ; - --tw-backdrop-saturate: ; - --tw-backdrop-sepia: ; - --tw-contain-size: ; - --tw-contain-layout: ; - --tw-contain-paint: ; - --tw-contain-style: ; -} - -::backdrop { - --tw-border-spacing-x: 0; - --tw-border-spacing-y: 0; - --tw-translate-x: 0; - --tw-translate-y: 0; - --tw-rotate: 0; - --tw-skew-x: 0; - --tw-skew-y: 0; - --tw-scale-x: 1; - --tw-scale-y: 1; - --tw-pan-x: ; - --tw-pan-y: ; - --tw-pinch-zoom: ; - --tw-scroll-snap-strictness: proximity; - --tw-gradient-from-position: ; - --tw-gradient-via-position: ; - --tw-gradient-to-position: ; - --tw-ordinal: ; - --tw-slashed-zero: ; - --tw-numeric-figure: ; - --tw-numeric-spacing: ; - --tw-numeric-fraction: ; - --tw-ring-inset: ; - --tw-ring-offset-width: 0px; - --tw-ring-offset-color: #fff; - --tw-ring-color: rgb(59 130 246 / 0.5); - --tw-ring-offset-shadow: 0 0 #0000; - --tw-ring-shadow: 0 0 #0000; - --tw-shadow: 0 0 #0000; - --tw-shadow-colored: 0 0 #0000; - --tw-blur: ; - --tw-brightness: ; - --tw-contrast: ; - --tw-grayscale: ; - --tw-hue-rotate: ; - --tw-invert: ; - --tw-saturate: ; - --tw-sepia: ; - --tw-drop-shadow: ; - --tw-backdrop-blur: ; - --tw-backdrop-brightness: ; - --tw-backdrop-contrast: ; - --tw-backdrop-grayscale: ; - --tw-backdrop-hue-rotate: ; - --tw-backdrop-invert: ; - --tw-backdrop-opacity: ; - --tw-backdrop-saturate: ; - --tw-backdrop-sepia: ; - --tw-contain-size: ; - --tw-contain-layout: ; - --tw-contain-paint: ; - --tw-contain-style: ; -} - -/* -! tailwindcss v3.4.17 | MIT License | https://tailwindcss.com -*/ - -/* -1. Prevent padding and border from affecting element width. (https://github.com/mozdevs/cssremedy/issues/4) -2. Allow adding a border to an element by just adding a border-width. (https://github.com/tailwindcss/tailwindcss/pull/116) -*/ - -*, -::before, -::after { - box-sizing: border-box; - /* 1 */ - border-width: 0; - /* 2 */ - border-style: solid; - /* 2 */ - border-color: #e5e7eb; - /* 2 */ -} - -::before, -::after { - --tw-content: ''; -} - -/* -1. Use a consistent sensible line-height in all browsers. -2. Prevent adjustments of font size after orientation changes in iOS. -3. Use a more readable tab size. -4. Use the user's configured `sans` font-family by default. -5. Use the user's configured `sans` font-feature-settings by default. -6. Use the user's configured `sans` font-variation-settings by default. -7. Disable tap highlights on iOS -*/ - -html, -:host { - line-height: 1.5; - /* 1 */ - -webkit-text-size-adjust: 100%; - /* 2 */ - -moz-tab-size: 4; - /* 3 */ - -o-tab-size: 4; - tab-size: 4; - /* 3 */ - font-family: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; - /* 4 */ - font-feature-settings: normal; - /* 5 */ - font-variation-settings: normal; - /* 6 */ - -webkit-tap-highlight-color: transparent; - /* 7 */ -} - -/* -1. Remove the margin in all browsers. -2. Inherit line-height from `html` so users can set them as a class directly on the `html` element. -*/ - -body { - margin: 0; - /* 1 */ - line-height: inherit; - /* 2 */ -} - -/* -1. Add the correct height in Firefox. -2. Correct the inheritance of border color in Firefox. (https://bugzilla.mozilla.org/show_bug.cgi?id=190655) -3. Ensure horizontal rules are visible by default. -*/ - -hr { - height: 0; - /* 1 */ - color: inherit; - /* 2 */ - border-top-width: 1px; - /* 3 */ -} - -/* -Add the correct text decoration in Chrome, Edge, and Safari. -*/ - -abbr:where([title]) { - -webkit-text-decoration: underline dotted; - text-decoration: underline dotted; -} - -/* -Remove the default font size and weight for headings. -*/ - -h1, -h2, -h3, -h4, -h5, -h6 { - font-size: inherit; - font-weight: inherit; -} - -/* -Reset links to optimize for opt-in styling instead of opt-out. -*/ - -a { - color: inherit; - text-decoration: inherit; -} - -/* -Add the correct font weight in Edge and Safari. -*/ - -b, -strong { - font-weight: bolder; -} - -/* -1. Use the user's configured `mono` font-family by default. -2. Use the user's configured `mono` font-feature-settings by default. -3. Use the user's configured `mono` font-variation-settings by default. -4. Correct the odd `em` font sizing in all browsers. -*/ - -code, -kbd, -samp, -pre { - font-family: ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace; - /* 1 */ - font-feature-settings: normal; - /* 2 */ - font-variation-settings: normal; - /* 3 */ - font-size: 1em; - /* 4 */ -} - -/* -Add the correct font size in all browsers. -*/ - -small { - font-size: 80%; -} - -/* -Prevent `sub` and `sup` elements from affecting the line height in all browsers. -*/ - -sub, -sup { - font-size: 75%; - line-height: 0; - position: relative; - vertical-align: baseline; -} - -sub { - bottom: -0.25em; -} - -sup { - top: -0.5em; -} - -/* -1. Remove text indentation from table contents in Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=999088, https://bugs.webkit.org/show_bug.cgi?id=201297) -2. Correct table border color inheritance in all Chrome and Safari. (https://bugs.chromium.org/p/chromium/issues/detail?id=935729, https://bugs.webkit.org/show_bug.cgi?id=195016) -3. Remove gaps between table borders by default. -*/ - -table { - text-indent: 0; - /* 1 */ - border-color: inherit; - /* 2 */ - border-collapse: collapse; - /* 3 */ -} - -/* -1. Change the font styles in all browsers. -2. Remove the margin in Firefox and Safari. -3. Remove default padding in all browsers. -*/ - -button, -input, -optgroup, -select, -textarea { - font-family: inherit; - /* 1 */ - font-feature-settings: inherit; - /* 1 */ - font-variation-settings: inherit; - /* 1 */ - font-size: 100%; - /* 1 */ - font-weight: inherit; - /* 1 */ - line-height: inherit; - /* 1 */ - letter-spacing: inherit; - /* 1 */ - color: inherit; - /* 1 */ - margin: 0; - /* 2 */ - padding: 0; - /* 3 */ -} - -/* -Remove the inheritance of text transform in Edge and Firefox. -*/ - -button, -select { - text-transform: none; -} - -/* -1. Correct the inability to style clickable types in iOS and Safari. -2. Remove default button styles. -*/ - -button, -input:where([type='button']), -input:where([type='reset']), -input:where([type='submit']) { - -webkit-appearance: button; - /* 1 */ - background-color: transparent; - /* 2 */ - background-image: none; - /* 2 */ -} - -/* -Use the modern Firefox focus style for all focusable elements. -*/ - -:-moz-focusring { - outline: auto; -} - -/* -Remove the additional `:invalid` styles in Firefox. (https://github.com/mozilla/gecko-dev/blob/2f9eacd9d3d995c937b4251a5557d95d494c9be1/layout/style/res/forms.css#L728-L737) -*/ - -:-moz-ui-invalid { - box-shadow: none; -} - -/* -Add the correct vertical alignment in Chrome and Firefox. -*/ - -progress { - vertical-align: baseline; -} - -/* -Correct the cursor style of increment and decrement buttons in Safari. -*/ - -::-webkit-inner-spin-button, -::-webkit-outer-spin-button { - height: auto; -} - -/* -1. Correct the odd appearance in Chrome and Safari. -2. Correct the outline style in Safari. -*/ - -[type='search'] { - -webkit-appearance: textfield; - /* 1 */ - outline-offset: -2px; - /* 2 */ -} - -/* -Remove the inner padding in Chrome and Safari on macOS. -*/ - -::-webkit-search-decoration { - -webkit-appearance: none; -} - -/* -1. Correct the inability to style clickable types in iOS and Safari. -2. Change font properties to `inherit` in Safari. -*/ - -::-webkit-file-upload-button { - -webkit-appearance: button; - /* 1 */ - font: inherit; - /* 2 */ -} - -/* -Add the correct display in Chrome and Safari. -*/ - -summary { - display: list-item; -} - -/* -Removes the default spacing and border for appropriate elements. -*/ - -blockquote, -dl, -dd, -h1, -h2, -h3, -h4, -h5, -h6, -hr, -figure, -p, -pre { - margin: 0; -} - -fieldset { - margin: 0; - padding: 0; -} - -legend { - padding: 0; -} - -ol, -ul, -menu { - list-style: none; - margin: 0; - padding: 0; -} - -/* -Reset default styling for dialogs. -*/ - -dialog { - padding: 0; -} - -/* -Prevent resizing textareas horizontally by default. -*/ - -textarea { - resize: vertical; -} - -/* -1. Reset the default placeholder opacity in Firefox. (https://github.com/tailwindlabs/tailwindcss/issues/3300) -2. Set the default placeholder color to the user's configured gray 400 color. -*/ - -input::-moz-placeholder, textarea::-moz-placeholder { - opacity: 1; - /* 1 */ - color: #9ca3af; - /* 2 */ -} - -input::placeholder, -textarea::placeholder { - opacity: 1; - /* 1 */ - color: #9ca3af; - /* 2 */ -} - -/* -Set the default cursor for buttons. -*/ - -button, -[role="button"] { - cursor: pointer; -} - -/* -Make sure disabled buttons don't get the pointer cursor. -*/ - -:disabled { - cursor: default; -} - -/* -1. Make replaced elements `display: block` by default. (https://github.com/mozdevs/cssremedy/issues/14) -2. Add `vertical-align: middle` to align replaced elements more sensibly by default. (https://github.com/jensimmons/cssremedy/issues/14#issuecomment-634934210) - This can trigger a poorly considered lint error in some tools but is included by design. -*/ - -img, -svg, -video, -canvas, -audio, -iframe, -embed, -object { - display: block; - /* 1 */ - vertical-align: middle; - /* 2 */ -} - -/* -Constrain images and videos to the parent width and preserve their intrinsic aspect ratio. (https://github.com/mozdevs/cssremedy/issues/14) -*/ - -img, -video { - max-width: 100%; - height: auto; -} - -/* Make elements with the HTML hidden attribute stay hidden by default */ - -[hidden]:where(:not([hidden="until-found"])) { - display: none; -} - -.visible { - visibility: visible; -} - -.invisible { - visibility: hidden; -} - -.static { - position: static; -} - -.absolute { - position: absolute; -} - -.relative { - position: relative; -} - -.-left-6 { - left: -1.5rem; -} - -.-top-5 { - top: -1.25rem; -} - -.m-0 { - margin: 0px; -} - -.m-1 { - margin: 0.25rem; -} - -.m-12 { - margin: 3rem; -} - -.m-2 { - margin: 0.5rem; -} - -.m-3 { - margin: 0.75rem; -} - -.m-6 { - margin: 1.5rem; -} - -.m-8 { - margin: 2rem; -} - -.mx-1 { - margin-left: 0.25rem; - margin-right: 0.25rem; -} - -.mx-12 { - margin-left: 3rem; - margin-right: 3rem; -} - -.mx-2 { - margin-left: 0.5rem; - margin-right: 0.5rem; -} - -.mx-3 { - margin-left: 0.75rem; - margin-right: 0.75rem; -} - -.mx-4 { - margin-left: 1rem; - margin-right: 1rem; -} - -.my-1 { - margin-top: 0.25rem; - margin-bottom: 0.25rem; -} - -.my-2 { - margin-top: 0.5rem; - margin-bottom: 0.5rem; -} - -.my-3 { - margin-top: 0.75rem; - margin-bottom: 0.75rem; -} - -.mb-3 { - margin-bottom: 0.75rem; -} - -.ml-auto { - margin-left: auto; -} - -.mt-1 { - margin-top: 0.25rem; -} - -.mt-2 { - margin-top: 0.5rem; -} - -.mt-3 { - margin-top: 0.75rem; -} - -.mt-4 { - margin-top: 1rem; -} - -.mt-8 { - margin-top: 2rem; -} - -.inline-block { - display: inline-block; -} - -.flex { - display: flex; -} - -.table { - display: table; -} - -.hidden { - display: none; -} - -.h-4\/5 { - height: 80%; -} - -.h-px { - height: 1px; -} - -.min-h-\[400px\] { - min-height: 400px; -} - -.w-1\/2 { - width: 50%; -} - -.w-full { - width: 100%; -} - -.min-w-full { - min-width: 100%; -} - -.max-w-3xl { - max-width: 48rem; -} - -.max-w-4xl { - max-width: 56rem; -} - -.max-w-xl { - max-width: 36rem; -} - -.max-w-xs { - max-width: 20rem; -} - -.flex-1 { - flex: 1 1 0%; -} - -.flex-auto { - flex: 1 1 auto; -} - -.flex-none { - flex: none; -} - -.grow { - flex-grow: 1; -} - -@keyframes fadeIn { - 0% { - opacity: 0; - } - - 100% { - opacity: 1; - } -} - -.animate-fade-in-one { - animation: fadeIn 1s ease-in 0.3s 1 normal forwards; -} - -@keyframes fadeIn { - 0% { - opacity: 0; - } - - 100% { - opacity: 1; - } -} - -.animate-fade-in-three { - animation: fadeIn 1s ease-in 0.9s 1 normal forwards; -} - -@keyframes fadeIn { - 0% { - opacity: 0; - } - - 100% { - opacity: 1; - } -} - -.animate-fade-in-two { - animation: fadeIn 1s ease-in 0.6s 1 normal forwards; -} - -@keyframes grow { - 0% { - width: 0%; - } - - 100% { - width: 100%; - } -} - -.animate-grow { - animation: grow 0.3s ease-in 0s 1 normal forwards; -} - -@keyframes marquee { - 0% { - transform: translateX(0%); - } - - 100% { - transform: translateX(-100%); - } -} - -.animate-marquee { - animation: marquee 25s linear infinite; -} - -.flex-row { - flex-direction: row; -} - -.flex-col { - flex-direction: column; -} - -.flex-wrap { - flex-wrap: wrap; -} - -.flex-nowrap { - flex-wrap: nowrap; -} - -.items-start { - align-items: flex-start; -} - -.items-center { - align-items: center; -} - -.justify-end { - justify-content: flex-end; -} - -.justify-center { - justify-content: center; -} - -.gap-2 { - gap: 0.5rem; -} - -.overflow-hidden { - overflow: hidden; -} - -.whitespace-nowrap { - white-space: nowrap; -} - -.rounded { - border-radius: 0.25rem; -} - -.rounded-md { - border-radius: 0.375rem; -} - -.border { - border-width: 1px; -} - -.border-0 { - border-width: 0px; -} - -.border-b { - border-bottom-width: 1px; -} - -.border-none { - border-style: none; -} - -.border-beige { - --tw-border-opacity: 1; - border-color: rgb(178 124 9 / var(--tw-border-opacity, 1)); -} - -.border-yellow-50 { - --tw-border-opacity: 1; - border-color: rgb(254 252 232 / var(--tw-border-opacity, 1)); -} - -.bg-beige { - --tw-bg-opacity: 1; - background-color: rgb(178 124 9 / var(--tw-bg-opacity, 1)); -} - -.bg-brown { - --tw-bg-opacity: 1; - background-color: rgb(62 56 52 / var(--tw-bg-opacity, 1)); -} - -.p-0 { - padding: 0px; -} - -.p-1 { - padding: 0.25rem; -} - -.p-12 { - padding: 3rem; -} - -.p-2 { - padding: 0.5rem; -} - -.p-4 { - padding: 1rem; -} - -.px-10 { - padding-left: 2.5rem; - padding-right: 2.5rem; -} - -.px-2 { - padding-left: 0.5rem; - padding-right: 0.5rem; -} - -.px-4 { - padding-left: 1rem; - padding-right: 1rem; -} - -.py-1 { - padding-top: 0.25rem; - padding-bottom: 0.25rem; -} - -.py-2 { - padding-top: 0.5rem; - padding-bottom: 0.5rem; -} - -.pl-5 { - padding-left: 1.25rem; -} - -.pt-4 { - padding-top: 1rem; -} - -.text-left { - text-align: left; -} - -.text-center { - text-align: center; -} - -.text-right { - text-align: right; -} - -.text-2xl { - font-size: 1.5rem; - line-height: 2rem; -} - -.text-3xl { - font-size: 1.875rem; - line-height: 2.25rem; -} - -.text-sm { - font-size: 0.875rem; - line-height: 1.25rem; -} - -.text-xl { - font-size: 1.25rem; - line-height: 1.75rem; -} - -.text-xs { - font-size: 0.75rem; - line-height: 1rem; -} - -.font-bold { - font-weight: 700; -} - -.capitalize { - text-transform: capitalize; -} - -.text-beige { - --tw-text-opacity: 1; - color: rgb(178 124 9 / var(--tw-text-opacity, 1)); -} - -.text-brown { - --tw-text-opacity: 1; - color: rgb(62 56 52 / var(--tw-text-opacity, 1)); -} - -.text-white { - --tw-text-opacity: 1; - color: rgb(255 255 255 / var(--tw-text-opacity, 1)); -} - -.text-yellow-50 { - --tw-text-opacity: 1; - color: rgb(254 252 232 / var(--tw-text-opacity, 1)); -} - -.opacity-0 { - opacity: 0; -} - -.transition-opacity { - transition-property: opacity; - transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1); - transition-duration: 150ms; -} - -.duration-200 { - transition-duration: 200ms; -} - -.focus\:outline-none:focus { - outline: 2px solid transparent; - outline-offset: 2px; -} - -@media (min-width: 450px) { - .min-\[450px\]\:flex-row { - flex-direction: row; - } -} - -@media (min-width: 640px) { - .sm\:text-3xl { - font-size: 1.875rem; - line-height: 2.25rem; - } - - .sm\:text-8xl { - font-size: 6rem; - line-height: 1; - } -} +*,:after,:before{--tw-border-spacing-x:0;--tw-border-spacing-y:0;--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness:proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:rgba(59,130,246,.5);--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: ;--tw-contain-size: ;--tw-contain-layout: ;--tw-contain-paint: ;--tw-contain-style: }::backdrop{--tw-border-spacing-x:0;--tw-border-spacing-y:0;--tw-translate-x:0;--tw-translate-y:0;--tw-rotate:0;--tw-skew-x:0;--tw-skew-y:0;--tw-scale-x:1;--tw-scale-y:1;--tw-pan-x: ;--tw-pan-y: ;--tw-pinch-zoom: ;--tw-scroll-snap-strictness:proximity;--tw-gradient-from-position: ;--tw-gradient-via-position: ;--tw-gradient-to-position: ;--tw-ordinal: ;--tw-slashed-zero: ;--tw-numeric-figure: ;--tw-numeric-spacing: ;--tw-numeric-fraction: ;--tw-ring-inset: ;--tw-ring-offset-width:0px;--tw-ring-offset-color:#fff;--tw-ring-color:rgba(59,130,246,.5);--tw-ring-offset-shadow:0 0 #0000;--tw-ring-shadow:0 0 #0000;--tw-shadow:0 0 #0000;--tw-shadow-colored:0 0 #0000;--tw-blur: ;--tw-brightness: ;--tw-contrast: ;--tw-grayscale: ;--tw-hue-rotate: ;--tw-invert: ;--tw-saturate: ;--tw-sepia: ;--tw-drop-shadow: ;--tw-backdrop-blur: ;--tw-backdrop-brightness: ;--tw-backdrop-contrast: ;--tw-backdrop-grayscale: ;--tw-backdrop-hue-rotate: ;--tw-backdrop-invert: ;--tw-backdrop-opacity: ;--tw-backdrop-saturate: ;--tw-backdrop-sepia: ;--tw-contain-size: ;--tw-contain-layout: ;--tw-contain-paint: ;--tw-contain-style: }/*! tailwindcss v3.4.17 | MIT License | https://tailwindcss.com*/*,:after,:before{border:0 solid #e5e7eb;box-sizing:border-box}:after,:before{--tw-content:""}:host,html{line-height:1.5;-webkit-text-size-adjust:100%;font-family:ui-sans-serif,system-ui,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol,Noto Color Emoji;font-feature-settings:normal;font-variation-settings:normal;-moz-tab-size:4;-o-tab-size:4;tab-size:4;-webkit-tap-highlight-color:transparent}body{line-height:inherit;margin:0}hr{border-top-width:1px;color:inherit;height:0}abbr:where([title]){-webkit-text-decoration:underline dotted;text-decoration:underline dotted}h1,h2,h3,h4,h5,h6{font-size:inherit;font-weight:inherit}a{color:inherit;text-decoration:inherit}b,strong{font-weight:bolder}code,kbd,pre,samp{font-family:ui-monospace,SFMono-Regular,Menlo,Monaco,Consolas,Liberation Mono,Courier New,monospace;font-feature-settings:normal;font-size:1em;font-variation-settings:normal}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sub{bottom:-.25em}sup{top:-.5em}table{border-collapse:collapse;border-color:inherit;text-indent:0}button,input,optgroup,select,textarea{color:inherit;font-family:inherit;font-feature-settings:inherit;font-size:100%;font-variation-settings:inherit;font-weight:inherit;letter-spacing:inherit;line-height:inherit;margin:0;padding:0}button,select{text-transform:none}button,input:where([type=button]),input:where([type=reset]),input:where([type=submit]){-webkit-appearance:button;background-color:transparent;background-image:none}:-moz-focusring{outline:auto}:-moz-ui-invalid{box-shadow:none}progress{vertical-align:baseline}::-webkit-inner-spin-button,::-webkit-outer-spin-button{height:auto}[type=search]{-webkit-appearance:textfield;outline-offset:-2px}::-webkit-search-decoration{-webkit-appearance:none}::-webkit-file-upload-button{-webkit-appearance:button;font:inherit}summary{display:list-item}blockquote,dd,dl,figure,h1,h2,h3,h4,h5,h6,hr,p,pre{margin:0}fieldset{margin:0}fieldset,legend{padding:0}menu,ol,ul{list-style:none;margin:0;padding:0}dialog{padding:0}textarea{resize:vertical}input::-moz-placeholder,textarea::-moz-placeholder{color:#9ca3af;opacity:1}input::placeholder,textarea::placeholder{color:#9ca3af;opacity:1}[role=button],button{cursor:pointer}:disabled{cursor:default}audio,canvas,embed,iframe,img,object,svg,video{display:block;vertical-align:middle}img,video{height:auto;max-width:100%}[hidden]:where(:not([hidden=until-found])){display:none}.visible{visibility:visible}.invisible{visibility:hidden}.static{position:static}.absolute{position:absolute}.relative{position:relative}.-left-6{left:-1.5rem}.-top-5{top:-1.25rem}.m-0{margin:0}.m-1{margin:.25rem}.m-12{margin:3rem}.m-2{margin:.5rem}.m-3{margin:.75rem}.m-6{margin:1.5rem}.m-8{margin:2rem}.mx-1{margin-left:.25rem;margin-right:.25rem}.mx-12{margin-left:3rem;margin-right:3rem}.mx-2{margin-left:.5rem;margin-right:.5rem}.mx-4{margin-left:1rem;margin-right:1rem}.my-1{margin-bottom:.25rem;margin-top:.25rem}.my-2{margin-bottom:.5rem;margin-top:.5rem}.my-3{margin-top:.75rem}.mb-3,.my-3{margin-bottom:.75rem}.ml-2{margin-left:.5rem}.ml-auto{margin-left:auto}.mr-2{margin-right:.5rem}.mt-1{margin-top:.25rem}.mt-2{margin-top:.5rem}.mt-3{margin-top:.75rem}.mt-4{margin-top:1rem}.mt-8{margin-top:2rem}.inline-block{display:inline-block}.flex{display:flex}.table{display:table}.hidden{display:none}.h-4\/5{height:80%}.h-px{height:1px}.min-h-\[400px\]{min-height:400px}.w-1\/2{width:50%}.w-full{width:100%}.min-w-full{min-width:100%}.max-w-3xl{max-width:48rem}.max-w-4xl{max-width:56rem}.max-w-xl{max-width:36rem}.max-w-xs{max-width:20rem}.flex-1{flex:1 1 0%}.flex-auto{flex:1 1 auto}.flex-none{flex:none}.grow{flex-grow:1}.animate-fade-in-one{animation:fadeIn 1s ease-in .3s 1 normal forwards}.animate-fade-in-three{animation:fadeIn 1s ease-in .9s 1 normal forwards}@keyframes fadeIn{0%{opacity:0}to{opacity:1}}.animate-fade-in-two{animation:fadeIn 1s ease-in .6s 1 normal forwards}@keyframes grow{0%{width:0}to{width:100%}}.animate-grow{animation:grow .3s ease-in 0s 1 normal forwards}@keyframes marquee{0%{transform:translateX(0)}to{transform:translateX(-100%)}}.animate-marquee{animation:marquee 25s linear infinite}.flex-row{flex-direction:row}.flex-col{flex-direction:column}.flex-wrap{flex-wrap:wrap}.flex-nowrap{flex-wrap:nowrap}.items-start{align-items:flex-start}.items-center{align-items:center}.justify-end{justify-content:flex-end}.justify-center{justify-content:center}.gap-2{gap:.5rem}.overflow-hidden{overflow:hidden}.whitespace-nowrap{white-space:nowrap}.rounded{border-radius:.25rem}.rounded-md{border-radius:.375rem}.border{border-width:1px}.border-0{border-width:0}.border-b{border-bottom-width:1px}.border-none{border-style:none}.border-beige{--tw-border-opacity:1;border-color:rgb(178 124 9/var(--tw-border-opacity,1))}.border-yellow-50{--tw-border-opacity:1;border-color:rgb(254 252 232/var(--tw-border-opacity,1))}.bg-beige{--tw-bg-opacity:1;background-color:rgb(178 124 9/var(--tw-bg-opacity,1))}.bg-brown{--tw-bg-opacity:1;background-color:rgb(62 56 52/var(--tw-bg-opacity,1))}.p-0{padding:0}.p-1{padding:.25rem}.p-12{padding:3rem}.p-2{padding:.5rem}.p-4{padding:1rem}.px-10{padding-left:2.5rem;padding-right:2.5rem}.px-2{padding-left:.5rem;padding-right:.5rem}.px-4{padding-left:1rem;padding-right:1rem}.py-1{padding-bottom:.25rem;padding-top:.25rem}.py-2{padding-bottom:.5rem;padding-top:.5rem}.pl-5{padding-left:1.25rem}.pt-4{padding-top:1rem}.text-left{text-align:left}.text-center{text-align:center}.text-right{text-align:right}.text-2xl{font-size:1.5rem;line-height:2rem}.text-3xl{font-size:1.875rem;line-height:2.25rem}.text-sm{font-size:.875rem;line-height:1.25rem}.text-xl{font-size:1.25rem;line-height:1.75rem}.text-xs{font-size:.75rem;line-height:1rem}.font-bold{font-weight:700}.capitalize{text-transform:capitalize}.text-beige{--tw-text-opacity:1;color:rgb(178 124 9/var(--tw-text-opacity,1))}.text-brown{--tw-text-opacity:1;color:rgb(62 56 52/var(--tw-text-opacity,1))}.text-white{--tw-text-opacity:1;color:rgb(255 255 255/var(--tw-text-opacity,1))}.text-yellow-50{--tw-text-opacity:1;color:rgb(254 252 232/var(--tw-text-opacity,1))}.opacity-0{opacity:0}.transition-opacity{transition-duration:.15s;transition-property:opacity;transition-timing-function:cubic-bezier(.4,0,.2,1)}.duration-200{transition-duration:.2s}.focus\:outline-none:focus{outline:2px solid transparent;outline-offset:2px}@media (min-width:450px){.min-\[450px\]\:flex-row{flex-direction:row}}@media (min-width:640px){.sm\:text-3xl{font-size:1.875rem;line-height:2.25rem}.sm\:text-8xl{font-size:6rem;line-height:1}} \ No newline at end of file diff --git a/folkugat_web/assets/templates/fragments/header.html b/folkugat_web/assets/templates/fragments/header.html index 68bb5b9..3f9e23d 100644 --- a/folkugat_web/assets/templates/fragments/header.html +++ b/folkugat_web/assets/templates/fragments/header.html @@ -1,5 +1,5 @@
- Folkugat diff --git a/folkugat_web/assets/templates/fragments/pdf_viewer.html b/folkugat_web/assets/templates/fragments/pdf_viewer.html index c6d29fa..42a74ea 100644 --- a/folkugat_web/assets/templates/fragments/pdf_viewer.html +++ b/folkugat_web/assets/templates/fragments/pdf_viewer.html @@ -1,6 +1,6 @@ + - - - + + + diff --git a/folkugat_web/config/api.py b/folkugat_web/config/api.py new file mode 100644 index 0000000..13a7913 --- /dev/null +++ b/folkugat_web/config/api.py @@ -0,0 +1,3 @@ +import os + +URL_SCHEME = os.getenv("URL_SCHEME", "http") diff --git a/folkugat_web/fragments/tema/links.py b/folkugat_web/fragments/tema/links.py index c40a205..a1ad4dc 100644 --- a/folkugat_web/fragments/tema/links.py +++ b/folkugat_web/fragments/tema/links.py @@ -1,7 +1,5 @@ -from fastapi import HTTPException, Request +from fastapi import Request from folkugat_web.model import temes as model -from folkugat_web.services.temes import query as temes_q -from folkugat_web.services.temes.links import guess_link_type from folkugat_web.templates import templates @@ -73,10 +71,7 @@ def link_icon(request: Request, logged_in: bool, link: model.Link): ) -def score(request: Request, logged_in: bool, tema_id: int): - tema = temes_q.get_tema_by_id(tema_id) - if not tema: - raise HTTPException(status_code=404, detail="Could not find tune") +def score(request: Request, logged_in: bool, tema: model.Tema): return templates.TemplateResponse( "fragments/tema/score.html", { diff --git a/folkugat_web/model/temes.py b/folkugat_web/model/temes.py index e85b271..bc91bfa 100644 --- a/folkugat_web/model/temes.py +++ b/folkugat_web/model/temes.py @@ -90,4 +90,10 @@ class Tema: return link.link_type is LinkType.IMAGE def score(self) -> Link | None: - return next(filter(self._is_score, self.links), None) + result = next(filter(self._is_score, self.links), None) + return result + + +class TemaCols(enum.Enum): + NOM = "nom" + COPS_TOCAT = "cops_tocat" diff --git a/folkugat_web/services/files.py b/folkugat_web/services/files.py index 518956e..ba5239d 100644 --- a/folkugat_web/services/files.py +++ b/folkugat_web/services/files.py @@ -1,11 +1,15 @@ import mimetypes +import os import re import uuid +from collections.abc import Iterator from pathlib import Path import magic from fastapi import HTTPException, UploadFile from folkugat_web.config import db +from folkugat_web.dal.sql.temes import links as links_dal +from folkugat_web.log import logger async def get_mimetype(upload_file: UploadFile) -> str: @@ -56,3 +60,17 @@ async def store_file(tema_id: int, upload_file: UploadFile) -> str: def list_files(tema_id: str) -> list[str]: filedir = db.DB_FILES_DIR / str(tema_id) return [get_db_file_path(f) for f in filedir.iterdir()] + + +def get_orphan_files() -> Iterator[Path]: + alive_files = {link.url for link in links_dal.get_links()} + return filter( + lambda p: p.is_file() and get_db_file_path(p) not in alive_files, + db.DB_FILES_DIR.rglob("*"), + ) + + +def clean_orphan_files(): + for path in get_orphan_files(): + logger.info(f"Deleting the orphan file: {path}") + os.remove(path) diff --git a/folkugat_web/services/playlists.py b/folkugat_web/services/playlists.py index c9ef46d..408f098 100644 --- a/folkugat_web/services/playlists.py +++ b/folkugat_web/services/playlists.py @@ -1,27 +1,31 @@ -from typing import Optional - from folkugat_web.dal.sql import Connection from folkugat_web.dal.sql._connection import get_connection from folkugat_web.dal.sql.playlists import query, write +from folkugat_web.log import logger from folkugat_web.model import playlists +from folkugat_web.services.temes import links as links_service from folkugat_web.services.temes import query as temes_query def add_temes_to_playlist(playlist: playlists.Playlist) -> playlists.Playlist: for set_ in playlist.sets: - add_temes_to_set(set_) + _ = add_temes_to_set(set_) return playlist def add_temes_to_set(set_: playlists.Set) -> playlists.Set: for tema_in_set in set_.temes: - add_tema_to_tema_in_set(tema_in_set) + _ = add_tema_to_tema_in_set(tema_in_set) return set_ def add_tema_to_tema_in_set(tema_in_set: playlists.TemaInSet) -> playlists.TemaInSet: if tema_in_set.tema_id is not None: tema_in_set.tema = temes_query.get_tema_by_id(tema_in_set.tema_id) + if not tema_in_set.tema: + logger.error("fCould not load tune in set: {tema_in_set}") + else: + _ = links_service.add_links_to_tema(tema_in_set.tema) return tema_in_set diff --git a/folkugat_web/services/temes/search.py b/folkugat_web/services/temes/search.py index 1d97112..5084ae2 100644 --- a/folkugat_web/services/temes/search.py +++ b/folkugat_web/services/temes/search.py @@ -84,7 +84,6 @@ def _apply_limit_offset(limit: int, offset: int) -> Callable[[Iterable[model.Tem def busca_temes(query: str, hidden: bool = False, limit: int = 10, offset: int = 0) -> list[model.Tema]: t0 = time.time() - with get_connection() as con: result = ( FnChain.transform(temes_q.get_tema_id_to_ngrams(con).items()) | diff --git a/folkugat_web/templates.py b/folkugat_web/templates.py index 5f0a190..d55a8fb 100644 --- a/folkugat_web/templates.py +++ b/folkugat_web/templates.py @@ -1,5 +1,20 @@ +from typing import Any + +from fastapi import Request from fastapi.templating import Jinja2Templates -from folkugat_web.config import directories as config +from folkugat_web.config import api as api_config +from folkugat_web.config import directories as directories_config -templates = Jinja2Templates(directory=config.TEMPLATES_DIR) +templates = Jinja2Templates(directory=directories_config.TEMPLATES_DIR) + + +def url_for(request: Request, name: str, **path_params: Any) -> str: + http_url = request.url_for(name, **path_params) + if api_config.URL_SCHEME == "http": + return str(http_url) + # Replace 'http' with 'https' + return str(http_url.replace(scheme=api_config.URL_SCHEME)) + + +templates.env.globals["url_for"] = url_for