a6.8.1

Mararsh · Apr 26, 2024 · 02dd909 · 02dd909
1 parent d78e100
commit 02dd909
Show file tree

Hide file tree

Showing 33 changed files with 291 additions and 319 deletions.
diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/BaseBatchController.java b/alpha/MyBox/src/main/java/mara/mybox/controller/BaseBatchController.java
@@ -27,6 +27,7 @@
 import mara.mybox.data.FileInformation.FileSelectorType;
 import mara.mybox.data.ImageItem;
 import mara.mybox.data.ProcessParameters;
+import mara.mybox.db.data.VisitHistory;
 import mara.mybox.dev.MyBoxLog;
 import mara.mybox.fxml.FxSingletonTask;
 import mara.mybox.fxml.FxTask;
@@ -55,7 +56,7 @@ public abstract class BaseBatchController<T> extends BaseTaskController {
     protected TableView<T> tableView;
     protected List<File> sourceFiles;
     protected List<String> filesPassword;
-    protected boolean sourceCheckSubdir, createDirectories, allowPaused, browseTargets, viewTargetPath;
+    protected boolean sourceCheckSubdir, createDirectories, allowPaused, viewTargetPath;
     protected boolean isPreview, paused;
     protected long dirFilesNumber, dirFilesHandled, totalFilesHandled = 0, totalItemsHandled = 0;
     protected long fileSelectorSize, fileSelectorTime;
@@ -84,7 +85,7 @@ public abstract class BaseBatchController<T> extends BaseTaskController {
 
     public BaseBatchController() {
         targetSubdirKey = "targetSubdirKey";
-        browseTargets = viewTargetPath = false;
+        viewTargetPath = false;
         allowPaused = false;
 
         sourceExtensionFilter = FileFilters.AllExtensionFilter;
@@ -121,7 +122,7 @@ public void afterTask(boolean ok) {
         if (!isPreview && openCheck != null && !openCheck.isSelected()) {
             return;
         }
-        if (targetFilesCount > 0 && viewTargetPath) {
+        if (viewTargetPath && targetFilesCount > 0) {
             openTarget();
         } else if (targetFiles == null || targetFilesCount == 1) {
             if (lastTargetName == null || !new File(lastTargetName).exists()) {
@@ -130,7 +131,7 @@ public void afterTask(boolean ok) {
                 viewTarget(new File(lastTargetName));
             }
         } else if (targetFilesCount > 0) {
-            if (browseTargets) {
+            if (VisitHistory.isImageType(TargetFileType)) {
                 browseAction();
             } else {
                 openTarget();

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/BaseBatchImageController.java b/alpha/MyBox/src/main/java/mara/mybox/controller/BaseBatchImageController.java
@@ -18,7 +18,6 @@ public abstract class BaseBatchImageController extends BaseBatchFileController {
 
     public BaseBatchImageController() {
         targetSubdirKey = "ImageCreatSubdir";
-        browseTargets = true;
     }
 
     @Override

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/BaseBatchPdfController.java b/alpha/MyBox/src/main/java/mara/mybox/controller/BaseBatchPdfController.java
@@ -10,7 +10,7 @@
 import mara.mybox.fxml.FxTask;
 import mara.mybox.tools.FileNameTools;
 import mara.mybox.value.AppVariables;
-import mara.mybox.value.Languages;
+import static mara.mybox.value.Languages.message;
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.encryption.InvalidPasswordException;
 
@@ -50,7 +50,7 @@ public void setFileType() {
     @Override
     public boolean makePreviewParameters() {
         if (!makeActualParameters()) {
-            popError(Languages.message("Invalid"));
+            popError(message("Invalid"));
             actualParameters = null;
             return false;
         }
@@ -128,13 +128,15 @@ public String handleFile(FxTask currentTask, File srcFile, File targetPath) {
             }
             currentParameters.startPage = 1;
         } catch (InvalidPasswordException e) {
-            return Languages.message("PasswordIncorrect");
+            return message("PasswordIncorrect");
         } catch (Exception e) {
-            return e.toString();
+            showLogs(e.toString());
+            return message("Failed");
         }
         updateInterface("CompleteFile");
-        return MessageFormat.format(Languages.message("HandlePagesGenerateNumber"),
-                currentParameters.currentPage - currentParameters.fromPage, generated);
+        showLogs(MessageFormat.format(message("HandlePagesGenerateNumber"),
+                currentParameters.currentPage - currentParameters.fromPage, generated));
+        return message("Successful");
     }
 
     public boolean preHandlePages(FxTask currentTask) {

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/BaseController_Actions.java b/alpha/MyBox/src/main/java/mara/mybox/controller/BaseController_Actions.java
@@ -253,7 +253,11 @@ public void openSourcePath() {
 
     @FXML
     public void openBackups() {
-        FileBackupController.load((BaseController) this);
+        openBackups(baseName + "BackupWhenSave");
+    }
+
+    public void openBackups(String name) {
+        FileBackupController.load((BaseController) this, name);
     }
 
     public FileBackup addBackup(FxTask inTask, File file) {

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/BaseDomEditorController.java b/alpha/MyBox/src/main/java/mara/mybox/controller/BaseDomEditorController.java
@@ -496,7 +496,7 @@ public void handle(ActionEvent event) {
 
                 menu = new MenuItem(message("FileBackups"), StyleTools.getIconImageView("iconBackup.png"));
                 menu.setOnAction((ActionEvent menuItemEvent) -> {
-                    openBackups();
+                    openBackups(baseName + "BackupWhenSave");
                 });
                 items.add(menu);
             }

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/BaseTextController.java b/alpha/MyBox/src/main/java/mara/mybox/controller/BaseTextController.java
@@ -255,7 +255,7 @@ public void handle(ActionEvent event) {
 
                 menu = new MenuItem(message("FileBackups"), StyleTools.getIconImageView("iconBackup.png"));
                 menu.setOnAction((ActionEvent menuItemEvent) -> {
-                    openBackups();
+                    openBackups(baseName + "BackupWhenSave");
                 });
                 items.add(menu);
             }

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/ControlFileBackup.java b/alpha/MyBox/src/main/java/mara/mybox/controller/ControlFileBackup.java
diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/Data2DAttributesController.java b/alpha/MyBox/src/main/java/mara/mybox/controller/Data2DAttributesController.java
@@ -242,8 +242,7 @@ public void handleMutiplePages(Data2D attributes) {
             @Override
             protected boolean handle() {
                 try {
-                    needBackup = sourceData.isDataFile() && !sourceData.isTmpData()
-                            && UserConfig.getBoolean(baseName + "BackupWhenSave", true);
+                    needBackup = sourceData.needBackup();
                     if (needBackup) {
                         backup = addBackup(this, sourceFile);
                     }

diff --git a/alpha/MyBox/src/main/java/mara/mybox/controller/Data2DDeleteController.java b/alpha/MyBox/src/main/java/mara/mybox/controller/Data2DDeleteController.java
@@ -10,7 +10,6 @@
 import mara.mybox.fxml.WindowTools;
 import mara.mybox.value.Fxmls;
 import static mara.mybox.value.Languages.message;
-import mara.mybox.value.UserConfig;
 
 /**
  * @Author Mara
@@ -134,8 +133,7 @@ public void handleAllTask() {
             @Override
             protected boolean handle() {
                 try {
-                    needBackup = data2D.isDataFile() && !data2D.isTmpData()
-                            && UserConfig.getBoolean(baseName + "BackupWhenSave", true);
+                    needBackup = data2D.needBackup();
                     if (needBackup) {
                         addBackup(this, data2D.getFile());
                     }