update AssetArtScanner
配置和报告容错性检测
This commit is contained in:
@@ -3,9 +3,24 @@ namespace YooAsset.Editor
|
||||
{
|
||||
public enum EHeaderType
|
||||
{
|
||||
/// <summary>
|
||||
/// 资源路径
|
||||
/// </summary>
|
||||
AssetPath,
|
||||
|
||||
/// <summary>
|
||||
/// 字符串
|
||||
/// </summary>
|
||||
StringValue,
|
||||
|
||||
/// <summary>
|
||||
/// 整数数值
|
||||
/// </summary>
|
||||
LongValue,
|
||||
|
||||
/// <summary>
|
||||
/// 浮点数数值
|
||||
/// </summary>
|
||||
DoubleValue,
|
||||
}
|
||||
}
|
||||
@@ -31,12 +31,28 @@ namespace YooAsset.Editor
|
||||
/// <summary>
|
||||
/// 添加扫描信息
|
||||
/// </summary>
|
||||
public void AddScanInfo(string headerTitle, string scanInfo)
|
||||
public void AddScanInfo(string headerTitle, string value)
|
||||
{
|
||||
var reportScanInfo = new ReportScanInfo(headerTitle, scanInfo);
|
||||
var reportScanInfo = new ReportScanInfo(headerTitle, value);
|
||||
ScanInfos.Add(reportScanInfo);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 添加扫描信息
|
||||
/// </summary>
|
||||
public void AddScanInfo(string headerTitle, long value)
|
||||
{
|
||||
AddScanInfo(headerTitle, value.ToString());
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 添加扫描信息
|
||||
/// </summary>
|
||||
public void AddScanInfo(string headerTitle, double value)
|
||||
{
|
||||
AddScanInfo(headerTitle, value.ToString());
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取扫描信息
|
||||
/// </summary>
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
using System;
|
||||
using UnityEditor;
|
||||
|
||||
namespace YooAsset.Editor
|
||||
{
|
||||
@@ -93,5 +94,35 @@ namespace YooAsset.Editor
|
||||
HeaderType = value;
|
||||
return this;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 检测数值有效性
|
||||
/// </summary>
|
||||
public void CheckValueValid(string value)
|
||||
{
|
||||
if (HeaderType == EHeaderType.AssetPath)
|
||||
{
|
||||
string guid = AssetDatabase.AssetPathToGUID(value);
|
||||
if (string.IsNullOrEmpty(guid))
|
||||
throw new Exception($"{HeaderTitle} value is invalid asset path : {value}");
|
||||
}
|
||||
else if (HeaderType == EHeaderType.DoubleValue)
|
||||
{
|
||||
if (double.TryParse(value, out double doubleValue) == false)
|
||||
throw new Exception($"{HeaderTitle} value is invalid double value : {value}");
|
||||
}
|
||||
else if (HeaderType == EHeaderType.LongValue)
|
||||
{
|
||||
if (long.TryParse(value, out long longValue) == false)
|
||||
throw new Exception($"{HeaderTitle} value is invalid long value : {value}");
|
||||
}
|
||||
else if (HeaderType == EHeaderType.StringValue)
|
||||
{
|
||||
}
|
||||
else
|
||||
{
|
||||
throw new System.NotImplementedException(HeaderType.ToString());
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -29,9 +29,9 @@ namespace YooAsset.Editor
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 报告标题
|
||||
/// 报告名称
|
||||
/// </summary>
|
||||
public string ReportTitle;
|
||||
public string ReportName;
|
||||
|
||||
/// <summary>
|
||||
/// 报告介绍
|
||||
@@ -41,7 +41,7 @@ namespace YooAsset.Editor
|
||||
/// <summary>
|
||||
/// 报告的标题列表
|
||||
/// </summary>
|
||||
public List<ReportHeader> HeaderTitles = new List<ReportHeader>();
|
||||
public List<ReportHeader> ReportHeaders = new List<ReportHeader>();
|
||||
|
||||
/// <summary>
|
||||
/// 扫描的元素列表
|
||||
@@ -49,23 +49,70 @@ namespace YooAsset.Editor
|
||||
public List<ReportElement> ReportElements = new List<ReportElement>();
|
||||
|
||||
|
||||
public ScanReport(string reportTitle, string reportDesc)
|
||||
public ScanReport(string reportName, string reportDesc)
|
||||
{
|
||||
ReportTitle = reportTitle;
|
||||
ReportName = reportName;
|
||||
ReportDesc = reportDesc;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 添加标题
|
||||
/// </summary>
|
||||
public ReportHeader AddHeader(string headerTitle, int width)
|
||||
{
|
||||
var reportHeader = new ReportHeader(headerTitle, width);
|
||||
HeaderTitles.Add(reportHeader);
|
||||
ReportHeaders.Add(reportHeader);
|
||||
return reportHeader;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 添加标题
|
||||
/// </summary>
|
||||
public ReportHeader AddHeader(string headerTitle, int width, int minWidth, int maxWidth)
|
||||
{
|
||||
var reportHeader = new ReportHeader(headerTitle, width, minWidth, maxWidth);
|
||||
HeaderTitles.Add(reportHeader);
|
||||
ReportHeaders.Add(reportHeader);
|
||||
return reportHeader;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 检测错误
|
||||
/// </summary>
|
||||
public void CheckError()
|
||||
{
|
||||
// 检测标题
|
||||
Dictionary<string, ReportHeader> headerMap = new Dictionary<string, ReportHeader>();
|
||||
foreach (var header in ReportHeaders)
|
||||
{
|
||||
string headerTitle = header.HeaderTitle;
|
||||
if (headerMap.ContainsKey(headerTitle))
|
||||
throw new Exception($"The header title {headerTitle} already exists !");
|
||||
else
|
||||
headerMap.Add(headerTitle, header);
|
||||
}
|
||||
|
||||
// 检测扫描元素
|
||||
HashSet<string> elementMap = new HashSet<string>();
|
||||
foreach (var element in ReportElements)
|
||||
{
|
||||
if (string.IsNullOrEmpty(element.GUID))
|
||||
throw new Exception($"The report element GUID is null or empty !");
|
||||
|
||||
if (elementMap.Contains(element.GUID))
|
||||
throw new Exception($"The report element GUID already exists ! {element.GUID}");
|
||||
else
|
||||
elementMap.Add(element.GUID);
|
||||
|
||||
foreach (var scanInfo in element.ScanInfos)
|
||||
{
|
||||
if (headerMap.ContainsKey(scanInfo.HeaderTitle) == false)
|
||||
throw new Exception($"The report element header {scanInfo.HeaderTitle} is missing !");
|
||||
|
||||
// 检测数值有效性
|
||||
var header = headerMap[scanInfo.HeaderTitle];
|
||||
header.CheckValueValid(scanInfo.ScanInfo);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -55,9 +55,9 @@ namespace YooAsset.Editor
|
||||
if (string.IsNullOrEmpty(SchemaType))
|
||||
{
|
||||
SchemaType = scanReport.SchemaType;
|
||||
ReportTitle = scanReport.ReportTitle;
|
||||
ReportTitle = scanReport.ReportName;
|
||||
ReportDesc = scanReport.ReportDesc;
|
||||
Headers = scanReport.HeaderTitles;
|
||||
Headers = scanReport.ReportHeaders;
|
||||
}
|
||||
|
||||
if (SchemaType != scanReport.SchemaType)
|
||||
@@ -82,7 +82,7 @@ namespace YooAsset.Editor
|
||||
List<ReportElement> elements = scanReport.ReportElements;
|
||||
|
||||
// 设置白名单
|
||||
var scanner = AssetArtScannerSettingData.GetScannerByGUID(scannerGUID);
|
||||
var scanner = AssetArtScannerSettingData.Setting.GetScanner(scannerGUID);
|
||||
if (scanner != null)
|
||||
{
|
||||
foreach (var element in elements)
|
||||
@@ -144,7 +144,7 @@ namespace YooAsset.Editor
|
||||
string scannerGUID = scanReport.ScannerGUID;
|
||||
var elements = scanReport.ReportElements;
|
||||
|
||||
var scanner = AssetArtScannerSettingData.GetScannerByGUID(scannerGUID);
|
||||
var scanner = AssetArtScannerSettingData.Setting.GetScanner(scannerGUID);
|
||||
if (scanner != null)
|
||||
{
|
||||
List<string> whiteList = new List<string>(elements.Count);
|
||||
@@ -207,7 +207,7 @@ namespace YooAsset.Editor
|
||||
|
||||
private void FixInternal(string scannerGUID, List<ReportElement> fixList)
|
||||
{
|
||||
AssetArtScanner scanner = AssetArtScannerSettingData.GetScannerByGUID(scannerGUID);
|
||||
AssetArtScanner scanner = AssetArtScannerSettingData.Setting.GetScanner(scannerGUID);
|
||||
if (scanner != null)
|
||||
{
|
||||
var schema = scanner.LoadSchema();
|
||||
|
||||
@@ -30,7 +30,7 @@ namespace YooAsset.Editor
|
||||
// 检测标题数和内容是否匹配
|
||||
foreach (var element in report.ReportElements)
|
||||
{
|
||||
if (element.ScanInfos.Count != report.HeaderTitles.Count)
|
||||
if (element.ScanInfos.Count != report.ReportHeaders.Count)
|
||||
{
|
||||
throw new Exception($"报告的标题数和内容不匹配!");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user