mirror/api
1
0
Fork 0
mirror of https://github.com/unraid/api.git synced 2025-12-31 13:39:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix(api): exclude duplicates from legacy script in archive retrieval

Browse Source
This commit is contained in:
Pujit Mehrotra
2024-11-14 11:40:05 -05:00
parent da5d1132d1
commit 9c38fa6a9c
1 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
api/src/unraid-api/graph/resolvers/notifications/notifications.service.ts
View File

@@ -529,14 +529,25 @@ export class NotificationsService {
* @returns An array of all notifications in the system. * @returns An array of all notifications in the system.
*/ */
public async getNotifications(filters: NotificationFilter): Promise<Notification[]> { public async getNotifications(filters: NotificationFilter): Promise<Notification[]> {
this.logger.debug('Getting Notifications'); this.logger.verbose('Getting Notifications');
const { type = NotificationType.UNREAD } = filters;
const { ARCHIVE, UNREAD } = this.paths(); const { ARCHIVE, UNREAD } = this.paths();
const directoryPath = filters.type === NotificationType.ARCHIVE ? ARCHIVE : UNREAD; let files: string[];
const unreadFiles = await this.listFilesInFolder(directoryPath); if (type === NotificationType.UNREAD) {
const [notifications] = await this.loadNotificationsFromPaths(unreadFiles, filters); files = await this.listFilesInFolder(UNREAD);
} else {
// Exclude notifications present in both unread & archive from archive.
//* this is necessary because the legacy script writes new notifications to both places.
//* this should be a temporary measure.
const unreads = new Set(await readdir(UNREAD));
files = await this.listFilesInFolder(ARCHIVE, (archives) => {
return archives.filter((file) => !unreads.has(file));
});
}
const [notifications] = await this.loadNotificationsFromPaths(files, filters);
return notifications; return notifications;
} }
@@ -545,12 +556,16 @@ export class NotificationsService {
* Sorted latest-first by default. * Sorted latest-first by default.
* *
* @param folderPath The path of the folder to read. * @param folderPath The path of the folder to read.
* @param narrowContent Returns which files from `folderPath` to include. Defaults to all.
* @param sortFn An optional function to sort folder contents. Defaults to descending birth time. * @param sortFn An optional function to sort folder contents. Defaults to descending birth time.
* @returns A list of absolute paths of all the files and contents in the folder. * @returns A list of absolute paths of all the files and contents in the folder.
*/ */
private async listFilesInFolder(folderPath: string, sortFn?: SortFn<Stats>): Promise<string[]> { private async listFilesInFolder(
sortFn ??= (fileA, fileB) => fileB.birthtimeMs - fileA.birthtimeMs; // latest first folderPath: string,
const contents = await readdir(folderPath); narrowContent: (contents: string[]) => string[] = (contents) => contents,
sortFn: SortFn<Stats> = (fileA, fileB) => fileB.birthtimeMs - fileA.birthtimeMs // latest first
): Promise<string[]> {
const contents = narrowContent(await readdir(folderPath));
return contents return contents
.map((content) => { .map((content) => {
// pre-map each file's stats to avoid excess calls during sorting // pre-map each file's stats to avoid excess calls during sorting