chizui/YarikStudio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- [Core] rework duplicate file processing [GUI/CLI]

Browse Source
This commit is contained in:
Razmoth
2024-01-20 16:18:29 +04:00
parent ee44722f81
commit c73d81ccff
8 changed files with 121 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
AssetStudio.CLI/Exporter.cs
View File

@@ -300,18 +300,45 @@ namespace AssetStudio.CLI
private static bool TryExportFile(string dir, AssetItem item, string extension, out string fullPath)
{
var fileName = FixFileName(item.Text);
fullPath = Path.Combine(dir, fileName + extension);
fullPath = Path.Combine(dir, $"{fileName}{extension}");
if (!File.Exists(fullPath))
{
Directory.CreateDirectory(dir);
return true;
}
fullPath = Path.Combine(dir, fileName + item.UniqueID + extension);
if (!File.Exists(fullPath))
if (Properties.Settings.Default.allowDuplicates)
{
for (int i = 0; ; i++)
{
fullPath = Path.Combine(dir, $"{fileName} ({i}){extension}");
if (!File.Exists(fullPath))
{
return true;
}
}
}
return false;
}
private static bool TryExportFolder(string dir, AssetItem item, out string fullPath)
{
var fileName = FixFileName(item.Text);
fullPath = Path.Combine(dir, fileName);
if (!Directory.Exists(fullPath))
{
Directory.CreateDirectory(dir);
return true;
}
if (Properties.Settings.Default.allowDuplicates)
{
for (int i = 0; ; i++)
{
fullPath = Path.Combine(dir, $"{fileName} ({i})");
if (!Directory.Exists(fullPath))
{
return true;
}
}
}
return false;
}
@@ -329,11 +356,9 @@ namespace AssetStudio.CLI
public static bool ExportAnimator(AssetItem item, string exportPath, List<AssetItem> animationList = null)
{
var exportFullPath = Path.Combine(exportPath, item.Text, item.Text + ".fbx");
if (File.Exists(exportFullPath))
{
exportFullPath = Path.Combine(exportPath, item.Text + item.UniqueID, item.Text + ".fbx");
}
if (!TryExportFolder(exportPath, item, out var exportFullPath))
return false;
var m_Animator = (Animator)item.Asset;
var options = new ModelConverter.Options()
{
@@ -352,8 +377,10 @@ namespace AssetStudio.CLI
public static bool ExportGameObject(AssetItem item, string exportPath, List <AssetItem> animationList = null)
{
if (!TryExportFolder(exportPath, item, out var exportFullPath))
return false;
var m_GameObject = (GameObject)item.Asset;
exportPath = Path.Combine(exportPath, m_GameObject.m_Name) + Path.DirectorySeparatorChar;
return ExportGameObject(m_GameObject, exportPath, animationList);
}

1
AssetStudio.CLI/Settings.cs
View File

@@ -54,6 +54,7 @@ namespace AssetStudio.CLI.Properties {
public bool restoreExtensionName => AppSettings.Get("restoreExtensionName", true);
public bool enableFileLogging => AppSettings.Get("enableFileLogging", false);
public bool minimalAssetMap => AppSettings.Get("minimalAssetMap", true);
public bool allowDuplicates => AppSettings.Get("allowDuplicates", false);
public string texs => AppSettings.Get("texs", string.Empty);
public string uvs => AppSettings.Get("uvs", string.Empty);