Adding normalizeFetchOptions util

johnhaley81 · Feb 6, 2017 · Jan 24, 2017 · Jan 25, 2017 · Jan 25, 2017 · Jan 25, 2017
commit 8213d3313a24bbbd4e4cdf184512b20e92427cf3
diff --git a/generate/templates/templates/nodegit.js b/generate/templates/templates/nodegit.js
@@ -78,6 +78,7 @@ var importExtension = function(name) {
 rawApi.Utils = {};
 require("./utils/lookup_wrapper");
 require("./utils/normalize_options");
+require("./utils/normalize_fetch_options");
 require("./utils/shallow_clone");
 
 // Load up extra types;

diff --git a/lib/clone.js b/lib/clone.js
@@ -1,5 +1,6 @@
 var NodeGit = require("../");
 var shallowClone = NodeGit.Utils.shallowClone;
+var normalizeFetchOptions = NodeGit.Utils.normalizeFetchOptions;
 var normalizeOptions = NodeGit.Utils.normalizeOptions;
 
 var Clone = NodeGit.Clone;
@@ -15,29 +16,15 @@ var _clone = Clone.clone;
  * @return {Repository} repo
  */
 Clone.clone = function(url, local_path, options) {
-  var remoteCallbacks = {};
-  var fetchOpts = {};
+  var fetchOpts = normalizeFetchOptions(options && options.fetchOpts);
 
   if (options) {
     options = shallowClone(options);
-    if (options.fetchOpts) {
-      fetchOpts = shallowClone(options.fetchOpts);
-    }
     delete options.fetchOpts;
   }
 
   options = normalizeOptions(options, NodeGit.CloneOptions);
 
-  if (fetchOpts.callbacks) {
-    remoteCallbacks = shallowClone(fetchOpts.callbacks);
-    delete fetchOpts.callbacks;
-  }
-
-  fetchOpts = normalizeOptions(fetchOpts, NodeGit.FetchOptions);
-
-  fetchOpts.callbacks =
-    normalizeOptions(remoteCallbacks, NodeGit.RemoteCallbacks);
-
   if (options) {
     options.fetchOpts = fetchOpts;
   }

diff --git a/lib/remote.js b/lib/remote.js
@@ -1,4 +1,5 @@
 var NodeGit = require("../");
+var normalizeFetchOptions = NodeGit.Utils.normalizeFetchOptions;
 var normalizeOptions = NodeGit.Utils.normalizeOptions;
 var lookupWrapper = NodeGit.Utils.lookupWrapper;
 var shallowClone = NodeGit.Utils.shallowClone;
@@ -84,32 +85,7 @@ Remote.prototype.download = function(refspecs, opts) {
  * @return {Number} error code
  */
 Remote.prototype.fetch = function(refspecs, opts, reflog_message) {
-  var callbacks;
-  var proxyOpts;
-
-  if (opts) {
-    opts = shallowClone(opts);
-    callbacks = opts.callbacks;
-    proxyOpts = opts.proxyOpts;
-    delete opts.callbacks;
-    delete opts.proxyOpts;
-  } else {
-    opts = {};
-  }
-
-  opts = normalizeOptions(opts, NodeGit.FetchOptions);
-
-  if (callbacks) {
-    opts.callbacks =
-      normalizeOptions(callbacks, NodeGit.RemoteCallbacks);
-  }
-
-  if (proxyOpts) {
-    opts.proxyOpts =
-      normalizeOptions(proxyOpts, NodeGit.ProxyOptions);
-  }
-
-  return _fetch.call(this, refspecs, opts, reflog_message);
+  return _fetch.call(this, refspecs, normalizeFetchOptions(opts), reflog_message);
 };
 
 /**

diff --git a/lib/utils/normalize_fetch_options.js b/lib/utils/normalize_fetch_options.js
@@ -0,0 +1,43 @@
+var NodeGit = require("../../");
+var normalizeOptions = require("./normalize_options");
+var shallowClone = require("./shallow_clone");
+
+/**
+ * Normalize an object to match a struct.
+ *
+ * @param {String, Object} oid - The oid string or instance.
+ * @return {Object} An Oid instance.
+ */
+function normalizeFetchOptions(options) {
+  if (options instanceof NodeGit.FetchOptions) {
+    return options;
+  }
+
+  var callbacks;
+  var proxyOpts;
+
+  if (options) {
+    options = shallowClone(options);
+    callbacks = options.callbacks;
+    proxyOpts = options.proxyOpts;
+    delete options.callbacks;
+    delete options.proxyOpts;
+  } else {
+    options = {};
+  }
+
+  options = normalizeOptions(options, NodeGit.FetchOptions);
+
+  if (callbacks) {
+    options.callbacks =
+      normalizeOptions(callbacks, NodeGit.RemoteCallbacks);
+  }
+
+  if (proxyOpts) {
+    options.proxyOpts =
+      normalizeOptions(proxyOpts, NodeGit.ProxyOptions);
+  }
+  return options;
+}
+
+NodeGit.Utils.normalizeFetchOptions = normalizeFetchOptions;