bvandeusen/imagerepo
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

series management tuning and import archive extraction troubleshooting

Browse Source
This commit is contained in:
Bryan Van Deusen
2026-01-23 23:05:25 -05:00
parent d3e73b9533
commit 9ebeeed133
7 changed files with 373 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/static/js/bulk-select.js
+68 -3
View File
@@ -105,7 +105,9 @@
if (state.selectedIds.has(id)) {
state.selectedIds.delete(id);
state.selectionOrder = state.selectionOrder.filter(x => x !== id);
// Remove from order array without creating new array (preserves window.selectionOrder reference)
const idx = state.selectionOrder.indexOf(id);
if (idx !== -1) state.selectionOrder.splice(idx, 1);
item.classList.remove('selected');
removeOrderBadge(item);
} else {
@@ -124,7 +126,8 @@
function clearSelection() {
state.selectedIds.clear();
state.selectionOrder = [];
// Clear array without creating new one (preserves window.selectionOrder reference)
state.selectionOrder.length = 0;
document.querySelectorAll('.img-clickable.selected').forEach(el => {
el.classList.remove('selected');
removeOrderBadge(el);
@@ -308,6 +311,7 @@
if (data.ok) {
loadCommonTags(); // Refresh common tags
refreshSelectedItemsTags(); // Update tag display on gallery items
} else {
console.error('Failed to add tag:', data.error);
}
@@ -329,6 +333,7 @@
if (data.ok) {
loadCommonTags(); // Refresh common tags
refreshSelectedItemsTags(); // Update tag display on gallery items
} else {
console.error('Failed to remove tag:', data.error);
}
@@ -509,6 +514,65 @@
return div.innerHTML;
}
// ---------------------------
// Tag Refresh for Gallery Items
// ---------------------------
function getTagDisplayName(name, kind) {
// Strip prefix for known prefixed kinds
if (['artist', 'character', 'series', 'fandom', 'rating'].includes(kind)) {
return name.includes(':') ? name.split(':', 2)[1] : name;
}
// Regular tags get a # prefix
return '#' + name;
}
async function refreshItemTags(imageId) {
// Find the gallery item
const item = document.querySelector(`.img-clickable[data-id="${imageId}"]`);
if (!item) return;
try {
const r = await fetch(`/image/${imageId}/tags`);
const data = await r.json();
if (!data.ok) return;
// Filter out archive tags (they're not shown)
const visibleTags = (data.tags || []).filter(t => t.kind !== 'archive');
// Find or create tag overlay
let overlay = item.querySelector('.tag-overlay');
if (visibleTags.length === 0) {
// No visible tags - remove overlay if exists
if (overlay) overlay.remove();
return;
}
if (!overlay) {
overlay = document.createElement('div');
overlay.className = 'tag-overlay';
item.appendChild(overlay);
}
// Render tags
overlay.innerHTML = visibleTags.map(t => {
const displayName = getTagDisplayName(t.name, t.kind);
const encodedName = encodeURIComponent(t.name);
return `<a class="tag-chip" href="/gallery?tag=${encodedName}" title="Filter by ${escapeHtml(t.name)}" onclick="event.stopPropagation()">${escapeHtml(displayName)}</a>`;
}).join('');
} catch (e) {
console.error('Failed to refresh tags for image', imageId, e);
}
}
async function refreshSelectedItemsTags() {
// Refresh tags for all currently selected items
const ids = Array.from(state.selectedIds);
await Promise.all(ids.map(id => refreshItemTags(id)));
}
// Initialize on DOM ready
if (document.readyState === 'loading') {
document.addEventListener('DOMContentLoaded', init);
@@ -516,10 +580,11 @@
init();
}
// Expose global API for other scripts (like series editor)
// Expose global API for other scripts (like series editor, modal)
window.selectedImages = state.selectedIds;
window.selectionOrder = state.selectionOrder; // Ordered array of selected IDs
window.clearSelection = clearSelection;
window.enableSelectMode = enableSelectMode;
window.disableSelectMode = disableSelectMode;
window.refreshItemTags = refreshItemTags; // Refresh tags display on a single gallery item
})();
app/static/js/modal-pagination.js
+93 -10
View File
@@ -105,6 +105,56 @@ document.addEventListener('DOMContentLoaded', () => {
}
}
// ---------------------------
// Gallery item tag refresh (fallback if bulk-select.js not loaded)
// ---------------------------
function getTagDisplayNameForOverlay(name, kind) {
if (['artist', 'character', 'series', 'fandom', 'rating'].includes(kind)) {
return name.includes(':') ? name.split(':', 2)[1] : name;
}
return '#' + name;
}
async function refreshItemTagsFallback(imageId) {
const item = document.querySelector(`.img-clickable[data-id="${imageId}"]`);
if (!item) return;
try {
const r = await fetch(`/image/${imageId}/tags`);
const data = await r.json();
if (!data.ok) return;
const visibleTags = (data.tags || []).filter(t => t.kind !== 'archive');
let overlay = item.querySelector('.tag-overlay');
if (visibleTags.length === 0) {
if (overlay) overlay.remove();
return;
}
if (!overlay) {
overlay = document.createElement('div');
overlay.className = 'tag-overlay';
item.appendChild(overlay);
}
overlay.innerHTML = visibleTags.map(t => {
const displayName = getTagDisplayNameForOverlay(t.name, t.kind);
const encodedName = encodeURIComponent(t.name);
const escapedName = t.name.replace(/"/g, '&quot;');
const escapedDisplay = displayName.replace(/</g, '&lt;').replace(/>/g, '&gt;');
return `<a class="tag-chip" href="/gallery?tag=${encodedName}" title="Filter by ${escapedName}" onclick="event.stopPropagation()">${escapedDisplay}</a>`;
}).join('');
} catch (e) {
console.error('Failed to refresh tags for image', imageId, e);
}
}
// Register fallback if bulk-select.js hasn't registered it
if (!window.refreshItemTags) {
window.refreshItemTags = refreshItemTagsFallback;
}
// ---------------------------
// Series info helpers
// ---------------------------
@@ -120,7 +170,8 @@ document.addEventListener('DOMContentLoaded', () => {
}
async function loadSeriesTags() {
if (!seriesSelect || seriesTagsLoaded) return;
if (!seriesSelect) return;
if (seriesTagsLoaded) return Promise.resolve();
try {
// Fetch all series tags using the kind filter
const r = await fetch('/api/tags/search?kind=series&limit=100');
@@ -144,12 +195,26 @@ document.addEventListener('DOMContentLoaded', () => {
}
}
function showAddToSeries() {
function showAddToSeries(seriesPage = null) {
if (!addToSeriesEl) return;
loadSeriesTags();
if (seriesSelect) seriesSelect.value = '';
if (addSeriesPageNumber) addSeriesPageNumber.value = '1';
if (addToSeriesBtn) addToSeriesBtn.disabled = true;
loadSeriesTags().then(() => {
// Pre-fill if image is already in a series
if (seriesPage && seriesSelect) {
seriesSelect.value = seriesPage.series_tag_id;
if (addSeriesPageNumber) addSeriesPageNumber.value = seriesPage.page_number;
if (addToSeriesBtn) {
addToSeriesBtn.disabled = false;
addToSeriesBtn.textContent = 'Update';
}
} else {
if (seriesSelect) seriesSelect.value = '';
if (addSeriesPageNumber) addSeriesPageNumber.value = '1';
if (addToSeriesBtn) {
addToSeriesBtn.disabled = true;
addToSeriesBtn.textContent = 'Add';
}
}
});
if (addToSeriesStatus) addToSeriesStatus.textContent = '';
addToSeriesEl.style.display = 'block';
}
@@ -161,8 +226,9 @@ document.addEventListener('DOMContentLoaded', () => {
if (!imageId || !seriesTagId || isNaN(pageNumber) || pageNumber < 1) return;
const isUpdate = addToSeriesBtn?.textContent === 'Update';
if (addToSeriesBtn) addToSeriesBtn.disabled = true;
if (addToSeriesStatus) addToSeriesStatus.textContent = 'Adding...';
if (addToSeriesStatus) addToSeriesStatus.textContent = isUpdate ? 'Updating...' : 'Adding...';
try {
const r = await fetch(`/api/image/${imageId}/add-to-series`, {
@@ -174,12 +240,13 @@ document.addEventListener('DOMContentLoaded', () => {
if (j.ok) {
if (addToSeriesStatus) {
addToSeriesStatus.textContent = '✓ Added';
addToSeriesStatus.textContent = '✓ Saved';
setTimeout(() => { addToSeriesStatus.textContent = ''; }, 2000);
}
// Switch to showing the series info instead of add-to-series
hideAddToSeries();
// Update the series info section with new data
showSeriesInfo(j.series_page);
// Re-enable the button
if (addToSeriesBtn) addToSeriesBtn.disabled = false;
} else {
if (addToSeriesStatus) addToSeriesStatus.textContent = j.error || 'Error';
if (addToSeriesBtn) addToSeriesBtn.disabled = false;
@@ -220,7 +287,9 @@ document.addEventListener('DOMContentLoaded', () => {
const r = await fetch(`/api/image/${imageId}/series-info`);
const j = await r.json();
if (j.ok && j.in_series) {
// Show series info (with link) and pre-fill the dropdown
showSeriesInfo(j.series_page);
showAddToSeries(j.series_page);
} else {
// Show add-to-series option when not in a series
showAddToSeries();
@@ -284,6 +353,12 @@ document.addEventListener('DOMContentLoaded', () => {
seriesSelect.addEventListener('change', () => {
if (addToSeriesBtn) {
addToSeriesBtn.disabled = !seriesSelect.value;
// Update button text: "Update" if image is in a series, "Add" if not
if (seriesSelect.value && currentSeriesPageId) {
addToSeriesBtn.textContent = 'Update';
} else if (seriesSelect.value) {
addToSeriesBtn.textContent = 'Add';
}
}
});
}
@@ -534,6 +609,9 @@ document.addEventListener('DOMContentLoaded', () => {
}
function closeModal() {
// Get the image ID before clearing so we can refresh its tags
const imageId = getEditorImageId();
modal.classList.remove('active');
modalImageWrapper.innerHTML = '';
currentIndex = -1;
@@ -544,6 +622,11 @@ document.addEventListener('DOMContentLoaded', () => {
hideSeriesInfo();
hideAddToSeries();
history.replaceState({}, '', window.location.pathname + window.location.search);
// Refresh the gallery item's tags display (if function available from bulk-select.js)
if (imageId && window.refreshItemTags) {
window.refreshItemTags(imageId);
}
}
function showNext() {