xuthus/pigallery2
1
0
Fork 0
mirror of https://github.com/xuthus83/pigallery2.git synced 2024-11-03 21:04:03 +08:00
Code Actions Projects Activity

implementing on the fly indexing

Browse Source
This commit is contained in:
Braun Patrik 2016-12-28 15:35:27 +01:00
parent 306613260e
commit d151c56e77
3 changed files with 43 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
backend/middlewares/GalleryMWs.ts
View File

@ -24,6 +24,7 @@ export class GalleryMWs {
ObjectManagerRepository.getInstance().getGalleryManager().listDirectory(directoryName, (err, directory: DirectoryDTO) => { ObjectManagerRepository.getInstance().getGalleryManager().listDirectory(directoryName, (err, directory: DirectoryDTO) => {
if (err || !directory) { if (err || !directory) {
console.error(err);
return next(new Error(ErrorCodes.GENERAL_ERROR, err)); return next(new Error(ErrorCodes.GENERAL_ERROR, err));
} }

46
backend/model/mysql/GalleryManager.ts
View File

@ -30,8 +30,7 @@ export class GalleryManager implements IGalleryManager {
.leftJoinAndSelect("directory.photos", "photos") .leftJoinAndSelect("directory.photos", "photos")
.getOne(); .getOne();
if (dir && dir.scanned == true) {
if (dir) {
if (dir.photos) { if (dir.photos) {
for (let i = 0; i < dir.photos.length; i++) { for (let i = 0; i < dir.photos.length; i++) {
dir.photos[i].directory = dir; dir.photos[i].directory = dir;
@ -41,7 +40,11 @@ export class GalleryManager implements IGalleryManager {
dir.photos[i].metadata.size = <any>JSON.parse(<any>dir.photos[i].metadata.size); dir.photos[i].metadata.size = <any>JSON.parse(<any>dir.photos[i].metadata.size);
} }
} }
return cb(null, dir);
cb(null, dir); //WARNING: only on the fly indexing should happen after this point
//on the fly updating
this.indexDirectory(relativeDirectoryName, cb);
} }
return this.indexDirectory(relativeDirectoryName, cb); return this.indexDirectory(relativeDirectoryName, cb);
@ -60,15 +63,44 @@ export class GalleryManager implements IGalleryManager {
let directoryRepository = connection.getRepository(DirectoryEntity); let directoryRepository = connection.getRepository(DirectoryEntity);
let photosRepository = connection.getRepository(PhotoEntity); let photosRepository = connection.getRepository(PhotoEntity);
let parentDir = await directoryRepository.persist(scannedDirectory);
let parentDir = await directoryRepository.createQueryBuilder("directory")
.where("directory.name = :name AND directory.path = :path", {
name: scannedDirectory.name,
path: scannedDirectory.path
}).getOne();
if (!!parentDir) {
parentDir.scanned = true;
parentDir.lastUpdate = Date.now();
parentDir = await directoryRepository.persist(parentDir);
} else {
(<DirectoryEntity>scannedDirectory).scanned = true;
parentDir = await directoryRepository.persist(<DirectoryEntity>scannedDirectory);
}
for (let i = 0; i < scannedDirectory.directories.length; i++) { for (let i = 0; i < scannedDirectory.directories.length; i++) {
if ((await directoryRepository.createQueryBuilder("directory")
.where("directory.name = :name AND directory.path = :path", {
name: scannedDirectory.directories[i].name,
path: scannedDirectory.directories[i].path
}).getCount()) > 0) {
continue;
}
scannedDirectory.directories[i].parent = parentDir; scannedDirectory.directories[i].parent = parentDir;
await directoryRepository.persist(scannedDirectory.directories[i]); (<DirectoryEntity>scannedDirectory.directories[i]).scanned = false;
await directoryRepository.persist(<DirectoryEntity>scannedDirectory.directories[i]);
} }
for (let i = 0; i < scannedDirectory.photos.length; i++) { for (let i = 0; i < scannedDirectory.photos.length; i++) {
//TODO: load as batch
if ((await photosRepository.createQueryBuilder("photo")
.where("photo.name = :name AND photo.directory = :dir", {
name: scannedDirectory.photos[i].name,
dir: parentDir.id
}).getCount()) > 0) {
continue;
}
//typeorm not supports recursive embended: TODO:fix it //typeorm not supports recursive embended: TODO:fix it
scannedDirectory.photos[i].directory = null; scannedDirectory.photos[i].directory = null;
let photo = Utils.clone(scannedDirectory.photos[i]); let photo = Utils.clone(scannedDirectory.photos[i]);
@ -81,7 +113,7 @@ export class GalleryManager implements IGalleryManager {
await photosRepository.persist(photo); await photosRepository.persist(photo);
} }
return cb(null, parentDir); return cb(null, scannedDirectory);
}).catch((error) => { }).catch((error) => {

3
backend/model/mysql/enitites/DirectoryEntity.ts
View File

@ -22,6 +22,9 @@ export class DirectoryEntity implements DirectoryDTO {
@Column('number') @Column('number')
public lastUpdate: number; public lastUpdate: number;
@Column({type: 'smallint', length: 1})
public scanned: boolean;
@ManyToOne(type => DirectoryEntity, directory => directory.directories) @ManyToOne(type => DirectoryEntity, directory => directory.directories)
public parent: DirectoryEntity; public parent: DirectoryEntity;