Trim markdown URLs for eclipse-platform/www.eclipse.org-eclipse/master`

- Use `f=` instead of `file=` where the prefix
`eclipse-platform/www.eclipse.org-eclipse/master` is implicit.
- E.g., https://eclipse.dev/eclipse/markdown/?f=news/4.36/index.md

Author: merks

markdown/index.html

@@ -119,7 +119,28 @@
 			"eclipse-ide/.github": "Eclipse IDE",
 		};
 
-		const file = new URLSearchParams(window.location.search).get('file');
+		function getFileParameter() {
+			const search = new URLSearchParams(window.location.search);
+			return search.get('file') ?? (search.get('f') == null ? null : `eclipse-platform/www.eclipse.org-eclipse/master/${search.get('f')}`);
+		}
+
+		function getMarkdownSearch(path) {
+			const parts = /eclipse-platform\/www\.eclipse\.org-eclipse\/master(.*)/.exec(path);
+			if (parts == null) {
+				return `?file=${path}`;
+			}
+			return `?f=${parts[1].replace(/^\//, '')}`;
+		}
+
+		function getMarkdownURL(path) {
+			const parts = /eclipse-platform\/www\.eclipse\.org-eclipse\/master(.*)/.exec(path);
+			if (parts == null) {
+				return `${markdownBase}${path}`;
+			}
+			return `${selfHostedMarkdownBase}${parts[1].replace(/^\//,'')}`;
+		}
+
+		const file = getFileParameter();
 		const parts = /(?<org>[^/]+)\/(?<repo>[^/]+)\/(?<branch>[^/]+)\/(?<path>.*)/.exec(file);
 		const org = parts == null ? '' : parts.groups.org;
 		const repo = parts == null ? '' : parts.groups.repo;
@@ -130,7 +151,7 @@
 		const selfHosted = repo == 'www.eclipse.org-eclipse';
 		const repoName = parts == null ? '' : repoNames[`${org}/${repo}`];
 
-		const localSiteNavigator = isLocalHost ? `<a href="${markdownBase}eclipse-platform/www.eclipse.org-eclipse/master/">Eclipse Website Navigator</a>` : '';
+		const localSiteNavigator = isLocalHost ? `<a href="${getMarkdownURL('eclipse-platform/www.eclipse.org-eclipse/master/')}">Eclipse Website Navigator</a>` : '';
 		defaultAside = toElements(`${markdownAside}${localSiteNavigator}`);
 
 		if (parts != null && parts.groups.path.endsWith('.md')) {
@@ -192,7 +213,7 @@ <h2>Table of Contents</h2>
 				const parts = /\/repos\/(?<org>[^/]+)\/(?<repo>[^/]+)\/contents\/(?<path>.*)/.exec(fileURL.pathname);
 				const url = new URL(window.location);
 				url.hash = '';
-				url.search = `?file=${parts.groups.org}/${parts.groups.repo}/${branch}/${parts.groups.path}`.replace('//', '/');
+				url.search = getMarkdownSearch(`${parts.groups.org}/${parts.groups.repo}/${branch}/${parts.groups.path}`.replace('//', '/'));
 				const label = niceName(fileName.groups.filename);
 				return `<div><a href="${url}">${label}<a/></div>\n`;
 			});
@@ -272,13 +293,13 @@ <h2>Table of Contents</h2>
 					if (logicalHref.hostname == 'api.github.com') {
 						const parts = /\/repos\/(?<org>[^/]+)\/(?<repo>[^/]+)\/contents\/(?<path>.*)/.exec(logicalHref.pathname);
 						if (parts != null) {
-							url.search = `?file=${parts.groups.org}/${parts.groups.repo}/${branch}/${parts.groups.path}`;
+							url.search = getMarkdownSearch(`${parts.groups.org}/${parts.groups.repo}/${branch}/${parts.groups.path}`);
 							a.href = url;
 						}
 					} else if (logicalHref.hostname == 'github.com') {
 						const parts = /(?<org>[^/]+)\/(?<repo>[^/]+)\/blob\/(?<branch>[^/]+)\/(?<path>.*)/.exec(logicalHref.pathname);
 						if (parts != null) {
-							url.search = `?file=${parts.groups.org}/${parts.groups.repo}/${parts.groups.branch}/${parts.groups.path}`;
+							url.search = getMarkdownSearch(`=${parts.groups.org}/${parts.groups.repo}/${parts.groups.branch}/${parts.groups.path}`);
 							a.href = url;
 						}
 					}
@@ -298,7 +319,7 @@ <h2>Table of Contents</h2>
 					const lastPart = filename == 'index' ? '' : `<li>${niceName(filename)}</li>`;
 					breadcrumb.append(...toElements(`
 <li><a href="${scriptBase}news/">News</a></li>
-<li><a href="${markdownBase}eclipse-platform/www.eclipse.org-eclipse/master/news/${version}/index.md">${version}</a></li>
+<li><a href="${getMarkdownURL(`eclipse-platform/www.eclipse.org-eclipse/master/news/${version}/index.md`)}">${version}</a></li>
 ${lastPart}
 `));
 					return true;
@@ -322,7 +343,8 @@ <h2>Table of Contents</h2>
 					let crumbPath = '';
 					for (const segment of segments) {
 						crumbPath = (crumbPath == '/' ? '/' : crumbPath + '/') + segment;
-						breadcrumb.append(...toElements(`<li><a href="?file=${org}/${repo}/${branch}${crumbPath}">${segment.length == 0 ? repoName : niceName(segment.replace(/\.md$/, ''))}</a></li>`));
+						const href = getMarkdownSearch(`${org}/${repo}/${branch}${crumbPath}`);
+						breadcrumb.append(...toElements(`<li><a href="${href}">${segment.length == 0 ? repoName : niceName(segment.replace(/\.md$/, ''))}</a></li>`));
 					}
 				}
 

project.js

@@ -8,8 +8,8 @@ window.onscroll = function() {
 const scriptBase = new URL(".", document.currentScript.src).href
 const apiGitHub = 'https://api.github.com/repos/eclipse-platform/www.eclipse.org-eclipse/contents/';
 const markdownBase = `${scriptBase}markdown/?file=`;
+const selfHostedMarkdownBase = `${scriptBase}markdown/?f=`;
 const newsBase = `${scriptBase}news/news.html?file=`;
-const selfHostedMarkdownBase = `${markdownBase}eclipse-platform/www.eclipse.org-eclipse/master/`;
 
 let meta = toElements(`
 <meta charset="utf-8">
@@ -90,7 +90,9 @@ let tableOfContentsAside = '';
 let selfContent = document.documentElement.outerHTML;
 
 function redirect(href) {
-	const location = href != null ? `${href}${window.location.search}${window.location.hash}`  : new URL(`${markdownBase}eclipse-platform/www.eclipse.org-eclipse/master${window.location.pathname.replace(/^\/eclipse/, '').replace(/\.html$/, '.md')}`);
+	const location = href != null ?
+		`${href}${window.location.search}${window.location.hash}` :
+		new URL(`${selfHostedMarkdownBase}${window.location.pathname.replace(/^\/eclipse\//, '').replace(/\/$/, '/index.html').replace(/\.html$/, '.md')}`);
 	const body = document.querySelector('body')
 	replaceChildren(body, "body", ...toElements(`<div style="display: none">If you are not redirected automatically, 	follow this <a href='${location}'>link</a>.</div>`));
 	window.location = location;