mirror of
https://github.com/immich-app/immich.git
synced 2025-12-12 15:50:43 -08:00
feat: change default media location to /data (#20367)
* feat!: change default media location to /data * feat: dynamically detect media location
This commit is contained in:
4
server/test/fixtures/asset.stub.ts
vendored
4
server/test/fixtures/asset.stub.ts
vendored
@@ -65,7 +65,7 @@ export const assetStub = {
|
||||
owner: userStub.user1,
|
||||
ownerId: 'user-id',
|
||||
deviceId: 'device-id',
|
||||
originalPath: 'upload/library/IMG_123.jpg',
|
||||
originalPath: '/data/library/IMG_123.jpg',
|
||||
files: [thumbnailFile],
|
||||
checksum: Buffer.from('file hash', 'utf8'),
|
||||
type: AssetType.Image,
|
||||
@@ -101,7 +101,7 @@ export const assetStub = {
|
||||
owner: userStub.user1,
|
||||
ownerId: 'user-id',
|
||||
deviceId: 'device-id',
|
||||
originalPath: 'upload/library/IMG_456.jpg',
|
||||
originalPath: '/data/library/IMG_456.jpg',
|
||||
files: [previewFile],
|
||||
checksum: Buffer.from('file hash', 'utf8'),
|
||||
type: AssetType.Image,
|
||||
|
||||
46
server/test/medium/specs/services/storage.service.spec.ts
Normal file
46
server/test/medium/specs/services/storage.service.spec.ts
Normal file
@@ -0,0 +1,46 @@
|
||||
import { Kysely } from 'kysely';
|
||||
import { AssetRepository } from 'src/repositories/asset.repository';
|
||||
import { ConfigRepository } from 'src/repositories/config.repository';
|
||||
import { DatabaseRepository } from 'src/repositories/database.repository';
|
||||
import { LoggingRepository } from 'src/repositories/logging.repository';
|
||||
import { StorageRepository } from 'src/repositories/storage.repository';
|
||||
import { SystemMetadataRepository } from 'src/repositories/system-metadata.repository';
|
||||
import { DB } from 'src/schema';
|
||||
import { StorageService } from 'src/services/storage.service';
|
||||
import { newMediumService } from 'test/medium.factory';
|
||||
import { mockEnvData } from 'test/repositories/config.repository.mock';
|
||||
import { getKyselyDB } from 'test/utils';
|
||||
|
||||
let defaultDatabase: Kysely<DB>;
|
||||
|
||||
const setup = (db?: Kysely<DB>) => {
|
||||
return newMediumService(StorageService, {
|
||||
database: db || defaultDatabase,
|
||||
real: [AssetRepository, DatabaseRepository, SystemMetadataRepository],
|
||||
mock: [StorageRepository, ConfigRepository, LoggingRepository],
|
||||
});
|
||||
};
|
||||
|
||||
beforeAll(async () => {
|
||||
defaultDatabase = await getKyselyDB();
|
||||
});
|
||||
|
||||
describe(StorageService.name, () => {
|
||||
describe('onBoostrap', () => {
|
||||
it('should work', async () => {
|
||||
const { sut, ctx } = setup();
|
||||
|
||||
const configMock = ctx.getMock(ConfigRepository);
|
||||
configMock.getEnv.mockReturnValue(mockEnvData({}));
|
||||
|
||||
const storageMock = ctx.getMock(StorageRepository);
|
||||
storageMock.mkdirSync.mockReturnValue(void 0);
|
||||
storageMock.existsSync.mockReturnValue(true);
|
||||
storageMock.createFile.mockResolvedValue(void 0);
|
||||
storageMock.overwriteFile.mockResolvedValue(void 0);
|
||||
storageMock.readFile.mockResolvedValue(Buffer.from('test content'));
|
||||
|
||||
await expect(sut.onBootstrap()).resolves.toBeUndefined();
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -41,10 +41,9 @@ export const makeMockWatcher =
|
||||
return () => Promise.resolve();
|
||||
};
|
||||
|
||||
export const newStorageRepositoryMock = (reset = true): Mocked<RepositoryInterface<StorageRepository>> => {
|
||||
if (reset) {
|
||||
StorageCore.reset();
|
||||
}
|
||||
export const newStorageRepositoryMock = (): Mocked<RepositoryInterface<StorageRepository>> => {
|
||||
StorageCore.reset();
|
||||
StorageCore.setMediaLocation('/data');
|
||||
|
||||
return {
|
||||
createZipStream: vitest.fn(),
|
||||
@@ -53,6 +52,7 @@ export const newStorageRepositoryMock = (reset = true): Mocked<RepositoryInterfa
|
||||
createFile: vitest.fn(),
|
||||
createWriteStream: vitest.fn(),
|
||||
createOrOverwriteFile: vitest.fn(),
|
||||
existsSync: vitest.fn(),
|
||||
overwriteFile: vitest.fn(),
|
||||
unlink: vitest.fn(),
|
||||
unlinkDir: vitest.fn().mockResolvedValue(true),
|
||||
|
||||
@@ -224,7 +224,7 @@ const assetFactory = (asset: Partial<MapAsset> = {}) => ({
|
||||
livePhotoVideoId: null,
|
||||
localDateTime: newDate(),
|
||||
originalFileName: 'IMG_123.jpg',
|
||||
originalPath: `upload/12/34/IMG_123.jpg`,
|
||||
originalPath: `/data/12/34/IMG_123.jpg`,
|
||||
ownerId: newUuid(),
|
||||
sidecarPath: null,
|
||||
stackId: null,
|
||||
|
||||
Reference in New Issue
Block a user