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

style: tighten import copy

Browse Source
This commit is contained in:
Arne Baeumler
2026-06-07 20:34:40 +02:00
parent 5f2bd97ea9
commit faeecfae89
1 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -819,7 +819,7 @@ function htmlPage(): string {
<path d="M3 12.5h10" stroke="currentColor" stroke-width="1.6" stroke-linecap="round"/> <path d="M3 12.5h10" stroke="currentColor" stroke-width="1.6" stroke-linecap="round"/>
</svg> </svg>
</span> </span>
<span>Import share</span> <span>Import</span>
</button> </button>
<button class="danger" id="cancel-share" type="button" disabled> <button class="danger" id="cancel-share" type="button" disabled>
<span class="button-icon" aria-hidden="true"> <span class="button-icon" aria-hidden="true">
@@ -827,12 +827,12 @@ function htmlPage(): string {
<path d="M4 4l8 8M12 4l-8 8" stroke="currentColor" stroke-width="1.6" stroke-linecap="round"/> <path d="M4 4l8 8M12 4l-8 8" stroke="currentColor" stroke-width="1.6" stroke-linecap="round"/>
</svg> </svg>
</span> </span>
<span>Cancel</span> <span>Stop</span>
</button> </button>
</div> </div>
<div class="status-row"> <div class="status-row">
<span class="spinner" id="activity-spinner" aria-hidden="true"></span> <span class="spinner" id="activity-spinner" aria-hidden="true"></span>
<div class="status" id="share-status">Ready to import a share.</div> <div class="status" id="share-status">Ready to import.</div>
</div> </div>
<div class="progress" aria-label="Loading progress"> <div class="progress" aria-label="Loading progress">
<div class="progress-bar" aria-hidden="true"> <div class="progress-bar" aria-hidden="true">
@@ -1801,7 +1801,7 @@ function htmlPage(): string {
try { try {
clearObjectUrls(); clearObjectUrls();
clearGallery(); clearGallery();
updateStatus("Loading share..."); updateStatus("Importing...");
const listing = await loadShareListing(shareUrl.value, controller.signal); const listing = await loadShareListing(shareUrl.value, controller.signal);
if (!listing.length) { if (!listing.length) {
@@ -1836,15 +1836,11 @@ function htmlPage(): string {
setProgress( setProgress(
processed, processed,
listing.length, listing.length,
"loaded " + loaded + ", skipped " + skipped "processed " + processed + " / " + listing.length
); );
updateStatus( updateStatus(
"Import running: " + "Importing: " + loaded + " shown, " + skipped + " skipped."
loaded + );
" images shown, " +
skipped +
" skipped."
);
} }
if (!loaded) { if (!loaded) {
@@ -1852,13 +1848,9 @@ function htmlPage(): string {
} }
updateStatus( updateStatus(
"Nextcloud import complete: " + "Import complete: " + loaded + " images imported" + (skipped ? ", " + skipped + " skipped" : "") + "."
loaded +
" images imported" +
(skipped ? ", " + skipped + " skipped" : "") +
"."
); );
setProgress(listing.length, listing.length, "done"); setProgress(listing.length, listing.length, "complete");
} catch (error) { } catch (error) {
if (controller.signal.aborted) { if (controller.signal.aborted) {
updateStatus("Import canceled."); updateStatus("Import canceled.");
@@ -1898,7 +1890,7 @@ function htmlPage(): string {
}); });
clearGallery(); clearGallery();
updateStatus("Ready to import a share."); updateStatus("Ready to import.");
</script> </script>
</body> </body>
</html>`; </html>`;