From a743d4b68d955d4ff13c33bf641d6b900fc459d5 Mon Sep 17 00:00:00 2001 From: Dragoon Dorise Date: Thu, 31 Oct 2024 10:33:02 +0100 Subject: [PATCH 1/9] fixed user with spaces --- tools/cloudSync/cloud_sync_force.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cloudSync/cloud_sync_force.bat b/tools/cloudSync/cloud_sync_force.bat index 2a9aec13..d9e77962 100644 --- a/tools/cloudSync/cloud_sync_force.bat +++ b/tools/cloudSync/cloud_sync_force.bat @@ -1 +1 @@ -powershell -ExecutionPolicy Bypass -NoExit . %APPDATA%\EmuDeck\backend\tools\cloudSync\cloud_sync_force.ps1 \ No newline at end of file +powershell -ExecutionPolicy Bypass -NoExit . "%APPDATA%\EmuDeck\backend\tools\cloudSync\cloud_sync_force.ps1" \ No newline at end of file From acb5b7ddfe08a92c783c4a49d6387134d203eb32 Mon Sep 17 00:00:00 2001 From: Dragoon Dorise Date: Mon, 18 Nov 2024 18:06:50 +0100 Subject: [PATCH 2/9] cloud 2 --- configs/rclone/rclone.conf | 10 +++++----- functions/ToolScripts/emuDeckSaveSync.ps1 | 14 +++++++++----- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/configs/rclone/rclone.conf b/configs/rclone/rclone.conf index 8b7f9070..3e0d5776 100644 --- a/configs/rclone/rclone.conf +++ b/configs/rclone/rclone.conf @@ -45,9 +45,9 @@ host = user = pass = + [Emudeck-cloud] -type = sftp -host = -user = -pass = -port = \ No newline at end of file +type = b2 +account = +key = +hard_delete = false \ No newline at end of file diff --git a/functions/ToolScripts/emuDeckSaveSync.ps1 b/functions/ToolScripts/emuDeckSaveSync.ps1 index 6b2010de..5038a045 100644 --- a/functions/ToolScripts/emuDeckSaveSync.ps1 +++ b/functions/ToolScripts/emuDeckSaveSync.ps1 @@ -272,20 +272,24 @@ function cloud_sync_config($cloud_sync_provider, $token){ $parts = $token -split '\|\|\|' $json = '{"token":"'+ $token + '"}' - $password = Invoke-RestMethod -Method Post -Uri "https://token.emudeck.com/create-cs.php" ` - -ContentType "application/x-www-form-urlencoded" ` - -Body "$json" + $response = Invoke-RestMethod -Method Post -Uri "https://token.emudeck.com/b2.php" ` + -ContentType "application/json" ` + -Body $json + + # Asignar los valores a variables + $cloud_key_id = $response.cloud_key_id + $cloud_key = $response.cloud_key $pass= $($password.cloud_token) $ofuspass = $pass $user=$($parts[0]) - setSetting "cs_user" "cs_$user\" + setSetting "cs_user" "cs$user\" Start-Process $cloud_sync_bin -ArgumentList @" - config update Emudeck-cloud host=cloud.emudeck.com user=cs_$user port=22 pass="$ofuspass" + config update Emudeck-cloud key="$cloud_key" account="$cloud_key_id" "@ -WindowStyle Maximized -Wait & $cloud_sync_bin mkdir "$cloud_sync_provider`:$cs_user`Emudeck\saves" From 159b3bc4cf0e6999f6e7396d7e8b43cc91f86adf Mon Sep 17 00:00:00 2001 From: Dragoon Dorise Date: Mon, 25 Nov 2024 15:41:43 +0100 Subject: [PATCH 3/9] fix Cemu --- functions/EmuScripts/emuDeckCemu.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/EmuScripts/emuDeckCemu.ps1 b/functions/EmuScripts/emuDeckCemu.ps1 index 9cb3afb2..c795c4ec 100644 --- a/functions/EmuScripts/emuDeckCemu.ps1 +++ b/functions/EmuScripts/emuDeckCemu.ps1 @@ -12,7 +12,7 @@ function Cemu_install(){ } Remove-Item -Recurse -Force cemu -ErrorAction SilentlyContinue - createLauncher "cemu" + createLauncher "Cemu" } function Cemu_init(){ From 073ca7249c799ab23c05ea078939f1f6b3ce3c36 Mon Sep 17 00:00:00 2001 From: Dragoon Dorise Date: Fri, 6 Dec 2024 11:27:08 +0100 Subject: [PATCH 4/9] greemDev --- functions/EmuScripts/emuDeckRyujinx.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/EmuScripts/emuDeckRyujinx.ps1 b/functions/EmuScripts/emuDeckRyujinx.ps1 index 6d53d0b0..61f34b6a 100644 --- a/functions/EmuScripts/emuDeckRyujinx.ps1 +++ b/functions/EmuScripts/emuDeckRyujinx.ps1 @@ -2,7 +2,7 @@ $Ryujinx_configFile="$emusPath\Ryujinx\portable\Config.json" function Ryujinx_install(){ setMSG "Downloading Ryujinx" - $url_ryu = getLatestReleaseURLGH "ryujinx-mirror/ryujinx" "zip" + $url_ryu = getLatestReleaseURLGH "GreemDev/Ryujinx" "zip" download $url_ryu "Ryujinx.zip" moveFromTo "$temp/Ryujinx" "$emusPath\Ryujinx" createLauncher "Ryujinx" From 46527bfb61c8e1505126ca5349237f060eddc410 Mon Sep 17 00:00:00 2001 From: Dragoon Dorise Date: Fri, 6 Dec 2024 11:30:29 +0100 Subject: [PATCH 5/9] publish --- functions/EmuScripts/emuDeckRyujinx.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/EmuScripts/emuDeckRyujinx.ps1 b/functions/EmuScripts/emuDeckRyujinx.ps1 index 61f34b6a..15985560 100644 --- a/functions/EmuScripts/emuDeckRyujinx.ps1 +++ b/functions/EmuScripts/emuDeckRyujinx.ps1 @@ -4,7 +4,7 @@ function Ryujinx_install(){ setMSG "Downloading Ryujinx" $url_ryu = getLatestReleaseURLGH "GreemDev/Ryujinx" "zip" download $url_ryu "Ryujinx.zip" - moveFromTo "$temp/Ryujinx" "$emusPath\Ryujinx" + moveFromTo "$temp/Ryujinx/publish" "$emusPath\Ryujinx" createLauncher "Ryujinx" } function Ryujinx_init(){ From 3cec93c34c60536c4c9cc157ff5f7d52f5fdedcc Mon Sep 17 00:00:00 2001 From: Dragoon Dorise Date: Fri, 6 Dec 2024 11:27:08 +0100 Subject: [PATCH 6/9] greemDev --- functions/EmuScripts/emuDeckRyujinx.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/EmuScripts/emuDeckRyujinx.ps1 b/functions/EmuScripts/emuDeckRyujinx.ps1 index 6d53d0b0..61f34b6a 100644 --- a/functions/EmuScripts/emuDeckRyujinx.ps1 +++ b/functions/EmuScripts/emuDeckRyujinx.ps1 @@ -2,7 +2,7 @@ $Ryujinx_configFile="$emusPath\Ryujinx\portable\Config.json" function Ryujinx_install(){ setMSG "Downloading Ryujinx" - $url_ryu = getLatestReleaseURLGH "ryujinx-mirror/ryujinx" "zip" + $url_ryu = getLatestReleaseURLGH "GreemDev/Ryujinx" "zip" download $url_ryu "Ryujinx.zip" moveFromTo "$temp/Ryujinx" "$emusPath\Ryujinx" createLauncher "Ryujinx" From cd7327ca7f95c62654cb0f59f965445d8b63592f Mon Sep 17 00:00:00 2001 From: Dragoon Dorise Date: Fri, 6 Dec 2024 11:30:29 +0100 Subject: [PATCH 7/9] publish --- functions/EmuScripts/emuDeckRyujinx.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/EmuScripts/emuDeckRyujinx.ps1 b/functions/EmuScripts/emuDeckRyujinx.ps1 index 61f34b6a..15985560 100644 --- a/functions/EmuScripts/emuDeckRyujinx.ps1 +++ b/functions/EmuScripts/emuDeckRyujinx.ps1 @@ -4,7 +4,7 @@ function Ryujinx_install(){ setMSG "Downloading Ryujinx" $url_ryu = getLatestReleaseURLGH "GreemDev/Ryujinx" "zip" download $url_ryu "Ryujinx.zip" - moveFromTo "$temp/Ryujinx" "$emusPath\Ryujinx" + moveFromTo "$temp/Ryujinx/publish" "$emusPath\Ryujinx" createLauncher "Ryujinx" } function Ryujinx_init(){ From 3e070092a5757595c9b85c25e78e49d77ae682e5 Mon Sep 17 00:00:00 2001 From: Blake Panter <7227893+nintendo424@users.noreply.github.com> Date: Tue, 10 Dec 2024 00:09:14 -0500 Subject: [PATCH 8/9] fix windows SMB --- functions/ToolScripts/emuDeckSaveSync.ps1 | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/functions/ToolScripts/emuDeckSaveSync.ps1 b/functions/ToolScripts/emuDeckSaveSync.ps1 index 5038a045..1dde1dfa 100644 --- a/functions/ToolScripts/emuDeckSaveSync.ps1 +++ b/functions/ToolScripts/emuDeckSaveSync.ps1 @@ -82,6 +82,15 @@ function Get-Custom-Credentials($provider){ $textBoxUrl.Size = New-Object System.Drawing.Size(150, 20) $form.Controls.Add($textBoxUrl) + $labelShare = New-Object System.Windows.Forms.Label + $labelShare.Text = "Share name:" + $labelShare.Location = New-Object System.Drawing.Point(30, 150) + $form.Controls.Add($labelShare) + $textBoxShare = New-Object System.Windows.Forms.TextBox + $textBoxShare.Location = New-Object System.Drawing.Point(140, 150) + $textBoxShare.Size = New-Object System.Drawing.Size(150, 20) + $form.Controls.Add($textBoxShare) + #$labelPort = New-Object System.Windows.Forms.Label #$labelPort.Text = "You need to create an emudeck folder in the root of your storage before #setting up CloudSync" #$labelPort.Location = New-Object System.Drawing.Point(40, 200) @@ -116,12 +125,14 @@ function Get-Custom-Credentials($provider){ if ($result -eq [System.Windows.Forms.DialogResult]::OK) { $username = $textBoxUsername.Text $password = $textBoxPassword.Text + $share = $textBoxShare.Text $url = $textBoxUrl.Text $port = $textBoxPort.Text #stopLog return [PSCustomObject]@{ Username = $username Password = $password + Share = $share Url = $url Port = $port } @@ -301,6 +312,7 @@ function cloud_sync_config($cloud_sync_provider, $token){ } elseif ($cloud_sync_provider -eq "Emudeck-SMB") { $credentials = Get-Custom-Credentials "Emudeck-SMB" $pass=$credentials.Password + $share=$credentials.Share $params="obscure $pass" $obscuredPassword = Invoke-Expression "$cloud_sync_bin $params" @@ -312,8 +324,9 @@ function cloud_sync_config($cloud_sync_provider, $token){ createCloudFile $_.FullName } - & $cloud_sync_bin mkdir "$cloud_sync_provider`:Emudeck\saves" - & $cloud_sync_bin copy $savesPath "$cloud_sync_provider`:Emudeck\saves" --include "*.cloud" + $path="${cloud_sync_provider}:${share}\Emudeck\saves" + & $cloud_sync_bin mkdir $path + & $cloud_sync_bin copy $savesPath $path --include "*.cloud" #Cleaning up Get-ChildItem -Path $carpetaLocal -Filter "*.cloud" | ForEach-Object { Remove-Item $_.FullName From 3a48a8d6773ce311d75a1746d511b09c7275d136 Mon Sep 17 00:00:00 2001 From: Blake Panter <7227893+nintendo424@users.noreply.github.com> Date: Tue, 10 Dec 2024 02:08:05 -0500 Subject: [PATCH 9/9] fix button height --- functions/ToolScripts/emuDeckSaveSync.ps1 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/functions/ToolScripts/emuDeckSaveSync.ps1 b/functions/ToolScripts/emuDeckSaveSync.ps1 index 1dde1dfa..c13b2394 100644 --- a/functions/ToolScripts/emuDeckSaveSync.ps1 +++ b/functions/ToolScripts/emuDeckSaveSync.ps1 @@ -101,7 +101,9 @@ function Get-Custom-Credentials($provider){ } if( $provider -eq "Emudeck-SFTP" ){ $buttonHeight=200 - }else{ + } elseif( $provider -eq "Emudeck-SMB" ) { + $buttonHeight=200 + } else{ $buttonHeight=160 }