update: 添加根据文本内容去水印功能

aerowolf · Jul 26, 2023 · 76d7e01 · 76d7e01
1 parent f9fd0c1
commit 76d7e01
Show file tree

Hide file tree

Showing 12 changed files with 1,362 additions and 112 deletions.
diff --git a/README.md b/README.md
@@ -19,6 +19,7 @@
     - [安装](#安装)
     - [使用](#使用)
   - [FAQ](#faq)
+  - [Star History](#star-history)
   - [Authors](#authors)
   - [License](#license)
   - [Acknowledgments](#acknowledgments)
@@ -406,6 +407,11 @@ chmod +x "${PWD}/PDF Guru.app/Contents/MacOS/PDF Guru"
 
 ![](https://minio.kevin2li.top/image-bed/blog/20230715195747.png)
 
+## Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=kevin2li/PDF-Guru&type=Date)](https://star-history.com/#kevin2li/PDF-Guru&Date)
+
+
 ## Authors
 
 [@Kevin2li](https://github.com/kevin2li)

diff --git a/frontend/src/components/Forms/AnkiForm.vue b/frontend/src/components/Forms/AnkiForm.vue
@@ -470,9 +470,11 @@ export default defineComponent({
                 message.error("请选择父牌组");
                 return;
             }
-            if(store.modelname === undefined){
-                message.error("请选择模板");
-                return;
+            if(store.card_type === "qa"){
+                if(store.modelname === undefined){
+                    message.error("请选择模板");
+                    return;
+                }
             }
             switch (store.card_type) {
                 case "mask": {

diff --git a/frontend/src/components/Forms/AnnotForm.vue b/frontend/src/components/Forms/AnnotForm.vue
diff --git a/frontend/src/components/Forms/WatermarkForm.vue b/frontend/src/components/Forms/WatermarkForm.vue
@@ -198,6 +198,7 @@
                         <a-radio value="type">类型水印</a-radio>
                         <a-radio value="mask">遮罩水印</a-radio>
                         <a-radio value="index">内容水印</a-radio>
+                        <a-radio value="text">(可编辑)文字水印</a-radio>
                     </a-radio-group>
                 </a-form-item>
                 <div v-if="store.remove_method === 'type'">
@@ -306,6 +307,11 @@
                         <a-input v-model:value="store.page" placeholder="应用的页码范围(留空表示全部), e.g. 1-10" allow-clear />
                     </a-form-item>
                 </div>
+                <div v-if="store.remove_method === 'text'">
+                    <a-form-item name="wm_text" label="水印文本">
+                        <a-input v-model:value="store.wm_text" placeholder="水印文本内容，支持正则，e.g. 内部资料" allow-clear />
+                    </a-form-item>
+                </div>
             </div>
             <a-form-item name="input" label="输入" :validateStatus="validateStatus.input" :help="validateHelp.input">
                 <div>
@@ -357,8 +363,7 @@ import {
     WatermarkPDFByText,
     WatermarkPDFByImage,
     WatermarkPDFByPDF,
-    RemoveWatermarkByIndex,
-    RemoveWatermarkByType,
+    RemoveWatermark,
     DetectWatermarkByIndex,
     MaskPDFByAnnot,
     MaskPDFByRect
@@ -558,7 +563,14 @@ export default defineComponent({
                 case "remove": {
                     switch (store.remove_method) {
                         case "type": {
-                            await handleOps(RemoveWatermarkByType, [store.input, store.output, store.page]);
+                            await handleOps(RemoveWatermark, [
+                                store.input,
+                                store.output,
+                                "type",
+                                [],
+                                "",
+                                store.page,
+                            ]);
                             break;
                         }
                         case "index": {
@@ -570,7 +582,14 @@ export default defineComponent({
                                 }
                                 case "2": {
                                     let wm_index = store.wm_index.split(",").map((item) => parseInt(item.trim()) - 1);
-                                    await handleOps(RemoveWatermarkByIndex, [store.input, store.output, wm_index, store.page]);
+                                    await handleOps(RemoveWatermark, [
+                                        store.input,
+                                        store.output,
+                                        "index",
+                                        wm_index,
+                                        "",
+                                        store.page
+                                    ]);
                                     break;
                                 }
                             }
@@ -589,6 +608,17 @@ export default defineComponent({
                             }
                             break;
                         }
+                        case "text": {
+                            await handleOps(RemoveWatermark, [
+                                store.input,
+                                store.output,
+                                "text",
+                                [],
+                                store.wm_text,
+                                store.page,
+                            ]);
+                            break;
+                        }
                     }
                     break;
                 }

diff --git a/frontend/src/components/data.tsx b/frontend/src/components/data.tsx
@@ -104,6 +104,7 @@ interface WatermarkState {
     remove_method: string;
     step: string;
     wm_index: string;
+    wm_text: string;
     wm_path: string;
     scale: number;
     mask_type: string;
@@ -318,6 +319,13 @@ interface SignState {
     font_color: string;
 }
 
+interface AnnotState {
+    input: string;
+    output: string;
+    op: string;
+    types: string[];
+}
+
 interface AnkiState {
     input: string;
     output: string;
@@ -477,6 +485,7 @@ export type {
     DualLayerState,
     CrackState,
     SignState,
+    AnnotState,
     AnkiState,
     IndexState,
 };

diff --git a/frontend/src/store/watermark.ts b/frontend/src/store/watermark.ts
@@ -23,6 +23,7 @@ export const useWatermarkState = defineStore("WatermarkState", {
         remove_method: "type",
         step: "1",
         wm_index: "",
+        wm_text: "",
         lines: 0,
         wm_path: "",
         scale: 1,
@@ -61,6 +62,7 @@ export const useWatermarkState = defineStore("WatermarkState", {
                 remove_method: "type",
                 step: "1",
                 wm_index: "",
+                wm_text: "",
                 lines: 0,
                 wm_path: "",
                 scale: 1,

diff --git a/frontend/wailsjs/go/main/App.d.ts b/frontend/wailsjs/go/main/App.d.ts
@@ -102,9 +102,7 @@ export function RemovePDFHeaderAndFooter(arg1:string,arg2:string,arg3:Array<numb
 
 export function RemovePDFPageNumber(arg1:string,arg2:string,arg3:Array<number>,arg4:string,arg5:string,arg6:string):Promise<void>;
 
-export function RemoveWatermarkByIndex(arg1:string,arg2:string,arg3:Array<number>,arg4:string):Promise<void>;
-
-export function RemoveWatermarkByType(arg1:string,arg2:string,arg3:string):Promise<void>;
+export function RemoveWatermark(arg1:string,arg2:string,arg3:string,arg4:Array<number>,arg5:string,arg6:string):Promise<void>;
 
 export function ReorderPDF(arg1:string,arg2:string,arg3:string):Promise<void>;
 

diff --git a/frontend/wailsjs/go/main/App.js b/frontend/wailsjs/go/main/App.js
@@ -202,12 +202,8 @@ export function RemovePDFPageNumber(arg1, arg2, arg3, arg4, arg5, arg6) {
   return window['go']['main']['App']['RemovePDFPageNumber'](arg1, arg2, arg3, arg4, arg5, arg6);
 }
 
-export function RemoveWatermarkByIndex(arg1, arg2, arg3, arg4) {
-  return window['go']['main']['App']['RemoveWatermarkByIndex'](arg1, arg2, arg3, arg4);
-}
-
-export function RemoveWatermarkByType(arg1, arg2, arg3) {
-  return window['go']['main']['App']['RemoveWatermarkByType'](arg1, arg2, arg3);
+export function RemoveWatermark(arg1, arg2, arg3, arg4, arg5, arg6) {
+  return window['go']['main']['App']['RemoveWatermark'](arg1, arg2, arg3, arg4, arg5, arg6);
 }
 
 export function ReorderPDF(arg1, arg2, arg3) {

diff --git a/thirdparty/.gitignore b/thirdparty/.gitignore
@@ -1,3 +1,4 @@
 dist
 build
-*.spec
+*.spec
+*cache*
-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
     dist
     build
-    *.spec
+    *.spec
+    *cache*