Skip to content

Speakr is a personal, self-hosted web application designed for transcribing audio recordings

Python

Make the merge recording picker search server-side and paginated (reusing a shared fetchRecordingsPage + a status filter) so it never downloads the whole recording list

Murtaza Nasirb4cf2f07f11b
diff --git a/src/api/recordings.py b/src/api/recordings.py
index ac83e23d..2da7a88f 100644
--- a/src/api/recordings.py
+++ b/src/api/recordings.py
@@ -1616,6 +1616,7 @@ def get_recordings_paginated():
needs_speakers = request.args.get('needs_speakers', '').lower() == 'true'
sort_by = request.args.get('sort_by', 'created_at') # 'created_at' or 'meeting_date'
folder_filter = request.args.get('folder', '').strip() # folder_id or 'none' for no folder
+ status_filter = request.args.get('status', '').strip().upper() # e.g. 'COMPLETED' (used by the merge picker)
# Get all accessible recording IDs (own + shared)
accessible_recording_ids = get_accessible_recording_ids(current_user.id)
@@ -1636,6 +1637,11 @@ def get_recordings_paginated():
# Build base query to include accessible recordings
stmt = select(Recording).where(Recording.id.in_(accessible_recording_ids))
+ # Apply status filter (AND with other filters). Used by the merge picker
+ # to request only mergeable (COMPLETED) recordings server-side.
+ if status_filter:
+ stmt = stmt.where(Recording.status == status_filter)
+
# Apply archived filter (AND with other filters)
if show_archived:
# Only show recordings where audio has been deleted
diff --git a/static/js/app.modular.js b/static/js/app.modular.js
index e3cb79a5..455c406d 100644
--- a/static/js/app.modular.js
+++ b/static/js/app.modular.js
@@ -2410,7 +2410,8 @@ document.addEventListener('DOMContentLoaded', async () => {
exitSelectionMode: bulkSelectionComposable.exitSelectionMode,
startReprocessingPoll: reprocessComposable.startReprocessingPoll,
t,
- finalizeRecordingMerge: audioComposable.finalizeRecordingMerge
+ finalizeRecordingMerge: audioComposable.finalizeRecordingMerge,
+ fetchRecordingsPage: recordingsComposable.fetchRecordingsPage
});
// Bridge merge-modal openers to the audio composable so the
diff --git a/static/js/modules/composables/bulk-operations.js b/static/js/modules/composables/bulk-operations.js
index fb8cac82..d7f3296e 100644
--- a/static/js/modules/composables/bulk-operations.js
+++ b/static/js/modules/composables/bulk-operations.js
@@ -3,7 +3,7 @@
* Handles bulk API operations for multiple recordings
*/
-const { ref, computed } = Vue;
+const { ref, computed, watch } = Vue;
export function useBulkOperations({
selectedRecordingIds,
@@ -18,7 +18,8 @@ export function useBulkOperations({
exitSelectionMode,
startReprocessingPoll,
t,
- finalizeRecordingMerge
+ finalizeRecordingMerge,
+ fetchRecordingsPage
}) {
const _t = (k, fallback) => (typeof t === 'function' ? t(k) : (fallback || k));
// Modal state
@@ -46,19 +47,69 @@ export function useBulkOperations({
// merge-from-recording flow that seeds the modal with a just-recorded clip).
const mergeAddPickerOpen = ref(false);
const mergeAddSearch = ref('');
- // Only completed recordings with settled audio are mergeable, and not ones
- // already in the list. Filtered by the search box.
+ // Server-side candidate search so the picker never downloads the whole list.
+ // Mirrors the sidebar's paginated /api/recordings search, filtered to
+ // mergeable (COMPLETED) recordings via the status param.
+ const mergePickerResults = ref([]);
+ const mergePickerLoading = ref(false);
+ const mergePickerPage = ref(1);
+ const mergePickerHasMore = ref(false);
+ const MERGE_PICKER_PER_PAGE = 20;
+
+ const loadMergeCandidates = async ({ append = false } = {}) => {
+ if (typeof fetchRecordingsPage !== 'function') return;
+ const page = append ? mergePickerPage.value + 1 : 1;
+ mergePickerLoading.value = true;
+ try {
+ const data = await fetchRecordingsPage({
+ page,
+ per_page: MERGE_PICKER_PER_PAGE,
+ q: mergeAddSearch.value.trim(),
+ status: 'COMPLETED',
+ // Deliberately ignores the sidebar's archived/starred/inbox/
+ // folder filters — the picker searches all completed recordings.
+ });
+ const list = Array.isArray(data.recordings) ? data.recordings : [];
+ mergePickerResults.value = append ? [...mergePickerResults.value, ...list] : list;
+ mergePickerPage.value = data.pagination ? data.pagination.page : page;
+ mergePickerHasMore.value = data.pagination ? !!data.pagination.has_next : false;
+ } catch (e) {
+ console.error('Merge candidate search failed:', e);
+ if (!append) mergePickerResults.value = [];
+ mergePickerHasMore.value = false;
+ } finally {
+ mergePickerLoading.value = false;
+ }
+ };
+
+ const loadMoreMergeCandidates = async () => {
+ if (mergePickerHasMore.value && !mergePickerLoading.value) {
+ await loadMergeCandidates({ append: true });
+ }
+ };
+
+ // Candidates = server results minus what's already in the merge list and
+ // anything without settled audio.
const mergeCandidates = computed(() => {
const inList = new Set(mergeOrderedList.value.map(r => r.id));
- const q = mergeAddSearch.value.trim().toLowerCase();
- return recordings.value.filter(r =>
- !inList.has(r.id) &&
- r.status === 'COMPLETED' &&
- r.audio_ready !== false &&
- (!q || (r.title || '').toLowerCase().includes(q))
+ return mergePickerResults.value.filter(r =>
+ !inList.has(r.id) && r.audio_ready !== false
);
});
+ // Debounced re-search when the query changes (only while the picker is open).
+ let _mergeSearchTimer = null;
+ watch(mergeAddSearch, () => {
+ if (!mergeAddPickerOpen.value) return;
+ clearTimeout(_mergeSearchTimer);
+ _mergeSearchTimer = setTimeout(() => loadMergeCandidates({ append: false }), 250);
+ });
+
+ // Load the first page whenever the picker opens.
+ watch(mergeAddPickerOpen, (open) => {
+ if (open) loadMergeCandidates({ append: false });
+ });
+
// Get CSRF token
const getCsrfToken = () => {
return document.querySelector('meta[name="csrf-token"]')?.getAttribute('content');
@@ -656,6 +707,9 @@ export function useBulkOperations({
mergeAddPickerOpen,
mergeAddSearch,
mergeCandidates,
+ mergePickerLoading,
+ mergePickerHasMore,
+ loadMoreMergeCandidates,
mergeMode,
// Bulk Delete
diff --git a/static/js/modules/composables/recordings.js b/static/js/modules/composables/recordings.js
index 15c549f3..a1d06301 100644
--- a/static/js/modules/composables/recordings.js
+++ b/static/js/modules/composables/recordings.js
@@ -24,6 +24,21 @@ export function useRecordings(state, utils, reprocessComposable) {
const { setGlobalError, showToast } = utils;
// Load recordings from API
+ // Low-level, state-free fetch of one page from the paginated recordings
+ // endpoint. Reused by the sidebar list (loadRecordings) and by the merge
+ // picker's server-side search so neither downloads the whole list. Only
+ // non-empty params are sent. Returns { recordings, pagination }.
+ const fetchRecordingsPage = async (params = {}) => {
+ const qs = new URLSearchParams();
+ Object.entries(params).forEach(([k, v]) => {
+ if (v !== undefined && v !== null && v !== '') qs.set(k, String(v));
+ });
+ const response = await fetch(`/api/recordings?${qs.toString()}`);
+ const data = await response.json();
+ if (!response.ok) throw new Error(data.error || 'Failed to load recordings');
+ return data;
+ };
+
const loadRecordings = async (page = 1, append = false, searchQueryParam = '') => {
globalError.value = null;
if (!append) {
@@ -33,54 +48,21 @@ export function useRecordings(state, utils, reprocessComposable) {
}
try {
- const endpoint = '/api/recordings';
-
- const params = new URLSearchParams({
- page: page.toString(),
- per_page: perPage.value.toString()
+ const data = await fetchRecordingsPage({
+ page,
+ per_page: perPage.value,
+ q: searchQueryParam.trim(),
+ sort_by: sortBy.value || '',
+ archived: showArchivedRecordings.value ? 'true' : '',
+ shared: showSharedWithMe.value ? 'true' : '',
+ starred: filterStarred.value ? 'true' : '',
+ inbox: filterInbox.value ? 'true' : '',
+ needs_transcription: filterNeedsTranscription.value ? 'true' : '',
+ needs_summary: filterNeedsSummary.value ? 'true' : '',
+ needs_speakers: filterNeedsSpeakers.value ? 'true' : '',
+ folder: (filterFolder && filterFolder.value) ? filterFolder.value : '',
});
- if (searchQueryParam.trim()) {
- params.set('q', searchQueryParam.trim());
- }
-
- // Add sort parameter
- if (sortBy.value) {
- params.set('sort_by', sortBy.value);
- }
-
- // Add archived/shared/starred/inbox filters as query params (ANDed with other filters)
- if (showArchivedRecordings.value) {
- params.set('archived', 'true');
- }
- if (showSharedWithMe.value) {
- params.set('shared', 'true');
- }
- if (filterStarred.value) {
- params.set('starred', 'true');
- }
- if (filterInbox.value) {
- params.set('inbox', 'true');
- }
- if (filterNeedsTranscription.value) {
- params.set('needs_transcription', 'true');
- }
- if (filterNeedsSummary.value) {
- params.set('needs_summary', 'true');
- }
- if (filterNeedsSpeakers.value) {
- params.set('needs_speakers', 'true');
- }
-
- // Add folder filter
- if (filterFolder && filterFolder.value) {
- params.set('folder', filterFolder.value);
- }
-
- const response = await fetch(`${endpoint}?${params}`);
- const data = await response.json();
- if (!response.ok) throw new Error(data.error || 'Failed to load recordings');
-
const recordingsList = data.recordings;
const pagination = data.pagination;
@@ -516,6 +498,7 @@ export function useRecordings(state, utils, reprocessComposable) {
};
return {
+ fetchRecordingsPage,
loadRecordings,
loadMoreRecordings,
performSearch,
diff --git a/static/locales/de.json b/static/locales/de.json
index a41d3b45..3accb8c2 100644
--- a/static/locales/de.json
+++ b/static/locales/de.json
@@ -1887,6 +1887,7 @@
"uploadedMergeManually": "Ihr Clip wurde hochgeladen. Wählen Sie ihn und eine weitere Aufnahme in der Liste aus, um sie zusammenzuführen.",
"preparingClip": "Ihr Clip wird vorbereitet — die Optionen zum Zusammenführen öffnen sich, sobald er bereit ist.",
"clipNotReady": "Der Clip konnte nicht zum Zusammenführen vorbereitet werden.",
- "thisRecording": "Diese Aufnahme"
+ "thisRecording": "Diese Aufnahme",
+ "searching": "Suche…"
}
}
\ No newline at end of file
diff --git a/static/locales/en.json b/static/locales/en.json
index b3f1bfd5..a008361d 100644
--- a/static/locales/en.json
+++ b/static/locales/en.json
@@ -1887,6 +1887,7 @@
"uploadedMergeManually": "Your clip was uploaded. Select it and another recording in the list to merge them.",
"preparingClip": "Preparing your clip — the merge options will open when it's ready.",
"clipNotReady": "The clip could not be prepared for merging.",
- "thisRecording": "This recording"
+ "thisRecording": "This recording",
+ "searching": "Searching…"
}
}
\ No newline at end of file
diff --git a/static/locales/es.json b/static/locales/es.json
index 095ad499..61842bb6 100644
--- a/static/locales/es.json
+++ b/static/locales/es.json
@@ -1887,6 +1887,7 @@
"uploadedMergeManually": "Tu clip se ha subido. Selecciónalo junto con otra grabación de la lista para combinarlos.",
"preparingClip": "Preparando tu clip: las opciones de combinación se abrirán cuando esté listo.",
"clipNotReady": "No se pudo preparar el clip para la combinación.",
- "thisRecording": "Esta grabación"
+ "thisRecording": "Esta grabación",
+ "searching": "Buscando…"
}
}
\ No newline at end of file
diff --git a/static/locales/fr.json b/static/locales/fr.json
index e9f9af3b..98dccbf7 100644
--- a/static/locales/fr.json
+++ b/static/locales/fr.json
@@ -1887,6 +1887,7 @@
"uploadedMergeManually": "Votre extrait a été téléversé. Sélectionnez-le ainsi qu'un autre enregistrement de la liste pour les fusionner.",
"preparingClip": "Préparation de votre extrait — les options de fusion s'ouvriront dès qu'il sera prêt.",
"clipNotReady": "Impossible de préparer l'extrait pour la fusion.",
- "thisRecording": "Cet enregistrement"
+ "thisRecording": "Cet enregistrement",
+ "searching": "Recherche…"
}
}
\ No newline at end of file
diff --git a/static/locales/pt-BR.json b/static/locales/pt-BR.json
index 99b8b850..1e7bec93 100644
--- a/static/locales/pt-BR.json
+++ b/static/locales/pt-BR.json
@@ -1887,6 +1887,7 @@
"uploadedMergeManually": "Seu clipe foi enviado. Selecione-o e outra gravação da lista para mesclá-los.",
"preparingClip": "Preparando seu clipe — as opções de mesclagem abrirão quando estiver pronto.",
"clipNotReady": "Não foi possível preparar o clipe para a mesclagem.",
- "thisRecording": "Esta gravação"
+ "thisRecording": "Esta gravação",
+ "searching": "Pesquisando…"
}
}
\ No newline at end of file
diff --git a/static/locales/ru.json b/static/locales/ru.json
index 3f355f48..aaa4f4f0 100644
--- a/static/locales/ru.json
+++ b/static/locales/ru.json
@@ -1887,6 +1887,7 @@
"uploadedMergeManually": "Ваш фрагмент загружен. Выберите его и другую запись в списке, чтобы объединить их.",
"preparingClip": "Подготовка фрагмента — параметры объединения откроются, когда он будет готов.",
"clipNotReady": "Не удалось подготовить фрагмент к объединению.",
- "thisRecording": "Эта запись"
+ "thisRecording": "Эта запись",
+ "searching": "Поиск…"
}
}
\ No newline at end of file
diff --git a/static/locales/zh.json b/static/locales/zh.json
index 21f55291..e618d526 100644
--- a/static/locales/zh.json
+++ b/static/locales/zh.json
@@ -1887,6 +1887,7 @@
"uploadedMergeManually": "您的片段已上传。请在列表中选择它和另一条录音以进行合并。",
"preparingClip": "正在准备您的片段——准备就绪后将打开合并选项。",
"clipNotReady": "无法准备该片段以进行合并。",
- "thisRecording": "此录音"
+ "thisRecording": "此录音",
+ "searching": "搜索中…"
}
}
\ No newline at end of file
diff --git a/templates/modals/bulk-merge-modal.html b/templates/modals/bulk-merge-modal.html
index f4f35512..f51ddaba 100644
--- a/templates/modals/bulk-merge-modal.html
+++ b/templates/modals/bulk-merge-modal.html
@@ -55,13 +55,17 @@
<div v-else class="rounded-md border border-[var(--border-primary)] overflow-hidden">
<input type="text" v-model="mergeAddSearch" :placeholder="t('mergeRecordings.searchRecordings')"
class="w-full px-3 py-2 text-sm bg-[var(--bg-input)] text-[var(--text-primary)] border-b border-[var(--border-primary)] focus:outline-none">
- <div class="max-h-40 overflow-y-auto">
+ <div class="max-h-40 overflow-y-auto"
+ @scroll="(e) => { if (e.target.scrollTop + e.target.clientHeight >= e.target.scrollHeight - 24) loadMoreMergeCandidates(); }">
<button v-for="cand in mergeCandidates" :key="cand.id" @click="addMergeCandidate(cand)"
class="w-full text-left px-3 py-2 text-sm hover:bg-[var(--bg-tertiary)] transition-colors flex items-center gap-2">
<i class="fas fa-plus text-[10px] text-[var(--text-accent)]"></i>
<span class="truncate">${ cand.title || t('mergeRecordings.untitled') }</span>
</button>
- <div v-if="mergeCandidates.length === 0" class="px-3 py-3 t-meta text-center" v-text="t('mergeRecordings.noCandidates')"></div>
+ <div v-if="mergePickerLoading" class="px-3 py-3 t-meta text-center">
+ <i class="fas fa-spinner fa-spin mr-1"></i><span v-text="t('mergeRecordings.searching')"></span>
+ </div>
+ <div v-else-if="mergeCandidates.length === 0" class="px-3 py-3 t-meta text-center" v-text="t('mergeRecordings.noCandidates')"></div>
</div>
</div>
</div>
diff --git a/tests/test_cov_recordings_read.py b/tests/test_cov_recordings_read.py
index 2dc1aa82..96ea203e 100644
--- a/tests/test_cov_recordings_read.py
+++ b/tests/test_cov_recordings_read.py
@@ -315,6 +315,21 @@ def test_paginated_folder_filter(owner):
assert no_folder not in ids
+def test_paginated_status_filter(owner):
+ # The merge picker uses ?status=COMPLETED to fetch only mergeable recordings.
+ with _db():
+ u = db.session.get(User, owner)
+ done = make_recording(u, title="done", status="COMPLETED").id
+ proc = make_recording(u, title="processing", status="PROCESSING").id
+
+ c = new_client()
+ login(c, owner)
+ resp = c.get("/api/recordings?status=COMPLETED&per_page=100")
+ ids = {r["id"] for r in resp.get_json()["recordings"]}
+ assert done in ids
+ assert proc not in ids
+
+
def test_paginated_folder_none_filter(owner):
with _db():
u = db.session.get(User, owner)