Merge branch 'feature-active-days-and-user-filter' of github.com:Happyesss/git-stats into new-version

Author: IonicaBizau

lib/index.js

@@ -23,6 +23,7 @@ const DEFAULT_DATA = {
     commits: {}
 }
 const CONFIG_PATH = Abs("~/.git-stats-config.js")
+const LEVELS = [0, 1, 2, 3, 4]
 
 
 class GitStats {
@@ -417,7 +418,8 @@ class GitStats {
                     days: {},
                     cStreak: 0,
                     lStreak: 0,
-                    max: 0
+                    max: 0,
+                    activeDays: 0
                 },
                 cDay = null,
                 days = Object.keys(graph),
@@ -432,6 +434,7 @@ class GitStats {
                 }
 
                 if (cDay.c > 0) {
+                    cal.activeDays++;
                     if (++cal.cStreak > cal.lStreak) {
                         cal.lStreak = cal.cStreak;
                     }
@@ -475,7 +478,12 @@ class GitStats {
 
         const self = this;
 
-        self.graph(options, function (err, graph) {
+        // Get calendar data which includes activeDays
+        self.calendar(options, function (err, calendarData) {
+            if (err) {
+                return callback(err);
+            }
+
             let cal = [],
                 data = {
                     theme: options.theme,
@@ -484,11 +492,12 @@ class GitStats {
                     firstDay: options.firstDay // [DEPRECATED] https://github.com/IonicaBizau/git-stats/issues/121
                         ,
                     cal: cal,
-                    raw: options.raw
+                    raw: options.raw,
+                    activeDays: calendarData.activeDays
                 };
 
             self.iterateDays(options, function (cDay) {
-                const cDayObj = graph[cDay];
+                const cDayObj = calendarData.days[cDay];
                 if (!cDayObj) {
                     return;
                 }

package.json

@@ -15,7 +15,8 @@
     "Gnab <[email protected]>",
     "William Boman <[email protected]>",
     "Fabian Furger <[email protected]>",
-    "Jonah Lawrence <[email protected]>"
+    "Jonah Lawrence <[email protected]>",
+    "Shashank kumar rathour <[email protected]>"
   ],
   "license": "MIT",
   "repository": {