apps/mapix
4
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

fix: restore share url parsing in importer

Browse Source
This commit is contained in:
Arne Baeumler
2026-06-07 19:59:55 +02:00
parent 4084db119b
commit cf2b7684b8
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/server/request-handler.ts
View File

@@ -836,6 +836,21 @@ function htmlPage(): string {
return Number.isNaN(date.getTime()) ? null : date.toISOString(); return Number.isNaN(date.getTime()) ? null : date.toISOString();
} }
function resolveDavBaseUrl(shareUrlValue) {
const url = new URL(shareUrlValue.trim());
const publicShare = url.pathname.match(/\\/s\\/([^/?#]+)/);
if (publicShare) {
return url.origin + "/public.php/dav/files/" + publicShare[1] + "/";
}
const davShare = url.pathname.match(/\\/public\\.php\\/dav\\/files\\/([^/?#]+)\\/?/);
if (davShare) {
return url.origin + "/public.php/dav/files/" + davShare[1] + "/";
}
throw new Error("Please enter a public Nextcloud share link.");
}
function clamp(value, min, max) { function clamp(value, min, max) {
return Math.min(max, Math.max(min, value)); return Math.min(max, Math.max(min, value));
} }
@@ -1502,9 +1517,10 @@ function htmlPage(): string {
}); });
} }
async function loadShareListing(davUrl, signal) { async function loadShareListing(shareUrlValue, signal) {
const davBaseUrl = resolveDavBaseUrl(shareUrlValue);
const response = await fetch( const response = await fetch(
"/api/nextcloud/list?share=" + encodeURIComponent(shareUrl.value.trim()), "/api/nextcloud/list?share=" + encodeURIComponent(shareUrlValue.trim()),
{ {
signal signal
} }
@@ -1514,7 +1530,7 @@ function htmlPage(): string {
throw new Error("Could not load the Nextcloud listing: " + response.status); throw new Error("Could not load the Nextcloud listing: " + response.status);
} }
return parseListing(await response.text(), davUrl); return parseListing(await response.text(), davBaseUrl);
} }
async function readRemotePhoto(entry, signal) { async function readRemotePhoto(entry, signal) {
@@ -1558,8 +1574,7 @@ function htmlPage(): string {
clearObjectUrls(); clearObjectUrls();
clearGallery(); clearGallery();
updateStatus("Loading share..."); updateStatus("Loading share...");
const { davUrl } = parseShareInput(shareUrl.value); const listing = await loadShareListing(shareUrl.value, controller.signal);
const listing = await loadShareListing(davUrl, controller.signal);
if (!listing.length) { if (!listing.length) {
throw new Error("No images were found in the share."); throw new Error("No images were found in the share.");