Skip to content

Sync-in · Sovereign platform for file storage, sharing, synchronization, and collaboration.

feat(files): add directory size retrieval with UI and API integration

johaven4528b438e081
diff --git a/backend/src/applications/files/constants/operations.ts b/backend/src/applications/files/constants/operations.ts
index a79e69a2..2657b31d 100644
--- a/backend/src/applications/files/constants/operations.ts
+++ b/backend/src/applications/files/constants/operations.ts
@@ -15,9 +15,10 @@ export enum FILE_OPERATION {
UPLOAD = 'upload',
TOUCH = 'touch',
THUMBNAIL = 'thumbnail',
+ GET_SIZE = 'getSize',
LOCK = 'lock',
UNLOCK = 'unlock',
- UNLOCK_REQUEST = 'unlock-request'
+ UNLOCK_REQUEST = 'unlockRequest'
}
export enum FILE_MODE {
diff --git a/backend/src/applications/files/files.controller.ts b/backend/src/applications/files/files.controller.ts
index acbfbfc3..8d2ce7cd 100644
--- a/backend/src/applications/files/files.controller.ts
+++ b/backend/src/applications/files/files.controller.ts
@@ -156,6 +156,11 @@ export class FilesController {
return this.filesMethods.unlockRequest(user, space)
}
+ @Get(`${FILES_ROUTE.OPERATION}/${FILE_OPERATION.GET_SIZE}/*`)
+ async getSize(@GetSpace() space: SpaceEnv): Promise<{ size: number }> {
+ return this.filesMethods.getSize(space)
+ }
+
// TASKS OPERATIONS
@Post(`${FILES_ROUTE.TASK_OPERATION}/${FILE_OPERATION.DOWNLOAD}/*`)
diff --git a/backend/src/applications/files/services/files-manager.service.ts b/backend/src/applications/files/services/files-manager.service.ts
index 43391432..98c93673 100644
--- a/backend/src/applications/files/services/files-manager.service.ts
+++ b/backend/src/applications/files/services/files-manager.service.ts
@@ -682,4 +682,15 @@ export class FilesManager {
}
}
}
+
+ async getSize(space: SpaceEnv): Promise<number> {
+ if (!(await isPathExists(space.realPath))) {
+ throw new FileError(HttpStatus.NOT_FOUND, 'Location not found')
+ }
+ if (await isPathIsDir(space.realPath)) {
+ return (await dirSize(space.realPath))[0]
+ } else {
+ return await fileSize(space.realPath)
+ }
+ }
}
diff --git a/backend/src/applications/files/services/files-methods.service.ts b/backend/src/applications/files/services/files-methods.service.ts
index 43d38d58..0833109f 100644
--- a/backend/src/applications/files/services/files-methods.service.ts
+++ b/backend/src/applications/files/services/files-methods.service.ts
@@ -177,6 +177,14 @@ export class FilesMethods {
}
}
+ async getSize(space: SpaceEnv): Promise<{ size: number }> {
+ try {
+ return { size: await this.filesManager.getSize(space) }
+ } catch (e) {
+ this.handleError(space, FILE_OPERATION.GET_SIZE, e)
+ }
+ }
+
private async copyMove(
user: UserModel,
space: SpaceEnv,
diff --git a/frontend/src/app/applications/files/components/sidebar/files-selection.component.html b/frontend/src/app/applications/files/components/sidebar/files-selection.component.html
index 3c58d852..65558fad 100644
--- a/frontend/src/app/applications/files/components/sidebar/files-selection.component.html
+++ b/frontend/src/app/applications/files/components/sidebar/files-selection.component.html
@@ -51,12 +51,17 @@
<div class="d-flex col-sm-5 ps-1 pb-1 fw-bold" l10nTranslate>Name</div>
<div class="word-break-all fs-xxs">{{ f.name }}</div>
</div>
- @if (f.size) {
- <div class="d-flex mb-1">
- <div class="d-flex col-sm-5 ps-1 pb-1 fw-bold" l10nTranslate>Size</div>
- <div class="fs-xxs">{{ f.hSize }}</div>
+ <div class="d-flex mb-1">
+ <div class="d-flex col-sm-5 ps-1 pb-1 fw-bold" l10nTranslate>Size</div>
+ <div class="fs-xxs">
+ @let size = (getSizeLazy(f) | async);
+ @if (size === null) {
+ <fa-icon [icon]="icons.faSpinner" animation="spin-pulse"></fa-icon>
+ } @else {
+ {{ size }}
+ }
</div>
- }
+ </div>
<div class="d-flex mb-1">
<div class="d-flex col-sm-5 ps-1 pb-1 fw-bold" l10nTranslate>Created</div>
<div class="fs-xxs">{{ f.ctime | amDateFormat }}</div>
diff --git a/frontend/src/app/applications/files/components/sidebar/files-selection.component.ts b/frontend/src/app/applications/files/components/sidebar/files-selection.component.ts
index 2244d52f..791333fb 100755
--- a/frontend/src/app/applications/files/components/sidebar/files-selection.component.ts
+++ b/frontend/src/app/applications/files/components/sidebar/files-selection.component.ts
@@ -4,13 +4,17 @@
* See the LICENSE file for licensing details
*/
+import { AsyncPipe } from '@angular/common'
import { ChangeDetectionStrategy, Component, computed, inject, input, InputSignal, Signal } from '@angular/core'
import { Router } from '@angular/router'
import { FaIconComponent } from '@fortawesome/angular-fontawesome'
-import { faArrowsAlt, faClipboardCheck, faLock, faUnlock } from '@fortawesome/free-solid-svg-icons'
+import { faArrowsAlt, faClipboardCheck, faLock, faSpinner, faUnlock } from '@fortawesome/free-solid-svg-icons'
import { L10N_LOCALE, L10nLocale, L10nTranslateDirective, L10nTranslatePipe } from 'angular-l10n'
+import { catchError, of, shareReplay } from 'rxjs'
+import { map } from 'rxjs/operators'
import { AutoResizeDirective } from '../../../../common/directives/auto-resize.directive'
import { TimeDateFormatPipe } from '../../../../common/pipes/time-date-format.pipe'
+import { convertBytesToText } from '../../../../common/utils/functions'
import { defaultCardImageSize } from '../../../../layout/layout.constants'
import { TAB_MENU } from '../../../../layout/layout.interfaces'
import { LayoutService } from '../../../../layout/layout.service'
@@ -35,7 +39,8 @@ import { FilesViewerMediaComponent } from '../viewers/files-viewer-media.compone
FaIconComponent,
FilesViewerMediaComponent,
UserAvatarComponent,
- FilePermissionsComponent
+ FilePermissionsComponent,
+ AsyncPipe
],
styles: ['.card {width: 100%; background: transparent; border: none}']
})
@@ -53,7 +58,8 @@ export class FilesSelectionComponent {
faLock,
faUnlock,
faClipboardCheck,
- faArrowsAlt
+ faArrowsAlt,
+ faSpinner
}
private readonly router = inject(Router)
private readonly layout = inject(LayoutService)
@@ -93,4 +99,16 @@ export class FilesSelectionComponent {
openLockDialog(f: FileModel) {
this.filesService.openLockDialog(f)
}
+
+ getSizeLazy(f: FileModel) {
+ if (!f.isDir) return of(f.hSize)
+ if (!f.hDirSize) {
+ f.hDirSize = this.filesService.getSize(f).pipe(
+ map((size) => convertBytesToText(size, 0, true)),
+ catchError(() => (f.hDirSize = of(f.hSize))),
+ shareReplay(1)
+ )
+ }
+ return f.hDirSize
+ }
}
diff --git a/frontend/src/app/applications/files/models/file.model.ts b/frontend/src/app/applications/files/models/file.model.ts
index 2c579528..1a4ee84f 100644
--- a/frontend/src/app/applications/files/models/file.model.ts
+++ b/frontend/src/app/applications/files/models/file.model.ts
@@ -14,6 +14,7 @@ import type { FileLockProps, FileProps } from '@sync-in-server/backend/src/appli
import type { File } from '@sync-in-server/backend/src/applications/files/schemas/file.interface'
import { SPACE_OPERATION } from '@sync-in-server/backend/src/applications/spaces/constants/spaces'
import { popFromObject } from '@sync-in-server/backend/src/common/shared'
+import type { Observable } from 'rxjs'
import { convertBytesToText, getNewly } from '../../../common/utils/functions'
import { dJs } from '../../../common/utils/time'
import { CommentModel } from '../../comments/models/comment.model'
@@ -71,6 +72,7 @@ export class FileModel implements File {
mimeUrl: string
hSize: string
hTimeAgo: string
+ hDirSize: Observable<string>
// States
newly = 0
diff --git a/frontend/src/app/applications/files/services/files.service.ts b/frontend/src/app/applications/files/services/files.service.ts
index 1930a8d1..ac026d05 100644
--- a/frontend/src/app/applications/files/services/files.service.ts
+++ b/frontend/src/app/applications/files/services/files.service.ts
@@ -233,6 +233,10 @@ export class FilesService {
return this.http.request<void>(FILE_OPERATION.UNLOCK, `${API_FILES_OPERATION}/${FILE_OPERATION.UNLOCK_REQUEST}/${file.path}`)
}
+ getSize(file: FileModel): Observable<number> {
+ return this.http.get<{ size: number }>(`${API_FILES_OPERATION}/${FILE_OPERATION.GET_SIZE}/${file.path}`).pipe(map((r) => r.size))
+ }
+
openLockDialog(file: FileModel): void {
this.layout.openDialog(FilesLockDialogComponent, null, {
initialState: {