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

use path instead of uri

Browse source
This commit is contained in:
Aleksey Kulikov 2021-11-01 18:44:14 +03:00
parent 7141d95cd6
commit 85ea6429eb
2 changed files with 26 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

16
bin/setup.dart
View file

@ -8,21 +8,14 @@ import 'package:libgit2dart/src/util.dart';
import 'package:path/path.dart' as path; import 'package:path/path.dart' as path;
import 'package:pub_cache/pub_cache.dart'; import 'package:pub_cache/pub_cache.dart';
/// Checks whether libgit2 library is present in directory for [platform].
bool libgit2IsPresent(String platform) {
final result = File.fromUri(
Directory.current.uri.resolve(path.join(libDir, platform, getLibName())),
).existsSync();
return result;
}
/// Copies prebuilt libgit2 library from package in '.pub_cache' into correct /// Copies prebuilt libgit2 library from package in '.pub_cache' into correct
/// directory for [platform]. /// directory for [platform].
Future<void> copyLibrary(String platform) async { Future<void> copyLibrary(String platform) async {
final logger = Logger.standard(); final logger = Logger.standard();
final ansi = Ansi(Ansi.terminalSupportsAnsi); final ansi = Ansi(Ansi.terminalSupportsAnsi);
if (libgit2IsPresent(platform)) { if (File(path.join(Directory.current.path, libDir, platform, getLibName()))
.existsSync()) {
if (libgit2Version == Libgit2.version) { if (libgit2Version == Libgit2.version) {
logger.stdout('${ansi.green}libgit2 for $platform is already available.'); logger.stdout('${ansi.green}libgit2 for $platform is already available.');
} else { } else {
@ -38,12 +31,13 @@ Future<void> copyLibrary(String platform) async {
final pubCacheDir = final pubCacheDir =
pubCache.getLatestVersion('libgit2dart')!.resolve()!.location; pubCache.getLatestVersion('libgit2dart')!.resolve()!.location;
final libName = getLibName(); final libName = getLibName();
final libUri = pubCacheDir.uri.resolve(path.join(platform, libName));
logger.stdout('Copying libgit2 for $platform'); logger.stdout('Copying libgit2 for $platform');
final destination = path.join(libDir, platform); final destination = path.join(libDir, platform);
Directory(destination).createSync(recursive: true); Directory(destination).createSync(recursive: true);
File.fromUri(libUri).copySync(path.join(destination, libName)); File(path.join(pubCacheDir.path, platform, libName)).copySync(
path.join(destination, libName),
);
logger.stdout( logger.stdout(
'${ansi.green}Done! libgit2 for $platform is now available!' '${ansi.green}Done! libgit2 for $platform is now available!'

41
lib/src/util.dart
View file

@ -26,44 +26,45 @@ String getLibName() {
} }
/// Checks if [File]/[Link] exists for an [uri]. /// Checks if [File]/[Link] exists for an [uri].
bool _doesFileExist(Uri uri) { bool _doesFileExist(String path) {
return File.fromUri(uri).existsSync() || Link.fromUri(uri).existsSync(); return File(path).existsSync() || Link(path).existsSync();
} }
/// Returns path to dynamic library if found. /// Returns path to dynamic library if found.
String? _resolveLibUri(String name) { String? _resolveLibPath(String name) {
var libUri = Directory.current.uri.resolve(name); var libPath = path.join(Directory.current.path, name);
// If lib is in Present Working Directory. // If lib is in Present Working Directory.
if (_doesFileExist(libUri)) { if (_doesFileExist(libPath)) {
return libUri.toFilePath(windows: Platform.isWindows); return libPath;
} }
// If lib is in Present Working Directory's '.dart_tool/libgit2/[platform]' folder. // If lib is in Present Working Directory's '.dart_tool/libgit2/[platform]' folder.
final logger = Logger.standard(); final logger = Logger.standard();
libUri = Directory.current.uri.resolve( libPath = path.join(
path.join(libDir, Platform.operatingSystem, name), Directory.current.path,
libDir,
Platform.operatingSystem,
name,
); );
logger.stdout('$libUri'); logger.stdout(libPath);
if (_doesFileExist(libUri)) { if (_doesFileExist(libPath)) {
return libUri.toFilePath(windows: Platform.isWindows); return libPath;
} }
// If lib is in Present Working Directory's '[platform]' folder. // If lib is in Present Working Directory's '[platform]' folder.
libUri = Directory.current.uri.resolve( libPath = path.join(Directory.current.path, Platform.operatingSystem, name);
path.join(Platform.operatingSystem, name), if (_doesFileExist(libPath)) {
); return libPath;
if (_doesFileExist(libUri)) {
return libUri.toFilePath(windows: Platform.isWindows);
} }
// If lib is in '.pub_cache' folder. // If lib is in '.pub_cache' folder.
final pubCache = PubCache(); final pubCache = PubCache();
final pubCacheDir = final pubCacheDir =
pubCache.getLatestVersion('libgit2dart')!.resolve()!.location; pubCache.getLatestVersion('libgit2dart')!.resolve()!.location;
libUri = pubCacheDir.uri.resolve(path.join(Platform.operatingSystem, name)); libPath = path.join(pubCacheDir.path, Platform.operatingSystem, name);
if (_doesFileExist(libUri)) { if (_doesFileExist(libPath)) {
return libUri.toFilePath(windows: Platform.isWindows); return libPath;
} }
return null; return null;
@ -72,7 +73,7 @@ String? _resolveLibUri(String name) {
DynamicLibrary loadLibrary(String name) { DynamicLibrary loadLibrary(String name) {
try { try {
return DynamicLibrary.open( return DynamicLibrary.open(
_resolveLibUri(name) ?? name, _resolveLibPath(name) ?? name,
); );
} catch (e) { } catch (e) {
final logger = Logger.standard(); final logger = Logger.standard();