Merge pull request #204 from dustinblackman/cleanup

v1.3.4
dustinblackman · Jul 28, 2016 · ad796d0 · ad796d0
2 parents f44bc1a + bb312c3
commit ad796d0
Show file tree

Hide file tree

Showing 26 changed files with 135 additions and 108 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+<a name="1.3.4" />
+### 1.3.4 (July 28th, 2016)
+
+#### Bug Fixes
+- Lolflavor is dead, remove from the app
+- Verify sources exist in code base before processing
+- Fix KoreanBuilds scraper to show proper titles and split blocks
+- Add trinkets to Korean Builds
+- Fix missing blue trinket from all item sets
+
 <a name="1.3.3" />
 ### 1.3.3 (April 6th, 2016)
 

diff --git a/README.md b/README.md
@@ -45,57 +45,15 @@ Found [here](https://github.com/dustinblackman/Championify/releases/latest)
 
 ## [Change Log](CHANGELOG.md)
 
-<a name="1.3.3" />
-### 1.3.3 (April 6th, 2016)
-
-#### Notes
-- Disabled LeagueOfGraphs
-
-<a name="1.3.2" />
-### 1.3.2 (April 6th, 2016)
-
-#### Bug Fixes
-- Fixed bug when install path isn't correctly set and throws an error instead of a warning
-- Fixed health pots missing
-- Fixed duplicate items
-
-<a name="1.3.1" />
-### 1.3.1 (April 6th, 2016)
-
-#### Bug Fixes
-- Fix preferences not being loaded correctly after updating.
-
-<a name="1.3.0" />
-### 1.3.0 (April 6th, 2016)
-
-#### Features
-- Added KoreanBuilds and LeagueOfGraphs as sources
-- Download multiple sources at once instead of just one
-- New logo by Omer Levy (cause yeah, pretty is a feature)
-- Updated latest translation
+<a name="1.3.4" />
+### 1.3.4 (July 28th, 2016)
 
 #### Bug Fixes
-- Fixed skills sometimes broken on certain champs (Kha'Zix for example)
-- Fixed various bugs with languages
-- Added missing consumables
-- Fixed sentences in specific languages being too long and pushing rows too far down
-- Progress bar is more accurate
-
-#### Technical Features
-- Complete refactor
-- Dropped Coffeescript, Lodash, and Async for ES6, Ramda, and Bluebird
-- Dropped Bower
-- Fixed development on Windows, `npm run dev` now works on both OSX and Windows
-- Code consistency to follow new styling guidelines
-- Removed anything that uses `window` for it's own module
-- Updated electron to 0.35.4 (still uses Node 4)
-- Improved error handling
-- Improved logging
-- Status view now shows in the full app (and scrolls like it did before)
-- New sources can now be dropped in and the app will handle the rest (see CONTRIBUTE.md)
-- Shrunk build size by 5MBs (deep cleaning of `node_modules` folder)
-- Removed a bunch of unused/unneeded packages
-- Docs written for the entire app to make contributing easier
+- Lolflavor is dead, remove from the app
+- Verify sources exist in code base before processing
+- Fix KoreanBuilds scraper to show proper titles and split blocks
+- Add trinkets to Korean Builds
+- Fix missing blue trinket from all item sets
 
 
 ## Idea/Suggestions

diff --git a/data/prebuilts.json b/data/prebuilts.json
@@ -9,11 +9,10 @@
       "count": 1
     },
     {
-      "id": "3342",
+      "id": "3363",
       "count": 1
     }
   ],
-
   "consumables": [
     {
       "id": "2003",
@@ -53,7 +52,6 @@
     }
 
   ],
-
   "trinket_upgrades": [
     {
       "id": "3361",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Championify",
-  "version": "1.3.3",
+  "version": "1.3.4",
   "description": "Downloads all the recent builds from websites like Champion.gg and imports them in to League of Legends.",
   "main": "electron.js",
   "scripts": {
@@ -10,7 +10,8 @@
     "build-artifact": "gulp build-artifact",
     "coveralls": "gulp coveralls",
     "dev": "gulp dev",
-    "lint": "gulp lint"
+    "lint": "gulp lint",
+    "release": "gulp release"
   },
   "repository": {
     "type": "git",

diff --git a/src/championify.js b/src/championify.js
@@ -194,7 +194,9 @@ function downloadItemSets() {
   progressbar.reset();
 
   const toProcess = [];
-  R.forEach(source => toProcess.push(sources[source].getSr), store.get('settings').sr_source);
+  R.forEach(source => {
+    if (sources[source]) toProcess.push(sources[source].getSr);
+  }, store.get('settings').sr_source);
 
   return saveSettings()
     .then(permissions.championTest)

diff --git a/src/preferences.js b/src/preferences.js
@@ -47,7 +47,15 @@ class Preferences {
   load() {
     const preference_file = this.file();
     if (fs.existsSync(preference_file)) {
-      const prefs = JSON.parse(fs.readFileSync(preference_file));
+      let prefs = {};
+      const rawprefs = fs.readFileSync(preference_file);
+      try {
+        prefs = JSON.parse(rawprefs);
+      } catch (err) {
+        Log.warn('Unable to parse preferences');
+        Log.warn(rawprefs);
+        Log.warn(err);
+      }
       if (!prefs.prefs_version || semver.lt(prefs.prefs_version, '1.3.3')) return null;
       return prefs;
     }
@@ -108,8 +116,7 @@ class Preferences {
         trinkets_position: trinkets_position,
         locksr: $('#options_locksr').is(':checked'),
         sr_source: $('#options_sr_source').val().split(','),
-        dontdeleteold: $('#options_dontdeleteold').is(':checked'),
-        aram: $('#options_aram').is(':checked')
+        dontdeleteold: $('#options_dontdeleteold').is(':checked')
       }
     };
   }

diff --git a/src/sources/koreanbuilds.js b/src/sources/koreanbuilds.js
@@ -9,6 +9,7 @@ import store from '../store';
 import T from '../translate';
 
 const default_schema = require('../../data/default.json');
+const prebuilts = require('../../data/prebuilts.json');
 
 
 export const source_info = {
@@ -80,9 +81,14 @@ export function getSr() {
           .then(cheerio.load)
           .then($c => {
             // Item sets
-            const items = $c('.item')
-              .map((idx, elem) => $c(elem).children().attr('src').match(/([^\/]+)(?=\.\w+$)/)[0])
-              .get();
+            function getItems(idx) {
+              return $c('#items').find('.float').eq(idx).find('.item')
+               .map((idx, elem) => $c(elem).children().attr('src').match(/([^\/]+)(?=\.\w+$)/)[0])
+               .get();
+            }
+
+            const items = getItems(0);
+            const early_items = R.concat(R.pluck('id', prebuilts.trinkets), getItems(1));
 
             // Skills
             let skills = [];
@@ -108,12 +114,18 @@ export function getSr() {
               skills = skills.join('.');
             }
 
-            const games_played = $c('p').eq(3).text().split(' ')[0];
-            const stats = $c('p').eq(2).text().slice(6);
-            const block = [{
-              items: _arrayToBuilds(items),
-              type: `${stats} - ${games_played} ${T.t('games_played', true)}`
-            }];
+            const games_played = $c('p').eq(4).text().split(' ')[0];
+            const stats = $c('p').eq(2).text().split(': ')[1];
+            const block = [
+              {
+                items: _arrayToBuilds(early_items),
+                type: `${T.t('starter', true)} - ${stats} - ${games_played} ${T.t('games_played', true)}`
+              },
+              {
+                items: _arrayToBuilds(items),
+                type: T.t('core_items', true)
+              }
+            ];
 
             const riot_json = R.merge(R.clone(default_schema, true), {
               champion: champ_data.name,

diff --git a/stylesheets/main.styl b/stylesheets/main.styl
@@ -73,6 +73,7 @@
   span
     color $text_color
     font-weight bold
+    padding-left 3px
 
 
 // Submit/Progress

diff --git a/tests/sources/fixtures/championgg/responses/brand.html b/tests/sources/fixtures/championgg/responses/brand.html
diff --git a/tests/sources/fixtures/championgg/responses/brand_support.html b/tests/sources/fixtures/championgg/responses/brand_support.html
diff --git a/tests/sources/fixtures/championgg/results/brand_result_consumables_beginning.json b/tests/sources/fixtures/championgg/results/brand_result_consumables_beginning.json
@@ -65,7 +65,7 @@
               "count": 1
             },
             {
-              "id": "3342",
+              "id": "3363",
               "count": 1
             }
           ],
@@ -209,7 +209,7 @@
               "count": 1
             },
             {
-              "id": "3342",
+              "id": "3363",
               "count": 1
             }
           ],
@@ -238,7 +238,7 @@
               "count": 1
             },
             {
-              "id": "3342",
+              "id": "3363",
               "count": 1
             }
           ],

diff --git a/tests/sources/fixtures/championgg/results/brand_result_consumables_end.json b/tests/sources/fixtures/championgg/results/brand_result_consumables_end.json
@@ -24,7 +24,7 @@
               "count": 1
             },
             {
-              "id": "3342",
+              "id": "3363",
               "count": 1
             }
           ],
@@ -168,7 +168,7 @@
               "count": 1
             },
             {
-              "id": "3342",
+              "id": "3363",
               "count": 1
             }
           ],
@@ -197,7 +197,7 @@
               "count": 1
             },
             {
-              "id": "3342",
+              "id": "3363",
               "count": 1
             }
           ],

diff --git a/tests/sources/fixtures/championgg/results/brand_result_default.json b/tests/sources/fixtures/championgg/results/brand_result_default.json
@@ -24,7 +24,7 @@
               "count": 1
             },
             {
-              "id": "3342",
+              "id": "3363",
               "count": 1
             }
           ],
@@ -127,7 +127,7 @@
               "count": 1
             },
             {
-              "id": "3342",
+              "id": "3363",
               "count": 1
             }
           ],
@@ -156,7 +156,7 @@
               "count": 1
             },
             {
-              "id": "3342",
+              "id": "3363",
               "count": 1
             }
           ],

diff --git a/tests/sources/fixtures/championgg/results/brand_result_locksr.json b/tests/sources/fixtures/championgg/results/brand_result_locksr.json
@@ -24,7 +24,7 @@
               "count": 1
             },
             {
-              "id": "3342",
+              "id": "3363",
               "count": 1
             }
           ],
@@ -127,7 +127,7 @@
               "count": 1
             },
             {
-              "id": "3342",
+              "id": "3363",
               "count": 1
             }
           ],
@@ -156,7 +156,7 @@
               "count": 1
             },
             {
-              "id": "3342",
+              "id": "3363",
               "count": 1
             }
           ],

diff --git a/tests/sources/fixtures/championgg/results/brand_result_shorthand.json b/tests/sources/fixtures/championgg/results/brand_result_shorthand.json
@@ -65,7 +65,7 @@
               "count": 1
             },
             {
-              "id": "3342",
+              "id": "3363",
               "count": 1
             }
           ],
@@ -209,7 +209,7 @@
               "count": 1
             },
             {
-              "id": "3342",
+              "id": "3363",
               "count": 1
             }
           ],
@@ -238,7 +238,7 @@
               "count": 1
             },
             {
-              "id": "3342",
+              "id": "3363",
               "count": 1
             }
           ],

diff --git a/tests/sources/fixtures/championgg/results/brand_result_splititems.json b/tests/sources/fixtures/championgg/results/brand_result_splititems.json
@@ -24,7 +24,7 @@
               "count": 1
             },
             {
-              "id": "3342",
+              "id": "3363",
               "count": 1
             }
           ],
@@ -94,7 +94,7 @@
               "count": 1
             },
             {
-              "id": "3342",
+              "id": "3363",
               "count": 1
             }
           ],
@@ -168,7 +168,7 @@
               "count": 1
             },
             {
-              "id": "3342",
+              "id": "3363",
               "count": 1
             }
           ],
@@ -242,7 +242,7 @@
               "count": 1
             },
             {
-              "id": "3342",
+              "id": "3363",
               "count": 1
             }
           ],