Skip to content

fix: Upload packaged assets when asset packaging is enabled #28

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 1 commit into from
Dec 28, 2025
Merged

fix: Upload packaged assets when asset packaging is enabled #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
102 changes: 91 additions & 11 deletions Intersect.Editor/Forms/FrmUploadToServer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ private async void btnUpload_Click(object sender, EventArgs e)
}
}

private (HashSet<string> excludeFiles, HashSet<string> excludeExtensions, HashSet<string> excludeDirectories, HashSet<string> typeSpecificExcludeFiles, HashSet<string> typeSpecificExcludeDirectories) BuildExclusionLists(string sourceDirectory, bool isEditorUpload)
private (HashSet<string> excludeFiles, HashSet<string> excludeExtensions, HashSet<string> excludeDirectories, HashSet<string> typeSpecificExcludeFiles, HashSet<string> typeSpecificExcludeDirectories) BuildExclusionLists(string sourceDirectory, bool isEditorUpload, bool packagingEnabled)
{
// Base exclusions that apply to both client and editor
var editorBaseName = Process.GetCurrentProcess().ProcessName.ToLowerInvariant();
Expand Down Expand Up @@ -415,18 +415,18 @@ private async void btnUpload_Click(object sender, EventArgs e)
{
// Editor upload - exclude client-specific files
typeSpecificExcludeFiles.Add("resources/client_strings.json");
typeSpecificExcludeDirectories.Add("resources/packs");

// Process packs if they exist
const string resourcesDirectoryName = "resources";
var pathToResourcesDirectory = Path.Combine(sourceDirectory, resourcesDirectoryName);
var pathToPacksDirectory = Path.Combine(pathToResourcesDirectory, "packs");

if (Directory.Exists(pathToPacksDirectory))
if (packagingEnabled && Directory.Exists(pathToPacksDirectory))
{
// When packaging is enabled, include the packs directory and exclude source files
var packFileNames = Directory.GetFiles(pathToPacksDirectory, "*.meta");
typeSpecificExcludeFiles.AddRange(packFileNames.Select(f => Path.GetRelativePath(sourceDirectory, f).Replace('\\', '/')));

// Exclude source texture files that were packed
typeSpecificExcludeFiles.AddRange(
packFileNames.SelectMany(pack =>
{
Expand All @@ -443,6 +443,7 @@ private async void btnUpload_Click(object sender, EventArgs e)
.Where(frameObject => frameObject.TryGetValue("filename", out _))
.Select(frameObject => frameObject["filename"]?.Value<string>())
.Where(filename => !string.IsNullOrWhiteSpace(filename))
.Select(filename => Path.Combine(resourcesDirectoryName, filename!).Replace('\\', '/'))
.OfType<string>();
}
catch
Expand All @@ -452,16 +453,16 @@ private async void btnUpload_Click(object sender, EventArgs e)
})
);

// Exclude source sound files that were packed
var soundIndex = Path.Combine(pathToPacksDirectory, "sound.index");
if (File.Exists(soundIndex))
{
typeSpecificExcludeFiles.Add(Path.GetRelativePath(sourceDirectory, soundIndex).Replace('\\', '/'));
try
{
using AssetPacker soundPacker = new(soundIndex, pathToPacksDirectory);
typeSpecificExcludeFiles.AddRange(
soundPacker.CachedPackages.Select(
cachedPackage => Path.Combine("resources/packs", cachedPackage).Replace('\\', '/')
soundPacker.FileList.Select(
sound => Path.Combine(resourcesDirectoryName, "sounds", sound.ToLower(CultureInfo.CurrentCulture)).Replace('\\', '/')
)
);
}
Expand All @@ -471,16 +472,16 @@ private async void btnUpload_Click(object sender, EventArgs e)
}
}

// Exclude source music files that were packed
var musicIndex = Path.Combine(pathToPacksDirectory, "music.index");
if (File.Exists(musicIndex))
{
typeSpecificExcludeFiles.Add(Path.GetRelativePath(sourceDirectory, musicIndex).Replace('\\', '/'));
try
{
using AssetPacker musicPacker = new(musicIndex, pathToPacksDirectory);
typeSpecificExcludeFiles.AddRange(
musicPacker.CachedPackages.Select(
cachedPackage => Path.Combine("resources/packs", cachedPackage).Replace('\\', '/')
musicPacker.FileList.Select(
music => Path.Combine(resourcesDirectoryName, "music", music.ToLower(CultureInfo.CurrentCulture)).Replace('\\', '/')
)
);
}
Expand All @@ -490,6 +491,80 @@ private async void btnUpload_Click(object sender, EventArgs e)
}
}
}
else if (!packagingEnabled)
{
// When packaging is disabled, exclude the packs directory entirely
typeSpecificExcludeDirectories.Add("resources/packs");

if (Directory.Exists(pathToPacksDirectory))
{
var packFileNames = Directory.GetFiles(pathToPacksDirectory, "*.meta");
typeSpecificExcludeFiles.AddRange(packFileNames.Select(f => Path.GetRelativePath(sourceDirectory, f).Replace('\\', '/')));

typeSpecificExcludeFiles.AddRange(
packFileNames.SelectMany(pack =>
{
try
{
var tokenPack = JToken.Parse(GzipCompression.ReadDecompressedString(pack));
if (tokenPack is not JObject objectPack || !objectPack.TryGetValue("frames", out var tokenFrames))
{
return Enumerable.Empty<string>();
}

return tokenFrames.Children()
.OfType<JObject>()
.Where(frameObject => frameObject.TryGetValue("filename", out _))
.Select(frameObject => frameObject["filename"]?.Value<string>())
.Where(filename => !string.IsNullOrWhiteSpace(filename))
.OfType<string>();
}
catch
{
return Enumerable.Empty<string>();
}
})
);

var soundIndex = Path.Combine(pathToPacksDirectory, "sound.index");
if (File.Exists(soundIndex))
{
typeSpecificExcludeFiles.Add(Path.GetRelativePath(sourceDirectory, soundIndex).Replace('\\', '/'));
try
{
using AssetPacker soundPacker = new(soundIndex, pathToPacksDirectory);
typeSpecificExcludeFiles.AddRange(
soundPacker.CachedPackages.Select(
cachedPackage => Path.Combine("resources/packs", cachedPackage).Replace('\\', '/')
)
);
}
catch
{
// Ignore packer errors
}
}

var musicIndex = Path.Combine(pathToPacksDirectory, "music.index");
if (File.Exists(musicIndex))
{
typeSpecificExcludeFiles.Add(Path.GetRelativePath(sourceDirectory, musicIndex).Replace('\\', '/'));
try
{
using AssetPacker musicPacker = new(musicIndex, pathToPacksDirectory);
typeSpecificExcludeFiles.AddRange(
musicPacker.CachedPackages.Select(
cachedPackage => Path.Combine("resources/packs", cachedPackage).Replace('\\', '/')
)
);
}
catch
{
// Ignore packer errors
}
}
}
}
}
else
{
Expand Down Expand Up @@ -626,9 +701,14 @@ private async Task PerformUpload()
var serverUrl = txtServerUrl.Text.TrimEnd('/');
var endpoint = $"{serverUrl}/api/v1/editor/updates/{uploadType}";

// Check if packaging is enabled
var packageUpdateAssets = Preferences.LoadPreference("PackageUpdateAssets");
var packagingEnabled = !string.IsNullOrWhiteSpace(packageUpdateAssets) &&
Convert.ToBoolean(packageUpdateAssets, CultureInfo.InvariantCulture);

// Build exclusion lists
var (excludeFiles, excludeExtensions, excludeDirectories, typeSpecificExcludeFiles, typeSpecificExcludeDirectories) =
BuildExclusionLists(_selectedDirectory!, isEditorUpload);
BuildExclusionLists(_selectedDirectory!, isEditorUpload, packagingEnabled);

// Get all files and filter them
var allFiles = Directory.GetFiles(
Expand Down
Loading