Skip to content

Commit 35aa58e

Browse files
gnu4cngnu4cn
committed
Working on fixing duplicated summaries.
1 parent f20a82e commit 35aa58e

7 files changed

Lines changed: 69 additions & 45 deletions

File tree

‎electron/src/crud.ts‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ export class CRUD {
3232
const value = query.condition.value;
3333
let item: IItem;
3434
let repo: any;
35-
let message: Array<string|object> = [];
35+
let message: Array<string> = [];
3636
switch(query.table){
3737
case 'Book':
3838
try {
@@ -48,7 +48,7 @@ export class CRUD {
4848

4949
message.push('成功获取到书籍')
5050
} catch (err) {
51-
message.push(err);
51+
message.push(err.message);
5252
throw err
5353
}
5454

@@ -65,7 +65,7 @@ export class CRUD {
6565

6666
message.push('成功获取到作者')
6767
} catch (err) {
68-
message.push(err);
68+
message.push(err.message);
6969
throw err
7070
}
7171
break
@@ -81,7 +81,7 @@ export class CRUD {
8181

8282
message.push('成功获取到托管平台')
8383
} catch (err) {
84-
message.push(err);
84+
message.push(err.message);
8585
throw err
8686
}
8787

@@ -97,7 +97,7 @@ export class CRUD {
9797

9898
message.push('成功获取到类别')
9999
} catch (err) {
100-
message.push(err);
100+
message.push(err.message);
101101
throw err
102102
}
103103
break
@@ -108,7 +108,7 @@ export class CRUD {
108108

109109
deleteItem = async (query: IQuery): Promise<IQueryResult> => {
110110
let item: IItem;
111-
let message: Array<string|object> = [];
111+
let message: Array<string> = [];
112112
switch(query.table){
113113
case 'Book':
114114
try {
@@ -121,7 +121,7 @@ export class CRUD {
121121
.execute();
122122
message.push(`书籍 ${item.name} 成功从数据库移除`);
123123
} catch (err) {
124-
message.push(err);
124+
message.push(err.message);
125125
throw err
126126
};
127127
break;
@@ -137,7 +137,7 @@ export class CRUD {
137137

138138
message.push(`作者 ${item.name} 成功从数据库移除`);
139139
} catch (err) {
140-
message.push(err);
140+
message.push(err.message);
141141
throw err
142142
};
143143
break;
@@ -153,7 +153,7 @@ export class CRUD {
153153

154154
message.push(`托管平台 ${item.uri} 成功从数据库移除`);
155155
} catch (err) {
156-
message.push(err);
156+
message.push(err.message);
157157
throw err
158158
};
159159
break;
@@ -169,23 +169,23 @@ export class CRUD {
169169

170170
message.push(`类别 ${item.name} 成功从数据库移除`);
171171
} catch (err) {
172-
message.push(err);
172+
message.push(err.message);
173173
throw err
174174
};
175175
break;
176176
case 'Record':
177177
try {
178-
item = query.item as Record;
178+
item = query.item as Book;
179179
await this.conn
180180
.createQueryBuilder()
181181
.delete()
182182
.from(Record)
183-
.where("id = :id", { id: item.id })
183+
.where("bookId = :id", { id: item.id })
184184
.execute();
185185

186-
message.push(`阅读记录 ${item.desc} 成功从数据库移除`);
186+
message.push(`${item.name} 的阅读记录成功从数据库移除`);
187187
} catch (err) {
188-
message.push(err);
188+
message.push(err.message);
189189
throw err
190190
};
191191
break;
@@ -197,7 +197,7 @@ export class CRUD {
197197
addItem = async (query: IQuery): Promise<IQueryResult> => {
198198
let item: IItem;
199199
let repo: any;
200-
let message: Array<string|object> = [];
200+
let message: Array<string> = [];
201201
switch(query.table){
202202
case 'Book':
203203
try {
@@ -207,7 +207,7 @@ export class CRUD {
207207

208208
message.push(`书籍 ${item.name} 成功添加`);
209209
} catch (err) {
210-
message.push(err);
210+
message.push(err.message);
211211
throw err
212212
};
213213
break;
@@ -219,7 +219,7 @@ export class CRUD {
219219

220220
message.push(`作者 ${item.name} 成功添加`);
221221
} catch (err) {
222-
message.push(err);
222+
message.push(err.message);
223223
throw err
224224
};
225225
break;
@@ -231,7 +231,7 @@ export class CRUD {
231231

232232
message.push(`托管平台 ${item.uri} 成功添加`);
233233
} catch (err) {
234-
message.push(err);
234+
message.push(err.message);
235235
throw err
236236
};
237237
break;
@@ -243,7 +243,7 @@ export class CRUD {
243243

244244
message.push(`类别 ${item.name} 成功添加`);
245245
} catch (err) {
246-
message.push(err);
246+
message.push(err.message);
247247
throw err
248248
};
249249
break;
@@ -255,7 +255,7 @@ export class CRUD {
255255

256256
message.push(`阅读记录 ${item.desc} 成功添加`);
257257
} catch (err) {
258-
message.push(err);
258+
message.push(err.message);
259259
throw err
260260
};
261261
break;
@@ -267,7 +267,7 @@ export class CRUD {
267267
}
268268

269269
updateItem = async (query: IQuery): Promise<IQueryResult> => {
270-
let message: Array<string|object> = [];
270+
let message: Array<string> = [];
271271
let repo: any;
272272
switch(query.table){
273273
case 'Book':
@@ -278,7 +278,7 @@ export class CRUD {
278278

279279
message.push(`书籍 ${book.name} 已成功更新`);
280280
} catch (err) {
281-
message.push(err);
281+
message.push(err.message);
282282
throw err
283283
};
284284
break;
@@ -290,7 +290,7 @@ export class CRUD {
290290

291291
message.push(`作者 ${writer.name} 已成功更新`);
292292
} catch (err) {
293-
message.push(err);
293+
message.push(err.message);
294294
throw err
295295
};
296296
break;
@@ -302,7 +302,7 @@ export class CRUD {
302302

303303
message.push(`托管平台 ${website.uri} 已成功更新`);
304304
} catch (err) {
305-
message.push(err);
305+
message.push(err.message);
306306
throw err
307307
};
308308
break;
@@ -314,7 +314,7 @@ export class CRUD {
314314

315315
message.push(`类别 ${cate.name} 已成功更新`);
316316
} catch (err) {
317-
message.push(err);
317+
message.push(err.message);
318318
throw err
319319
};
320320
break;
@@ -325,7 +325,7 @@ export class CRUD {
325325
getItems = async(getParam: IFind): Promise<IQueryResult> => {
326326
let itemList: Array<IItem>;
327327
let repo: any;
328-
let message: Array<string|object> = [];
328+
let message: Array<string> = [];
329329

330330
switch(getParam.table){
331331
case 'Book':
@@ -341,7 +341,7 @@ export class CRUD {
341341

342342
message.push(`获取到 ${itemList.length} 本书籍`);
343343
} catch (err){
344-
message.push(err);
344+
message.push(err.message);
345345
throw err;
346346
}
347347
break;
@@ -356,7 +356,7 @@ export class CRUD {
356356

357357
message.push(`获取到 ${itemList.length} 名作者`);
358358
} catch (err){
359-
message.push(err);
359+
message.push(err.message);
360360
throw err;
361361
}
362362
break;
@@ -370,7 +370,7 @@ export class CRUD {
370370

371371
message.push(`获取到 ${itemList.length} 个类别`);
372372
} catch (err){
373-
message.push(err);
373+
message.push(err.message);
374374
throw err;
375375
}
376376
break;
@@ -385,7 +385,7 @@ export class CRUD {
385385

386386
message.push(`获取到 ${itemList.length} 个托管平台`);
387387
} catch (err){
388-
message.push(err);
388+
message.push(err.message);
389389
throw err;
390390
}
391391
break;

‎electron/src/index.ts‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,11 @@ export default class Main {
120120
const bookDir = join(booksDir, book.website.uri, book.writer.name, book.name);
121121
await remove(bookDir)
122122
.then(() => res.message.push('，已成功从文件系统移除'))
123-
.catch(e => res.message.push(e));
123+
.catch((e: Error) => res.message.push(e.message));
124+
}
124125

125-
event.returnValue = res;
126-
}});
126+
event.returnValue = res;
127+
});
127128

128129

129130
ipcMain.on('update-item', async (event, query) =>{

‎src/app/book/markdown/markdown.service.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -290,6 +290,8 @@ export class MarkdownService {
290290
if(fullPath){
291291
const pathsFromFile: Array<string> = await this.loadSummaryFromFile(_vfile, fullPath);
292292

293+
console.log(pathsFromBackend, pathsFromFile);
294+
293295
// 把从后台获取的 paths 补充到 pathsFromFile 中
294296
pathsFromBackend.map((_: string) => {
295297
if(pathsFromFile.findIndex((__: string) => __ === _) < 0) pathsFromFile.push(_);

‎src/app/home/components/delete-book-dialog.component.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ <h1 mat-dialog-title>删除 - {{ this.data.name }}</h1>
22
<div mat-dialog-content>
33
<p>删除注意事项：</p>
44
<ul>
5-
<li *ngIf="!this.data.recycled">选择放入“回收站”，可在回收站中查看并恢复删除的书籍</li>
5+
<li *ngIf="!this.data.recycled">选择放入“回收站”，将<ion-text color="danger" *ngIf="this.data.recordList && this.data.recordList.length > 0">删除该书籍的阅读记录，</ion-text>可在回收站中查看并恢复删除的书籍</li>
66
<li>选择彻底删除，<ion-text color="danger">系统将删除下载的该书籍所有文件，并从数据库中移除书籍与该书籍的阅读记录</ion-text></li>
77
<li>关闭此对话框，将不进行任何操作</li>
88
</ul>

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

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,17 @@ export class BookService {
120120
recycleRecoverDelete = async (res: IDeleteBookDialogResData) => {
121121
let query: IQuery;
122122

123+
if(res.recycled || res.remove) {
124+
query = {
125+
table: 'Record',
126+
item: res.book
127+
}
128+
129+
await this.crud.deleteItem(query).subscribe((res: IQueryResult) => {
130+
this.opMessage.newMsg(res.message);
131+
});
132+
}
133+
123134
if (!res.recycled && res.remove){
124135
query = {
125136
table: 'Book',
@@ -131,15 +142,12 @@ export class BookService {
131142
this.listUpdated(res.book, true);
132143
});
133144

134-
return 0;
145+
return;
135146
}
136147

137-
if(res.recycled){
138-
res.book.recycled = true;
139-
140-
} else {
141-
res.book.recycled = false;
142-
}
148+
if(res.recycled) { res.book.recycled = true; }
149+
else { res.book.recycled = false; }
150+
delete res.book.recordList;
143151

144152
query = {
145153
table: 'Book',

‎src/app/home/services/op-message.service.ts‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,29 @@
11
import { Injectable } from '@angular/core';
22

3-
import { TOpMessage } from '../../vendor';
3+
import { TOpMessage, IMessage } from '../../vendor';
4+
import { MessageService } from '../../services/message.service';
45

56
@Injectable({
67
providedIn: 'root'
78
})
89
export class OpMessageService {
910
private _messageList: TOpMessage = [];
1011

11-
constructor() {}
12+
get opMsgList () {
13+
return this._messageList;
14+
}
15+
16+
constructor(
17+
private message: MessageService
18+
) {}
1219

1320
newMsg = (msg: TOpMessage) => {
1421
this._messageList = [...this._messageList, ...msg];
22+
23+
const _msg: IMessage = {
24+
event: 'new-op-message',
25+
data: this.opMsgList
26+
};
27+
this.message.sendMessage(_msg);
1528
}
1629
}

‎src/app/vendor.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export interface IQuery {
5252
}
5353

5454
export interface IQueryResult {
55-
message: Array<string|object>;
55+
message: TOpMessage;
5656
data?: IItem | Array<IItem>;
5757
}
5858

@@ -130,7 +130,7 @@ export interface IAddBookDialogResData {
130130
cateList: Array<Category>;
131131
}
132132

133-
export type TOpMessage = Array<string|object>;
133+
export type TOpMessage = Array<string>;
134134

135135
export interface IDeleteBookDialogResData {
136136
recycled: boolean;

0 commit comments

Comments
 (0)