From cb475738f8868f76602fad7ea12a7e3113f05d64 Mon Sep 17 00:00:00 2001
From: Jianyun <yihy8023@gmail.com>
Date: Sun, 1 Sep 2024 10:53:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/calibre-pages/src/api/api.ts              | 34 +++++--
 app/calibre-pages/src/api/apiUtils.ts         | 20 ++++
 .../src/components/MetadataEdit.vue           | 94 ++++++++++---------
 .../src/components/MetadataUpdate.vue         | 53 ++++-------
 app/calibre-pages/src/views/Detail.vue        | 10 +-
 internal/calibre/api.go                       | 70 +++++++++-----
 6 files changed, 162 insertions(+), 119 deletions(-)
 create mode 100644 app/calibre-pages/src/api/apiUtils.ts

diff --git a/app/calibre-pages/src/api/api.ts b/app/calibre-pages/src/api/api.ts
index 24a3afb..385c16f 100644
--- a/app/calibre-pages/src/api/api.ts
+++ b/app/calibre-pages/src/api/api.ts
@@ -1,10 +1,12 @@
 // src/api/api.ts
+import {handleApiResponse} from "@/api/apiUtils";
+
 export async function fetchPublishers() {
     const response = await fetch('/api/publisher');
     if (!response.ok) {
         throw new Error('Failed to fetch publishers');
     }
-    return response.json().then((data) => data.data);
+    return handleApiResponse(response);
 }
 
 export async function fetchRandomBooks() {
@@ -12,7 +14,7 @@ export async function fetchRandomBooks() {
     if (!response.ok) {
         throw new Error('Failed to random');
     }
-    return response.json().then((data) => data.data);
+    return handleApiResponse(response);
 }
 
 export async function fetchRecentBooks(limit: number, offset: number) {
@@ -20,7 +22,7 @@ export async function fetchRecentBooks(limit: number, offset: number) {
     if (!response.ok) {
         throw new Error('Failed to random');
     }
-    return response.json().then((data) => data.data);
+    return handleApiResponse(response);
 }
 
 export async function fetchBooks(keyword: string, filter: string[], limit: number, offset: number) {
@@ -38,7 +40,7 @@ export async function fetchBooks(keyword: string, filter: string[], limit: numbe
     if (!response.ok) {
         throw new Error('Failed to fetch books');
     }
-    return response.json().then((data) => data.data);
+    return handleApiResponse(response);
 }
 
 export async function deleteBook(bookId: number) {
@@ -51,16 +53,34 @@ export async function deleteBook(bookId: number) {
     if (!response.ok) {
         throw new Error('Failed to delete book');
     }
-    return response.json().then((data) => data.data);
+    return handleApiResponse(response);
 }
 
 export async function fetchBook(id: string) {
     try {
         const response = await fetch(`/api/book/${id}`);
         if (!response.ok) throw new Error('Network response was not ok');
-        return await response.json();
+        return handleApiResponse(response);
     } catch (error) {
         console.error('There was a problem with the fetch operation:', error);
         throw error;
     }
-}
\ No newline at end of file
+}
+
+export async function updateBook(id: string, body: any) {
+    try {
+        const response = await fetch(`/api/book/${id}/update`, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/json',
+            },
+            body: JSON.stringify(body),
+        });
+        if (!response.ok) throw new Error('Network response was not ok');
+        return handleApiResponse(response);
+    } catch (error) {
+        console.error('There was a problem with the fetch operation:', error);
+        throw error;
+    }
+}
+
diff --git a/app/calibre-pages/src/api/apiUtils.ts b/app/calibre-pages/src/api/apiUtils.ts
new file mode 100644
index 0000000..0787702
--- /dev/null
+++ b/app/calibre-pages/src/api/apiUtils.ts
@@ -0,0 +1,20 @@
+// src/api/apiUtils.ts
+import {ElNotification} from "element-plus";
+import {h} from "vue";
+
+export async function handleApiResponse(response: Response) {
+    const data = await response.json();
+    if (response.status === 200) {
+        if (data.code == 200) {
+            return data.data;
+        } else {
+            ElNotification({
+                title: 'ERROR: ' + data.message,
+                message: h('i', {style: 'color: red'}, data.message),
+                type: 'error'
+            })
+        }
+    } else {
+        throw new Error(data.message || 'API request failed');
+    }
+}
\ No newline at end of file
diff --git a/app/calibre-pages/src/components/MetadataEdit.vue b/app/calibre-pages/src/components/MetadataEdit.vue
index 71cc31c..186828c 100644
--- a/app/calibre-pages/src/components/MetadataEdit.vue
+++ b/app/calibre-pages/src/components/MetadataEdit.vue
@@ -9,6 +9,7 @@
   >
     <el-form
         v-loading="loading"
+        v-if="dialogEditVisible"
         :model="form"
         label-width="70px"
         class="book-form"
@@ -99,18 +100,18 @@
     <template #footer>
       <div class="dialog-footer">
         <el-button @click="emit('update:dialogEditVisible', false)">取消</el-button>
-        <el-button type="primary" @click="updateMetadata" :loading="loading" >更新</el-button>
+        <el-button type="primary" @click="updateMetadata" :loading="loading">更新</el-button>
       </div>
     </template>
   </el-dialog>
 
 
-
 </template>
 <script setup lang="ts">
-import {h, reactive, ref, watch} from 'vue';
+import {reactive, ref, watch} from 'vue';
 import {ElButton, ElInput, ElNotification} from 'element-plus';
 import {Book} from '@/types/book';
+import {updateBook} from "@/api/api";
 
 const props = defineProps<{
   book: Book;
@@ -131,17 +132,32 @@ const form = reactive({
   rating: props.book.rating,
 });
 
-watch(() => props.book, (newVal) => {
-  console.log(newVal)
-  form.title = newVal.title;
-  form.authors = newVal.authors;
-  form.publisher = newVal.publisher;
-  form.pubdate = newVal.pubdate;
-  form.isbn = newVal.isbn;
-  form.comments = newVal.comments;
-  form.tags = newVal.tags;
-  form.rating = newVal.rating;
-  console.log(form)
+// watch(() => props.book, (newVal) => {
+//   console.log(newVal)
+//   form.title = newVal.title;
+//   form.authors = newVal.authors;
+//   form.publisher = newVal.publisher;
+//   form.pubdate = newVal.pubdate;
+//   form.isbn = newVal.isbn;
+//   form.comments = newVal.comments;
+//   form.tags = newVal.tags;
+//   form.rating = newVal.rating;
+//   console.log(form)
+// });
+
+watch(() => props.dialogEditVisible, (newVal) => {
+
+  if (newVal) {
+    console.log(props.book)
+    form.title = props.book.title;
+    form.authors = props.book.authors;
+    form.publisher = props.book.publisher;
+    form.pubdate = props.book.pubdate;
+    form.isbn = props.book.isbn;
+    form.comments = props.book.comments;
+    form.tags = props.book.tags;
+    form.rating = props.book.rating;
+  }
 });
 
 const loading = ref(false);
@@ -150,40 +166,26 @@ const updateMetadata = async () => {
   loading.value = true;
   console.log(form);
 
-  try {
-    const response = await fetch(`/api/book/${props.book.id}/update`, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify(form),
-    });
-    if (response.ok) {
-      setTimeout(() => {
-        ElNotification({
-          title: '书籍更新成功',
-          message: form.title,
-          type: 'success',
-        });
+
+  await updateBook(String(props.book.id), form)
+      .then((response) => {
+        if (response) {
+          setTimeout(() => {
+            ElNotification({
+              title: '书籍更新成功',
+              message: form.title,
+              type: 'success',
+            });
+            loading.value = false;
+            emit('update:dialogEditVisible', false);
+            window.location.reload();
+          }, 1000);
+        }
+      })
+      .finally(() => {
         loading.value = false;
-        window.location.reload();
-      }, 1000);
-    } else {
-      ElNotification({
-        title: '书籍更新失败',
-        message: h('i', {style: 'color: red'}, form.title),
-        type: 'error',
       });
-      loading.value = false;
-    }
-  } catch (e: any) {
-    ElNotification({
-      title: '书籍更新失败',
-      message: h('i', {style: 'color: red'}, e.message),
-      type: 'error',
-    });
-    loading.value = false;
-  }
+
 };
 </script>
 
diff --git a/app/calibre-pages/src/components/MetadataUpdate.vue b/app/calibre-pages/src/components/MetadataUpdate.vue
index 2b0d9c0..c08459a 100644
--- a/app/calibre-pages/src/components/MetadataUpdate.vue
+++ b/app/calibre-pages/src/components/MetadataUpdate.vue
@@ -159,8 +159,9 @@
 </template>
 <script setup lang="ts">
 import {ElNotification} from 'element-plus'
-import {h, reactive, ref, watch} from 'vue'
+import {reactive, ref, watch} from 'vue'
 import {Book} from '@/types/book'
+import {updateBook} from "@/api/api";
 
 const props = defineProps<{
   book: Book;
@@ -226,43 +227,23 @@ const updateMetadata = async () => {
   loading.value = true;
   console.log(form);
 
-  try {
-    const response = await fetch(`/api/book/${props.book.id}/update`, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json'
-      },
-      body: JSON.stringify(form)
-    });
-    if (response.ok) {
-      setTimeout(() => {
-        ElNotification({
-          title: '书籍更新成功',
-          message: form.title,
-          type: 'success'
-        });
+  await updateBook(String(props.book.id), form)
+      .then((response) => {
+        if (response) {
+          setTimeout(() => {
+            ElNotification({
+              title: '书籍更新成功',
+              message: form.title,
+              type: 'success',
+            });
+            loading.value = false;
+            window.location.reload();
+          }, 1000);
+        }
+      })
+      .finally(() => {
         loading.value = false;
-        //刷新页面
-        window.location.reload();
-      }, 1000);
-    } else {
-      ElNotification({
-        title: '书籍更新失败',
-        message: h('i', {style: 'color: red'}, form.title),
-        type: 'error'
       });
-      loading.value = false;
-      // this.updateMetadataFlag = false
-    }
-  } catch (e: any) {
-    ElNotification({
-      title: '书籍更新失败',
-      message: h('i', {style: 'color: red'}, e.message),
-      type: 'error'
-    });
-    loading.value = false;
-    // this.updateMetadataFlag = false
-  }
 };
 
 watch(() => props.updateMetadataFlag, (val) => {
diff --git a/app/calibre-pages/src/views/Detail.vue b/app/calibre-pages/src/views/Detail.vue
index ad227a3..8bc76c0 100644
--- a/app/calibre-pages/src/views/Detail.vue
+++ b/app/calibre-pages/src/views/Detail.vue
@@ -314,20 +314,14 @@ export default {
       return tags.join(', ')
     },
     async deleteBook(bookId: string) {
-      const response = await deleteBook(Number(bookId))
-      if (response.ok) {
+      const data = await deleteBook(Number(bookId))
+      if (data) {
         ElNotification({
           title: 'Book deleted successfully',
           message: this.book.title,
           type: 'success'
         })
         this.$router.back()
-      } else {
-        ElNotification({
-          title: '删除书籍失败',
-          message: h('i', {style: 'color: red'}, this.book.title),
-          type: 'error'
-        })
       }
     },
     readBook() {
diff --git a/internal/calibre/api.go b/internal/calibre/api.go
index bc3017c..e5bff5b 100644
--- a/internal/calibre/api.go
+++ b/internal/calibre/api.go
@@ -190,10 +190,17 @@ func (c *Api) getBook(r *gin.Context) {
 
 	if err != nil {
 		// 返回文件找不到
-		r.JSON(http.StatusNotFound, "book not found")
+		r.JSON(http.StatusOK, gin.H{
+			"message": "book not found" + err.Error(),
+			"code":    http.StatusNotFound,
+		})
 		return
 	}
-	r.JSON(http.StatusOK, book)
+	r.JSON(http.StatusOK, gin.H{
+		"data":    &book,
+		"message": "ok",
+		"code":    200,
+	})
 
 }
 
@@ -202,16 +209,26 @@ func (c *Api) deleteBook(r *gin.Context) {
 
 	err := c.contentApi.DeleteBooks([]string{id}, "")
 	if err != nil {
-		r.JSON(http.StatusNotFound, "book not found"+err.Error())
+		r.JSON(http.StatusOK, gin.H{
+			"message": "book not found" + err.Error(),
+			"code":    http.StatusNotFound,
+		})
 		return
 	}
 	_, err = c.currentIndex().DeleteDocument(id)
 	if err != nil {
 		// 返回文件找不到
-		r.JSON(http.StatusNotFound, "book not found"+err.Error())
+		r.JSON(http.StatusOK, gin.H{
+			"message": "book not found" + err.Error(),
+			"code":    http.StatusNotFound,
+		})
 		return
 	}
-	r.JSON(http.StatusOK, "success")
+	r.JSON(http.StatusOK, gin.H{
+		"data":    true,
+		"message": "ok",
+		"code":    200,
+	})
 }
 
 func (c *Api) getBookToc(r *gin.Context) {
@@ -583,26 +600,30 @@ func (c *Api) updateMetadata(r *gin.Context) {
 	book := &Book{}
 	err := r.Bind(book)
 	if err != nil {
-		r.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+		r.JSON(http.StatusOK, gin.H{
+			"code":    400,
+			"data":    false,
+			"message": "请求参数错误" + err.Error(),
+		})
 		return
 	}
 
 	oldBook := &Book{}
 	err = c.currentIndex().GetDocument(id, nil, oldBook)
 	if err != nil {
-		r.JSON(http.StatusNotFound, gin.H{
-			"code":  500,
-			"error": err.Error(),
-			"msg":   "元数据更新失败",
+		r.JSON(http.StatusOK, gin.H{
+			"code":    500,
+			"data":    false,
+			"message": "元数据更新失败",
 		})
 		return
 	}
 	_, err = c.contentApi.UpdateMetaData(id, parseParams(book, oldBook), "")
 	if err != nil {
 		r.JSON(http.StatusNotFound, gin.H{
-			"code":  500,
-			"error": err.Error(),
-			"msg":   "元数据更新失败",
+			"code":    500,
+			"data":    false,
+			"message": "元数据更新失败",
 		})
 		return
 	}
@@ -610,31 +631,36 @@ func (c *Api) updateMetadata(r *gin.Context) {
 	data, err := c.contentApi.GetBookMetaDatas([]int64{cast.ToInt64(id)}, "")
 	if err != nil {
 		log.Warnf("get book metadata error: %v", err)
-		r.JSON(http.StatusInternalServerError, gin.H{"code": 500, "error": err.Error()})
+		r.JSON(http.StatusOK, gin.H{
+			"code":    500,
+			"data":    false,
+			"message": "元数据更新成功，但是查询元数据失败",
+		})
 		return
 	}
 	books, err := convertContentBooks(data)
 	if err != nil {
-		r.JSON(http.StatusNotFound, gin.H{
-			"code":  500,
-			"error": err.Error(),
-			"msg":   "书籍元数据翻译失败，请刷新索引",
+		r.JSON(http.StatusOK, gin.H{
+			"code":    500,
+			"data":    false,
+			"message": "书籍元数据翻译失败，请刷新索引",
 		})
 		return
 	}
 	_, err = c.currentIndex().AddDocuments(books)
 	if err != nil {
 		// 返回文件找不到
-		r.JSON(http.StatusNotFound, gin.H{
-			"code":  500,
-			"error": err.Error(),
-			"msg":   "元数据更新成功，但是索引更新失败，请刷新索引",
+		r.JSON(http.StatusOK, gin.H{
+			"code":    500,
+			"data":    false,
+			"message": "元数据更新成功，但是索引更新失败，请刷新索引",
 		})
 		return
 	}
 	r.JSON(http.StatusOK, gin.H{
 		"code":    200,
 		"message": "success",
+		"data":    &books[0],
 	})
 	return
 }