nodegit · implausible · Aug 1, 2017 · Jun 1, 2017 · Jun 6, 2017 · Jun 9, 2017
diff --git a/generate/input/callbacks.json b/generate/input/callbacks.json
@@ -311,6 +311,102 @@
      "error": -1
    }
  },
+  "git_filter_apply_fn": { 
+    "args": [ 
+      { 
+        "name": "self", 
+        "cType": "git_filter *" 
+      }, 
+      { 
+        "name": "payload", 
+        "cType": "void **" 
+      }, 
+      { 
+        "name": "to", 
+        "cType": "git_buf *" 
+      }, 
+      { 
+        "name": "from", 
+        "cType": "const git_buf *" 
+      }, 
+      { 
+        "name": "src", 
+        "cType": "const git_filter_source *" 
+      } 
+    ], 
+    "return": { 
+      "type": "int", 
+      "noResults": -30, 
+      "success": 0, 
+      "error": -1 
+    } 
+  }, 
+  "git_filter_check_fn": { 
+    "args": [ 
+      { 
+        "name": "self", 
+        "cType": "git_filter *" 
+      }, 
+      { 
+        "name": "payload",
+        "cType": "void **"
+      }, 
+      { 
+        "name": "src",
+        "cType": "const git_filter_source *"
+      }, 
+      { 
+        "name": "attr_values", 
+        "cType": "const char **" 
+      } 
+    ], 
+    "return": { 
+      "type": "int", 
+      "noResults": -30, 
+      "success": 0, 
+      "error": -1 
+    } 
+  }, 
+  "git_filter_cleanup_fn": { 
+    "args": [ 
+      { 
+        "name": "self", 
+        "cType": "git_filter *" 
+      }, 
+      { 
+        "name": "payload", 
+        "cType": "void *" 
+      } 
+    ], 
+    "return": { 
+      "type": "void" 
+    } 
+  }, 
+  "git_filter_init_fn": { 
+    "args": [ 
+      { 
+        "name": "self", 
+        "cType": "git_filter *" 
+      } 
+    ], 
+    "return": { 
+      "type": "int", 
+      "noResults": 0,
+      "success": 0, 
+      "error": -1 
+    } 
+  }, 
+  "git_filter_shutdown_fn": { 
+    "args": [ 
+      { 
+        "name": "self", 
+        "cType": "git_filter *" 
+      } 
+    ], 
+    "return": { 
+      "type": "void" 
+    } 
+  },
  "git_index_matched_path_cb": {
    "args": [
      {

diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json
@@ -879,6 +879,8 @@
      }
    },
    "filter": {
+      "selfFreeing": false,
+      "hasConstructor": true,
      "functions": {
        "git_filter_list_apply_to_blob": {
          "ignore": true
@@ -920,30 +922,21 @@
          "ignore": true
        }
      },
+      "cDependencies": [
+        "git2/sys/filter.h"
+      ],
      "fields": {
-        "initialize": {
-          "ignore": true
-        },
-        "shutdown": {
-          "ignore": true
-        },
-        "check": {
-          "ignore": true
-        },
-        "apply": {
-          "ignore": true
-        },
-        "cleanup": {
+        "stream": {
          "ignore": true
        }
-      },
+      }
+    },
+    "filter_source": {
+      "ignore": false,
      "cDependencies": [
        "git2/sys/filter.h"
      ]
    },
-    "filter_source": {
-      "ignore": true
-    },
    "graph": {
      "functions": {
        "git_graph_ahead_behind": {

diff --git a/generate/input/libgit2-supplement.json b/generate/input/libgit2-supplement.json
@@ -273,6 +273,17 @@
          "git_annotated_commit_lookup"
        ]
      ],
+      [
+        "filter_source",
+        [
+          "git_filter_source_repo",
+          "git_filter_source_path",
+          "git_filter_source_filemode",
+          "git_filter_source_id",
+          "git_filter_source_mode",
+          "git_filter_source_flags"
+        ]
+      ],
      [
        "odb_object",
        [
@@ -422,33 +433,23 @@
            },
            {
              "type": "git_filter_init_fn",
-              "name": "initialize",
-              "ignore": true
+              "name": "initialize"
            },
            {
              "type": "git_filter_shutdown_fn",
-              "name": "shutdown",
-              "ignore": true
+              "name": "shutdown"
            },
            {
              "type": "git_filter_check_fn",
-              "name": "check",
-              "ignore": true
+              "name": "check"
            },
            {
              "type": "git_filter_apply_fn",
-              "name": "apply",
-              "ignore": true
-            },
-            {
-              "type": "git_filter_stream_fn",
-              "name": "stream",
-              "ignore": true
+              "name": "apply"
            },
            {
              "type": "git_filter_cleanup_fn",
-              "name": "cleanup",
-              "ignore": true
+              "name": "cleanup"
            }
          ]
        }
@@ -765,14 +766,26 @@
        "git_annotated_commit_lookup"
      ]
    },
-    "odb": {
+    "filter": {
      "functions": [
-        "git_odb_object_data",
-        "git_odb_object_dup",
-        "git_odb_object_free",
-        "git_odb_object_id",
-        "git_odb_object_size",
-        "git_odb_object_type"
+        "git_filter_list_apply_to_blob",
+        "git_filter_list_apply_to_data",
+        "git_filter_list_apply_to_file",
+        "git_filter_list_contains",
+        "git_filter_list_free",
+        "git_filter_list_length",
+        "git_filter_list_load",
+        "git_filter_list_new",
+        "git_filter_list_push",
+        "git_filter_list_stream_blob",
+        "git_filter_list_stream_data",
+        "git_filter_list_stream_file",
+        "git_filter_source_filemode",
+        "git_filter_source_flags",
+        "git_filter_source_id",
+        "git_filter_source_mode",
+        "git_filter_source_path",
+        "git_filter_source_repo"
      ]
    },
    "merge": {
@@ -784,6 +797,16 @@
        "git_merge_head_id"
      ]
    },
+    "odb": {
+      "functions": [
+        "git_odb_object_data",
+        "git_odb_object_dup",
+        "git_odb_object_free",
+        "git_odb_object_id",
+        "git_odb_object_size",
+        "git_odb_object_type"
+      ]
+    },
    "reflog": {
      "functions": [
        "git_reflog_entry_committer",

diff --git a/generate/scripts/generateJson.js b/generate/scripts/generateJson.js
@@ -169,9 +169,18 @@ module.exports = function generateJson() {
      }
    };

+    var addSelfReferentialField = function(prop){
+      if (helpers.isSelfReferential(prop.type)) {
+        prop.isSelfReferential = true;
+        def.isExtendedStruct = true;
+      }
+    };
+
    def.fields.forEach(addDependencies);
+    def.fields.forEach(addSelfReferentialField);
    def.functions.forEach(addDependencies);

+
    Object.keys(dependencies).forEach(function (dependencyFilename) {
      def.dependencies.push("../include/" + dependencyFilename + ".h");
    });
@@ -183,7 +192,6 @@ module.exports = function generateJson() {
      fn.cppClassName = def.cppClassName;
    });
  });
-
  // Process enums
  _(enums).forEach(function(enumerable) {
    output.some(function(obj) {

diff --git a/generate/scripts/generateNativeCode.js b/generate/scripts/generateNativeCode.js
@@ -68,9 +68,11 @@ module.exports = function generateNativeCode() {
    replace: require("../templates/filters/replace"),
    returnsCount: require("../templates/filters/returns_count"),
    returnsInfo: require("../templates/filters/returns_info"),
+    subtract: require("../templates/filters/subtract"),
    titleCase: require("../templates/filters/title_case"),
    toBool: require('../templates/filters/to_bool'),
    unPointer: require("../templates/filters/un_pointer"),
+    setUnsigned: require("../templates/filters/unsigned"),
    upper: require("../templates/filters/upper")
  };


diff --git a/generate/scripts/helpers.js b/generate/scripts/helpers.js
@@ -1,4 +1,5 @@
-var callbackTypePattern = /\s*_cb/;
+var callbackTypePattern = /\s*_(cb|fn)/,
+  selfReferentialTypePattern = /\s*_fn/;

 var utils = require("./utils");
 var _ = require("lodash");
@@ -93,6 +94,10 @@ var Helpers = {
      && ~cbField.name.indexOf(payloadName.replace("_payload", ""));
  },

+  isSelfReferential: function(cType){
+    return selfReferentialTypePattern.test(cType);
+  },
+
  getLibgitType: function(normalizedType, types) {
    var libgitType;


diff --git a/generate/templates/filters/args_info.js b/generate/templates/filters/args_info.js
@@ -13,12 +13,8 @@ module.exports = function(args) {
      jsArg++;
    }

-    if (cArg === args.length -1) {
-      arg.lastArg = true;
-    }
-    else {
-      arg.lastArg = false;
-    }
+    arg.lastArg = cArg === args.length - 1;
+    arg.firstArg = !arg.lastArg && cArg === 0;

    arg.cArg = cArg;
    arg.isCppClassStringOrArray = ~["String", "Array"].indexOf(arg.cppClassName);

diff --git a/generate/templates/filters/subtract.js b/generate/templates/filters/subtract.js
@@ -0,0 +1,3 @@
+module.exports = function(value, other) {
+  return value - other;
+};
diff --git a/generate/templates/filters/unsigned.js b/generate/templates/filters/unsigned.js
@@ -0,0 +1,3 @@
+module.exports = function(value) {
+  return value < 0 ? 0 : value;
+};
diff --git a/generate/templates/manual/include/async_baton.h b/generate/templates/manual/include/async_baton.h
@@ -60,4 +60,38 @@ struct AsyncBatonWithResult : public AsyncBaton {
  }
 };

+struct AsyncBatonWithNoResult : public AsyncBaton {
+  void (*onCompletion)(AsyncBaton *);
+
+  void Done() {
+    if (onCompletion) {
+      onCompletion(this);
+    } else {
+      // signal completion
+      uv_sem_post(&semaphore);
+    }
+  }
+
+  void ExecuteAsync(ThreadPool::Callback asyncCallback, void (*onCompletion)(AsyncBaton *) = NULL) {
+    this->onCompletion = onCompletion;
+    if (!onCompletion) {
+      uv_sem_init(&semaphore, 0);
+    }
+
+    {
+      LockMaster::TemporaryUnlock temporaryUnlock;
+
+      libgit2ThreadPool.ExecuteReverseCallback(asyncCallback, this);
+
+      if (!onCompletion) {
+        // wait for completion
+        uv_sem_wait(&semaphore);
+        uv_sem_destroy(&semaphore);
+      }
+    }
+
+    return;
+  }
+};
+
 #endif