Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Automatic numerical sorting of watchedFoldermedia #3338

Closed
wants to merge 7 commits into from
Closed

feat: Automatic numerical sorting of watchedFoldermedia #3338

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0ed8748
Added sort by numerical sequence for watched folder items
advenimus Nov 14, 2024
bd29ae1
Added numerical sorting of watched folder media if prefixed with # - …
advenimus Nov 15, 2024
126f776
Merge branch 'sircharlo:master' into master
advenimus Nov 15, 2024
5b991f2
Merge branch 'master' into master
sircharlo Nov 15, 2024
742bb47
Merge branch 'master' into master
sircharlo Nov 15, 2024
5c07b59
fix: revert dot files that are irrelevant to this PR
sircharlo Nov 15, 2024
46964c6
Merge branch 'master' into master
sircharlo Nov 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/pages/MediaCalendarPage.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,7 +779,11 @@ const generateMediaList = () => {
const combinedMediaItems = [
...datedAdditionalMediaMap.value,
...(selectedDateObject.value?.dynamicMedia ?? []),
...(watchFolderMedia.value?.[selectedDate.value] ?? []),
...(watchFolderMedia.value?.[selectedDate.value] ?? []).sort((a, b) => {
const numA = parseInt(a.title.split(' - ')[0], 10);
const numB = parseInt(b.title.split(' - ')[0], 10);
return numA - numB;
}),
];
if (combinedMediaItems && currentCongregation.value) {
mediaSort.value[currentCongregation.value] ??= {};
Expand Down Expand Up @@ -1579,5 +1583,6 @@ const resetDragging = () => {
currentFile.value = 0;
totalFiles.value = 0;
sectionToAddTo.value = undefined;
generateMediaList(); // Restore the numerical order on reset
};
</script>