Merge branch 'fix/opgg'

dustinblackman · Nov 10, 2017 · 3e5c605 · 3e5c605
2 parents 66849fd + 3d08bbc
commit 3e5c605
Show file tree

Hide file tree

Showing 21 changed files with 350 additions and 174 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+<a name="2.1.1" />
+## 2.1.1 (November 10th, 2017)
+
+#### Bug Fixes
+- Fixed op.gg to work with updated website
+
 <a name="2.1.0" />
 ## 2.1.0 (October 31st, 2017)
 

diff --git a/data/csspaths.json b/data/csspaths.json
@@ -5,11 +5,11 @@
   },
   "opgg": {
     "version": "body > div.LayoutWrap.CurrentMenu-champion > div.ContentWrap > div > div.PageHeaderWrap > div.PageDescription > span.Small",
-    "starter": "div.SideContent > div:nth-child(3) > div > table > tbody > tr",
-    "boots": "div.SideContent > div:nth-child(2) > div > table > tbody > tr",
-    "core": "div.SideContent > div:nth-child(1) > div > table > tbody > tr",
-    "items": "div.RealContent > div > div > table > tbody > tr",
-    "skills": "div > div > div > table > tbody > tr"
+    "starter": "div > div.l-champion-statistics-content__main > div:nth-child(3) > div > table > tbody > tr",
+    "boots": "div > div.l-champion-statistics-content__main > div:nth-child(2) > div > table > tbody > tr",
+    "core": "div > div.l-champion-statistics-content__main > div:nth-child(1) > div > table > tbody > tr",
+    "items": "div > div.l-champion-statistics-content__side > div > div > table > tbody > tr",
+    "skills": "div > div > div.tabItem.ChampionSkillPriorites-1 > table > tbody > tr"
   },
   "lolmasters": {
     "version": "span:contains('Patch:')"

diff --git a/i18n/el.json b/i18n/el.json
@@ -91,7 +91,7 @@
   "something_broke": "Κάτι έσπασε...",
   "start_league": "Έναρξη League of Legends",
   "starter": "Αρχικά",
-  "starting_items": "Αντικείμενα Εκκίνησης ",
+  "starting_items": "Αντικείμενα Εκκίνησης",
   "status": "Κατάσταση",
   "summoners_rift_source": "Επιλέξτε αντικείμενα για το Φαράγγι των Επικαλεστών",
   "support": "Υποστηρικτής",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Championify",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Downloads all the recent builds from websites like Champion.gg and imports them in to League of Legends.",
   "main": "electron.js",
   "scripts": {

diff --git a/src/sources/opgg.js b/src/sources/opgg.js
@@ -12,7 +12,6 @@ const csspaths = require('../../data/csspaths.json');
 const default_schema = require('../../data/default.json');
 const prebuilts = require('../../data/prebuilts.json');
 
-const skills_map = ['Q', 'W', 'E', 'R'];
 const templates = {
   combindedStart: (pickrate, winrate) => `${T.t('frequent', true)}/${T.t('highest_start', true)} - Winrate: ${winrate}, Pickrate: ${pickrate}%`,
   combinedCore: (pickrate, winrate) => `${T.t('frequent', true)}/${T.t('highest_core', true)} - Winrate: ${winrate}%, Pickrate: ${pickrate}%`,
@@ -55,7 +54,7 @@ function createSituationalItemsBlock(templateFunc, rate_type, items) {
   const sorted = R.reverse(R.sortBy(R.prop(rate_type), items));
   const rate = `${sorted[0][rate_type]}-${sorted[5][rate_type]}`;
   return {
-    items: arrayToBuilds(R.pluck('items', sorted).slice(0, 5)),
+    items: arrayToBuilds(R.pluck('items', sorted).slice(0, 6)),
     type: templateFunc(rate),
     rate
   };
@@ -89,11 +88,28 @@ function mapItems($, selector) {
       el = $(el);
       const items = el.find('img')
         .map((idx, item_el) => R.last($(item_el).attr('src').split('/')).split('.')[0])
+        .filter(entry => entry !== 'blet')
         .get();
-      const pickrate = Number(el.find('.PickRate').eq(0).contents().filter(function() {
-        return this.type === 'text';
-      }).text().replace(/[^0-9.]/g, ''));
-      const winrate = Number(el.find('.WinRate').eq(0).text().replace(/[^0-9.]/g, ''));
+
+      const pickrate = Number(el
+        .find('.champion-stats__table__cell--pickrate')
+        .eq(0)
+        .contents()
+        .filter(function() {
+          return this.type === 'text';
+        })
+        .text()
+        .split('%')[0]
+        .replace(/[^0-9.]/g, '')
+        .trim()
+      );
+
+      const winrate = Number(el
+        .find('.champion-stats__table__cell--winrate')
+        .eq(0)
+        .text()
+        .replace(/[^0-9.]/g, '')
+    );
 
       return {items, pickrate, winrate};
     })
@@ -104,16 +120,9 @@ function mapSkills($, selector) {
   const skills = $(selector)
     .map((idx, el) => {
       el = $(el);
-      const pickrate = el.find('.PickRate > div').text().trim().replace(/[^0-9.]/g, '');
-      const winrate = el.find('.WinRate').text().trim().replace(/[^0-9.]/g, '');
-      const skills = [];
-      el.find('.Row').each((idx, row) => {
-        const ability = skills_map[idx];
-        $(row).find('.LevelUP').map((idx, cell) => {
-          skills[Number($(cell).text().trim()) - 1] = ability;
-        });
-      });
-
+      const pickrate = el.find('.champion-stats__table__cell--pickrate').text().split('%')[0].replace(/[^0-9.]/g, '').trim() + '%';
+      const winrate = el.find('.champion-stats__table__cell--winrate').text().split('%')[0].replace(/[^0-9.]/g, '').trim() + '%';
+      const skills = el.find('tr').eq(1).text().replace(/[^A-Z]/g, '').split('');
       return {skills, pickrate, winrate};
     })
     .get();
@@ -147,7 +156,7 @@ function _makeRequest(url) {
 export function getVersion() {
   return request('https://www.op.gg/champion/ahri/statistics/mid')
     .then(cheerio.load)
-    .then($ => R.last($('span.Small').text().split(': ')))
+    .then($ => R.last($('.champion-stats-header-version').text().split(':')).trim())
     .tap(version => store.set('opgg_ver', version));
 }
 
@@ -156,8 +165,8 @@ export function getSr() {
 
   return _makeRequest('https://www.op.gg/champion/statistics')
     .then($ => {
-      return $('.ChampionIndexGrid')
-        .find('.Item')
+      return $('.champion-index__champion-list')
+        .find('.champion-index__champion-item')
         .map((idx, el) => {
           el = $(el);
           return {

diff --git a/tests/sources/fixtures/opgg/responses/ahri_statistics.html b/tests/sources/fixtures/opgg/responses/ahri_statistics.html
diff --git a/tests/sources/fixtures/opgg/responses/item.html b/tests/sources/fixtures/opgg/responses/item.html
diff --git a/tests/sources/fixtures/opgg/responses/skill.html b/tests/sources/fixtures/opgg/responses/skill.html
diff --git a/tests/sources/fixtures/opgg/responses/statistics.html b/tests/sources/fixtures/opgg/responses/statistics.html
diff --git a/tests/sources/fixtures/opgg/responses/stats.html b/tests/sources/fixtures/opgg/responses/stats.html
diff --git a/tests/sources/fixtures/opgg/results/ahri_result_consumables_beginning.json b/tests/sources/fixtures/opgg/results/ahri_result_consumables_beginning.json
@@ -45,7 +45,7 @@
                 "count": 1
               }
             ],
-            "type": "Consumables | Frequent: Q.E.W.Q.Q.R.Q.E.Q.E.R.E.E.W.W"
+            "type": "Consumables | Frequent: Q.W.E.Q.Q.R.Q.W.Q.W.R.W.W.E.E"
           },
           {
             "items": [
@@ -70,7 +70,7 @@
                 "count": 1
               }
             ],
-            "type": "Most Frequent Starters - Pickrate: 61.02%"
+            "type": "Most Frequent Starters - Pickrate: 95.86%"
           },
           {
             "items": [
@@ -95,49 +95,57 @@
                 "count": 1
               }
             ],
-            "type": "Highest Win % Starters - Winrate: 64.29%"
+            "type": "Highest Win % Starters - Winrate: 59.68%"
           },
           {
             "items": [
               {
                 "id": "3165",
                 "count": 1
               },
+              {
+                "id": "blet",
+                "count": 2
+              },
               {
                 "id": "3285",
                 "count": 1
               },
               {
-                "id": "3089",
+                "id": "3157",
                 "count": 1
               },
               {
                 "id": "3020",
                 "count": 1
               }
             ],
-            "type": "Most Frequent Core Build - Pickrate: 7.12%"
+            "type": "Most Frequent Core Build - Pickrate: 9.47%"
           },
           {
             "items": [
               {
                 "id": "3165",
                 "count": 1
               },
+              {
+                "id": "blet",
+                "count": 2
+              },
               {
                 "id": "3285",
                 "count": 1
               },
               {
-                "id": "3089",
+                "id": "3151",
                 "count": 1
               },
               {
-                "id": "3158",
+                "id": "3020",
                 "count": 1
               }
             ],
-            "type": "Highest Win % Core Build - Winrate: 68.73%"
+            "type": "Highest Win % Core Build - Winrate: 68.81%"
           },
           {
             "items": [
@@ -158,11 +166,15 @@
                 "count": 1
               },
               {
-                "id": "3001",
+                "id": "3157",
+                "count": 1
+              },
+              {
+                "id": "1026",
                 "count": 1
               }
             ],
-            "type": "Most Frequent Items - Pickrate: 15.66-5.91%"
+            "type": "Most Frequent Items - Pickrate: 15.78-4.07%"
           },
           {
             "items": [
@@ -171,26 +183,30 @@
                 "count": 1
               },
               {
-                "id": "3100",
+                "id": "3151",
+                "count": 1
+              },
+              {
+                "id": "3116",
                 "count": 1
               },
               {
                 "id": "3089",
                 "count": 1
               },
               {
-                "id": "3152",
+                "id": "3135",
                 "count": 1
               },
               {
                 "id": "3285",
                 "count": 1
               }
             ],
-            "type": "Highest Win % Items - Winrate: 76.73-58.84%"
+            "type": "Highest Win % Items - Winrate: 76.63-55.33%"
           }
         ],
-        "title": "OPGG Middle 6.22",
+        "title": "OPGG Middle 7.21",
         "priority": false,
         "mode": "any",
         "type": "custom",