feat(blob): add bindings and api

This commit is contained in:
Aleksey Kulikov 2021-09-02 17:00:09 +03:00
parent 88d064bda2
commit f0803298c8
14 changed files with 455 additions and 143 deletions

View file

@ -9,5 +9,6 @@ export 'src/reflog.dart';
export 'src/tree.dart'; export 'src/tree.dart';
export 'src/signature.dart'; export 'src/signature.dart';
export 'src/revwalk.dart'; export 'src/revwalk.dart';
export 'src/blob.dart';
export 'src/error.dart'; export 'src/error.dart';
export 'src/enums.dart'; export 'src/enums.dart';

108
lib/src/bindings/blob.dart Normal file
View file

@ -0,0 +1,108 @@
import 'dart:ffi';
import 'package:ffi/ffi.dart';
import '../error.dart';
import 'libgit2_bindings.dart';
import '../util.dart';
/// Lookup a blob object from a repository.
///
/// Throws a [LibGit2Error] if error occured.
Pointer<git_blob> lookup(Pointer<git_repository> repo, Pointer<git_oid> id) {
final out = calloc<Pointer<git_blob>>();
final error = libgit2.git_blob_lookup(out, repo, id);
if (error < 0) {
throw LibGit2Error(libgit2.git_error_last());
} else {
return out.value;
}
}
/// Get the id of a blob.
Pointer<git_oid> id(Pointer<git_blob> blob) => libgit2.git_blob_id(blob);
/// Determine if the blob content is most certainly binary or not.
///
/// The heuristic used to guess if a file is binary is taken from core git:
/// Searching for NUL bytes and looking for a reasonable ratio of printable to
/// non-printable characters among the first 8000 bytes.
bool isBinary(Pointer<git_blob> blob) {
final result = libgit2.git_blob_is_binary(blob);
return result == 1 ? true : false;
}
/// Get a read-only buffer with the raw content of a blob.
///
/// A pointer to the raw content of a blob is returned; this pointer is owned
/// internally by the object and shall not be free'd. The pointer may be invalidated
/// at a later time.
String content(Pointer<git_blob> blob) {
final result = libgit2.git_blob_rawcontent(blob);
return result.cast<Utf8>().toDartString();
}
/// Get the size in bytes of the contents of a blob.
int size(Pointer<git_blob> blob) => libgit2.git_blob_rawsize(blob);
/// Write content of a string buffer to the ODB as a blob.
///
/// Throws a [LibGit2Error] if error occured.
Pointer<git_oid> create(
Pointer<git_repository> repo,
String buffer,
int len,
) {
final out = calloc<git_oid>();
final bufferC = buffer.toNativeUtf8().cast<Void>();
final error = libgit2.git_blob_create_from_buffer(out, repo, bufferC, len);
calloc.free(bufferC);
if (error < 0) {
throw LibGit2Error(libgit2.git_error_last());
} else {
return out;
}
}
/// Read a file from the working folder of a repository and write it to the
/// Object Database as a loose blob.
///
/// Throws a [LibGit2Error] if error occured.
Pointer<git_oid> createFromWorkdir(
Pointer<git_repository> repo,
String relativePath,
) {
final out = calloc<git_oid>();
final relativePathC = relativePath.toNativeUtf8().cast<Int8>();
final error = libgit2.git_blob_create_from_workdir(out, repo, relativePathC);
calloc.free(relativePathC);
if (error < 0) {
throw LibGit2Error(libgit2.git_error_last());
} else {
return out;
}
}
/// Read a file from the filesystem and write its content to the Object Database as a loose blob.
///
/// Throws a [LibGit2Error] if error occured.
Pointer<git_oid> createFromDisk(
Pointer<git_repository> repo,
String path,
) {
final out = calloc<git_oid>();
final pathC = path.toNativeUtf8().cast<Int8>();
final error = libgit2.git_blob_create_from_disk(out, repo, pathC);
if (error < 0) {
throw LibGit2Error(libgit2.git_error_last());
} else {
return out;
}
}
/// Close an open blob to release memory.
void free(Pointer<git_blob> blob) => libgit2.git_blob_free(blob);

61
lib/src/blob.dart Normal file
View file

@ -0,0 +1,61 @@
import 'dart:ffi';
import 'bindings/libgit2_bindings.dart';
import 'bindings/blob.dart' as bindings;
import 'oid.dart';
import 'repository.dart';
class Blob {
/// Initializes a new instance of [Blob] class from provided
/// [Repository] and [Oid] objects.
///
/// Should be freed with `free()` to release allocated memory.
Blob.lookup(Repository repo, Oid oid) {
_blobPointer = bindings.lookup(repo.pointer, oid.pointer);
}
late final Pointer<git_blob> _blobPointer;
/// Pointer to memory address for allocated blob object.
Pointer<git_blob> get pointer => _blobPointer;
/// Creates a new blob from a [content] string and writes it to ODB.
///
/// Throws a [LibGit2Error] if error occured.
static Oid create(Repository repo, String content) {
return Oid(bindings.create(repo.pointer, content, content.length));
}
/// Creates a new blob from the file in working directory of a repository and writes
/// it to the ODB. Provided [relativePath] should be relative to the working directory.
///
/// Throws a [LibGit2Error] if error occured.
static Oid createFromWorkdir(Repository repo, String relativePath) {
return Oid(bindings.createFromWorkdir(repo.pointer, relativePath));
}
/// Creates a new blob from the file in filesystem and writes it to the ODB.
///
/// Throws a [LibGit2Error] if error occured.
static Oid createFromDisk(Repository repo, String path) {
return Oid(bindings.createFromDisk(repo.pointer, path));
}
/// Returns the Oid of the blob.
Oid get id => Oid(bindings.id(_blobPointer));
/// Determines if the blob content is most certainly binary or not.
///
/// The heuristic used to guess if a file is binary is taken from core git:
/// Searching for NUL bytes and looking for a reasonable ratio of printable to
/// non-printable characters among the first 8000 bytes.
bool get isBinary => bindings.isBinary(_blobPointer);
/// Returns a read-only buffer with the raw content of a blob.
String get content => bindings.content(_blobPointer);
/// Returns the size in bytes of the contents of a blob.
int get size => bindings.size(_blobPointer);
/// Releases memory allocated for blob object.
void free() => bindings.free(_blobPointer);
}

View file

@ -10,6 +10,7 @@ import 'oid.dart';
import 'reference.dart'; import 'reference.dart';
import 'revwalk.dart'; import 'revwalk.dart';
import 'revparse.dart'; import 'revparse.dart';
import 'blob.dart';
import 'enums.dart'; import 'enums.dart';
import 'util.dart'; import 'util.dart';
@ -379,4 +380,21 @@ class Repository {
two.pointer, two.pointer,
)); ));
} }
/// Creates a new blob from a [content] string and writes it to ODB.
///
/// Throws a [LibGit2Error] if error occured.
Oid createBlob(String content) => Blob.create(this, content);
/// Creates a new blob from the file in working directory of a repository and writes
/// it to the ODB. Provided [path] should be relative to the working directory.
///
/// Throws a [LibGit2Error] if error occured.
Oid createBlobFromWorkdir(String relativePath) =>
Blob.createFromWorkdir(this, relativePath);
/// Creates a new blob from the file in filesystem and writes it to the ODB.
///
/// Throws a [LibGit2Error] if error occured.
Oid createBlobFromDisk(String path) => Blob.createFromDisk(this, path);
} }

View file

@ -7,12 +7,6 @@ import 'enums.dart';
import 'util.dart'; import 'util.dart';
class Tree { class Tree {
/// Initializes a new instance of [Tree] class from provided
/// pointer to tree object in memory.
Tree(this._treePointer) {
libgit2.git_libgit2_init();
}
/// Initializes a new instance of [Tree] class from provided /// Initializes a new instance of [Tree] class from provided
/// [Repository] and [Oid] objects. /// [Repository] and [Oid] objects.
/// ///

100
test/blob_test.dart Normal file
View file

@ -0,0 +1,100 @@
import 'dart:io';
import 'package:test/test.dart';
import 'package:libgit2dart/libgit2dart.dart';
import 'helpers/util.dart';
void main() {
late Repository repo;
late Blob blob;
final tmpDir = '${Directory.systemTemp.path}/blob_testrepo/';
const blobSHA = '9c78c21d6680a7ffebc76f7ac68cacc11d8f48bc';
const blobContent = 'Feature edit\n';
const newBlobContent = 'New blob\n';
setUp(() async {
if (await Directory(tmpDir).exists()) {
await Directory(tmpDir).delete(recursive: true);
}
await copyRepo(
from: Directory('test/assets/testrepo/'),
to: await Directory(tmpDir).create(),
);
repo = Repository.open(tmpDir);
blob = Blob.lookup(repo, Oid.fromSHA(repo, blobSHA));
});
tearDown(() async {
blob.free();
repo.free();
await Directory(tmpDir).delete(recursive: true);
});
group('Blob', () {
test('successfully initializes blob from provided Oid', () {
expect(blob, isA<Blob>());
});
test('returns correct values', () {
expect(blob.id.sha, blobSHA);
expect(blob.isBinary, false);
expect(blob.size, 13);
expect(blob.content, blobContent);
});
test('successfully creates new blob', () {
final oid = Blob.create(repo, newBlobContent);
final newBlob = Blob.lookup(repo, oid);
expect(newBlob.id.sha, '18fdaeef018e57a92bcad2d4a35b577f34089af6');
expect(newBlob.isBinary, false);
expect(newBlob.size, 9);
expect(newBlob.content, newBlobContent);
newBlob.free();
});
test('successfully creates new blob from file at provided relative path',
() {
final oid = Blob.createFromWorkdir(repo, 'feature_file');
final newBlob = Blob.lookup(repo, oid);
expect(newBlob.id.sha, blobSHA);
expect(newBlob.isBinary, false);
expect(newBlob.size, 13);
expect(newBlob.content, blobContent);
newBlob.free();
});
test('throws when creating new blob from invalid path', () {
expect(
() => Blob.createFromWorkdir(repo, 'invalid/path.txt'),
throwsA(isA<LibGit2Error>()),
);
});
test(
'throws when creating new blob from path that is outside of working directory',
() {
final outsideFile =
File('${Directory.current.absolute.path}/test/blob_test.dart');
expect(
() => Blob.createFromWorkdir(repo, outsideFile.path),
throwsA(isA<LibGit2Error>()),
);
});
test('successfully creates new blob from file at provided path', () {
final outsideFile =
File('${Directory.current.absolute.path}/test/blob_test.dart');
final oid = Blob.createFromDisk(repo, outsideFile.path);
final newBlob = Blob.lookup(repo, oid);
expect(newBlob, isA<Blob>());
expect(newBlob.isBinary, false);
newBlob.free();
});
});
}

View file

@ -7,43 +7,43 @@ import 'helpers/util.dart';
void main() { void main() {
const mergeCommit = '78b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8'; const mergeCommit = '78b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8';
group('Commit', () { late Repository repo;
late Repository repo; final tmpDir = '${Directory.systemTemp.path}/commit_testrepo/';
final tmpDir = '${Directory.systemTemp.path}/commit_testrepo/';
const message = "Commit message.\n\nSome description.\n"; const message = "Commit message.\n\nSome description.\n";
const tree = '7796359a96eb722939c24bafdb1afe9f07f2f628'; const tree = '7796359a96eb722939c24bafdb1afe9f07f2f628';
late Signature author; late Signature author;
late Signature commiter; late Signature commiter;
setUp(() async { setUp(() async {
if (await Directory(tmpDir).exists()) { if (await Directory(tmpDir).exists()) {
await Directory(tmpDir).delete(recursive: true);
}
await copyRepo(
from: Directory('test/assets/testrepo/'),
to: await Directory(tmpDir).create(),
);
repo = Repository.open(tmpDir);
author = Signature.create(
name: 'Author Name',
email: 'author@email.com',
time: 123,
);
commiter = Signature.create(
name: 'Commiter',
email: 'commiter@email.com',
time: 124,
);
});
tearDown(() async {
author.free();
commiter.free();
repo.free();
await Directory(tmpDir).delete(recursive: true); await Directory(tmpDir).delete(recursive: true);
}); }
await copyRepo(
from: Directory('test/assets/testrepo/'),
to: await Directory(tmpDir).create(),
);
repo = Repository.open(tmpDir);
author = Signature.create(
name: 'Author Name',
email: 'author@email.com',
time: 123,
);
commiter = Signature.create(
name: 'Commiter',
email: 'commiter@email.com',
time: 124,
);
});
tearDown(() async {
author.free();
commiter.free();
repo.free();
await Directory(tmpDir).delete(recursive: true);
});
group('Commit', () {
test('successfully returns when 40 char sha hex is provided', () { test('successfully returns when 40 char sha hex is provided', () {
final commit = repo[mergeCommit]; final commit = repo[mergeCommit];
expect(commit, isA<Commit>()); expect(commit, isA<Commit>());

View file

@ -18,17 +18,17 @@ void main() {
late Config config; late Config config;
setUp(() {
File('$tmpDir/$configFileName').writeAsStringSync(contents);
config = Config.open('$tmpDir/$configFileName');
});
tearDown(() {
config.free();
File('$tmpDir/$configFileName').deleteSync();
});
group('Config', () { group('Config', () {
setUp(() {
File('$tmpDir/$configFileName').writeAsStringSync(contents);
config = Config.open('$tmpDir/$configFileName');
});
tearDown(() {
config.free();
File('$tmpDir/$configFileName').deleteSync();
});
test('opens file successfully with provided path', () { test('opens file successfully with provided path', () {
expect(config, isA<Config>()); expect(config, isA<Config>());
}); });

View file

@ -6,27 +6,25 @@ import 'helpers/util.dart';
void main() { void main() {
const lastCommit = '78b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8'; const lastCommit = '78b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8';
late Repository repo;
final tmpDir = '${Directory.systemTemp.path}/odb_testrepo/';
group('Odb', () { setUp(() async {
late Repository repo; if (await Directory(tmpDir).exists()) {
final tmpDir = '${Directory.systemTemp.path}/odb_testrepo/';
setUp(() async {
if (await Directory(tmpDir).exists()) {
await Directory(tmpDir).delete(recursive: true);
}
await copyRepo(
from: Directory('test/assets/testrepo/'),
to: await Directory(tmpDir).create(),
);
repo = Repository.open(tmpDir);
});
tearDown(() async {
repo.free();
await Directory(tmpDir).delete(recursive: true); await Directory(tmpDir).delete(recursive: true);
}); }
await copyRepo(
from: Directory('test/assets/testrepo/'),
to: await Directory(tmpDir).create(),
);
repo = Repository.open(tmpDir);
});
tearDown(() async {
repo.free();
await Directory(tmpDir).delete(recursive: true);
});
group('Odb', () {
test('successfully initializes', () { test('successfully initializes', () {
expect(repo.odb, isA<Odb>()); expect(repo.odb, isA<Odb>());
repo.odb.free(); repo.odb.free();

View file

@ -8,26 +8,26 @@ void main() {
const sha = '78b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8'; const sha = '78b8bf123e3952c970ae5c1ce0a3ea1d1336f6e8';
const biggerSha = '78b8bf123e3952c970ae5c1ce0a3ea1d1336f6e9'; const biggerSha = '78b8bf123e3952c970ae5c1ce0a3ea1d1336f6e9';
const lesserSha = '78b8bf123e3952c970ae5c1ce0a3ea1d1336f6e7'; const lesserSha = '78b8bf123e3952c970ae5c1ce0a3ea1d1336f6e7';
late Repository repo;
final tmpDir = '${Directory.systemTemp.path}/oid_testrepo/';
setUp(() async {
if (await Directory(tmpDir).exists()) {
await Directory(tmpDir).delete(recursive: true);
}
await copyRepo(
from: Directory('test/assets/testrepo/'),
to: await Directory(tmpDir).create(),
);
repo = Repository.open(tmpDir);
});
tearDown(() async {
repo.free();
await Directory(tmpDir).delete(recursive: true);
});
group('Oid', () { group('Oid', () {
late Repository repo;
final tmpDir = '${Directory.systemTemp.path}/oid_testrepo/';
setUp(() async {
if (await Directory(tmpDir).exists()) {
await Directory(tmpDir).delete(recursive: true);
}
await copyRepo(
from: Directory('test/assets/testrepo/'),
to: await Directory(tmpDir).create(),
);
repo = Repository.open(tmpDir);
});
tearDown(() async {
repo.free();
await Directory(tmpDir).delete(recursive: true);
});
group('fromSHA()', () { group('fromSHA()', () {
test('initializes successfully', () { test('initializes successfully', () {
final oid = Oid.fromSHA(repo, sha); final oid = Oid.fromSHA(repo, sha);

View file

@ -7,27 +7,26 @@ import 'helpers/util.dart';
void main() { void main() {
const lastCommit = '821ed6e80627b8769d170a293862f9fc60825226'; const lastCommit = '821ed6e80627b8769d170a293862f9fc60825226';
const newCommit = 'c68ff54aabf660fcdd9a2838d401583fe31249e3'; const newCommit = 'c68ff54aabf660fcdd9a2838d401583fe31249e3';
late Repository repo;
final tmpDir = '${Directory.systemTemp.path}/ref_testrepo/';
setUp(() async {
if (await Directory(tmpDir).exists()) {
await Directory(tmpDir).delete(recursive: true);
}
await copyRepo(
from: Directory('test/assets/testrepo/'),
to: await Directory(tmpDir).create(),
);
repo = Repository.open(tmpDir);
});
tearDown(() async {
repo.free();
await Directory(tmpDir).delete(recursive: true);
});
group('Reference', () { group('Reference', () {
late Repository repo;
final tmpDir = '${Directory.systemTemp.path}/ref_testrepo/';
setUp(() async {
if (await Directory(tmpDir).exists()) {
await Directory(tmpDir).delete(recursive: true);
}
await copyRepo(
from: Directory('test/assets/testrepo/'),
to: await Directory(tmpDir).create(),
);
repo = Repository.open(tmpDir);
});
tearDown(() async {
repo.free();
await Directory(tmpDir).delete(recursive: true);
});
test('returns a list', () { test('returns a list', () {
expect( expect(
repo.references.list(), repo.references.list(),

View file

@ -5,30 +5,29 @@ import 'package:libgit2dart/libgit2dart.dart';
import 'helpers/util.dart'; import 'helpers/util.dart';
void main() { void main() {
group('RefLog', () { late Repository repo;
late Repository repo; late RefLog reflog;
late RefLog reflog; final tmpDir = '${Directory.systemTemp.path}/reflog_testrepo/';
final tmpDir = '${Directory.systemTemp.path}/reflog_testrepo/';
setUp(() async { setUp(() async {
if (await Directory(tmpDir).exists()) { if (await Directory(tmpDir).exists()) {
await Directory(tmpDir).delete(recursive: true);
}
await copyRepo(
from: Directory('test/assets/testrepo/'),
to: await Directory(tmpDir).create(),
);
repo = Repository.open(tmpDir);
reflog = RefLog(repo.head);
});
tearDown(() async {
repo.head.free();
reflog.free();
repo.free();
await Directory(tmpDir).delete(recursive: true); await Directory(tmpDir).delete(recursive: true);
}); }
await copyRepo(
from: Directory('test/assets/testrepo/'),
to: await Directory(tmpDir).create(),
);
repo = Repository.open(tmpDir);
reflog = RefLog(repo.head);
});
tearDown(() async {
repo.head.free();
reflog.free();
repo.free();
await Directory(tmpDir).delete(recursive: true);
});
group('RefLog', () {
test('initializes successfully', () { test('initializes successfully', () {
expect(reflog, isA<RefLog>()); expect(reflog, isA<RefLog>());
}); });

View file

@ -269,6 +269,41 @@ void main() {
expect(repo.isBranchUnborn, true); expect(repo.isBranchUnborn, true);
}); });
}); });
group('createBlob', () {
const newBlobContent = 'New blob\n';
test('successfully creates new blob', () {
final oid = repo.createBlob(newBlobContent);
final newBlob = Blob.lookup(repo, oid);
expect(newBlob, isA<Blob>());
newBlob.free();
});
test(
'successfully creates new blob from file at provided relative path',
() {
final oid = repo.createBlobFromWorkdir('feature_file');
final newBlob = Blob.lookup(repo, oid);
expect(newBlob, isA<Blob>());
newBlob.free();
});
test('successfully creates new blob from file at provided path', () {
final outsideFile =
File('${Directory.current.absolute.path}/test/blob_test.dart');
final oid = repo.createBlobFromDisk(outsideFile.path);
final newBlob = Blob.lookup(repo, oid);
expect(newBlob, isA<Blob>());
newBlob.free();
});
});
}); });
}); });
} }

View file

@ -3,25 +3,24 @@ import 'package:libgit2dart/libgit2dart.dart';
void main() { void main() {
late Signature signature; late Signature signature;
const name = 'Some Name';
const email = 'some@email.com';
const time = 1234567890;
const offset = 0;
setUp(() {
signature = Signature.create(
name: name,
email: email,
time: time,
offset: offset,
);
});
tearDown(() {
signature.free();
});
group('Signature', () { group('Signature', () {
const name = 'Some Name';
const email = 'some@email.com';
const time = 1234567890;
const offset = 0;
setUp(() {
signature = Signature.create(
name: name,
email: email,
time: time,
offset: offset,
);
});
tearDown(() {
signature.free();
});
test('successfully creates with provided time and offset', () { test('successfully creates with provided time and offset', () {
expect(signature, isA<Signature>()); expect(signature, isA<Signature>());
}); });