diff --git a/plugins/DupFileManager/DupFileManager.py b/plugins/DupFileManager/DupFileManager.py index 6f8d4d9..b86f5ce 100644 --- a/plugins/DupFileManager/DupFileManager.py +++ b/plugins/DupFileManager/DupFileManager.py @@ -1743,9 +1743,6 @@ try: elif stash.PLUGIN_TASK_NAME == "delete_tagged_duplicates_task": manageDuplicatesTaggedOrInReport(deleteScenes=True) stash.Debug(f"{stash.PLUGIN_TASK_NAME} EXIT") - elif stash.PLUGIN_TASK_NAME.startswith("deleteScene"): - manageDuplicatesTaggedOrInReport(deleteScenes=True, checkFlagOption=True) - stash.Debug(f"{stash.PLUGIN_TASK_NAME} EXIT") elif stash.PLUGIN_TASK_NAME == "delete_duplicates_task": mangeDupFiles(deleteDup=True, merge=mergeDupFilename) stash.Debug(f"{stash.PLUGIN_TASK_NAME} EXIT") @@ -1761,6 +1758,9 @@ try: elif stash.PLUGIN_TASK_NAME == "deleteScene": deleteScene() stash.Debug(f"{stash.PLUGIN_TASK_NAME} EXIT") + elif stash.PLUGIN_TASK_NAME.startswith("deleteScene"): + manageDuplicatesTaggedOrInReport(deleteScenes=True, checkFlagOption=True) + stash.Debug(f"{stash.PLUGIN_TASK_NAME} EXIT") elif stash.PLUGIN_TASK_NAME == "removeScene": deleteScene(deleteFile=False) stash.Debug(f"{stash.PLUGIN_TASK_NAME} EXIT") diff --git a/plugins/DupFileManager/DupFileManager.yml b/plugins/DupFileManager/DupFileManager.yml index 8544b65..cdcb265 100644 --- a/plugins/DupFileManager/DupFileManager.yml +++ b/plugins/DupFileManager/DupFileManager.yml @@ -1,6 +1,6 @@ name: DupFileManager description: Manages duplicate files. -version: 1.0.0 +version: 1.0.0.1 url: https://github.com/David-Maisonave/Axter-Stash/tree/main/plugins/DupFileManager ui: javascript: diff --git a/plugins/DupFileManager/DupFileManager_report_config.py b/plugins/DupFileManager/DupFileManager_report_config.py index f450bf0..b2b4305 100644 --- a/plugins/DupFileManager/DupFileManager_report_config.py +++ b/plugins/DupFileManager/DupFileManager_report_config.py @@ -239,7 +239,7 @@ function RunPluginOperation(Mode, ActionID, button, asyncAjax){ $("body").css("cursor", "default"); } if (Mode === "renameFile" || Mode === "clearAllSceneFlags" || Mode === "mergeTags" || (Mode !== "deleteScene" && Mode.startsWith("deleteScene"))) - location.replace(location.href); + location.href = location.href; // location.replace(location.href); if (!chkBxRemoveValid.checked && Mode !== "flagScene") alert("Action " + Mode + " for scene(s) ID# " + ActionID + " complete.\\n\\nResults=" + result); }, error: function(XMLHttpRequest, textStatus, errorThrown) { console.log("Ajax failed with Status: " + textStatus + "; Error: " + errorThrown); diff --git a/plugins/DupFileManager/README.md b/plugins/DupFileManager/README.md index 74aa5b8..0bef1ad 100644 --- a/plugins/DupFileManager/README.md +++ b/plugins/DupFileManager/README.md @@ -1,4 +1,4 @@ -# DupFileManager: Ver 1.0.0 (By David Maisonave) +# DupFileManager: Ver 1.0.0.1 (By David Maisonave) DupFileManager is a [Stash](https://github.com/stashapp/stash) plugin which manages duplicate files in the Stash system. It has both **task** and **tools-UI** components. diff --git a/plugins/DupFileManager/version_history/README.md b/plugins/DupFileManager/version_history/README.md index 38f4a7a..55ad055 100644 --- a/plugins/DupFileManager/version_history/README.md +++ b/plugins/DupFileManager/version_history/README.md @@ -28,4 +28,6 @@ - Added performance enhancement for removing (clearing) duplicate tags from all scenes by using SQL call. - Added option to report to delete files that do not exist by duplicate candidates in report, as well as by tagged files. - Added logic to disable scene in report if deleted by [**Advance Duplicate File Deletion Menu**]. Note: Requires a refresh. -- Added report option to delete by flags set on the report. \ No newline at end of file +- Added report option to delete by flags set on the report. +### 1.0.0.1 +- Fixed bug with report delete scene request.