Add description parsing #27

readme.md

@@ -603,6 +603,12 @@ includeLabels:
 - pending
 - approved
 
+# Only works if using a local configuration file!
+# Extend the global configuration if set to true, pass a string to extend 
+# the configuration file stored at the given path
+# defaults to true
+extend: true
+
 # Change number of concurrent connections/http queries
 # Note: Handle with care, we don't want to spam GitLabs API too much
 # defaults to 10
@@ -612,11 +618,14 @@ _parallel: 20
 # defaults to 100
 _perPage: 100
 
-# Only works if using a local configuration file!
-# Extend the global configuration if set to true, pass a string to extend 
-# the configuration file stored at the given path
-# defaults to true
-extend: true
+# Verbose output
+_verbose: false
+
+# Check access token validity up front
+_checkToken: false
+
+# Skip parsing the issue/merge_request description for time records
+_skipDescriptionParsing: false
 ```
 
 ### Time format

src/include/config.js

@@ -38,7 +38,8 @@ const defaults = {
     _perPage: 100,
     _parallel: 10,
     _verbose: false,
-    _checkToken: false
+    _checkToken: false,
+    _skipDescriptionParsing: false
 };
 
 /**

src/models/hasTimes.js

@@ -15,7 +15,6 @@ class hasTimes extends Base {
     constructor(config) {
         super(config);
         this.times = [];
-        this.name = '';
     }
 
     /**
@@ -59,7 +58,7 @@ class hasTimes extends Base {
         let times = [],
             timeSpent = 0,
             timeUsers = {},
-            timeFormat = this.config.get('timeFormat', this.name);
+            timeFormat = this.config.get('timeFormat', this._type);
 
         // sort by created at
         this.notes.sort((a, b) => {
@@ -95,6 +94,17 @@ class hasTimes extends Base {
             done();
         });
 
+        promise = promise.then(() => new Promise(resolve => {
+            if (this.config('_skipDescriptionParsing') || timeSpent === this.data.time_stats.total_time_spent) return resolve();
+
+            let difference = this.data.time_stats.total_time_spent - timeSpent,
+                note = Object.assign({noteable_type: this._typeSingular}, this.data);
+
+            times.unshift(new Time(Time.toHumanReadable(difference, this.config.get('hoursPerDay')), note, this, this.config));
+
+            resolve();
+        }));
+
         promise.then(() => {
             _.each(timeUsers, (time, name) => this[`time_${name}`] = Time.toHumanReadable(time, this.config.get('hoursPerDay'), timeFormat));
             this.timeSpent = timeSpent;

src/models/issue.js

@@ -10,7 +10,6 @@ class issue extends hasTimes {
     constructor(config, data = {}) {
         super(config);
         this.data = data;
-        this.name= 'issues';
     }
 
     make(project, id, create = false) {
@@ -88,20 +87,24 @@ class issue extends hasTimes {
     }
 
     get spent() {
-        return this.config.toHumanReadable(this.timeSpent, this.name);
+        return this.config.toHumanReadable(this.timeSpent, this._type);
     }
 
     get total_spent() {
-        return this.stats ? this.config.toHumanReadable(this.stats.total_time_spent, this.name) : null;
+        return this.stats ? this.config.toHumanReadable(this.stats.total_time_spent, this._type) : null;
     }
 
     get total_estimate() {
-        return this.stats ? this.config.toHumanReadable(this.stats.time_estimate, this.name) : null;
+        return this.stats ? this.config.toHumanReadable(this.stats.time_estimate, this._type) : null;
     }
 
     get _type() {
         return 'issues';
     }
+
+    get _typeSingular() {
+        return 'Issue';
+    }
 }
 
 module.exports = issue;

src/models/mergeRequest.js

@@ -7,7 +7,6 @@ class mergeRequest extends hasTimes {
     constructor(config, data = {}) {
         super(config);
         this.data = data;
-        this.name = 'merge_requests';
     }
 
     make(project, id, create = false) {
@@ -81,20 +80,24 @@ class mergeRequest extends hasTimes {
     }
 
     get spent() {
-        return this.config.toHumanReadable(this.timeSpent, this.name);
+        return this.config.toHumanReadable(this.timeSpent, this._type);
     }
 
     get total_spent() {
-        return this.stats ? this.config.toHumanReadable(this.stats.total_time_spent, this.name) : null;
+        return this.stats ? this.config.toHumanReadable(this.stats.total_time_spent, this._type) : null;
     }
 
     get total_estimate() {
-        return this.stats ? this.config.toHumanReadable(this.stats.time_estimate, this.name) : null;
+        return this.stats ? this.config.toHumanReadable(this.stats.time_estimate, this._type) : null;
     }
 
     get _type() {
         return 'merge_requests';
     }
+
+    get _typeSingular() {
+        return 'Merge Request';
+    }
 }
 
 module.exports = mergeRequest;