Merge remote-tracking branch 'refs/remotes/origin/dev'

jpmn · Aug 16, 2016 · aafa685 · aafa685
2 parents 95ba2a9 + 488f8b7
commit aafa685
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 22 deletions.
diff --git a/src/ElectronicBoxExtension/_locales/en/messages.json b/src/ElectronicBoxExtension/_locales/en/messages.json
@@ -269,6 +269,9 @@
    "about_changelog_version_0_2_13":{
       "message":"- Bug fix: The FR language file was wrongly overwritten by the EN file.<br />- Bug fix: The current month was always displayed in english."
    },
+   "about_changelog_version_0_2_14":{
+      "message":"- Bug fix: Data crawling fixed"
+   },
    "popup_notice_status_limit_title":{
       "message":"Limit!"
    },

diff --git a/src/ElectronicBoxExtension/_locales/fr/messages.json b/src/ElectronicBoxExtension/_locales/fr/messages.json
@@ -263,6 +263,9 @@
    "about_changelog_version_0_2_13":{
       "message":"- Bug fix: Le fichier de langue FR avait été écrasé par celui de langue EN<br />- Bug fix: Le mois courant était seulement affiché en anglais."
    },
+   "about_changelog_version_0_2_14":{
+      "message":"- Bug fix: Correction de la détection des données"
+   },
    "popup_notice_status_limit_title":{
       "message":"Limite!"
    },

diff --git a/src/ElectronicBoxExtension/js/background.js b/src/ElectronicBoxExtension/js/background.js
@@ -129,29 +129,27 @@ function sync_remote_settings(callback) {
 }
 
 function parse_detail_plan(value) {
-    return value.match(/^.*:\s?(.*)\s?$/)[1];
+    return value.match(/Plan:.*?(.*)/)[1];
 }
 
 function parse_detail_extra(value) {
-    return parseInt(value.match(/^.*:\s?(\d+)\sX\s(?:\d+)\sGB\s?$/)[1], 10);
+    return parseInt(value.match(/Extra:\s?(\d+)\s?X\s?(?:\d+)\s?GB/i)[1], 10);
 }
 
 function parse_detail_block(value) {
-    return parseFloat(value.match(/^.*:\s?(?:\d+)\sX\s(\d+)\sGB\s?$/)[1]);
+    return parseFloat(value.match(/Extra:\s?(?:\d+)\s?X\s?(\d+)\s?GB/i)[1]);
 }
 
 function parse_detail_total(value) {
-    return parseFloat(value.match(/^.*:\s?(\d+)\sG\s?$/)[1]);
+    return parseFloat(value.match(/Plan total:\s?(\d+)\sG\s?/i)[1]);
 }
 
 function parse_detail_available(value) {
-    return parseFloat(value.match(/^.*:\s?(-?\d+(?:\.\d+)?)\sG\s?$/)[1]);
+    return parseFloat(value.match(/Available:\s?(-?\d+(?:\.\d+)?)\s/i)[1]);
 }
 
 function parse_detail_peak(value) {
-    //return value.match(/^.*:\s?(NON?)\s?$/).length === 0;
-    // FIX de Keven Lefebvre, merci!
-    return !(/^.*:\s?(NON?)\s?$/.test(value));
+    return !(/Super off peak option:\s?(NON?).*?/i.test(value));
 }
 
 function set_detail_consumed(details) {
@@ -287,8 +285,8 @@ function update_bandwidth(callback) {
 
     var params = {
       actions: 'list',
-      DELETE_lng: options.profile.locale,
-      lng: options.profile.locale,
+      DELETE_lng: 'en', // forcing 'en' instead of options.profile.locale
+      lng: 'en', // forcing 'en' instead of options.profile.locale
       code: options.profile.vlcode
     }
 
@@ -373,21 +371,18 @@ function parse_page_maintenance(response) {
 
 function parse_page_details(response, callback) {
     var $container = $(response);
-    var $details = $container.find('div:lt(5)');
-
-    var content = $details.map(function(i, elem) {
-        return $(elem).text();
-    }).get();
 
     var details = {
-        plan: parse_detail_plan(content[0]),
-        extra: parse_detail_extra(content[1]),
-        block: parse_detail_block(content[1]),
-        total: parse_detail_total(content[2]),
-        available: parse_detail_available(content[3]),
-        peak: parse_detail_peak(content[4])
+        plan: parse_detail_plan($container.find('table tr:eq(4)').text()),
+        extra: parse_detail_extra($container.find('table tr:eq(5)').text()),
+        block: parse_detail_block($container.find('table tr:eq(5)').text()),
+        total: parse_detail_total($container.find('table tr:eq(6)').text()),
+        available: parse_detail_available($container.find('table tr:eq(7)').text()),
+        peak: parse_detail_peak($container.find('table tr:eq(8)').text())
     };
 
+    //console.log(details);
+
     details.consumed = set_detail_consumed(details);
     details.normal_usage = set_detail_normal_usage(details);
     details.current_usage = set_detail_current_usage(details);

diff --git a/src/ElectronicBoxExtension/js/options.js b/src/ElectronicBoxExtension/js/options.js
@@ -110,6 +110,7 @@ angular.module('ebbe', ['ebbe.filters', 'ebbe.services', 'ngRoute', 'ui.bootstra
 
     $scope.changelog = {
         versions: [
+            { number: '0.2.14', changes: 'about_changelog_version_0_2_14' },
             { number: '0.2.13', changes: 'about_changelog_version_0_2_13' },
             { number: '0.2.12', changes: 'about_changelog_version_0_2_12' },
             { number: '0.2.11', changes: 'about_changelog_version_0_2_11' },

diff --git a/src/ElectronicBoxExtension/manifest.json b/src/ElectronicBoxExtension/manifest.json
@@ -3,7 +3,7 @@
 
     "name": "__MSG_extension_name__",
     "description": "__MSG_extension_description__",
-    "version": "0.2.13",
+    "version": "0.2.14",
 
     "default_locale": "en",