feat: Add script to get fonts on build

Signed-off-by: Julius Härtl <[email protected]>

.gitignore

@@ -1,3 +1,4 @@
+/assets/fonts
 tests/clover.xml
 .idea
 node_modules/

.nextcloudignore

@@ -1,4 +1,5 @@
 src
+build
 .git
 tests
 node_modules

assets/fonts/.gitkeep

@@ -0,0 +1 @@
+Fonts will be added here during release build thorugh the build/download-fonts.sh script.

build/download-fonts.sh

@@ -0,0 +1,47 @@
+#!/bin/bash
+#
+# Download font files and put them into the assets/fonts folder for the release
+
+FONTLIST=(
+    "https://github.com/google/fonts/raw/main/ofl/amaticsc/AmaticSC-Regular.ttf"
+    "https://github.com/google/fonts/raw/main/ofl/amaticsc/AmaticSC-Bold.ttf"
+    "https://github.com/google/fonts/blob/main/ofl/caveat/Caveat%5Bwght%5D.ttf"
+    "https://github.com/google/fonts/raw/main/ofl/comfortaa/Comfortaa%5Bwght%5D.ttf"
+    "https://github.com/google/fonts/raw/main/ofl/ebgaramond/EBGaramond%5Bwght%5D.ttf"
+    "https://github.com/google/fonts/raw/main/ofl/lexend/Lexend%5Bwght%5D.ttf"
+    "https://github.com/google/fonts/raw/main/ofl/lobster/Lobster-Regular.ttf"
+    "https://github.com/google/fonts/raw/main/ofl/lora/Lora%5Bwght%5D.ttf"
+    "https://github.com/google/fonts/raw/main/ofl/montserrat/Montserrat%5Bwght%5D.ttf"
+    "https://github.com/google/fonts/raw/main/ofl/nunito/Nunito%5Bwght%5D.ttf"
+    "https://github.com/google/fonts/raw/main/ofl/oswald/Oswald%5Bwght%5D.ttf"
+    "https://github.com/google/fonts/raw/main/ofl/pacifico/Pacifico-Regular.ttf"
+    "https://github.com/google/fonts/raw/main/ofl/playfairdisplay/PlayfairDisplay%5Bwght%5D.ttf"
+    "https://github.com/google/fonts/blob/main/ofl/roboto/Roboto%5Bwdth%2Cwght%5D.ttf"
+    "https://github.com/google/fonts/raw/main/apache/robotomono/RobotoMono%5Bwght%5D.ttf"
+    "https://github.com/google/fonts/blob/main/ofl/spectral/Spectral-Regular.ttf"
+)
+
+rm assets/fonts/*
+
+function urldecode() { : "${*//+/ }"; echo -e "${_//%/\\x}"; }
+
+for font in "${FONTLIST[@]}"; do
+    echo "$font"
+    wget -q -P assets/fonts/ $font
+
+    FILENAME=$(urldecode "$(basename "$font")")
+
+    if [[ $FILENAME == *"wght"* ]]; then
+        NEWFILENAME=$(echo $FILENAME | sed 's/\[wght\]/-wght/g')
+        NEWFILENAME=$(echo $NEWFILENAME | sed 's/\[wdth,wght\]/-wdtg-wght/g')
+        mv assets/fonts/$FILENAME assets/fonts/$NEWFILENAME
+    else
+        NEWFILENAME=$(echo $FILENAME)
+    fi
+
+    echo "$FILENAME"
+    FONTNAME=$(echo $NEWFILENAME | sed 's/.ttf//g')
+
+    echo "$(dirname $font)/OFL.txt"
+    wget -q -O "assets/fonts/$FONTNAME.LICENSE.txt" "$(dirname $font)/OFL.txt"
+done

krankerl.toml

@@ -2,6 +2,7 @@
 before_cmds = [
 	"composer install --working-dir=composer/",
 	"composer dump --working-dir=composer/",
+	"bash ./build/download-fonts.sh",
 	"npm ci",
 	"npm run build"
 ]

lib/Migration/InstallDefaultFonts.php

@@ -18,7 +18,7 @@ public function getName(): string {
 	public function run(IOutput $output): void {
 		$appVersion = $this->config->getAppValue('richdocuments', 'installed_version');
 
-		if (!empty($appVersion) && version_compare($appVersion, '8.2.2') < 1) {
+		if (empty($appVersion) || version_compare($appVersion, '8.3.0', '>')) {
 			return;
 		}
 

lib/Service/FontService.php

@@ -261,7 +261,7 @@ public function installDefaultFonts(): void {
 		}
 
 		while (false !== ($fileName = readdir($handle))) {
-			if ($fileName === '.' || $fileName === '..') {
+			if (\str_starts_with($fileName, '.') || \str_ends_with($fileName, '.txt')) {
 				continue;
 			}
 

src/components/AdminSettings.vue

@@ -527,7 +527,7 @@ export default {
 		fontXmlHint() {
 			return `
 <remote_font_config>
-	<url desc="URL of optional JSON file that lists fonts to be included in Online" type="string" default="">${this.fontHintUrl}</url>
+	<url>${this.fontHintUrl}</url>
 </remote_font_config>
 			`
 		},