CAsset: GetIdentifier to get label or hex id

luke-jr · instagibbs · commit 047799cb1277 · 2019-04-09T11:13:26.000-04:00
diff --git a/src/assetsdir.cpp b/src/assetsdir.cpp
@@ -72,6 +72,13 @@ std::string CAssetsDir::GetLabel(const CAsset& asset) const
     return GetMetadata(asset).GetLabel();
 }
 
+std::string CAssetsDir::GetIdentifier(const CAsset& asset) const
+{
+    const std::string label = GetMetadata(asset).GetLabel();
+    if (!label.empty()) return label;
+    return asset.GetHex();
+}
+
 std::vector<CAsset> CAssetsDir::GetKnownAssets() const
 {
     std::vector<CAsset> knownAssets;
diff --git a/src/assetsdir.h b/src/assetsdir.h
@@ -40,6 +40,9 @@ class CAssetsDir
     /** @return the label associated to the asset id */
     std::string GetLabel(const CAsset& asset) const;
 
+    /** @return the label associated to the asset id, or some other identifier */
+    std::string GetIdentifier(const CAsset& asset) const;
+
     std::vector<CAsset> GetKnownAssets() const;
 };
 
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
@@ -790,12 +790,8 @@ QString formatAssetAmount(const CAsset& asset, const CAmount& amount, const int
     if (fraction) {
         str += QString(".%1").arg(fraction, 8, 10, QLatin1Char('0'));
     }
-    std::string asset_label = gAssetsDir.GetLabel(asset);
-    if (asset_label.empty()) {
-        asset_label = asset.GetHex();
-    }
     if (include_asset_name) {
-        str += QString(" ") + QString::fromStdString(asset_label);
+        str += QString(" ") + QString::fromStdString(gAssetsDir.GetIdentifier(asset));
     }
     return str;
 }

Original file line number	Diff line number	Diff line change
`@@ -72,6 +72,13 @@ std::string CAssetsDir::GetLabel(const CAsset& asset) const`
`72`	`72`	`return GetMetadata(asset).GetLabel();`
`73`	`73`	`}`
`74`	`74`
	`75`	`+std::string CAssetsDir::GetIdentifier(const CAsset& asset) const`
	`76`	`+{`
	`77`	`+ const std::string label = GetMetadata(asset).GetLabel();`
	`78`	`+ if (!label.empty()) return label;`
	`79`	`+ return asset.GetHex();`
	`80`	`+}`
	`81`	`+`
`75`	`82`	`std::vector<CAsset> CAssetsDir::GetKnownAssets() const`
`76`	`83`	`{`
`77`	`84`	`std::vector<CAsset> knownAssets;`
Original file line number	Diff line number	Diff line change
`@@ -790,12 +790,8 @@ QString formatAssetAmount(const CAsset& asset, const CAmount& amount, const int`
`790`	`790`	`if (fraction) {`
`791`	`791`	`str += QString(".%1").arg(fraction, 8, 10, QLatin1Char('0'));`
`792`	`792`	`}`
`793`		`- std::string asset_label = gAssetsDir.GetLabel(asset);`
`794`		`- if (asset_label.empty()) {`
`795`		`- asset_label = asset.GetHex();`
`796`		`- }`
`797`	`793`	`if (include_asset_name) {`
`798`		`- str += QString(" ") + QString::fromStdString(asset_label);`
	`794`	`+ str += QString(" ") + QString::fromStdString(gAssetsDir.GetIdentifier(asset));`
`799`	`795`	`}`
`800`	`796`	`return str;`
`801`	`797`	`}`