Skip to content

Claude/sync upload checkbox setting 4 x qd q #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
NerdsCorp merged 2 commits into from
Dec 28, 2025
Merged

Claude/sync upload checkbox setting 4 x qd q #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3d57e0
feat: Sync asset packing setting with upload to server functionality
claude Dec 28, 2025
280cf5d
feat: Auto-use Editor directory for upload, remove directory selectio…
claude Dec 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 6 additions & 46 deletions Intersect.Editor/Forms/FrmUploadToServer.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

67 changes: 15 additions & 52 deletions Intersect.Editor/Forms/FrmUploadToServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
using System.Net.Http.Headers;
using System.Security.Cryptography;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
using DarkUI.Forms;
Expand All @@ -31,6 +32,8 @@
{
InitializeComponent();
Icon = Program.Icon;
// Automatically set directory to Editor's current directory
_selectedDirectory = Environment.CurrentDirectory;
LoadSettings();
FormClosing += FrmUploadToServer_FormClosing;
}
Expand Down Expand Up @@ -58,14 +61,6 @@
rbEditorAssets.Checked = savedType == "editor";
rbClientAssets.Checked = !rbEditorAssets.Checked;

var savedDirectory = Preferences.LoadPreference("upload_lastDirectory");
if (!string.IsNullOrWhiteSpace(savedDirectory) && Directory.Exists(savedDirectory))
{
_selectedDirectory = savedDirectory;
txtDirectory.Text = savedDirectory;
// Don't enable upload here - let UpdateAuthenticationStatus handle it
}

var rawTokenResponse = Preferences.LoadPreference(nameof(TokenResponse));
if (!string.IsNullOrWhiteSpace(rawTokenResponse))
{
Expand Down Expand Up @@ -95,14 +90,12 @@
{
lblStatus.Text = "✓ Authenticated - Ready to upload";
btnLogin.Text = "Re-Login";
// Only enable upload if we have authentication AND a directory selected
btnUpload.Enabled = !string.IsNullOrWhiteSpace(_selectedDirectory) && Directory.Exists(_selectedDirectory);
btnUpload.Enabled = true;
}
else
{
lblStatus.Text = "⚠ Not authenticated - Please click the Login button below to authenticate";
btnLogin.Text = "Login";
// Disable upload when not authenticated
btnUpload.Enabled = false;
}

Expand Down Expand Up @@ -310,34 +303,6 @@
{
Preferences.SavePreference("upload_serverUrl", txtServerUrl.Text);
Preferences.SavePreference("upload_type", rbEditorAssets.Checked ? "editor" : "client");

if (!string.IsNullOrWhiteSpace(_selectedDirectory))
{
Preferences.SavePreference("upload_lastDirectory", _selectedDirectory);
}
}

private void btnBrowse_Click(object sender, EventArgs e)
{
using var folderDialog = new FolderBrowserDialog
{
Description = Strings.UploadToServer.SourceDirectoryPrompt,
ShowNewFolderButton = false
};

var lastDir = Preferences.LoadPreference("upload_lastDirectory");
if (!string.IsNullOrWhiteSpace(lastDir) && Directory.Exists(lastDir))
{
folderDialog.SelectedPath = lastDir;
}

if (folderDialog.ShowDialog() == DialogResult.OK)
{
_selectedDirectory = folderDialog.SelectedPath;
txtDirectory.Text = _selectedDirectory;
// Only enable upload if authenticated
btnUpload.Enabled = _tokenResponse != null && !IsTokenExpired(_tokenResponse);
}
}

private async void btnUpload_Click(object sender, EventArgs e)
Expand Down Expand Up @@ -366,22 +331,21 @@
return;
}

if (string.IsNullOrWhiteSpace(_selectedDirectory) ||
!Directory.Exists(_selectedDirectory))
SaveSettings();

// Check if we should package assets before uploading
var packageUpdateAssets = Preferences.LoadPreference("PackageUpdateAssets");
if (!string.IsNullOrWhiteSpace(packageUpdateAssets) &&
Convert.ToBoolean(packageUpdateAssets, CultureInfo.InvariantCulture))
{
DarkMessageBox.ShowError(
Strings.UploadToServer.InvalidDirectory,
Strings.UploadToServer.Title,
DarkDialogButton.Ok,
Icon
);
return;
Globals.PackingProgressForm = new FrmProgress();
Globals.PackingProgressForm.SetTitle(Strings.AssetPacking.title);
var assetThread = new Thread(() => frmMain.packAssets(_selectedDirectory, this));

Check failure on line 343 in Intersect.Editor/Forms/FrmUploadToServer.cs

View workflow job for this annotation

GitHub Actions / build 

The name 'frmMain' does not exist in the current context
assetThread.Start();
_ = Globals.PackingProgressForm.ShowDialog();
}

SaveSettings();

btnUpload.Enabled = false;
btnBrowse.Enabled = false;
txtServerUrl.Enabled = false;
rbClientAssets.Enabled = false;
rbEditorAssets.Enabled = false;
Expand All @@ -406,7 +370,6 @@
finally
{
btnUpload.Enabled = true;
btnBrowse.Enabled = true;
txtServerUrl.Enabled = true;
rbClientAssets.Enabled = true;
rbEditorAssets.Enabled = true;
Expand Down
10 changes: 5 additions & 5 deletions Intersect.Editor/Forms/frmMain.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1774,7 +1774,7 @@ private void packClientTexturesToolStripMenuItem_Click(object sender, EventArgs

}

private void packAssets(string rootDirectory)
public static void packAssets(string rootDirectory, Form parentForm = null)
{
//TODO: Make packing heuristic that the texture packer class should use configurable.
var preferenceMusicPackSize = Preferences.LoadPreference("MusicPackSize");
Expand All @@ -1784,7 +1784,7 @@ private void packAssets(string rootDirectory)
if (!int.TryParse(preferenceMusicPackSize, out var musicPackSize))
{
_ = MessageBox.Show(
this,
parentForm,
Strings.Errors.UnableToParseInvalidIntegerFormat.ToString(preferenceMusicPackSize),
Strings.Errors.InvalidInputXCaption.ToString(Strings.Options.MusicPackSize),
MessageBoxButtons.OK,
Expand All @@ -1796,7 +1796,7 @@ private void packAssets(string rootDirectory)
if (!int.TryParse(preferenceSoundPackSize, out var soundPackSize))
{
_ = MessageBox.Show(
this,
parentForm,
Strings.Errors.UnableToParseInvalidIntegerFormat.ToString(preferenceSoundPackSize),
Strings.Errors.InvalidInputXCaption.ToString(Strings.Options.SoundPackSize),
MessageBoxButtons.OK,
Expand All @@ -1808,7 +1808,7 @@ private void packAssets(string rootDirectory)
if (!int.TryParse(preferenceTexturePackSize, out var texturePackSize))
{
_ = MessageBox.Show(
this,
parentForm,
Strings.Errors.UnableToParseInvalidIntegerFormat.ToString(preferenceTexturePackSize),
Strings.Errors.InvalidInputXCaption.ToString(Strings.Options.TextureSize),
MessageBoxButtons.OK,
Expand Down Expand Up @@ -2097,7 +2097,7 @@ private void PackageUpdate()
{
Globals.PackingProgressForm = new FrmProgress();
Globals.PackingProgressForm.SetTitle(Strings.AssetPacking.title);
var assetThread = new Thread(() => packAssets(sourceDirectory));
var assetThread = new Thread(() => packAssets(sourceDirectory, this));
assetThread.Start();
_ = Globals.PackingProgressForm.ShowDialog();
}
Expand Down
Loading