From 326fa960b7fb23a978727910faa3bf0166c99924 Mon Sep 17 00:00:00 2001 From: cocktailpeanut Date: Thu, 4 Jan 2024 14:12:21 -0500 Subject: [PATCH 01/15] update --- menu.js | 72 +++++++++++++++++++++++++++++++++----------------------- start.js | 11 ++++----- 2 files changed, 46 insertions(+), 37 deletions(-) diff --git a/menu.js b/menu.js index 496518f..9809c10 100644 --- a/menu.js +++ b/menu.js @@ -9,36 +9,48 @@ module.exports = async kernel => { if (kernel.running(__dirname, 'start.js')) { - const session = await kernel.require(__dirname, 'session.json'); - - menu = - [ - { - icon: 'fa-solid fa-spin fa-circle-notch', - text: 'Running ' + session.mode - }, - { - icon: 'fa-solid fa-desktop', - text: 'Server', - href: 'start.js', - params: - { - fullscreen: true - } - } - ]; - if (session && session.url) - { - menu.push( - { - icon: 'fa-solid fa-rocket', - text: 'Open session', - href: session.url, - target: '_blank' - }); - } - return menu; - } + const memory = kernel.memory.local[path.resolve(__dirname, "start.json")] + if (memory && memory.url && memory.mode) + { + menu = + [ + { + icon: 'fa-solid fa-spin fa-circle-notch', + text: 'Running ' + memory.mode + }, + { + icon: 'fa-solid fa-desktop', + text: 'Server', + href: 'start.js', + params: + { + fullscreen: true + } + }, + { + icon: 'fa-solid fa-rocket', + text: 'Open session', + href: memory.url, + target: '_blank' + } + ]; + } + else + { + menu = + [ + { + icon: 'fa-solid fa-desktop', + text: 'Server', + href: 'start.js', + params: + { + fullscreen: true + } + } + ]; + } + } menu = [ { diff --git a/start.js b/start.js index b24b688..e5bbd24 100644 --- a/start.js +++ b/start.js @@ -35,21 +35,18 @@ module.exports = () => } }, { - method: 'self.set', + method: 'local.set', params: { - 'session.json': - { - mode: '{{local.mode}}', - url: '{{input.stdout.match(/(http:\\S+)/gi)[0]}}' - } + mode: '{{local.mode}}', + url: '{{input.stdout.match(/(http:\\S+)/gi)[0]}}' } }, { method: 'browser.open', params: { - uri: '{{self.session.url}}', + uri: '{{local.url}}', target: '_blank' } } From 2b8f0ccc2ea3241ef2ec1ef6eb0e6a5da2b14b1a Mon Sep 17 00:00:00 2001 From: cocktailpeanut Date: Thu, 4 Jan 2024 14:15:00 -0500 Subject: [PATCH 02/15] add path --- menu.js | 1 + 1 file changed, 1 insertion(+) diff --git a/menu.js b/menu.js index 9809c10..00abbd1 100644 --- a/menu.js +++ b/menu.js @@ -1,3 +1,4 @@ +const path = require('path') module.exports = async kernel => { const hasEnv = await kernel.exists(__dirname, 'facefusion', 'env'); From 69816bf3e3a9eaeca4e903f9ccef503e4d29167b Mon Sep 17 00:00:00 2001 From: cocktailpeanut Date: Thu, 4 Jan 2024 14:21:35 -0500 Subject: [PATCH 03/15] update --- menu.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/menu.js b/menu.js index 00abbd1..7482c5c 100644 --- a/menu.js +++ b/menu.js @@ -15,13 +15,9 @@ module.exports = async kernel => { menu = [ - { - icon: 'fa-solid fa-spin fa-circle-notch', - text: 'Running ' + memory.mode - }, { icon: 'fa-solid fa-desktop', - text: 'Server', + text: 'Server (' + memory.mode + ')', href: 'start.js', params: { From 563f4132559ab5c394f065c33411c7ee7963bcb2 Mon Sep 17 00:00:00 2001 From: cocktailpeanut Date: Thu, 4 Jan 2024 14:24:15 -0500 Subject: [PATCH 04/15] update --- menu.js | 22 ++++++++++++++++++++++ reset.js | 8 ++++++++ 2 files changed, 30 insertions(+) create mode 100644 reset.js diff --git a/menu.js b/menu.js index 7482c5c..c9ac06a 100644 --- a/menu.js +++ b/menu.js @@ -94,6 +94,28 @@ module.exports = async kernel => } } ]; + menu.push( + { + icon: 'fa-solid fa-plug', + text: 'Reinstall', + href: 'install.js', + params: + { + run: true, + fullscreen: true + } + }, + { + icon: 'fa-solid fa-plug', + text: 'Factory Reset", + href: 'reset.js', + params: + { + run: true, + fullscreen: true + } + } + ) } else { diff --git a/reset.js b/reset.js new file mode 100644 index 0000000..8784ae8 --- /dev/null +++ b/reset.js @@ -0,0 +1,8 @@ +{ + "run": [{ + "method": "fs.rm", + "params": { + "path": "facefusion" + } + }] +} From 0bdca66f1f98c3d52551be8f0d90568a0f1f90e0 Mon Sep 17 00:00:00 2001 From: cocktailpeanut Date: Thu, 4 Jan 2024 14:24:53 -0500 Subject: [PATCH 05/15] typo --- menu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/menu.js b/menu.js index c9ac06a..b1588cb 100644 --- a/menu.js +++ b/menu.js @@ -107,7 +107,7 @@ module.exports = async kernel => }, { icon: 'fa-solid fa-plug', - text: 'Factory Reset", + text: 'Factory Reset', href: 'reset.js', params: { From 1ecc116bdd43bad8f10f1ff080a2ccc04f0c2163 Mon Sep 17 00:00:00 2001 From: cocktailpeanut Date: Thu, 4 Jan 2024 14:28:16 -0500 Subject: [PATCH 06/15] update --- menu.js | 97 +++++++++++++++++++++++++++++---------------------------- 1 file changed, 50 insertions(+), 47 deletions(-) diff --git a/menu.js b/menu.js index b1588cb..0b21f11 100644 --- a/menu.js +++ b/menu.js @@ -48,56 +48,59 @@ module.exports = async kernel => ]; } } - menu = - [ - { - icon: 'fa-solid fa-power-off', - text: 'Launch default', - href: 'start.js', - params: - { - run: true, - fullscreen: true, - mode: 'Default' - } - }, - { - icon: 'fa-solid fa-gauge', - text: 'Launch benchmark', - href: 'start.js', - params: - { - run: true, - fullscreen: true, - mode: 'Benchmark' - } - }, - { - icon: 'fa-solid fa-camera', - text: 'Launch webcam', - href: 'start.js', - params: - { - run: true, - fullscreen: true, - mode: 'Webcam' - } - }, - { - icon: 'fa-solid fa-rotate', - text: 'Update', - href: 'update.js', - params: - { - run: true, - fullscreen: true - } - } - ]; + else + { + menu = + [ + { + icon: 'fa-solid fa-power-off', + text: 'Launch default', + href: 'start.js', + params: + { + run: true, + fullscreen: true, + mode: 'Default' + } + }, + { + icon: 'fa-solid fa-gauge', + text: 'Launch benchmark', + href: 'start.js', + params: + { + run: true, + fullscreen: true, + mode: 'Benchmark' + } + }, + { + icon: 'fa-solid fa-camera', + text: 'Launch webcam', + href: 'start.js', + params: + { + run: true, + fullscreen: true, + mode: 'Webcam' + } + }, + { + icon: 'fa-solid fa-rotate', + text: 'Update', + href: 'update.js', + params: + { + run: true, + fullscreen: true + } + } + ]; + } menu.push( { icon: 'fa-solid fa-plug', - text: 'Reinstall', + text: 'Install', href: 'install.js', params: { From 89d05857ef35c571dd4c8ac49b1230a53df3bb12 Mon Sep 17 00:00:00 2001 From: cocktailpeanut Date: Thu, 4 Jan 2024 14:33:03 -0500 Subject: [PATCH 07/15] update --- menu.js | 50 ++++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/menu.js b/menu.js index 0b21f11..97d7bc1 100644 --- a/menu.js +++ b/menu.js @@ -84,7 +84,11 @@ module.exports = async kernel => fullscreen: true, mode: 'Webcam' } - }, + } + ]; + } + menu = menu.concat( + [ { icon: 'fa-solid fa-rotate', text: 'Update', @@ -94,30 +98,28 @@ module.exports = async kernel => run: true, fullscreen: true } + }, + { + icon: 'fa-solid fa-plug', + text: 'Install', + href: 'install.js', + params: + { + run: true, + fullscreen: true + } + }, + { + icon: 'fa-solid fa-plug', + text: 'Factory Reset', + href: 'reset.js', + params: + { + run: true, + fullscreen: true + } } - ]; - } - menu.push( - { - icon: 'fa-solid fa-plug', - text: 'Install', - href: 'install.js', - params: - { - run: true, - fullscreen: true - } - }, - { - icon: 'fa-solid fa-plug', - text: 'Factory Reset', - href: 'reset.js', - params: - { - run: true, - fullscreen: true - } - } + ] ) } else From 6c47b969bcb57bbc315dba082e59a54244c67378 Mon Sep 17 00:00:00 2001 From: cocktailpeanut Date: Thu, 4 Jan 2024 14:36:35 -0500 Subject: [PATCH 08/15] update --- menu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/menu.js b/menu.js index 97d7bc1..6912922 100644 --- a/menu.js +++ b/menu.js @@ -110,7 +110,7 @@ module.exports = async kernel => } }, { - icon: 'fa-solid fa-plug', + icon: 'fa-regular fa-circle-mark', text: 'Factory Reset', href: 'reset.js', params: From 8589b646fd3d4600da218bfc18353bd6e3a7af3a Mon Sep 17 00:00:00 2001 From: cocktailpeanut Date: Thu, 4 Jan 2024 14:36:59 -0500 Subject: [PATCH 09/15] update --- menu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/menu.js b/menu.js index 6912922..585f56b 100644 --- a/menu.js +++ b/menu.js @@ -110,7 +110,7 @@ module.exports = async kernel => } }, { - icon: 'fa-regular fa-circle-mark', + icon: 'fa-regular fa-circle-xmark', text: 'Factory Reset', href: 'reset.js', params: From 54f61ab211de8a468299bd7a57a1828455552b14 Mon Sep 17 00:00:00 2001 From: cocktailpeanut Date: Thu, 4 Jan 2024 14:38:47 -0500 Subject: [PATCH 10/15] update --- start.js | 1 - 1 file changed, 1 deletion(-) diff --git a/start.js b/start.js index e5bbd24..d236e98 100644 --- a/start.js +++ b/start.js @@ -38,7 +38,6 @@ module.exports = () => method: 'local.set', params: { - mode: '{{local.mode}}', url: '{{input.stdout.match(/(http:\\S+)/gi)[0]}}' } }, From 4132c4afed09f23b9e43997876c1a6644aae0f34 Mon Sep 17 00:00:00 2001 From: cocktailpeanut Date: Thu, 4 Jan 2024 14:41:36 -0500 Subject: [PATCH 11/15] update --- menu.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/menu.js b/menu.js index 585f56b..1b8ec1c 100644 --- a/menu.js +++ b/menu.js @@ -10,7 +10,7 @@ module.exports = async kernel => { if (kernel.running(__dirname, 'start.js')) { - const memory = kernel.memory.local[path.resolve(__dirname, "start.json")] + const memory = kernel.memory.local[path.resolve(__dirname, "start.js")] if (memory && memory.url && memory.mode) { menu = From ee7ab0e47106f809342b76d5568c3ea0cb212dca Mon Sep 17 00:00:00 2001 From: cocktailpeanut Date: Thu, 4 Jan 2024 14:42:24 -0500 Subject: [PATCH 12/15] update --- menu.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/menu.js b/menu.js index 1b8ec1c..04b75b6 100644 --- a/menu.js +++ b/menu.js @@ -15,6 +15,12 @@ module.exports = async kernel => { menu = [ + { + icon: 'fa-solid fa-rocket', + text: 'Open session', + href: memory.url, + target: '_blank' + }, { icon: 'fa-solid fa-desktop', text: 'Server (' + memory.mode + ')', @@ -23,12 +29,6 @@ module.exports = async kernel => { fullscreen: true } - }, - { - icon: 'fa-solid fa-rocket', - text: 'Open session', - href: memory.url, - target: '_blank' } ]; } From b429641620e3d69bf37c0d4a0dbab0b4de85b55e Mon Sep 17 00:00:00 2001 From: henryruhs Date: Thu, 4 Jan 2024 22:25:47 +0100 Subject: [PATCH 13/15] Fix coding style and reset.js --- menu.js | 226 ++++++++++++++++++++++++++++--------------------------- reset.js | 25 ++++-- 2 files changed, 132 insertions(+), 119 deletions(-) diff --git a/menu.js b/menu.js index 04b75b6..cb0de22 100644 --- a/menu.js +++ b/menu.js @@ -1,4 +1,5 @@ -const path = require('path') +const path = require('path'); + module.exports = async kernel => { const hasEnv = await kernel.exists(__dirname, 'facefusion', 'env'); @@ -10,117 +11,118 @@ module.exports = async kernel => { if (kernel.running(__dirname, 'start.js')) { - const memory = kernel.memory.local[path.resolve(__dirname, "start.js")] - if (memory && memory.url && memory.mode) - { - menu = - [ - { - icon: 'fa-solid fa-rocket', - text: 'Open session', - href: memory.url, - target: '_blank' - }, - { - icon: 'fa-solid fa-desktop', - text: 'Server (' + memory.mode + ')', - href: 'start.js', - params: - { - fullscreen: true - } - } - ]; - } - else - { - menu = - [ - { - icon: 'fa-solid fa-desktop', - text: 'Server', - href: 'start.js', - params: - { - fullscreen: true - } - } - ]; - } - } - else - { - menu = - [ - { - icon: 'fa-solid fa-power-off', - text: 'Launch default', - href: 'start.js', - params: - { - run: true, - fullscreen: true, - mode: 'Default' - } - }, - { - icon: 'fa-solid fa-gauge', - text: 'Launch benchmark', - href: 'start.js', - params: - { - run: true, - fullscreen: true, - mode: 'Benchmark' - } - }, - { - icon: 'fa-solid fa-camera', - text: 'Launch webcam', - href: 'start.js', - params: - { - run: true, - fullscreen: true, - mode: 'Webcam' - } - } - ]; - } - menu = menu.concat( - [ - { - icon: 'fa-solid fa-rotate', - text: 'Update', - href: 'update.js', - params: - { - run: true, - fullscreen: true - } - }, - { - icon: 'fa-solid fa-plug', - text: 'Install', - href: 'install.js', - params: - { - run: true, - fullscreen: true - } - }, - { - icon: 'fa-regular fa-circle-xmark', - text: 'Factory Reset', - href: 'reset.js', - params: - { - run: true, - fullscreen: true - } - } - ] - ) + const memory = kernel.memory.local[path.resolve(__dirname, 'start.js')]; + + if (memory && memory.url && memory.mode) + { + menu = + [ + { + icon: 'fa-solid fa-rocket', + text: 'Open session', + href: memory.url, + target: '_blank' + }, + { + icon: 'fa-solid fa-desktop', + text: 'Server (' + memory.mode + ')', + href: 'start.js', + params: + { + fullscreen: true + } + } + ]; + } + else + { + menu = + [ + { + icon: 'fa-solid fa-desktop', + text: 'Server', + href: 'start.js', + params: + { + fullscreen: true + } + } + ]; + } + } + else + { + menu = + [ + { + icon: 'fa-solid fa-power-off', + text: 'Launch default', + href: 'start.js', + params: + { + run: true, + fullscreen: true, + mode: 'Default' + } + }, + { + icon: 'fa-solid fa-gauge', + text: 'Launch benchmark', + href: 'start.js', + params: + { + run: true, + fullscreen: true, + mode: 'Benchmark' + } + }, + { + icon: 'fa-solid fa-camera', + text: 'Launch webcam', + href: 'start.js', + params: + { + run: true, + fullscreen: true, + mode: 'Webcam' + } + } + ]; + } + menu = menu.concat( + [ + { + icon: 'fa-solid fa-rotate', + text: 'Update', + href: 'update.js', + params: + { + run: true, + fullscreen: true + } + }, + { + icon: 'fa-solid fa-plug', + text: 'Install', + href: 'install.js', + params: + { + run: true, + fullscreen: true + } + }, + { + icon: 'fa-regular fa-circle-xmark', + text: 'Factory Reset', + href: 'reset.js', + params: + { + run: true, + fullscreen: true + } + } + ] + ); } else { diff --git a/reset.js b/reset.js index 8784ae8..5d74c4d 100644 --- a/reset.js +++ b/reset.js @@ -1,8 +1,19 @@ +module.exports = () => { - "run": [{ - "method": "fs.rm", - "params": { - "path": "facefusion" - } - }] -} + const config = + { + run: + [ + { + method: 'fs.rm', + params: + { + 'path': 'facefusion' + } + } + ] + }; + + return config; +}; + From 6c170f8918e843fce561364f94258b3d5ff6493b Mon Sep 17 00:00:00 2001 From: henryruhs Date: Thu, 4 Jan 2024 22:32:09 +0100 Subject: [PATCH 14/15] Minor cosmetics --- menu.js | 61 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 30 insertions(+), 31 deletions(-) diff --git a/menu.js b/menu.js index cb0de22..ce3e7ce 100644 --- a/menu.js +++ b/menu.js @@ -90,39 +90,38 @@ module.exports = async kernel => ]; } menu = menu.concat( - [ + [ + { + icon: 'fa-solid fa-rotate', + text: 'Update', + href: 'update.js', + params: { - icon: 'fa-solid fa-rotate', - text: 'Update', - href: 'update.js', - params: - { - run: true, - fullscreen: true - } - }, - { - icon: 'fa-solid fa-plug', - text: 'Install', - href: 'install.js', - params: - { - run: true, - fullscreen: true - } - }, - { - icon: 'fa-regular fa-circle-xmark', - text: 'Factory Reset', - href: 'reset.js', - params: - { - run: true, - fullscreen: true - } + run: true, + fullscreen: true } - ] - ); + }, + { + icon: 'fa-solid fa-plug', + text: 'Install', + href: 'install.js', + params: + { + run: true, + fullscreen: true + } + }, + { + icon: 'fa-regular fa-circle-xmark', + text: 'Factory reset', + href: 'reset.js', + params: + { + run: true, + fullscreen: true + } + } + ]); } else { From a9dae46257bcc1a030b33411fa42c25d5be219e3 Mon Sep 17 00:00:00 2001 From: henryruhs Date: Thu, 4 Jan 2024 23:04:48 +0100 Subject: [PATCH 15/15] Add version --- pinokio.js | 1 + 1 file changed, 1 insertion(+) diff --git a/pinokio.js b/pinokio.js index e8fb1f1..7fa68f3 100644 --- a/pinokio.js +++ b/pinokio.js @@ -1,5 +1,6 @@ module.exports = { + version: '1', title: 'FaceFusion 2.1.3', description: 'Next generation face swapper and enhancer', icon: 'icon.png',