Improved keywords

Ealenn · Dec 9, 2016 · c914960 · c914960
1 parent 80131ce
commit c914960
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 59 deletions.
diff --git a/package.json b/package.json
@@ -20,7 +20,6 @@
   "author": "Ealen",
   "license": "ISC",
   "dependencies": {
-    "density": "^0.1.0",
     "electron": "^1.4.10",
     "electron-packager": "^8.3.0",
     "electron-prebuilt": "^1.4.10",
@@ -31,6 +30,7 @@
     "psi": "^2.0.4",
     "request": "^2.79.0",
     "title-case": "^2.1.0",
+    "topick": "^0.1.3",
     "w3c-css": "^2.0.0",
     "w3cjs": "^0.3.0",
     "wappalyzer": "^2.0.4"

diff --git a/stopwords.json b/stopwords.json
diff --git a/view/Website.class.js b/view/Website.class.js
@@ -22,12 +22,14 @@ class Website{
   }
 
   /** KEYWORDS
-   * @return {array} JSon https://www.npmjs.com/package/density =
-   * [{"word": "world","count": 1},{"word": "hello","count": 2}]
+   * @return {array} JSon
+   * @param {Requester~requestCallback} callback function(data)
    */
-  getKeywords(){
-    var density = require('density');
-    return density(this.html).getDensity();
+  getKeywords(callback){
+    var Topick = require('topick');
+    Topick.getKeywords(this.url, {maxNumberOfKeywords:50, minKeywordLength: 4, ngram: { min_count: 5, max_size: 3 }}).then((keywords) => {
+      callback(keywords);
+    })
   }
 
   /**

diff --git a/view/app.js b/view/app.js
@@ -90,8 +90,9 @@ $(document).ready(function(){
 
       /* Keyword */
       T.addTask('keywords', ()=>{
-        var ArrayKeyword = Website.getKeywords();
-        T.finishTask('keywords', {key: ArrayKeyword});
+        var ArrayKeyword = Website.getKeywords((data)=>{
+          T.finishTask('keywords', {keyword : data});
+        });
       })
 
       /* Google Search */

diff --git a/view/index.html b/view/index.html
@@ -175,17 +175,13 @@ <h3 class="panel-title">Keywords</h3>
               <thead>
                <tr>
                  <th>Word</th>
-                 <th>Repeat</th>
                </tr>
              </thead>
              <tbody>
-              {{#each key}}
-                {{#ifSup this.count 5}}
+              {{#each keyword}}
                 <tr>
-                  <td>{{this.word}}</td>
-                  <td>{{this.count}}</td>
+                  <td>{{this}}</td>
                 </tr>
-                {{/ifSup}}
               {{/each}}
             </tbody>
             </table>