xuthus/pigallery2
1
0
Fork 0
mirror of https://github.com/xuthus83/pigallery2.git synced 2025-01-14 14:43:17 +08:00
Code Actions Projects Activity

improving duplicate page

Browse Source
This commit is contained in:
Patrik J. Braun 2019-01-19 17:31:36 +01:00
parent 0f3d664c58
commit 1f58bffa2c
5 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/middlewares/thumbnail/ThumbnailGeneratorMWs.ts
View File

@ -65,7 +65,7 @@ export class ThumbnailGeneratorMWs {
} }
} catch (error) { } catch (error) {
return next(new ErrorDTO(ErrorCodes.SERVER_ERROR, 'error during postprocessing result', error.toString())); return next(new ErrorDTO(ErrorCodes.SERVER_ERROR, 'error during postprocessing result (adding thumbnail info)', error.toString()));
} }

7
frontend/app/duplicates/duplicates.component.css
View File

@ -1,6 +1,3 @@
.same-data {
font-weight: bold;
}
.card{ .card{
margin: 8px 0; margin: 8px 0;
} }
@ -13,3 +10,7 @@
.row:hover{ .row:hover{
background-color: #f8f9fa; background-color: #f8f9fa;
} }
a{
color: #212529;
}

29
frontend/app/duplicates/duplicates.component.html
View File

@ -2,28 +2,31 @@
<div body class="container"> <div body class="container">
<ng-template [ngIf]="renderedDirGroups"> <ng-template [ngIf]="renderedDirGroups">
<div class="alert alert-secondary" role="alert" *ngIf=" duplicateCount.photos >0" i18n>
Listing <strong>{{duplicateCount.pairs}}</strong> duplicates ({{duplicateCount.photos}} photos).
</div>
<div class="alert alert-secondary" role="alert" *ngIf=" duplicateCount.photos ==0" i18n>
No duplicates found
</div>
<div *ngFor="let group of renderedDirGroups"> <div *ngFor="let group of renderedDirGroups">
<strong>{{group.name}}</strong> <strong>{{group.name}}</strong>
<div *ngFor="let pairs of group.duplicates" class="card"> <div *ngFor="let pairs of group.duplicates" class="card">
<div class="card-body"> <div class="card-body">
<div *ngFor="let media of pairs.media" <a *ngFor="let media of pairs.media"
class="row" class="row"
[routerLink]="['/gallery', getDirectoryPath(media.directory)]" [routerLink]="['/gallery', getDirectoryPath(media.directory)]"
[queryParams]="queryService.getParams()"> [queryParams]="queryService.getParams()">
<app-duplicates-photo class="col-1" [media]="media"></app-duplicates-photo> <app-duplicates-photo class="col-1" [media]="media"></app-duplicates-photo>
<div class="col-5"> <div class="col-6">
/{{getDirectoryPath(media.directory)}}/<span class="same-data">{{media.name}}</span> /{{getDirectoryPath(media.directory)}}/<strong>{{media.name}}</strong>
</div> </div>
<div class="col-2"> <div class="col-2">
<span class="same-data">{{media.metadata.fileSize | fileSize}}</span> {{media.metadata.fileSize | fileSize}}
</div> </div>
<div class="col-2" [title]="media.metadata.creationDate"> <div class="col-3" [title]="media.metadata.creationDate">
{{media.metadata.creationDate | date}} {{media.metadata.creationDate | date}}, {{media.metadata.creationDate | date:'mediumTime'}}
</div> </div>
<div class="col-2"> </a>
{{media.metadata.size.width}}x{{media.metadata.size.height}}
</div>
</div>
</div> </div>
</div> </div>
</div> </div>

11
frontend/app/duplicates/duplicates.component.ts
View File

@ -28,6 +28,10 @@ export class DuplicateComponent implements OnDestroy {
}; };
subscription: Subscription; subscription: Subscription;
renderTimer: number = null; renderTimer: number = null;
duplicateCount = {
pairs: 0,
photos: 0
};
constructor(public _duplicateService: DuplicateService, constructor(public _duplicateService: DuplicateService,
public queryService: QueryService) { public queryService: QueryService) {
@ -36,9 +40,16 @@ export class DuplicateComponent implements OnDestroy {
this.directoryGroups = []; this.directoryGroups = [];
this.renderedIndex = {group: -1, pairs: 0}; this.renderedIndex = {group: -1, pairs: 0};
this.renderedDirGroups = []; this.renderedDirGroups = [];
this.duplicateCount = {
pairs: 0,
photos: 0
};
if (duplicates === null) { if (duplicates === null) {
return; return;
} }
this.duplicateCount.photos = duplicates.reduce((prev: number, curr) => prev + curr.media.length, 0);
this.duplicateCount.pairs = duplicates.length;
const getMostFrequentDir = (dupls: DuplicatesDTO[]) => { const getMostFrequentDir = (dupls: DuplicatesDTO[]) => {
if (dupls.length === 0) { if (dupls.length === 0) {
return null; return null;

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "pigallery2", "name": "pigallery2",
"version": "1.5.6", "version": "1.5.8",
"description": "This is a photo gallery optimised for running low resource servers (especially on raspberry pi)", "description": "This is a photo gallery optimised for running low resource servers (especially on raspberry pi)",
"author": "Patrik J. Braun", "author": "Patrik J. Braun",
"homepage": "https://github.com/bpatrik/PiGallery2", "homepage": "https://github.com/bpatrik/PiGallery2",