From a26248e1d2789f95e9b804826723d7272e8d03f5 Mon Sep 17 00:00:00 2001
From: Alexander Ivash <elderorb@gmail.com>
Date: Fri, 18 May 2018 02:46:01 +0300
Subject: [PATCH] switch to regexp-based method of extracting marketplaceId
 from url

---
 .../qml/hifi/avatarapp/AvatarsModel.qml          | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

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