From 94d17f153429adb0caafc73ab47cef2707833d2c Mon Sep 17 00:00:00 2001 From: Elbert Alias Date: Sat, 1 Dec 2012 17:16:10 +1100 Subject: [PATCH] Confidence levels --- README.md | 17 +++++++++-------- drivers/bookmarklet/json | 4 +++- drivers/chrome/apps.json | 4 +++- drivers/chrome/js/driver.js | 5 +---- drivers/firefox-jetpack/data/apps.json | 4 +++- drivers/firefox/content/apps.json | 4 +++- drivers/html/apps.json | 4 +++- drivers/php/apps.json | 4 +++- share/apps.json | 4 +++- 9 files changed, 31 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 58b5fb005..47bf1be24 100644 --- a/README.md +++ b/README.md @@ -27,14 +27,15 @@ Example: ```javascript "Application Name": { - cats: [ "1" ], - headers: { "X-Powered-By": "Application Name" }, - url: ".+\\.application-name\\.com", - html: "]application-name\\.css", - meta: { "generator": "Application Name" }, - script: "application-name\\.js", - env: "ApplicationName", - implies: [ "PHP" ] + "cats": [ 1 ], + "headers": { "X-Powered-By": "Application Name" }, + "url": ".+\\.application-name\\.com", + "html": "]application-name\\.css", + "meta": { "generator": "Application Name" }, + "script": "application-name\\.js", + "env": "ApplicationName", + "implies": [ "PHP" ], + "confidence": { "html": 50, "script": 50 } } ``` diff --git a/drivers/bookmarklet/json b/drivers/bookmarklet/json index c59edee7b..2e1c7e333 100644 --- a/drivers/bookmarklet/json +++ b/drivers/bookmarklet/json @@ -814,6 +814,7 @@ "headers": { "X-Content-Encoded-By": "Joomla" }, "env": "^jcomments$", "implies": [ "PHP" ] + "confidence": { "html": 50, "url": 50 } }, "jqPlot": { "cats": [ 25 ], @@ -930,7 +931,8 @@ "script": "(js/mage|skin/frontend/(default|enterprise))", "headers": { "Set-Cookie": "frontend=" }, "env": "^(Mage|VarienForm)$", - "implies": [ "PHP" ] + "implies": [ "PHP" ], + "confidence": { "headers": 50 } }, "Mambo": { "cats": [ 1 ], diff --git a/drivers/chrome/apps.json b/drivers/chrome/apps.json index c59edee7b..2e1c7e333 100644 --- a/drivers/chrome/apps.json +++ b/drivers/chrome/apps.json @@ -814,6 +814,7 @@ "headers": { "X-Content-Encoded-By": "Joomla" }, "env": "^jcomments$", "implies": [ "PHP" ] + "confidence": { "html": 50, "url": 50 } }, "jqPlot": { "cats": [ 25 ], @@ -930,7 +931,8 @@ "script": "(js/mage|skin/frontend/(default|enterprise))", "headers": { "Set-Cookie": "frontend=" }, "env": "^(Mage|VarienForm)$", - "implies": [ "PHP" ] + "implies": [ "PHP" ], + "confidence": { "headers": 50 } }, "Mambo": { "cats": [ 1 ], diff --git a/drivers/chrome/js/driver.js b/drivers/chrome/js/driver.js index 86e52bbac..c003fdaac 100644 --- a/drivers/chrome/js/driver.js +++ b/drivers/chrome/js/driver.js @@ -140,13 +140,10 @@ if ( count > 0 ) { // Find the main application to display - var i, appName, confidence, found = false; + var i, appName, found = false; w.driver.categoryOrder.map(function(match) { for ( appName in w.detected[tab.url] ) { - confidence = w.detected[tab.url][appName].total; - - w.apps[appName].cats.map(function(cat) { if ( cat == match && !found ) { chrome.browserAction.setIcon({ tabId: tab.id, path: 'images/icons/' + appName + '.png' }); diff --git a/drivers/firefox-jetpack/data/apps.json b/drivers/firefox-jetpack/data/apps.json index c59edee7b..2e1c7e333 100644 --- a/drivers/firefox-jetpack/data/apps.json +++ b/drivers/firefox-jetpack/data/apps.json @@ -814,6 +814,7 @@ "headers": { "X-Content-Encoded-By": "Joomla" }, "env": "^jcomments$", "implies": [ "PHP" ] + "confidence": { "html": 50, "url": 50 } }, "jqPlot": { "cats": [ 25 ], @@ -930,7 +931,8 @@ "script": "(js/mage|skin/frontend/(default|enterprise))", "headers": { "Set-Cookie": "frontend=" }, "env": "^(Mage|VarienForm)$", - "implies": [ "PHP" ] + "implies": [ "PHP" ], + "confidence": { "headers": 50 } }, "Mambo": { "cats": [ 1 ], diff --git a/drivers/firefox/content/apps.json b/drivers/firefox/content/apps.json index c59edee7b..2e1c7e333 100644 --- a/drivers/firefox/content/apps.json +++ b/drivers/firefox/content/apps.json @@ -814,6 +814,7 @@ "headers": { "X-Content-Encoded-By": "Joomla" }, "env": "^jcomments$", "implies": [ "PHP" ] + "confidence": { "html": 50, "url": 50 } }, "jqPlot": { "cats": [ 25 ], @@ -930,7 +931,8 @@ "script": "(js/mage|skin/frontend/(default|enterprise))", "headers": { "Set-Cookie": "frontend=" }, "env": "^(Mage|VarienForm)$", - "implies": [ "PHP" ] + "implies": [ "PHP" ], + "confidence": { "headers": 50 } }, "Mambo": { "cats": [ 1 ], diff --git a/drivers/html/apps.json b/drivers/html/apps.json index c59edee7b..2e1c7e333 100644 --- a/drivers/html/apps.json +++ b/drivers/html/apps.json @@ -814,6 +814,7 @@ "headers": { "X-Content-Encoded-By": "Joomla" }, "env": "^jcomments$", "implies": [ "PHP" ] + "confidence": { "html": 50, "url": 50 } }, "jqPlot": { "cats": [ 25 ], @@ -930,7 +931,8 @@ "script": "(js/mage|skin/frontend/(default|enterprise))", "headers": { "Set-Cookie": "frontend=" }, "env": "^(Mage|VarienForm)$", - "implies": [ "PHP" ] + "implies": [ "PHP" ], + "confidence": { "headers": 50 } }, "Mambo": { "cats": [ 1 ], diff --git a/drivers/php/apps.json b/drivers/php/apps.json index c59edee7b..2e1c7e333 100644 --- a/drivers/php/apps.json +++ b/drivers/php/apps.json @@ -814,6 +814,7 @@ "headers": { "X-Content-Encoded-By": "Joomla" }, "env": "^jcomments$", "implies": [ "PHP" ] + "confidence": { "html": 50, "url": 50 } }, "jqPlot": { "cats": [ 25 ], @@ -930,7 +931,8 @@ "script": "(js/mage|skin/frontend/(default|enterprise))", "headers": { "Set-Cookie": "frontend=" }, "env": "^(Mage|VarienForm)$", - "implies": [ "PHP" ] + "implies": [ "PHP" ], + "confidence": { "headers": 50 } }, "Mambo": { "cats": [ 1 ], diff --git a/share/apps.json b/share/apps.json index c59edee7b..2e1c7e333 100644 --- a/share/apps.json +++ b/share/apps.json @@ -814,6 +814,7 @@ "headers": { "X-Content-Encoded-By": "Joomla" }, "env": "^jcomments$", "implies": [ "PHP" ] + "confidence": { "html": 50, "url": 50 } }, "jqPlot": { "cats": [ 25 ], @@ -930,7 +931,8 @@ "script": "(js/mage|skin/frontend/(default|enterprise))", "headers": { "Set-Cookie": "frontend=" }, "env": "^(Mage|VarienForm)$", - "implies": [ "PHP" ] + "implies": [ "PHP" ], + "confidence": { "headers": 50 } }, "Mambo": { "cats": [ 1 ],