Merge branch 'dev'

.github/workflows/main.yml

@@ -5,7 +5,7 @@ on:
     branches:
       - dev
 env:
-  VERRSION: "1.0.8"
+  VERRSION: "1.0.9"
 jobs:
   deploy-macos:
     runs-on: macos-latest

README.md

@@ -45,7 +45,7 @@
 3. 跨平台：支持在Windows、Mac、Linux设备上使用
 4. 开源免费
 5. 界面简洁，使用简单
-6. 体积小巧(<30M)，绿色免安装，随用随开
+6. 体积小巧(~30M)，绿色免安装，随用随开
 7. 插件化：根据需要选择是否安装额外组件，减小安装包体积
 
 ## 应用截图

build/windows/installer/setup.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "PDF Guru"
-#define MyAppVersion "1.0.8"
+#define MyAppVersion "1.0.9"
 #define MyAppPublisher "Kevin2li"
 #define MyAppURL "https://github.com/kevin2li/PDF-Guru"
 #define MyAppExeName "PDF Guru.exe"

cmd_output_win.go

@@ -70,6 +70,7 @@ func (a *App) cmdRunner(args []string, cmdType string) error {
 	} else if cmdType == "python" {
 		err = a.CheckFileExists(config.PythonPath)
 		if err != nil {
+			err = errors.Wrap(err, "python not found!")
 			return err
 		}
 		cmd = exec.Command(config.PythonPath, args...)

encrypt.go

@@ -45,3 +45,26 @@ func (a *App) DecryptPDF(inFile string, outFile string, passwd string) error {
 	logger.Println(args)
 	return a.cmdRunner(args, "pdf")
 }
+
+func (a *App) ChangePasswordPDF(inFile string, outFile string, oldUpw string, upw string, oldOpw string, opw string) error {
+	logger.Printf("inFile: %s, outFile: %s, oldUpw: %s, upw: %s, oldOpw: %s, opw: %s\n", inFile, outFile, oldUpw, upw, oldOpw, opw)
+	args := []string{"change_password"}
+	if oldUpw != "" {
+		args = append(args, "--old_user_password", oldUpw)
+	}
+	if upw != "" {
+		args = append(args, "--user_password", upw)
+	}
+	if oldOpw != "" {
+		args = append(args, "--old_owner_password", oldOpw)
+	}
+	if opw != "" {
+		args = append(args, "--owner_password", opw)
+	}
+	if outFile != "" {
+		args = append(args, "-o", outFile)
+	}
+	args = append(args, inFile)
+	logger.Println(args)
+	return a.cmdRunner(args, "pdf")
+}

frontend/package.json

@@ -10,8 +10,12 @@
   },
   "dependencies": {
     "ant-design-vue": "^3.2.20",
+    "lightvue": "^1.5.1",
     "pinia": "^2.1.4",
-    "vue": "^3.2.37"
+    "tinycolor2": "^1.6.0",
+    "v-perfect-signature": "^1.2.1",
+    "vue": "^3.2.37",
+    "vue3-colorpicker": "^2.1.6"
   },
   "devDependencies": {
     "@babel/types": "^7.18.10",
@@ -21,4 +25,4 @@
     "vite": "^3.0.7",
     "vue-tsc": "^0.39.5"
   }
-}
+}

frontend/package.json.md5

@@ -1 +1 @@
-2105d132f60b3e26a0a6327ce1f48aaa
+9f342127cb11d3aafd2cbbc64f4d342d