Cutlery/immich
1
0
Fork 1
mirror of https://github.com/immich-app/immich.git synced 2025-11-04 03:27:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix(server): reverse geocoding delete dump logic (#2551)

Browse Source
This commit is contained in:
Jason Rasmussen 2023-05-23 21:36:36 -04:00 committed by GitHub
parent 2dc8a93685
commit a1f1e5bc37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/apps/microservices/src/processors/metadata-extraction.processor.ts
View File

@ -50,14 +50,14 @@ export class MetadataExtractionProcessor {
this.reverseGeocodingEnabled = !configService.get('DISABLE_REVERSE_GEOCODING'); this.reverseGeocodingEnabled = !configService.get('DISABLE_REVERSE_GEOCODING');
} }
async init(skipCache = false) { async init(deleteCache = false) {
this.logger.warn(`Reverse geocoding is ${this.reverseGeocodingEnabled ? 'enabled' : 'disabled'}`); this.logger.warn(`Reverse geocoding is ${this.reverseGeocodingEnabled ? 'enabled' : 'disabled'}`);
if (!this.reverseGeocodingEnabled) { if (!this.reverseGeocodingEnabled) {
return; return;
} }
try { try {
if (!skipCache) { if (deleteCache) {
await this.geocodingRepository.deleteCache(); await this.geocodingRepository.deleteCache();
} }
this.logger.log('Initializing Reverse Geocoding'); this.logger.log('Initializing Reverse Geocoding');

10
server/libs/infra/src/repositories/geocoding.repository.ts
View File

@ -1,9 +1,10 @@
import { GeoPoint, IGeocodingRepository, ReverseGeocodeResult } from '@app/domain'; import { GeoPoint, IGeocodingRepository, ReverseGeocodeResult } from '@app/domain';
import { localGeocodingConfig } from '@app/infra'; import { localGeocodingConfig } from '@app/infra';
import { Injectable, Logger } from '@nestjs/common'; import { Injectable, Logger } from '@nestjs/common';
import { rm } from 'fs/promises'; import { readdir, rm } from 'fs/promises';
import { getName } from 'i18n-iso-countries'; import { getName } from 'i18n-iso-countries';
import geocoder, { AddressObject } from 'local-reverse-geocoder'; import geocoder, { AddressObject } from 'local-reverse-geocoder';
import path from 'path';
import { promisify } from 'util'; import { promisify } from 'util';
export interface AdminCode { export interface AdminCode {
@ -31,7 +32,12 @@ export class GeocodingRepository implements IGeocodingRepository {
async deleteCache() { async deleteCache() {
const dumpDirectory = localGeocodingConfig.dumpDirectory; const dumpDirectory = localGeocodingConfig.dumpDirectory;
if (dumpDirectory) { if (dumpDirectory) {
await rm(dumpDirectory, { recursive: true, force: true }); // delete contents
const items = await readdir(dumpDirectory, { withFileTypes: true });
const folders = items.filter((item) => item.isDirectory());
for (const { name } of folders) {
await rm(path.join(dumpDirectory, name), { recursive: true, force: true });
}
} }
} }