提交 4a43be46 编写于 作者: 魔术师Dix's avatar 魔术师Dix

[Fix]判空,以及打印处理;

上级 a1fe5f09
......@@ -40,7 +40,14 @@ namespace Cocklebur
OnAfterDeserialize();
}
public override IEnumerable<UIError> errors => null;
public override IEnumerable<UIError> errors
{
get
{
//ToDo : 以后这里需要判定错误;不要直接返回空这么暴力;
return null;
}
}
public string fullVersionString { get; private set; }
public SemVersion semVersion { get; private set; }
......@@ -87,7 +94,7 @@ namespace Cocklebur
base.OnAfterDeserialize();
semVersion = m_Version ?? new SemVersion();
var revision = packageInfo?.git?.revision ?? "";
var revision = GetGitRevision();
if (!revision.Contains(m_VersionString) && 0 < revision.Length)
{
fullVersionString = $"{m_Version} ({revision})";
......@@ -112,7 +119,16 @@ namespace Cocklebur
{
Debug.LogException(e);
}
}
public string GetGitRevision()
{
var pkgInfo = this.GetPackageInfo();
if (pkgInfo == null) return string.Empty;
if (pkgInfo.git == null) return string.Empty;
if (pkgInfo.git.revision == null) return string.Empty;
return pkgInfo.git.revision;
}
}
}
\ No newline at end of file
......@@ -249,7 +249,7 @@ namespace Cocklebur
private static string GetShortPackageId(UpmPackageVersionEx self)
{
var semver = self.semVersion.GetPkgVersionName();
var revision = self.GetPackageInfo()?.git?.revision;
var revision = self.GetGitRevision();
return revision.Contains(semver)
? $"{self.packageUniqueId}/{semver}"
: $"{self.packageUniqueId}/{semver} ({revision})";
......
......@@ -180,7 +180,10 @@ namespace Cocklebur
return pkg;
}
#if DEBUG_UPM_GIT
Debug.LogError($"【UPM】未查找到 PackageInfo : {key}");
//To Do : 重新按照地址下载 PkgInfo ?
#endif
return null;
#else
return version.packageInfo;
......@@ -195,15 +198,6 @@ namespace Cocklebur
SetCachePackageInfo(key, version.packageInfo);
}
internal static PackageInfo GetPackageInfo(string pkgId)
{
PackageInfo info;
if (dictCachePackageInfo.TryGetValue(pkgId, out info))
return info;
Debug.LogError($"【UPM】未查找到 PackageInfo : {pkgId}");
return null;
}
private static void SetCachePackageInfo(string key, PackageInfo newInfo)
{
PackageInfo oldInfo;
......@@ -215,7 +209,13 @@ namespace Cocklebur
if (string.IsNullOrEmpty(url)) return;
return;
}
//To Do : 新增时需要比对;
/*
* To Do :
* 新增时需要比对;
* 现在是直接替换,但是很多数据最好是不直接替换而是比对;
* 直接替换会导致一些别的问题;
*/
dictCachePackageInfo[key] = newInfo;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册