switch to regexp-based method of extracting marketplaceId from url

This commit is contained in:
Alexander Ivash 2018-05-18 02:46:01 +03:00
parent 1778e59142
commit a26248e1d2

View file

@ -5,14 +5,18 @@ ListModel {
property url externalAvatarThumbnailUrl; property url externalAvatarThumbnailUrl;
function extractMarketId(avatarUrl) { function extractMarketId(avatarUrl) {
var splittedUrl = avatarUrl.split('/');
var marketId = splittedUrl[splittedUrl.length - 2]; var guidRegexp = '([A-Z0-9]{8}-[A-Z0-9]{4}-[A-Z0-9]{4}-[A-Z0-9]{4}-[A-Z0-9]{12})';
var indexOfVSuffix = marketId.indexOf('-v');
if(indexOfVSuffix !== -1) { var regexp = new RegExp(guidRegexp,["i"]);
marketId = marketId.substring(0, indexOfVSuffix); var match = regexp.exec(avatarUrl);
if (match !== null)
{
console.debug('marketplaceId guid', match[1]);
return match[1];
} }
return marketId; return '';
} }
function makeMarketItemUrl(avatarUrl) { function makeMarketItemUrl(avatarUrl) {