chris/Axter-Stash
1
0
Fork 0
forked from Github/Axter-Stash
Code Pull Requests Activity

Fixed bug with report delete scene request.

Browse Source
This commit is contained in:
David Maisonave
2024-11-27 00:16:28 -05:00
parent 214ba134c4
commit 6ae3c3c689
5 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/DupFileManager/DupFileManager.py
View File

@@ -1743,9 +1743,6 @@ try:
elif stash.PLUGIN_TASK_NAME == "delete_tagged_duplicates_task": elif stash.PLUGIN_TASK_NAME == "delete_tagged_duplicates_task":
manageDuplicatesTaggedOrInReport(deleteScenes=True) manageDuplicatesTaggedOrInReport(deleteScenes=True)
stash.Debug(f"{stash.PLUGIN_TASK_NAME} EXIT") 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": elif stash.PLUGIN_TASK_NAME == "delete_duplicates_task":
mangeDupFiles(deleteDup=True, merge=mergeDupFilename) mangeDupFiles(deleteDup=True, merge=mergeDupFilename)
stash.Debug(f"{stash.PLUGIN_TASK_NAME} EXIT") stash.Debug(f"{stash.PLUGIN_TASK_NAME} EXIT")
@@ -1761,6 +1758,9 @@ try:
elif stash.PLUGIN_TASK_NAME == "deleteScene": elif stash.PLUGIN_TASK_NAME == "deleteScene":
deleteScene() deleteScene()
stash.Debug(f"{stash.PLUGIN_TASK_NAME} EXIT") 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": elif stash.PLUGIN_TASK_NAME == "removeScene":
deleteScene(deleteFile=False) deleteScene(deleteFile=False)
stash.Debug(f"{stash.PLUGIN_TASK_NAME} EXIT") stash.Debug(f"{stash.PLUGIN_TASK_NAME} EXIT")

2
plugins/DupFileManager/DupFileManager.yml
View File

@@ -1,6 +1,6 @@
name: DupFileManager name: DupFileManager
description: Manages duplicate files. 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 url: https://github.com/David-Maisonave/Axter-Stash/tree/main/plugins/DupFileManager
ui: ui:
javascript: javascript:

2
plugins/DupFileManager/DupFileManager_report_config.py
View File

@@ -239,7 +239,7 @@ function RunPluginOperation(Mode, ActionID, button, asyncAjax){
$("body").css("cursor", "default"); $("body").css("cursor", "default");
} }
if (Mode === "renameFile" || Mode === "clearAllSceneFlags" || Mode === "mergeTags" || (Mode !== "deleteScene" && Mode.startsWith("deleteScene"))) 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); if (!chkBxRemoveValid.checked && Mode !== "flagScene") alert("Action " + Mode + " for scene(s) ID# " + ActionID + " complete.\\n\\nResults=" + result);
}, error: function(XMLHttpRequest, textStatus, errorThrown) { }, error: function(XMLHttpRequest, textStatus, errorThrown) {
console.log("Ajax failed with Status: " + textStatus + "; Error: " + errorThrown); console.log("Ajax failed with Status: " + textStatus + "; Error: " + errorThrown);

2
plugins/DupFileManager/README.md
View File

@@ -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. 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. It has both **task** and **tools-UI** components.

4
plugins/DupFileManager/version_history/README.md
View File

@@ -28,4 +28,6 @@
- Added performance enhancement for removing (clearing) duplicate tags from all scenes by using SQL call. - 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 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 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. - Added report option to delete by flags set on the report.
### 1.0.0.1
- Fixed bug with report delete scene request.