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 folder indexing texts

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

65
frontend/app/settings/indexing/indexing.settings.component.ts
View File

@ -4,7 +4,7 @@ import {AuthenticationService} from '../../model/network/authentication.service'
import {NavigationService} from '../../model/navigation.service'; import {NavigationService} from '../../model/navigation.service';
import {NotificationService} from '../../model/notification.service'; import {NotificationService} from '../../model/notification.service';
import {ErrorDTO} from '../../../../common/entities/Error'; import {ErrorDTO} from '../../../../common/entities/Error';
import {Observable, interval} from 'rxjs'; import {interval, Observable} from 'rxjs';
import {IndexingConfig, ReIndexingSensitivity} from '../../../../common/config/private/IPrivateConfig'; import {IndexingConfig, ReIndexingSensitivity} from '../../../../common/config/private/IPrivateConfig';
import {SettingsComponent} from '../_abstract/abstract.settings.component'; import {SettingsComponent} from '../_abstract/abstract.settings.component';
import {Utils} from '../../../../common/Utils'; import {Utils} from '../../../../common/Utils';
@ -23,15 +23,46 @@ export class IndexingSettingsComponent extends SettingsComponent<IndexingConfig,
types: { key: number; value: string }[] = []; types: { key: number; value: string }[] = [];
statistic: StatisticDTO;
private subscription: { timer: any, settings: any } = { private subscription: { timer: any, settings: any } = {
timer: null, timer: null,
settings: null settings: null
}; };
statistic: StatisticDTO;
private $counter: Observable<number> = null; private $counter: Observable<number> = null;
constructor(_authService: AuthenticationService,
_navigation: NavigationService,
_settingsService: IndexingSettingsService,
notification: NotificationService,
i18n: I18n) {
super(i18n('Indexing'),
_authService,
_navigation,
<any>_settingsService,
notification,
i18n,
s => s.Server.indexing);
}
get TimeLeft() {
const prg = this._settingsService.progress.value;
return (prg.time.current - prg.time.start) / prg.indexed * prg.left;
}
get TimeElapsed() {
const prg = this._settingsService.progress.value;
return (prg.time.current - prg.time.start);
}
updateProgress = async () => { updateProgress = async () => {
try { try {
const wasRunning = this._settingsService.progress.value !== null;
await (<IndexingSettingsService>this._settingsService).getProgress(); await (<IndexingSettingsService>this._settingsService).getProgress();
if (wasRunning && this._settingsService.progress.value === null) {
this.notification.success(this.i18n('Folder indexed'), this.i18n('Success'));
}
} catch (err) { } catch (err) {
if (this.subscription.timer != null) { if (this.subscription.timer != null) {
this.subscription.timer.unsubscribe(); this.subscription.timer.unsubscribe();
@ -50,22 +81,6 @@ export class IndexingSettingsComponent extends SettingsComponent<IndexingConfig,
} }
}; };
constructor(_authService: AuthenticationService,
_navigation: NavigationService,
_settingsService: IndexingSettingsService,
notification: NotificationService,
i18n: I18n) {
super(i18n('Indexing'),
_authService,
_navigation,
<any>_settingsService,
notification,
i18n,
s => s.Server.indexing);
}
async ngOnInit() { async ngOnInit() {
super.ngOnInit(); super.ngOnInit();
this.types = Utils this.types = Utils
@ -105,7 +120,7 @@ export class IndexingSettingsComponent extends SettingsComponent<IndexingConfig,
try { try {
await this._settingsService.index(createThumbnails); await this._settingsService.index(createThumbnails);
this.updateProgress(); this.updateProgress();
this.notification.success(this.i18n('Folder indexed'), this.i18n('Success')); this.notification.info(this.i18n('Folder indexing started'));
this.inProgress = false; this.inProgress = false;
return true; return true;
} catch (err) { } catch (err) {
@ -119,21 +134,13 @@ export class IndexingSettingsComponent extends SettingsComponent<IndexingConfig,
return false; return false;
} }
get TimeLeft() {
const prg = this._settingsService.progress.value;
return (prg.time.current - prg.time.start) / prg.indexed * prg.left;
}
get TimeElapsed() {
const prg = this._settingsService.progress.value;
return (prg.time.current - prg.time.start);
}
async cancelIndexing() { async cancelIndexing() {
this.inProgress = true; this.inProgress = true;
this.error = ''; this.error = '';
try { try {
await (<IndexingSettingsService>this._settingsService).cancel(); await (<IndexingSettingsService>this._settingsService).cancel();
this.notification.success(this.i18n('Folder indexed'), this.i18n('Success')); this._settingsService.progress.next(null);
this.notification.info(this.i18n('Folder indexing interrupted'));
this.inProgress = false; this.inProgress = false;
return true; return true;
} catch (err) { } catch (err) {