fix cache clean

Author: barais

src/main/webapp/app/dbsqlite.worker.ts

@@ -1,3 +1,4 @@
+import { map } from 'rxjs/operators';
 /* eslint-disable no-console */
 /* eslint-disable spaced-comment */
 /* eslint-disable @typescript-eslint/explicit-function-return-type */
@@ -128,6 +129,12 @@ addEventListener('message', e => {
       db1.addNonAligneImage(_sqlite3, e.data);
       break;
     }
+    case 'cleanOutDatedCached': {
+      console.error('cleanOutDatedCached', e.data);
+      cleanOutdatedCache(e.data);
+
+      break;
+    }
 
     case 'resetDatabase': {
       let db1 = dbs.get(e.data.payload.examId);
@@ -480,6 +487,32 @@ addEventListener('message', e => {
   }
 });
 
+async function cleanOutdatedCache(data: any) {
+  try {
+    console.error('cleanOutdatedCache for ', data);
+
+    const examIds = data.payload.examIds;
+    const cacheNames: string[] = examIds.map((id: number) => '' + id + '.sqlite3');
+    const cacheJournalNames = examIds.map((id: number) => '' + id + '.sqlite3-journal');
+    cacheNames.push(...cacheJournalNames);
+    if (navigator.storage.getDirectory !== undefined) {
+      const root = await navigator.storage.getDirectory();
+      const keys = (root as any).keys();
+      let next = await keys.next();
+      while (next.value) {
+        if (next.value.endsWith('.sqlite3') || (next.value.endsWith('.sqlite3-journal') && !cacheNames.includes(next.value))) {
+          await root.removeEntry(next.value);
+        }
+        next = await keys.next();
+      }
+    }
+  } finally {
+    postMessage({
+      msg: data.msg,
+      uid: data.uid,
+    });
+  }
+}
 /*
   addTemplate(elt: AlignImage ): Promise<number>;
   countNonAlignWithPageNumber(examId:number, pageInscan:number): Promise<number>;
@@ -623,9 +656,9 @@ class DB {
         const keys = (root as any).keys();
         let next = await keys.next();
         while (next.value !== undefined) {
-          if (next.value.endsWith('.sqlite3')) {
+          if (next.value === this.examName + '.sqlite3') {
             await root.removeEntry(next.value);
-          } else if (next.value.endsWith('sqlite3-journal')) {
+          } else if (next.value === this.examName + 'sqlite3-journal') {
             await root.removeEntry(next.value);
           }
           next = await keys.next();

src/main/webapp/app/home/home.component.ts

@@ -26,6 +26,9 @@ import { DrawerModule } from 'primeng/drawer';
 import { HasAnyAuthorityDirective } from '../shared/auth/has-any-authority.directive';
 
 import { ButtonModule } from 'primeng/button';
+import { ExamService } from 'app/entities/exam/service/exam.service';
+import { CacheService } from '../scanexam/db/db';
+import { CacheServiceImpl } from 'app/scanexam/db/CacheServiceImpl';
 
 interface Upload {
   progress: number;
@@ -117,6 +120,8 @@ export class HomeComponent implements OnInit, OnDestroy {
     private loginService: LoginService,
     private zone: NgZone,
     private http: HttpClient,
+    private examService: ExamService,
+    private db: CacheServiceImpl,
   ) {}
 
   ngOnInit(): void {
@@ -153,7 +158,19 @@ export class HomeComponent implements OnInit, OnDestroy {
     this.accountService
       .getAuthenticationState()
       .pipe(takeUntil(this.destroy$))
-      .subscribe(account => (this.account = account));
+      .subscribe(account => {
+        this.account = account;
+        if (account) {
+          this.examService.query().subscribe(res => {
+            if (res.body) {
+              const examIds = res.body.map(exam => (exam.id ? exam.id : 0));
+              this.db.cleanOutDatedCached(examIds).then(() => {
+                console.log('cleanOutDatedCached done');
+              });
+            }
+          });
+        }
+      });
 
     this.translateService.get('home.creercours').subscribe(() => {
       this.initCmpt();

src/main/webapp/app/scanexam/coursdetail/coursdetails.component.ts

@@ -302,7 +302,10 @@ export class CoursdetailsComponent implements OnInit {
         message: data,
         accept: () => {
           if (this.course !== undefined) {
+            this.blocked = true;
             this.courseService.delete(this.course.id!).subscribe(e => {
+              this.blocked = false;
+
               this.router.navigateByUrl('/');
             });
           }

src/main/webapp/app/scanexam/db/CacheServiceImpl.ts

@@ -17,6 +17,11 @@ export class CacheServiceImpl implements CacheService {
       (this.service as SqliteCacheService).load();
     }
   }
+
+  cleanOutDatedCached(examIds: number[]): Promise<void> {
+    return this.service.cleanOutDatedCached(examIds);
+  }
+
   getNonAlignImagesForPageNumbers(examId: number, pages: number[]): Promise<ImageDB[]> {
     return this.service.getNonAlignImagesForPageNumbers(examId, pages);
   }

src/main/webapp/app/scanexam/db/db.ts

@@ -34,6 +34,21 @@ export interface NonAlignImage {
   value: string;
 }
 
+export async function cleanOutDatedCached(examIds: number[]) {
+  const databasesNamedToKeep = examIds.map(id => 'correctExam' + id);
+  const databases = await Dexie.getDatabaseNames();
+  const databasesToRemove = databases.filter(dbname => dbname.startsWith('correctExam') && !databasesNamedToKeep.includes(dbname));
+  for (let i = 0; i < databasesToRemove.length; i++) {
+    try {
+      await Dexie.delete(databasesToRemove[i]);
+      // eslint-disable-next-line no-console
+      console.log('remove old database', databasesToRemove[i]);
+    } catch (e) {
+      console.error('unable to remove old database', databasesToRemove[i], e);
+    }
+  }
+}
+
 export class ExamIndexDB extends Dexie {
   private exams!: Table<Exam, number>;
   private templates!: Table<Template, number>;
@@ -393,6 +408,10 @@ export class AppDB implements CacheService {
   /* async populate() {
   } */
 
+  cleanOutDatedCached(examIds: number[]): Promise<void> {
+    return cleanOutDatedCached(examIds);
+  }
+
   async resetDatabase(examId: number): Promise<void> {
     let db1 = this.dbs.get(examId);
     if (db1 === undefined) {
@@ -730,6 +749,7 @@ export class AppDB implements CacheService {
 }
 
 export interface CacheService {
+  cleanOutDatedCached(examIds: number[]): Promise<void>;
   resetDatabase(examId: number): Promise<void>;
   removeExam(examId: number): Promise<void>;
   removeElementForExam(examId: number): Promise<void>;

src/main/webapp/app/scanexam/db/dbsqlite.ts

@@ -201,6 +201,14 @@ export class SqliteCacheService implements CacheService {
     workersqllite.postMessage({ msg: 'load', uid: '0' });
   }
 
+  async cleanOutDatedCached(examIds: number[]) {
+    const el1 = {
+      examIds: examIds,
+    };
+    console.error('cleanOutDatedCached', el1);
+    return this._dispatch<void>('cleanOutDatedCached', el1).toPromise();
+  }
+
   async addAligneImage(elt: ImageDB) {
     const enc = new TextEncoder(); // always utf-8
     const el1 = {

src/main/webapp/app/scanexam/exam-detail/cacheUpload.service.ts

@@ -316,7 +316,7 @@ export class CacheUploadService {
       let data: Blob = (await firstValueFrom(this.getCache(examId + 'indexdb.json'))) as Blob;
       if (data.size === 0) {
         data = await firstValueFrom(this.getCache(examId + '_exam_template_indexdb.json'));
-
+        console.error('data', data, showFailMessage);
         if (data.size === 0) {
           if (showFailMessage) {
             messageService.add({

src/main/webapp/app/scanexam/exam-detail/exam-detail.component.ts

@@ -190,7 +190,7 @@ export class ExamDetailComponent implements OnInit, CacheUploadNotification, Cac
                 });
               } else {
                 if (this.exam?.scanfileId) {
-                  this.cacheUploadService.importCache(+this.examId, this.translateService, this.messageService, this, false);
+                  this.cacheUploadService.importCache(+this.examId, this.translateService, this.messageService, this, true);
                 } else {
                   this.blocked = false;
                 }
@@ -309,10 +309,12 @@ export class ExamDetailComponent implements OnInit, CacheUploadNotification, Cac
       this.confirmationService.confirm({
         message: data,
         accept: () => {
+          this.blocked = true;
           this.examService.delete(this.exam!.id!).subscribe(() => {
             this.db
               .removeElementForExam(+this.examId)
               .then(() => {
+                this.blocked = false;
                 this.router.navigateByUrl('/course/' + this.course!.id);
               })
               .catch(() => {