Fix publishing

.github/workflows/generate_all.yml

@@ -9,10 +9,15 @@ on:
         type: boolean
         default: true
       pdf:
-        description: 'Generate pdf'
+        description: 'Generate pdf of the whole songbooks'
         required: false
         type: boolean
         default: true
+      pdf_songs:
+        description: 'Generate individual song PDFs'
+        required: false
+        type: boolean
+        default: false
       html:
         description: 'Generate htmls'
         required: false
@@ -35,6 +40,11 @@ on:
         required: false
         type: boolean
         default: true
+      pdf_songs:
+        description: 'Generate individual song PDFs'
+        required: false
+        type: boolean
+        default: false
       html:
         description: 'Generate htmls'
         required: false
@@ -54,7 +64,10 @@ jobs:
   generate-artifacts:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/wdw21/github-latex-worker:latest
+      image: ghcr.io/spiewaj/github-latex-worker:latest
+      credentials:
+        username: ${{ github.actor }}
+        password: ${{ secrets.github_token }}
       volumes:
         - ${{ github.workspace }}:/workspace
     steps:
@@ -78,6 +91,41 @@ jobs:
           name: songbooks_pdfs
           path: /workspace/build/songs_tex/*.pdf
 
+      - name: Generate individual song PDFs
+        if: ${{ inputs.pdf_songs }}
+        run: |
+          cd /workspace
+          chmod 755 ./render_pdfs_songs.sh
+
+          # Check if we can detect changed song files
+          CHANGED_SONGS=""
+
+          if [ "${{ github.event_name }}" = "pull_request" ]; then
+            echo "Detecting changed song files in PR..."
+            # Get changed files that match songs/**/*.xml pattern
+            CHANGED_SONGS=$(git diff --name-only ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }} | grep '^songs/.*\.xml$' || true)
+          elif [ "${{ github.event_name }}" = "push" ] && [ -n "${{ github.event.before }}" ] && [ "${{ github.event.before }}" != "0000000000000000000000000000000000000000" ]; then
+            echo "Detecting changed song files in push..."
+            # Get changed files in the push
+            CHANGED_SONGS=$(git diff --name-only ${{ github.event.before }}..${{ github.sha }} | grep '^songs/.*\.xml$' || true)
+          fi
+
+          if [ -n "$CHANGED_SONGS" ]; then
+            echo "Found changed songs:"
+            echo "$CHANGED_SONGS"
+            # Pass changed songs as arguments to the script
+            ./render_pdfs_songs.sh $CHANGED_SONGS
+          else
+            echo "No changed songs detected or not a PR/push event, processing all songs..."
+            ./render_pdfs_songs.sh
+          fi
+      - name: Upload individual songs PDFs
+        if: ${{ inputs.pdf_songs }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: songs_pdfs
+          path: /workspace/build/songs_pdf/*.pdf
+
       - name: Create Release
         id: create_release
         if: ${{ inputs.release }}
@@ -154,6 +202,8 @@ jobs:
           path: | 
             /workspace/build/*.zip
             /workspace/build/index.xhtml
+            /workspace/build/sitemap.xml
+            /workspace/build/*.js
 
 
       - name: Upload htmls to release

.github/workflows/generate_changed_pdf.yml

@@ -9,7 +9,10 @@ jobs:
   Generate-artifacts:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/wdw21/github-latex-worker:latest
+      image: ghcr.io/spiewaj/github-latex-worker:latest
+      credentials:
+        username: ${{ github.actor }}
+        password: ${{ secrets.github_token }}
       volumes:
         - ${{ github.workspace }}:/workspace
     steps:

.github/workflows/publish_page.yml

@@ -28,6 +28,7 @@ jobs:
       html: true
       epub: true
       pdf:  true
+      pdf_songs: true
       release: false
   # Single deploy job since we're just deploying
   deploy:
@@ -47,6 +48,13 @@ jobs:
         with:
           name: songbooks_pdfs
           path: _generated
+
+      - name: Download generated song artifacts (pdfs)
+        uses: actions/download-artifact@v4
+        with:
+          name: songs_pdfs
+          path: _generated/songs_pdf
+
       - name: Download generated songbook artifacts (epub)
         uses: actions/download-artifact@v4
         with:
@@ -59,11 +67,14 @@ jobs:
           path: _generated
       - name: Prepare _site
         run: |
-          mkdir -p _site/songs_html _site/songs_tex
+          mkdir -p _site/songs_html _site/songs_tex _site/songs_pdf
           unzip -o _generated/*.zip -d _site
-          mv _generated/index.xhtml _site/index.xhtml
-          mv _generated/*.pdf _site/songs_tex
+          mv _generated/index.html _site/
+          mv _generated/sitemap.xml _site/
+          mv _generated/*.pdf _site/songs_tex/
+          mv _generated/songs_pdf/*.pdf _site/songs_pdf
           mv _generated/*.epub _site/
+          mv _generated/*.js _site/
           cp -R editor _site/
           ls -la _site/
 

.gitignore

@@ -7,3 +7,4 @@ npmtmp/
 __pycache__/
 node_modules/
 *-download
+.secrets

README.md

@@ -1,6 +1,6 @@
 ### Recent generated artifacts:
-  Generated artifacts are auto-published (post-commit on) https://songbook.21wdw.org.
-  You can also check the latest release: https://github.com/wdw21/songbook/releases/latest.
+  Generated artifacts are auto-published (post-commit on) https://spiewaj.com.
+  You can also check the latest release: https://github.com/spiewaj/songbook/releases/latest.
 # About
 
 This project contains:
@@ -16,18 +16,18 @@ The XML format is pretty well self-describing.
 
 # Editing of the songs
 
-To reduce the friction when working with git/github and XML format we provide a [graphical editor](https://songbook.21wdw.org/editor) and (github-integration https://ghe.songbook.21wdw.org/editor/] to make the songs editing as smooth as possible. 
+To reduce the friction when working with git/github and XML format we provide a [graphical editor](https://spiewaj.com/editor) and (github-integration https://spiewaj.com/editor/] to make the songs editing as smooth as possible. 
 The changes you will make can be easily published for review and added to this repository. 
 
 # Generating PDF songbooks
 
 The songs can be converted to a PDF songbook. We use LaTeX for this. 
-You can [download a ready PDF]( https://github.com/wdw21/songbook/releases/latest) or generate it yourself.
+You can [download a ready PDF]( https://github.com/spiewaj/songbook/releases/latest) or generate it yourself.
 
 Running the render script requires:
 1) a python environment with dependencies listed in requirements.txt
 2) a pdflatex compiler with ucs, extsizes, and Polish localization support
 
 # Generating EPUBs songbooks
 You can run `./render_epub.sh`.
-You can download recent generated EPUB from here: [spiewnik.epub]( https://github.com/wdw21/songbook/releases/latest).
+You can download recent generated EPUB from here: [spiewnik.epub]( https://github.com//songbook/releases/latest).

_site/index.js

@@ -1,16 +1,13 @@
-function edit(file) {
-    let d = document.createElement('form');
-    d.setAttribute("action", "https://ghe.songbook.21wdw.org/users/me/changes:new")
-    d.setAttribute("method", "post")
-    let i = document.createElement("input")
-    i.setAttribute("type", "hidden")
-    i.setAttribute("name", "file")
-    i.setAttribute("value", file)
-    d.appendChild(i);
-
-    document.body.appendChild(d);
-    d.submit();
+function simplifyString(str) {
+    if (typeof str !== 'string') {
+        return '';
+    }
+    return str
+        .normalize('NFD')
+        .replace(/[\u0300-\u036f]/g, '')
+        .replace(/ł/gi, 'l'); // Added to handle 'ł' and 'Ł'
 }
+
 function filterSongs() {
     // 1. Get references to the input and the list
     const input = document.getElementById('songSearch');
@@ -20,18 +17,22 @@ function filterSongs() {
 
     // 2. Loop through all list items
     for (let i = 0; i < li.length; i++) {
-        // 3. Find the link (a) inside the list item
-        const a = li[i].getElementsByTagName("a")[0];
+        let txtValue = "";
+        // 3. Find the title link inside the list item
+        const a = li[i].getElementsByClassName("title")[0];
         if (a) {
-            // 4. Get the text content of the link
-            const txtValue = a.textContent || a.innerText;
-
-            // 5. Check if the song title includes the filter text
-            if (txtValue.toUpperCase().indexOf(filter) > -1) {
-                li[i].style.display = ""; // Show the list item
-            } else {
-                li[i].style.display = "none"; // Hide the list item
+            txtValue += ' ' + a.textContent || a.innerText;
+        }
+        for (const span of li[i].getElementsByTagName("span")) {
+            if (span.textContent != 'edit') {
+              txtValue += ' ' + span.textContent || span.innerText;
             }
         }
+        if (txtValue.toUpperCase().indexOf(filter) > -1 ||
+            simplifyString(txtValue).toUpperCase().indexOf(filter) > -1) {
+            li[i].style.display = ""; // Show the list item
+        } else {
+            li[i].style.display = "none"; // Hide the list item
+        }
     }
 }

_site/song.xsd

@@ -137,5 +137,10 @@
             <xs:element type="xs:string" name="music_source" minOccurs="0" maxOccurs="1"/>
         </xs:all>
         <xs:attribute type="xs:string" name="title" use="required"/>
+        <xs:attribute name="lang" type="xs:string" use="optional" default="pl">
+            <xs:annotation>
+                <xs:documentation>Language code (e.g., 'pl', 'en', 'de', 'fr')</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
     </xs:complexType>
 </xs:schema>

containers/Dockerfile

@@ -1,8 +1,8 @@
-FROM ubuntu
+FROM ubuntu:rolling
 WORKDIR /app
 ENV TZ=Europe/Warsaw
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-RUN apt-get update && apt-get -yq install texlive texlive-latex-extra texlive-lang-polish pip pkg-config libicu-dev epubcheck python3-markupsafe python3-icu python3-lxml python3-jinja2 python3-yaml git curl xindy && apt-get clean
+RUN apt-get update && apt-get -yq install python3.13 texlive texlive-latex-extra texlive-lang-polish pip pkg-config libicu-dev epubcheck python3-markupsafe python3-icu python3-lxml python3-jinja2 python3-yaml python3-cairosvg python3-pillow git curl xindy && apt-get clean
 #RUN tlmgr install truncate
 #COPY ../requirements.txt /tmp/requirements.txt
 #RUN pip3 install -r /tmp/requirements.txt

containers/build_push_images.sh

@@ -2,21 +2,24 @@
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
+ORG="spiewaj"
+
 set -e -x
 
-#gh auth token  | docker login ghcr.io -u ptabor --password-stdin
 # Authorization using:
 #  - https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens
 #  - https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry
 #  The token is configured here: https://github.com/settings/tokens for scopes:  delete:packages, repo, write:packages
-#echo "{PERSONAL_ACCESS_TOKEN}" | docker login ghcr.io -u ptabor --password-stdin
+#echo "${PERSONAL_ACCESS_TOKEN}" | docker login ghcr.io -u ptabor --password-stdin
+#  If you forget - you need to regenerate.
 
-cd "${SCRIPT_DIR}/.."
-docker build -f "${SCRIPT_DIR}/Dockerfile" -t europe-docker.pkg.dev/wdw-21/songbook/github-latex-worker:latest --platform linux/amd64 .
 
-docker image tag europe-docker.pkg.dev/wdw-21/songbook/github-latex-worker ghcr.io/wdw21/github-latex-worker:latest
 
-docker push europe-docker.pkg.dev/wdw-21/songbook/github-latex-worker:latest
+cd "${SCRIPT_DIR}/.."
+docker build -f "${SCRIPT_DIR}/Dockerfile" -t europe-docker.pkg.dev/$ORG/songbook/github-latex-worker:latest --platform linux/amd64 .
+
+docker image tag europe-docker.pkg.dev/$ORG/songbook/github-latex-worker ghcr.io/$ORG/github-latex-worker:latest
 
+# docker push europe-docker.pkg.dev/$ORG/songbook/github-latex-worker:latest
 
-docker push ghcr.io/wdw21/github-latex-worker:latest
+docker push ghcr.io/$ORG/github-latex-worker:latest

containers/test.sh

@@ -1,2 +1,3 @@
-docker run -v "${PWD}/..:/work" -w /work -it europe-docker.pkg.dev/wdw-21/songbook/github-latex-worker:latest /bin/bash
-#docker run -v "${PWD}/..:/work" -w /work -it europe-docker.pkg.dev/wdw-21/songbook/github-latex-worker:latest ./render_pdf.sh songbook a4 test ./songs/alpuhara.xml
+ORG=spiewaj
+docker run -v "${PWD}/..:/work" -w /work -it europe-docker.pkg.dev/$ORG/songbook/github-latex-worker:latest /bin/bash
+#docker run -v "${PWD}/..:/work" -w /work -it europe-docker.pkg.dev/$ORG/songbook/github-latex-worker:latest ./render_pdf.sh songbook a4 test ./songs/alpuhara.xml

editor-github-pr-proxy/deploy.sh

@@ -3,6 +3,6 @@
 gcloud functions deploy editor-github-pr-proxy \
   --allow-unauthenticated \
   --project wdw-21 \
-  --region=europe-west3 --runtime nodejs16 --trigger-http --max-instances=3 --source . --memory=128Mi --gen2 \
+  --region=europe-west3 --runtime nodejs20 --trigger-http --max-instances=3 --source . --memory=128Mi --gen2 \
   --entry-point=app \
   --set-secrets=GITHUB_TOKEN=projects/wdw-21/secrets/github-comments-token:latest

editor-github/common.js

@@ -25,12 +25,12 @@ export const REDIRECT_BASE_URL = BASE_URL + "/redirect";
 export const CONFIG_BASE_URL = BASE_URL + "/config";
 export const AUTH_URL = BASE_URL + "/auth";
 
-export const MAIN_BRANCH_NAME="songeditor-main";
-
+export const GITHUB_OWNER='spiewaj';
+export const MAIN_BRANCH_NAME="songeditor-main-spiewaj.com";
 
 export async function getFileFromBranch(octokit, user, branchName) {
     let diff = await octokit.rest.repos.compareCommitsWithBasehead({
-        owner: 'wdw21',
+        owner: GITHUB_OWNER,
         repo: 'songbook',
         basehead: `main...${user}:songbook:${branchName}`
     });
@@ -217,7 +217,6 @@ export async function fetchBranch(octokit, user, branchName) {
 export async function prepareMainBranch(octokit, user) {
     let branch = await fetchBranch(octokit, user, MAIN_BRANCH_NAME);
     if (!branch) {
-        // let originBranch = await fetchBranch(octokit, 'wdw21', 'main');
         // console.log(util.inspect(originBranch, false, null, false));
         // We use really old commit as (originBranch.data.commit.sha) was sometimes not pulled from the repository.
         await octokit.rest.git.createRef({owner: user, repo: 'songbook', "ref": "refs/heads/" + MAIN_BRANCH_NAME, "sha": 'c21af496c93eecd96902d8ee01c994b9ec2e8157'});
@@ -226,18 +225,28 @@ export async function prepareMainBranch(octokit, user) {
             repo: 'songbook',
             title: 'Automated creation of songbook-main branch.',
             body: 'Should get automatically merged.',
-            head: 'wdw21:songbook:main',
+            head: GITHUB_OWNER + ':songbook:main',
             base: MAIN_BRANCH_NAME
         })
-        console.log("Creating pull request", JSON.stringify(res));
+        console.log("Created pull request", JSON.stringify(res));
         const merge = await octokit.request('PUT /repos/{owner}/{repo}/pulls/{pull_number}/merge', {
             owner: user,
             repo: 'songbook',
             pull_number: res.data.number
         })
         console.log("Merging", JSON.stringify(merge));
     }
-    await octokit.rest.repos.mergeUpstream({owner: user, repo: 'songbook', 'branch': MAIN_BRANCH_NAME});
+    // For repositories that got forked from github.com/wdw21/songbook... 
+    // the upstream branch would not be github.com/spiewaj/songbook.
+    // await octokit.rest.repos.mergeUpstream({owner: user, repo: 'songbook', 'branch': MAIN_BRANCH_NAME});
+    let originBranch = await fetchBranch(octokit, GITHUB_OWNER, 'main');
+    console.log("originBranch", JSON.stringify(originBranch));   
+    // https://github.com/octokit/rest.js/issues/339
+    let updateCmd = {owner: user, repo: 'songbook', "ref": "heads/" + MAIN_BRANCH_NAME, "sha": originBranch.data.commit.sha, "force": true}
+    console.log("updateCmd", JSON.stringify(updateCmd));
+    const updateRef=await octokit.rest.git.updateRef(updateCmd);
+    console.log("UpdateRef", JSON.stringify(updateRef));    
+
     return fetchBranch(octokit, user, MAIN_BRANCH_NAME);
 }