McPringle/fitpub
1
0
Fork 0
Code Issues 24 Pull requests 6 Projects Releases Packages Wiki Activity Actions

Merge branch 'refs/heads/komoot-import' into sattelgeschichten

Browse source
This commit is contained in:
Marcus Fihlon 2026-04-29 15:15:23 +02:00
commit c10a3429c4
Signed by: McPringle
GPG key ID: C6B7F469EE363E1F
1 changed files with 29 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/main/resources/templates/activities/komoot.html
View file

@ -77,7 +77,7 @@
</span> </span>
<span id="importFirstSpinner" class="d-none"> <span id="importFirstSpinner" class="d-none">
<span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span> <span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span>
Importing... <span id="importFirstProgressText">Importing...</span>
</span> </span>
</button> </button>
<button type="button" class="btn btn-outline-danger d-none" id="cancelImportBtn"> <button type="button" class="btn btn-outline-danger d-none" id="cancelImportBtn">
@ -139,6 +139,7 @@
const importFirstBtn = document.getElementById('importFirstBtn'); const importFirstBtn = document.getElementById('importFirstBtn');
const importFirstText = document.getElementById('importFirstText'); const importFirstText = document.getElementById('importFirstText');
const importFirstSpinner = document.getElementById('importFirstSpinner'); const importFirstSpinner = document.getElementById('importFirstSpinner');
const importFirstProgressText = document.getElementById('importFirstProgressText');
const cancelImportBtn = document.getElementById('cancelImportBtn'); const cancelImportBtn = document.getElementById('cancelImportBtn');
let currentActivities = []; let currentActivities = [];
let importCancellationRequested = false; let importCancellationRequested = false;
@ -161,6 +162,17 @@
importFirstSpinner.classList.toggle('d-none', !loading); importFirstSpinner.classList.toggle('d-none', !loading);
cancelImportBtn.classList.toggle('d-none', !loading); cancelImportBtn.classList.toggle('d-none', !loading);
cancelImportBtn.disabled = !loading; cancelImportBtn.disabled = !loading;
if (!loading) {
importFirstProgressText.textContent = 'Importing...';
}
}
function updateImportProgress(current, total) {
if (current == null || total == null || total <= 0) {
importFirstProgressText.textContent = 'Importing...';
return;
}
importFirstProgressText.textContent = `Importing ${current}/${total}...`;
} }
function showError(message) { function showError(message) {
@ -429,10 +441,13 @@
let importedCount = 0; let importedCount = 0;
let failedCount = 0; let failedCount = 0;
let cancelled = false; let cancelled = false;
let rateLimited = false;
const totalActivitiesToImport = activitiesToImport.length;
for (const activity of activitiesToImport) { for (const [index, activity] of activitiesToImport.entries()) {
activity.uiImportStatus = 'importing'; activity.uiImportStatus = 'importing';
activity.uiImportError = null; activity.uiImportError = null;
updateImportProgress(index + 1, totalActivitiesToImport);
renderActivities(currentActivities); renderActivities(currentActivities);
try { try {
@ -441,6 +456,15 @@
body: buildImportPayload(activity.id) body: buildImportPayload(activity.id)
}); });
if (response.status === 429) {
rateLimited = true;
activity.uiImportStatus = null;
activity.uiImportError = null;
resetQueuedActivities();
renderActivities(currentActivities);
break;
}
if (!response.ok) { if (!response.ok) {
let message = 'Failed to import Komoot activity.'; let message = 'Failed to import Komoot activity.';
try { try {
@ -476,7 +500,9 @@
} }
} }
if (cancelled) { if (rateLimited) {
showStatus('Komoot rate limit reached. Import stopped. Please try again later.');
} else if (cancelled) {
showStatus(`Import stopped after the current activity. Imported ${importedCount} Komoot activit${importedCount === 1 ? 'y' : 'ies'}${failedCount > 0 ? `, ${failedCount} failed` : ''}.`); showStatus(`Import stopped after the current activity. Imported ${importedCount} Komoot activit${importedCount === 1 ? 'y' : 'ies'}${failedCount > 0 ? `, ${failedCount} failed` : ''}.`);
} else { } else {
showStatus(`Imported ${importedCount} Komoot activit${importedCount === 1 ? 'y' : 'ies'}${failedCount > 0 ? `, ${failedCount} failed` : ''}.`); showStatus(`Imported ${importedCount} Komoot activit${importedCount === 1 ? 'y' : 'ies'}${failedCount > 0 ? `, ${failedCount} failed` : ''}.`);