1
0
mirror of https://github.com/immich-app/immich.git synced 2024-12-25 10:43:13 +02:00

asset count instead of statistics

This commit is contained in:
Jonathan Jogenfors 2024-12-18 11:36:15 +01:00
parent 845b3f7a0e
commit 1df1b85aa8
15 changed files with 60 additions and 108 deletions

BIN
mobile/openapi/README.md generated

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -2853,9 +2853,9 @@
]
}
},
"/libraries/{id}/scan": {
"post": {
"operationId": "scanLibrary",
"/libraries/{id}/count": {
"get": {
"operationId": "getAssetCount",
"parameters": [
{
"name": "id",
@ -2868,7 +2868,14 @@
}
],
"responses": {
"204": {
"200": {
"content": {
"application/json": {
"schema": {
"type": "number"
}
}
},
"description": ""
}
},
@ -2888,9 +2895,9 @@
]
}
},
"/libraries/{id}/statistics": {
"get": {
"operationId": "getLibraryStatistics",
"/libraries/{id}/scan": {
"post": {
"operationId": "scanLibrary",
"parameters": [
{
"name": "id",
@ -2903,14 +2910,7 @@
}
],
"responses": {
"200": {
"content": {
"application/json": {
"schema": {
"$ref": "#/components/schemas/LibraryStatsResponseDto"
}
}
},
"204": {
"description": ""
}
},
@ -9464,34 +9464,6 @@
],
"type": "object"
},
"LibraryStatsResponseDto": {
"properties": {
"photos": {
"default": 0,
"type": "integer"
},
"total": {
"default": 0,
"type": "integer"
},
"usage": {
"default": 0,
"format": "int64",
"type": "integer"
},
"videos": {
"default": 0,
"type": "integer"
}
},
"required": [
"photos",
"total",
"usage",
"videos"
],
"type": "object"
},
"LicenseKeyDto": {
"properties": {
"activationKey": {

View File

@ -574,12 +574,6 @@ export type UpdateLibraryDto = {
importPaths?: string[];
name?: string;
};
export type LibraryStatsResponseDto = {
photos: number;
total: number;
usage: number;
videos: number;
};
export type ValidateLibraryDto = {
exclusionPatterns?: string[];
importPaths?: string[];
@ -2099,6 +2093,16 @@ export function updateLibrary({ id, updateLibraryDto }: {
body: updateLibraryDto
})));
}
export function getAssetCount({ id }: {
id: string;
}, opts?: Oazapfts.RequestOpts) {
return oazapfts.ok(oazapfts.fetchJson<{
status: 200;
data: number;
}>(`/libraries/${encodeURIComponent(id)}/count`, {
...opts
}));
}
export function scanLibrary({ id }: {
id: string;
}, opts?: Oazapfts.RequestOpts) {
@ -2107,16 +2111,6 @@ export function scanLibrary({ id }: {
method: "POST"
}));
}
export function getLibraryStatistics({ id }: {
id: string;
}, opts?: Oazapfts.RequestOpts) {
return oazapfts.ok(oazapfts.fetchJson<{
status: 200;
data: LibraryStatsResponseDto;
}>(`/libraries/${encodeURIComponent(id)}/statistics`, {
...opts
}));
}
export function validate({ id, validateLibraryDto }: {
id: string;
validateLibraryDto: ValidateLibraryDto;

View File

@ -57,10 +57,10 @@ export class LibraryController {
return this.service.validate(id, dto);
}
@Get(':id/statistics')
@Get(':id/count')
@Authenticated({ permission: Permission.LIBRARY_STATISTICS, admin: true })
getLibraryStatistics(@Param() { id }: UUIDParamDto): Promise<LibraryStatsResponseDto> {
return this.service.getStatistics(id);
getAssetCount(@Param() { id }: UUIDParamDto): Promise<number> {
return this.service.getAssetCount(id);
}
@Post(':id/scan')

View File

@ -201,5 +201,5 @@ export interface IAssetRepository {
upsertFiles(files: UpsertFileOptions[]): Promise<void>;
updateOffline(library: LibraryEntity): Promise<UpdateResult>;
getNewPaths(libraryId: string, paths: string[]): Promise<string[]>;
getAssetCount(id: string, options: AssetSearchOptions): Promise<number | undefined>;
getAssetCount(options: AssetSearchOptions): Promise<number | undefined>;
}

View File

@ -786,7 +786,7 @@ export class AssetRepository implements IAssetRepository {
.then((result) => result.map((row: { path: string }) => row.path));
}
async getAssetCount(id: string, options: AssetSearchOptions = {}): Promise<number | undefined> {
async getAssetCount(options: AssetSearchOptions = {}): Promise<number | undefined> {
let builder = this.repository.createQueryBuilder('asset').leftJoinAndSelect('asset.files', 'files');
builder = searchAssetBuilder(builder, options);
return builder.getCount();

View File

@ -249,7 +249,12 @@ export class AssetService extends BaseService {
const { thumbnailFile, previewFile } = getAssetFiles(asset.files);
const files = [thumbnailFile?.path, previewFile?.path, asset.encodedVideoPath];
if (deleteOnDisk) {
if (deleteOnDisk && !asset.isOffline) {
/* We don't want to delete an offline asset because it is either...
...missing from disk => don't delete the file since it doesn't exist where we expect
...outside of any import path => don't delete the file since we're not responsible for it
...matching an exclusion pattern => don't delete the file since it's excluded */
files.push(asset.sidecarPath, asset.originalPath);
}

View File

@ -266,7 +266,7 @@ export class JobService extends BaseService {
}
case JobName.GENERATE_THUMBNAILS: {
if (!item.data.notify && item.data.source !== 'upload') {
if (!item.data.notify && item.data.source !== 'upload' && item.data.source !== 'library-import') {
break;
}

View File

@ -1,4 +1,4 @@
import { BadRequestException, Injectable } from '@nestjs/common';
import { BadRequestException, Injectable, InternalServerErrorException } from '@nestjs/common';
import { R_OK } from 'node:constants';
import path, { basename, isAbsolute, parse } from 'node:path';
import picomatch from 'picomatch';
@ -174,12 +174,12 @@ export class LibraryService extends BaseService {
}
}
async getStatistics(id: string): Promise<LibraryStatsResponseDto> {
const statistics = await this.libraryRepository.getStatistics(id);
if (!statistics) {
throw new BadRequestException(`Library ${id} not found`);
async getAssetCount(id: string): Promise<number> {
const count = await this.assetRepository.getAssetCount({ libraryId: id });
if (count == undefined) {
throw new InternalServerErrorException(`Failed to get asset count for library ${id}`);
}
return statistics;
return count;
}
async get(id: string): Promise<LibraryResponseDto> {
@ -354,7 +354,8 @@ export class LibraryService extends BaseService {
private processEntity(filePath: string, ownerId: string, libraryId: string): AssetCreate {
const assetPath = path.normalize(filePath);
const now = new Date();
// This date will be set until metadata extraction runs
const datePlaceholder = new Date('1900-01-01');
return {
ownerId: ownerId,
@ -365,9 +366,9 @@ export class LibraryService extends BaseService {
// TODO: device asset id is deprecated, remove it
deviceAssetId: `${basename(assetPath)}`.replaceAll(/\s+/g, ''),
deviceId: 'Library Import',
fileCreatedAt: now,
fileModifiedAt: now,
localDateTime: now,
fileCreatedAt: datePlaceholder,
fileModifiedAt: datePlaceholder,
localDateTime: datePlaceholder,
type: mimeTypes.isVideo(assetPath) ? AssetType.VIDEO : AssetType.IMAGE,
originalFileName: parse(assetPath).base,
isExternal: true,
@ -620,7 +621,7 @@ export class LibraryService extends BaseService {
return JobStatus.SKIPPED;
}
const assetCount = await this.assetRepository.getAssetCount(library.id, { withDeleted: true });
const assetCount = await this.assetRepository.getAssetCount({ libraryId: job.id, withDeleted: true });
if (!assetCount) {
this.logger.log(`Library ${library.id} is empty, no need to check assets`);

View File

@ -52,7 +52,7 @@ export class TrashService extends BaseService {
);
for await (const assetIds of assetPagination) {
this.logger.debug(`Queueing ${assetIds.length} assets for deletion from the trash`);
this.logger.debug(`Queueing ${assetIds.length} asset(s) for deletion from the trash`);
count += assetIds.length;
await this.jobRepository.queueAll(
assetIds.map((assetId) => ({

View File

@ -12,18 +12,16 @@
notificationController,
NotificationType,
} from '$lib/components/shared-components/notification/notification';
import { ByteUnit, getBytesWithUnit } from '$lib/utils/byte-units';
import { handleError } from '$lib/utils/handle-error';
import {
createLibrary,
deleteLibrary,
getAllLibraries,
getLibraryStatistics,
getAssetCount,
getUserAdmin,
scanLibrary,
updateLibrary,
type LibraryResponseDto,
type LibraryStatsResponseDto,
type UserResponseDto,
} from '@immich/sdk';
import { mdiDatabase, mdiDotsVertical, mdiPlusBoxOutline, mdiSync } from '@mdi/js';
@ -44,13 +42,8 @@
let libraries: LibraryResponseDto[] = $state([]);
let stats: LibraryStatsResponseDto[] = [];
let owner: UserResponseDto[] = $state([]);
let photos: number[] = [];
let videos: number[] = [];
let totalCount: number[] = $state([]);
let diskUsage: number[] = $state([]);
let diskUsageUnit: ByteUnit[] = $state([]);
let assetCount: number[] = $state([]);
let editImportPaths: number | undefined = $state();
let editScanSettings: number | undefined = $state();
let renameLibrary: number | undefined = $state();
@ -74,12 +67,8 @@
};
const refreshStats = async (listIndex: number) => {
stats[listIndex] = await getLibraryStatistics({ id: libraries[listIndex].id });
assetCount[listIndex] = await getAssetCount({ id: libraries[listIndex].id });
owner[listIndex] = await getUserAdmin({ id: libraries[listIndex].ownerId });
photos[listIndex] = stats[listIndex].photos;
videos[listIndex] = stats[listIndex].videos;
totalCount[listIndex] = stats[listIndex].total;
[diskUsage[listIndex], diskUsageUnit[listIndex]] = getBytesWithUnit(stats[listIndex].usage, 0);
};
async function readLibraryList() {
@ -190,10 +179,10 @@
}
await refreshStats(index);
const assetCount = totalCount[index];
if (assetCount > 0) {
const count = assetCount[index];
if (count > 0) {
const isConfirmed = await dialogController.show({
prompt: $t('admin.confirm_delete_library_assets', { values: { count: assetCount } }),
prompt: $t('admin.confirm_delete_library_assets', { values: { count } }),
});
if (!isConfirmed) {
@ -242,19 +231,18 @@
<thead
class="mb-4 flex h-12 w-full rounded-md border bg-gray-50 text-immich-primary dark:border-immich-dark-gray dark:bg-immich-dark-gray dark:text-immich-dark-primary"
>
<tr class="grid grid-cols-6 w-full place-items-center">
<tr class="grid grid-cols-5 w-full place-items-center">
<th class="text-center text-sm font-medium">{$t('type')}</th>
<th class="text-center text-sm font-medium">{$t('name')}</th>
<th class="text-center text-sm font-medium">{$t('owner')}</th>
<th class="text-center text-sm font-medium">{$t('assets')}</th>
<th class="text-center text-sm font-medium">{$t('size')}</th>
<th class="text-center text-sm font-medium"></th>
</tr>
</thead>
<tbody class="block overflow-y-auto rounded-md border dark:border-immich-dark-gray">
{#each libraries as library, index (library.id)}
<tr
class={`grid grid-cols-6 h-[80px] w-full place-items-center text-center dark:text-immich-dark-fg ${
class={`grid grid-cols-5 h-[80px] w-full place-items-center text-center dark:text-immich-dark-fg ${
index % 2 == 0
? 'bg-immich-gray dark:bg-immich-dark-gray/75'
: 'bg-immich-bg dark:bg-immich-dark-gray/50'
@ -275,18 +263,10 @@
{:else}{owner[index].name}{/if}
</td>
<td class=" text-ellipsis px-4 text-sm">
{#if totalCount[index] == undefined}
{#if assetCount[index] == undefined}
<LoadingSpinner size="40" />
{:else}
{totalCount[index].toLocaleString($locale)}
{/if}
</td>
<td class=" text-ellipsis px-4 text-sm">
{#if diskUsage[index] == undefined}
<LoadingSpinner size="40" />
{:else}
{diskUsage[index]}
{diskUsageUnit[index]}
{assetCount[index].toLocaleString($locale)}
{/if}
</td>