Bugs fixed.

Author: gnu4cn

electron/db.sqlite

@@ -16,6 +16,7 @@ import { Book, Category } from '../../models';
 import { BookService } from '../services/book.service';
 import { CateService } from '../services/cate.service';
 import { OpMessageService } from '../services/op-message.service';
+import { MessageService } from '../../services/message.service';
 
 import { DeleteBookDialog } from './delete-book-dialog.component';
 import { EditBookCateListDialog } from './edit-book-cate-list.component';
@@ -25,6 +26,7 @@ import {
     sortBy,
     IFilter,
     IDeleteBookDialogResData,
+    IMessage,
     IFilterAction,
     IFilterItem,
     TBookSortBy,
@@ -37,40 +39,45 @@ import {
     styleUrls: ['./book-list.component.scss'],
 })
 export class BookListComponent implements OnInit, OnChanges {
-    @Input() sortBy: string;
-    @Input() displayRecycled: boolean;
-    @Input() beenOpened: boolean;
+    @Input() sortBy: string = 'openCount';
+    @Input() displayRecycled: boolean = false;
+    @Input() beenOpened: boolean = true;
 
     filter: IFilter = {
         displayRecycled: this.displayRecycled,
-        isOpened: this.beenOpened,
+        beenOpened: this.beenOpened,
         filterList: []
     };
 
-    bookList: Array<Book>;
+    private _bookList: Array<Book>;
 
     constructor(
         private crud: CrudService,
         private dialog: MatDialog,
         private book: BookService,
+        private msgService: MessageService,
         private opMessage: OpMessageService
-    ) {}
+    ) {
+        this._bookList = this.book.list;
+    }
 
-    loadBookList = async () => {
-        const bookList = await this.book.getList(this.filter).slice();
+    get bookList () {
+        const bookList = this._bookList.filter(b => filterFn(b, this.filter));
         return sortBy(bookList, this.sortBy);
-    };
+    }
 
     ngOnInit() {
-        this.loadBookList().then(list => this.bookList = list.slice());
+        this.msgService.getMessage().subscribe((msg: IMessage) => {
+            if(msg.event === 'book-list-updated'){
+                this._bookList = msg.data as Array<Book>;
+            }
+        });
     }
 
     ngOnChanges (changes: SimpleChanges) {
         if ('sortBy' in changes) {
             if(changes.displayRecycled) this.filter.displayRecycled = changes.displayRecycled.currentValue;
-            if(changes.beenOpened) this.filter.isOpened = changes.beenOpened.currentValue;
-
-            this.loadBookList().then(list => this.bookList = list.slice());
+            if(changes.beenOpened) this.filter.beenOpened = changes.beenOpened.currentValue;
         }
     }
 

src/app/home/components/book-list.component.ts

@@ -17,7 +17,7 @@
                     <!-- 正在看的书, 打开次数大于 0 的书 -->
                     <ion-col>
                         <ion-badge color="success" style="position: absolute; right: 0px; top: 0px; overflow: visible!important;">
-                            {{currentlyReadingNumber}}
+                            {{currentlyReading}}
                         </ion-badge>
                         <ion-fab-button 
                             color="light" (click)="displayBookListCurrentlyReading()" matTooltip="正在看的书">
@@ -30,7 +30,7 @@
                     <!-- 书架上的书, 打开 0 次的书 -->
                     <ion-col>
                         <ion-badge color="success" style="position: absolute; right: 0px; top: 0px; overflow: visible!important;">
-                            {{onShelfNumber}}
+                            {{onShelf}}
                         </ion-badge>
                         <ion-fab-button color="light" (click)="displayBookListOnShelf()" matTooltip="书架上的书">
                             <ion-avatar id="avatar-on-shelf">
@@ -42,7 +42,7 @@
                     <!-- 准备删除的书 -->
                     <ion-col>
                         <ion-badge color="warning" style="position: absolute; right: 0px; top: 0px; overflow: visible!important;">
-                            {{recycledNumber}}
+                            {{recycled}}
                         </ion-badge>
 
                         <ion-fab-button color="light" (click)="displayBookListRecycled()" matTooltip="暂存在回收站的书">

src/app/home/home.page.html

@@ -15,6 +15,7 @@ import {
 import { Book } from '../models';
 import { CrudService } from '../services/crud.service';
 import { BookService } from './services/book.service';
+import { MessageService } from '../services/message.service';
 
 import { SnackbarComponent } from './components/snackbar.component';
 import { NewBookDialog } from './components/new-book-dialog.component';
@@ -23,7 +24,9 @@ import {
     IProgressMessage,
     IAddBookDialogResData,
     IFilter,
+    IMessage,
     TAvatarIds, 
+    filterFn,
     TBookSortBy,
 } from '../vendor';
 
@@ -41,14 +44,17 @@ export class HomePage implements OnInit {
     sortBy: TBookSortBy = 'openCount';
     displayRecycled: boolean = false;
     beenOpened: boolean = true;
-    
+    private bookList: Array<Book>;
+
     constructor(
         private crud: CrudService,
         private snackbar: MatSnackBar,
         private dialog: MatDialog,
+        private msgSevice: MessageService,
         private book: BookService,
-    ) {}
-
+    ) {
+        this.bookList = this.book.list;
+    }
 
     private changeFabButton = (button: TAvatarIds) => {
         const buttonList = ['currently-reading', 'on-shelf', 'recycled'];
@@ -64,32 +70,38 @@ export class HomePage implements OnInit {
         });
     } 
 
-    get currentlyReadingNumber () {
-        const currentlyReadingFilter: IFilter = {
+    get currentlyReading () {
+        const filter: IFilter = {
             displayRecycled: false,
-            isOpened: true,
+            beenOpened: true,
         }
-        return this.book.getList(currentlyReadingFilter).length
+        return this.bookList.filter(b => filterFn(b, filter)).length;
     }
 
-    get onShelfNumber () {
-        const onShelfFilter: IFilter = {
+    get onShelf () {
+        const filter = {
             displayRecycled: false,
-            isOpened: true,
+            beenOpened: false,
         }
-        return this.book.getList(onShelfFilter).length
+        return this.bookList.filter(b => filterFn(b, filter)).length;
     }
 
-    get recycledNumber () {
-        const recycledFilter: IFilter = {
+    get recycled () {
+        const filter = {
             displayRecycled: true,
         }
-        return this.book.getList(recycledFilter).length;
+        return this.bookList.filter(b => filterFn(b, filter)).length;
     }
 
     ngOnInit() {
+        this.msgSevice.getMessage().subscribe((msg: IMessage) => {
+            if(msg.event === 'book-list-updated'){
+                this.bookList = msg.data as Array<Book>;
+            }
+        });
+
         this.crud.ipcRenderer.on('error-occured', (ev, book: Book) => {
-            this.book.bookUpdated(book);
+            this.book.listUpdated(book);
         });
 
         this.crud.ipcRenderer.on('new-downloading-progress', (ev, msg: IProgressMessage) => {
@@ -115,7 +127,7 @@ export class HomePage implements OnInit {
 
             this.downloadingList.splice(index, 1);
 
-            this.book.bookUpdated(msg.book);
+            this.book.listUpdated(msg.book);
 
             if(this.downloadingList.length === 0){
                 this.snackbar.dismiss();

src/app/home/home.page.ts

@@ -6,6 +6,7 @@ import { OpMessageService } from './op-message.service';
 import { WriterService } from './writer.service';
 import { WebsiteService } from './website.service';
 import { CateService } from './cate.service';
+import { MessageService } from '../../services/message.service';
 
 import { 
     IFilter,
@@ -14,6 +15,7 @@ import {
     IQueryResult,
     REGEXP_SITE, 
     REGEXP_LOC,
+    IMessage,
     IAddBookDialogResData,
     IDeleteBookDialogResData,
 } from '../../vendor';
@@ -22,47 +24,47 @@ import {
     providedIn: 'root'
 })
 export class BookService {
-    private _filter: IFilter = {
-        displayRecycled: false,
-        isOpened: false,
-        filterList: []
-    };
+    list: Array<Book>;
 
     constructor(
         private crud: CrudService,
         private opMessage: OpMessageService,
         private website: WebsiteService,
+        private msgService: MessageService,
         private writer: WriterService,
         private cate: CateService
     ) {
-    }
-
-    getList = async () => {
-        let list: Array<Book>;
-
-        await this.crud.getItems({table: 'Book'})
+        this.crud.getItems({table: 'Book'})
             .subscribe((res: IQueryResult) => {
                 this.opMessage.newMsg(res.message);
                 const books = res.data as Book[];
-                list = books.slice();
+                this.list = books.slice();
             });
+    }
 
-        return list;
+    filterdList = async (filter: IFilter) => {
+        return this.list.filter(b => filterFn(b, filter));
     }
 
-    getFilterdList = async (filter: IFilter) => {
-        const list = await this.getList();
-        return list.filter(b => filterFn(b, filter));
+    listUpdated = (book: Book, kept: boolean = true) => {
+        const index = this.list.findIndex(b => b.id === book.id);
+        this.list.splice(index, 1);
+        if(kept) this.list.push(book);
+
+        const msg: IMessage = {
+            event: 'book-list-updated',
+            data: this.list
+        }
     }
 
     save = async (res: IAddBookDialogResData) => {
         const newBook = new Book();
-        newBook.cateList = [];
 
         const newBookUri = res.bookUri;
 
         const site = newBookUri.match(REGEXP_SITE)[0];
         const [ writerName, name ] = newBookUri.replace(REGEXP_SITE, '').match(REGEXP_LOC)[0].split('/');
+
         const re = new RegExp(/\.git$/)
         newBook.name = re.test(name) ? name.replace(re, '') : name;
 
@@ -74,8 +76,10 @@ export class BookService {
             table: 'Book',
             item: newBook
         }
+
         this.crud.addItem(query).subscribe((res: IQueryResult) => {
             this.opMessage.newMsg(res.message);
+            this.list.push(res.data as Book);
         });
     }
 
@@ -91,6 +95,7 @@ export class BookService {
 
         this.crud.updateItem(query).subscribe((queryRes: IQueryResult) => {
             this.opMessage.newMsg(queryRes.message);
+            this.listUpdated(queryRes.data as Book);
         });
     }
 
@@ -105,6 +110,7 @@ export class BookService {
         }
         this.crud.updateItem(query).subscribe((queryRes: IQueryResult) => {
             this.opMessage.newMsg(queryRes.message);
+            this.listUpdated(queryRes.data as Book);
         });
     }
 
@@ -119,6 +125,7 @@ export class BookService {
 
             await this.crud.deleteItem(query).subscribe((queryRes: IQueryResult) => {
                 this.opMessage.newMsg(queryRes.message);
+                this.listUpdated(queryRes.data as Book, false);
             });
 
             return 0;
@@ -139,6 +146,7 @@ export class BookService {
 
         this.crud.updateItem(query).subscribe((queryRes: IQueryResult) => {
             this.opMessage.newMsg(queryRes.message);
+            this.listUpdated(queryRes.data as Book);
         });
     }
 }

src/app/home/services/book.service.ts

@@ -13,31 +13,26 @@ import {
     providedIn: 'root'
 })
 export class CateService {
+    list: Array<Category>;
+
     constructor(
         private crud: CrudService,
         private opMessage: OpMessageService,
     ) {
-    }
-
-    getList = async () => {
-        let list: Array<Category>;
-
-        await this.crud.getItems({table: 'Category'})
+        this.crud.getItems({table: 'Category'})
             .subscribe((res: IQueryResult) => {
                 this.opMessage.newMsg(res.message);
                 const cates = res.data as Category[];
-                list = cates.slice();
+                this.list = cates.slice();
             });
-
-        return list;
     }
 
     saveList = async (cateList: Array<Category>) => {
         const tempList: Array<Category> = [];
-        const list = await this.getList();
 
         await cateList.map(c => {
-            const cate = list.find(cate => cate.name === c.name);
+            const cate = this.list.find(cate => cate.name === c.name);
+
             if (cate) tempList.push(cate);
             else {
                 const _cate = new Category();