Siklos/libgit2dart
1
0
Fork 0
mirror of https://github.com/SkinnyMind/libgit2dart.git synced 2025-05-05 04:39:07 -04:00
Code Issues Projects Releases Wiki Activity

refactor: simplify setup

Browse source
This commit is contained in:
Aleksey Kulikov 2021-11-01 12:16:41 +03:00
parent c8895524be
commit f33958c40d
2 changed files with 28 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

32
lib/src/util.dart
View file

@ -6,6 +6,8 @@ import 'dart:io';
import 'package:cli_util/cli_logging.dart' show Ansi, Logger; import 'package:cli_util/cli_logging.dart' show Ansi, Logger;
import 'package:ffi/ffi.dart'; import 'package:ffi/ffi.dart';
import 'package:libgit2dart/src/bindings/libgit2_bindings.dart'; import 'package:libgit2dart/src/bindings/libgit2_bindings.dart';
import 'package:path/path.dart' as p;
import 'package:pub_cache/pub_cache.dart';
const tag = 'libs-v1.3.0'; const tag = 'libs-v1.3.0';
const libUrl = const libUrl =
@ -20,7 +22,7 @@ String getLibName() {
ext = 'dll'; ext = 'dll';
} else if (Platform.isMacOS) { } else if (Platform.isMacOS) {
ext = 'dylib'; ext = 'dylib';
} else if (!(Platform.isLinux || Platform.isAndroid)) { } else if (!(Platform.isLinux)) {
throw Exception('Unsupported platform.'); throw Exception('Unsupported platform.');
} }
@ -32,17 +34,36 @@ bool _doesFileExist(Uri uri) {
return File.fromUri(uri).existsSync() || Link.fromUri(uri).existsSync(); return File.fromUri(uri).existsSync() || Link.fromUri(uri).existsSync();
} }
/// Returns path to dynamic library if found.
String? _resolveLibUri(String name) { String? _resolveLibUri(String name) {
var libUri = Directory.current.uri.resolve(name); var libUri = Directory.current.uri.resolve(name);
final dartToolDir = '$libDir${Platform.operatingSystem}';
// If lib is in Present Working Directory. // If lib is in Present Working Directory.
if (_doesFileExist(libUri)) { if (_doesFileExist(libUri)) {
return libUri.toFilePath(windows: Platform.isWindows); return libUri.toFilePath(windows: Platform.isWindows);
} }
// If lib is in Present Working Directory's .dart_tool folder. // If lib is in Present Working Directory's '.dart_tool/libgit2/[platform]' folder.
libUri = Directory.current.uri.resolve('$dartToolDir/$name'); libUri = Directory.current.uri.resolve(
p.join(libDir, Platform.operatingSystem, name),
);
if (_doesFileExist(libUri)) {
return libUri.toFilePath(windows: Platform.isWindows);
}
// If lib is in Present Working Directory's '[platform]' folder.
libUri = Directory.current.uri.resolve(
p.join(Platform.operatingSystem, name),
);
if (_doesFileExist(libUri)) {
return libUri.toFilePath(windows: Platform.isWindows);
}
// If lib is in '.pub_cache' folder.
final pubCache = PubCache();
final pubCacheDir =
pubCache.getLatestVersion('libgit2dart')!.resolve()!.location;
libUri = pubCacheDir.uri.resolve(p.join(Platform.operatingSystem, name));
if (_doesFileExist(libUri)) { if (_doesFileExist(libUri)) {
return libUri.toFilePath(windows: Platform.isWindows); return libUri.toFilePath(windows: Platform.isWindows);
} }
@ -51,9 +72,10 @@ String? _resolveLibUri(String name) {
} }
DynamicLibrary loadLibrary(String name) { DynamicLibrary loadLibrary(String name) {
final resolvedUri = _resolveLibUri(name);
try { try {
return DynamicLibrary.open( return DynamicLibrary.open(
_resolveLibUri(name) ?? name, resolvedUri ?? name,
); );
} catch (e) { } catch (e) {
final logger = Logger.standard(); final logger = Logger.standard();

1
pubspec.yaml
View file

@ -11,6 +11,7 @@ dependencies:
args: ^2.3.0 args: ^2.3.0
cli_util: ^0.3.5 cli_util: ^0.3.5
ffi: ^1.1.2 ffi: ^1.1.2
pub_cache: ^0.3.1
dev_dependencies: dev_dependencies:
ffigen: ^4.0.0 ffigen: ^4.0.0