nodes/rgthree-rgthree-comfy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make showing the UI for corrupt links optional and off by default. It can be a power-user thing.

Browse Source
This commit is contained in:
rgthree
2023-11-30 23:41:46 -05:00
parent d7cf0e393b
commit 39c66749c2
3 changed files with 81 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rgthree_config.json.default
+2 -1
View File
@@ -1,7 +1,8 @@
// COPY THIS FILE BEFORE MAKING CHANGES TO: rgthree_config.json
{
"patch_recursive_execution": true,
"monitor_bad_links": false,
"show_corrupt_link_alerts": false,
"monitor_for_corrupt_links": false,
"nodes": {
"reroute": {
"default_width": 40,
ts/rgthree.ts
+39 -30
View File
@@ -233,39 +233,48 @@ class Rgthree {
const graphToUse = wasLoadingAborted ? (graphCopy || graph) : app.graph
const fixBadLinksResult = fixBadLinks(graphToUse);
if (fixBadLinksResult.hasBadLinks) {
that.showMessage({
id: 'bad-links',
type: 'warn',
message: 'The workflow you\'ve loaded may have connection/linking data that could be fixed.',
actions: [
{
label: 'Open fixer',
href: '/extensions/rgthree-comfy/html/links.html',
},
{
label: 'Fix in place',
href: '/extensions/rgthree-comfy/html/links.html',
callback: (event) => {
event.stopPropagation();
event.preventDefault();
if (confirm('This will attempt to fix in place. Please make sure to have a saved copy of your workflow.')) {
const fixBadLinksResult = fixBadLinks(graphToUse, true);
if (!fixBadLinksResult.hasBadLinks) {
that.hideMessage('bad-links');
alert('Success! It\'s possible some valid links may have been affected. Please check and verify your workflow.');
wasLoadingAborted && app.loadGraphData(fixBadLinksResult.graph);
if (rgthreeConfig['monitor_bad_links']) {
that.monitorLinkTimeout = setTimeout(() => {
that.monitorBadLinks();
}, 5000);
that.log(LogLevel.WARN, `The workflow you've loaded has corrupt linking data. Open ${new URL(location.href).origin}/extensions/rgthree-comfy/html/links.html to try to fix.`);
if (rgthreeConfig['show_corrupt_link_alerts']) {
that.showMessage({
id: 'bad-links',
type: 'warn',
message: 'The workflow you\'ve loaded has corrupt linking data that may be able to be fixed.',
actions: [
{
label: 'Open fixer',
href: '/extensions/rgthree-comfy/html/links.html',
},
{
label: 'Fix in place',
href: '/extensions/rgthree-comfy/html/links.html',
callback: (event) => {
event.stopPropagation();
event.preventDefault();
if (confirm('This will attempt to fix in place. Please make sure to have a saved copy of your workflow.')) {
try {
const fixBadLinksResult = fixBadLinks(graphToUse, true);
if (!fixBadLinksResult.hasBadLinks) {
that.hideMessage('bad-links');
alert('Success! It\'s possible some valid links may have been affected. Please check and verify your workflow.');
wasLoadingAborted && app.loadGraphData(fixBadLinksResult.graph);
if (rgthreeConfig['monitor_for_corrupt_links'] || rgthreeConfig['monitor_bad_links']) {
that.monitorLinkTimeout = setTimeout(() => {
that.monitorBadLinks();
}, 5000);
}
}
} catch(e) {
console.error(e);
alert('Unsuccessful at fixing corrupt data. :(');
that.hideMessage('bad-links');
}
}
}
}
},
]
});
} else if (rgthreeConfig['monitor_bad_links']) {
},
]
});
}
} else if (rgthreeConfig['monitor_for_corrupt_links'] || rgthreeConfig['monitor_bad_links']) {
that.monitorLinkTimeout = setTimeout(() => {
that.monitorBadLinks();
}, 5000);
web/rgthree.js
+40 -30
View File
@@ -179,40 +179,50 @@ class Rgthree {
const graphToUse = wasLoadingAborted ? (graphCopy || graph) : app.graph;
const fixBadLinksResult = fixBadLinks(graphToUse);
if (fixBadLinksResult.hasBadLinks) {
that.showMessage({
id: 'bad-links',
type: 'warn',
message: 'The workflow you\'ve loaded may have connection/linking data that could be fixed.',
actions: [
{
label: 'Open fixer',
href: '/extensions/rgthree-comfy/html/links.html',
},
{
label: 'Fix in place',
href: '/extensions/rgthree-comfy/html/links.html',
callback: (event) => {
event.stopPropagation();
event.preventDefault();
if (confirm('This will attempt to fix in place. Please make sure to have a saved copy of your workflow.')) {
const fixBadLinksResult = fixBadLinks(graphToUse, true);
if (!fixBadLinksResult.hasBadLinks) {
that.hideMessage('bad-links');
alert('Success! It\'s possible some valid links may have been affected. Please check and verify your workflow.');
wasLoadingAborted && app.loadGraphData(fixBadLinksResult.graph);
if (rgthreeConfig['monitor_bad_links']) {
that.monitorLinkTimeout = setTimeout(() => {
that.monitorBadLinks();
}, 5000);
that.log(LogLevel.WARN, `The workflow you've loaded has corrupt linking data. Open ${new URL(location.href).origin}/extensions/rgthree-comfy/html/links.html to try to fix.`);
if (rgthreeConfig['show_corrupt_link_alerts']) {
that.showMessage({
id: 'bad-links',
type: 'warn',
message: 'The workflow you\'ve loaded has corrupt linking data that may be able to be fixed.',
actions: [
{
label: 'Open fixer',
href: '/extensions/rgthree-comfy/html/links.html',
},
{
label: 'Fix in place',
href: '/extensions/rgthree-comfy/html/links.html',
callback: (event) => {
event.stopPropagation();
event.preventDefault();
if (confirm('This will attempt to fix in place. Please make sure to have a saved copy of your workflow.')) {
try {
const fixBadLinksResult = fixBadLinks(graphToUse, true);
if (!fixBadLinksResult.hasBadLinks) {
that.hideMessage('bad-links');
alert('Success! It\'s possible some valid links may have been affected. Please check and verify your workflow.');
wasLoadingAborted && app.loadGraphData(fixBadLinksResult.graph);
if (rgthreeConfig['monitor_for_corrupt_links'] || rgthreeConfig['monitor_bad_links']) {
that.monitorLinkTimeout = setTimeout(() => {
that.monitorBadLinks();
}, 5000);
}
}
}
catch (e) {
console.error(e);
alert('Unsuccessful at fixing corrupt data. :(');
that.hideMessage('bad-links');
}
}
}
}
},
]
});
},
]
});
}
}
else if (rgthreeConfig['monitor_bad_links']) {
else if (rgthreeConfig['monitor_for_corrupt_links'] || rgthreeConfig['monitor_bad_links']) {
that.monitorLinkTimeout = setTimeout(() => {
that.monitorBadLinks();
}, 5000);