From cef832fda4f807c8036f06b8062ef93c603a9729 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Sat, 14 Jun 2025 17:55:38 +0300 Subject: [PATCH] fix(website/download): fix URLs for download --- apps/website/src/lib/download-helper.ts | 34 ++++++++------------- apps/website/src/routes/download-now.svelte | 8 ++--- 2 files changed, 16 insertions(+), 26 deletions(-) diff --git a/apps/website/src/lib/download-helper.ts b/apps/website/src/lib/download-helper.ts index d7e184dda..61b6e7ef9 100644 --- a/apps/website/src/lib/download-helper.ts +++ b/apps/website/src/lib/download-helper.ts @@ -9,7 +9,7 @@ export type Platform = 'macos' | 'windows' | 'linux'; let version = rootPackageJson.version; export function buildDesktopDownloadUrl(platform: Platform, format: string, architecture: Architecture): string { - return `https://github.com/TriliumNext/Notes/releases/download/${version}/TriliumNextNotes-${version}-${platform}-${architecture}.${format}`; + return `https://github.com/TriliumNext/Notes/releases/download/v${version}/TriliumNextNotes-v${version}-${platform}-${architecture}.${format}`; } export interface DownloadInfo { @@ -145,28 +145,18 @@ function getPlatform(): Platform { } } -function getDownloadLink(platform: Platform, architecture: Architecture) { - const baseUrl = 'https://example.com/downloads'; - let url; - if (platform === 'mac') { - url = `${baseUrl}/mac-${architecture}.dmg`; - } else if (platform === 'windows') { - url = `${baseUrl}/windows-${architecture}.exe`; - } else if (platform === 'linux') { - url = `${baseUrl}/linux-${architecture}.tar.gz`; - } else { - url = `${baseUrl}/other-${architecture}.zip`; - } - - return { - url: url, - platform: platform, - architecture: architecture - }; -} - export function getRecommendedDownload() { const architecture = getArchitecture(); const platform = getPlatform(); - return getDownloadLink(platform, architecture); + + const downloadInfo = downloadMatrix.desktop[platform]?.downloads; + const recommendedDownload = Object.entries(downloadInfo || {}).find(d => d[1].recommended); + const format = recommendedDownload?.[0]; + const url = buildDesktopDownloadUrl(platform, format || 'zip', architecture); + + return { + architecture, + platform, + url + } } diff --git a/apps/website/src/routes/download-now.svelte b/apps/website/src/routes/download-now.svelte index 8762ed9f8..c0ca6244b 100644 --- a/apps/website/src/routes/download-now.svelte +++ b/apps/website/src/routes/download-now.svelte @@ -1,14 +1,14 @@ -{#if recommendedDownload} - +{#if url} + Download now - ({recommendedDownload.platform} {recommendedDownload.architecture}) + ({platform} {architecture}) {/if} \ No newline at end of file