mirror of
https://github.com/GitJournal/GitJournal.git
synced 2025-08-24 17:31:06 +08:00
Avoid importing dart_git's Result class
It's easier to see where all dart_git is used this way, and this result class should be refactored into its own package anyway.
This commit is contained in:
@ -4,11 +4,11 @@
|
|||||||
* SPDX-License-Identifier: AGPL-3.0-or-later
|
* SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import 'package:dart_git/utils/result.dart';
|
|
||||||
import 'package:grpc/grpc.dart';
|
import 'package:grpc/grpc.dart';
|
||||||
|
|
||||||
import 'package:gitjournal/.env.dart';
|
import 'package:gitjournal/.env.dart';
|
||||||
import 'package:gitjournal/analytics/generated/analytics.pbgrpc.dart';
|
import 'package:gitjournal/analytics/generated/analytics.pbgrpc.dart';
|
||||||
|
import 'package:gitjournal/utils/result.dart';
|
||||||
import 'generated/analytics.pb.dart' as pb;
|
import 'generated/analytics.pb.dart' as pb;
|
||||||
|
|
||||||
const _port = 443;
|
const _port = 443;
|
||||||
|
@ -9,9 +9,10 @@ import 'dart:async';
|
|||||||
import 'package:flutter/foundation.dart';
|
import 'package:flutter/foundation.dart';
|
||||||
|
|
||||||
import 'package:collection/collection.dart';
|
import 'package:collection/collection.dart';
|
||||||
import 'package:dart_git/utils/result.dart';
|
|
||||||
|
|
||||||
export 'package:dart_git/utils/result.dart';
|
import 'package:gitjournal/utils/result.dart';
|
||||||
|
|
||||||
|
export 'package:gitjournal/utils/result.dart';
|
||||||
|
|
||||||
typedef OAuthCallback = void Function(GitHostException?);
|
typedef OAuthCallback = void Function(GitHostException?);
|
||||||
|
|
||||||
|
@ -6,7 +6,6 @@
|
|||||||
|
|
||||||
import 'dart:collection';
|
import 'dart:collection';
|
||||||
|
|
||||||
import 'package:dart_git/utils/result.dart';
|
|
||||||
import 'package:easy_localization/easy_localization.dart';
|
import 'package:easy_localization/easy_localization.dart';
|
||||||
import 'package:path/path.dart' as p;
|
import 'package:path/path.dart' as p;
|
||||||
import 'package:path/path.dart';
|
import 'package:path/path.dart';
|
||||||
@ -19,6 +18,7 @@ import 'package:gitjournal/core/note_storage.dart';
|
|||||||
import 'package:gitjournal/core/views/inline_tags_view.dart';
|
import 'package:gitjournal/core/views/inline_tags_view.dart';
|
||||||
import 'package:gitjournal/generated/locale_keys.g.dart';
|
import 'package:gitjournal/generated/locale_keys.g.dart';
|
||||||
import 'package:gitjournal/logger/logger.dart';
|
import 'package:gitjournal/logger/logger.dart';
|
||||||
|
import 'package:gitjournal/utils/result.dart';
|
||||||
import '../file/file.dart';
|
import '../file/file.dart';
|
||||||
import '../file/ignored_file.dart';
|
import '../file/ignored_file.dart';
|
||||||
import '../note.dart';
|
import '../note.dart';
|
||||||
|
@ -6,12 +6,12 @@
|
|||||||
|
|
||||||
import 'dart:isolate';
|
import 'dart:isolate';
|
||||||
|
|
||||||
import 'package:dart_git/utils/result.dart';
|
|
||||||
import 'package:synchronized/synchronized.dart';
|
import 'package:synchronized/synchronized.dart';
|
||||||
import 'package:universal_io/io.dart';
|
import 'package:universal_io/io.dart';
|
||||||
|
|
||||||
import 'package:gitjournal/core/markdown/md_yaml_doc.dart';
|
import 'package:gitjournal/core/markdown/md_yaml_doc.dart';
|
||||||
import 'package:gitjournal/core/markdown/md_yaml_doc_codec.dart';
|
import 'package:gitjournal/core/markdown/md_yaml_doc_codec.dart';
|
||||||
|
import 'package:gitjournal/utils/result.dart';
|
||||||
|
|
||||||
class MdYamlDocLoader {
|
class MdYamlDocLoader {
|
||||||
Isolate? _isolate;
|
Isolate? _isolate;
|
||||||
|
@ -6,7 +6,6 @@
|
|||||||
|
|
||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
|
|
||||||
import 'package:dart_git/utils/result.dart';
|
|
||||||
import 'package:path/path.dart' as p;
|
import 'package:path/path.dart' as p;
|
||||||
import 'package:universal_io/io.dart' as io;
|
import 'package:universal_io/io.dart' as io;
|
||||||
|
|
||||||
@ -16,6 +15,7 @@ import 'package:gitjournal/core/markdown/md_yaml_doc_codec.dart';
|
|||||||
import 'package:gitjournal/core/markdown/md_yaml_doc_loader.dart';
|
import 'package:gitjournal/core/markdown/md_yaml_doc_loader.dart';
|
||||||
import 'package:gitjournal/core/markdown/md_yaml_note_serializer.dart';
|
import 'package:gitjournal/core/markdown/md_yaml_note_serializer.dart';
|
||||||
import 'package:gitjournal/logger/logger.dart';
|
import 'package:gitjournal/logger/logger.dart';
|
||||||
|
import 'package:gitjournal/utils/result.dart';
|
||||||
import 'file/file.dart';
|
import 'file/file.dart';
|
||||||
import 'folder/notes_folder_fs.dart';
|
import 'folder/notes_folder_fs.dart';
|
||||||
import 'note.dart';
|
import 'note.dart';
|
||||||
|
@ -8,7 +8,6 @@ import 'package:flutter/material.dart';
|
|||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
|
|
||||||
import 'package:collection/collection.dart';
|
import 'package:collection/collection.dart';
|
||||||
import 'package:dart_git/utils/result.dart';
|
|
||||||
import 'package:easy_localization/easy_localization.dart';
|
import 'package:easy_localization/easy_localization.dart';
|
||||||
import 'package:path/path.dart' as p;
|
import 'package:path/path.dart' as p;
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
@ -33,6 +32,7 @@ import 'package:gitjournal/generated/locale_keys.g.dart';
|
|||||||
import 'package:gitjournal/logger/logger.dart';
|
import 'package:gitjournal/logger/logger.dart';
|
||||||
import 'package:gitjournal/repository.dart';
|
import 'package:gitjournal/repository.dart';
|
||||||
import 'package:gitjournal/settings/settings.dart';
|
import 'package:gitjournal/settings/settings.dart';
|
||||||
|
import 'package:gitjournal/utils/result.dart';
|
||||||
import 'package:gitjournal/utils/utils.dart';
|
import 'package:gitjournal/utils/utils.dart';
|
||||||
import 'package:gitjournal/widgets/folder_selection_dialog.dart';
|
import 'package:gitjournal/widgets/folder_selection_dialog.dart';
|
||||||
import 'package:gitjournal/widgets/note_delete_dialog.dart';
|
import 'package:gitjournal/widgets/note_delete_dialog.dart';
|
||||||
|
@ -6,7 +6,6 @@
|
|||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
import 'package:dart_git/utils/result.dart';
|
|
||||||
import 'package:dashbook/dashbook.dart';
|
import 'package:dashbook/dashbook.dart';
|
||||||
import 'package:easy_localization/easy_localization.dart';
|
import 'package:easy_localization/easy_localization.dart';
|
||||||
import 'package:path_provider/path_provider.dart';
|
import 'package:path_provider/path_provider.dart';
|
||||||
@ -16,6 +15,7 @@ import 'package:gitjournal/app_router.dart';
|
|||||||
import 'package:gitjournal/logger/logger.dart';
|
import 'package:gitjournal/logger/logger.dart';
|
||||||
import 'package:gitjournal/repository_manager.dart';
|
import 'package:gitjournal/repository_manager.dart';
|
||||||
import 'package:gitjournal/settings/app_config.dart';
|
import 'package:gitjournal/settings/app_config.dart';
|
||||||
|
import 'package:gitjournal/utils/result.dart';
|
||||||
|
|
||||||
Future<void> main() async {
|
Future<void> main() async {
|
||||||
//TestWidgetsFlutterBinding.ensureInitialized();
|
//TestWidgetsFlutterBinding.ensureInitialized();
|
||||||
|
@ -8,7 +8,6 @@ import 'dart:convert';
|
|||||||
|
|
||||||
import 'package:flutter/foundation.dart' as foundation;
|
import 'package:flutter/foundation.dart' as foundation;
|
||||||
|
|
||||||
import 'package:dart_git/utils/result.dart';
|
|
||||||
import 'package:google_api_availability/google_api_availability.dart';
|
import 'package:google_api_availability/google_api_availability.dart';
|
||||||
import 'package:http/http.dart' as http;
|
import 'package:http/http.dart' as http;
|
||||||
import 'package:in_app_purchase/in_app_purchase.dart';
|
import 'package:in_app_purchase/in_app_purchase.dart';
|
||||||
@ -19,6 +18,7 @@ import 'package:gitjournal/error_reporting.dart';
|
|||||||
import 'package:gitjournal/features.dart';
|
import 'package:gitjournal/features.dart';
|
||||||
import 'package:gitjournal/logger/logger.dart';
|
import 'package:gitjournal/logger/logger.dart';
|
||||||
import 'package:gitjournal/settings/app_config.dart';
|
import 'package:gitjournal/settings/app_config.dart';
|
||||||
|
import 'package:gitjournal/utils/result.dart';
|
||||||
|
|
||||||
class InAppPurchases {
|
class InAppPurchases {
|
||||||
static Future<void> confirmProPurchaseBoot() async {
|
static Future<void> confirmProPurchaseBoot() async {
|
||||||
|
@ -6,7 +6,6 @@
|
|||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
import 'package:dart_git/utils/result.dart';
|
|
||||||
import 'package:path/path.dart' as p;
|
import 'package:path/path.dart' as p;
|
||||||
import 'package:shared_preferences/shared_preferences.dart';
|
import 'package:shared_preferences/shared_preferences.dart';
|
||||||
|
|
||||||
@ -14,6 +13,7 @@ import 'package:gitjournal/logger/logger.dart';
|
|||||||
import 'package:gitjournal/repository.dart';
|
import 'package:gitjournal/repository.dart';
|
||||||
import 'package:gitjournal/settings/settings.dart';
|
import 'package:gitjournal/settings/settings.dart';
|
||||||
import 'package:gitjournal/settings/storage_config.dart';
|
import 'package:gitjournal/settings/storage_config.dart';
|
||||||
|
import 'package:gitjournal/utils/result.dart';
|
||||||
|
|
||||||
class RepositoryManager with ChangeNotifier {
|
class RepositoryManager with ChangeNotifier {
|
||||||
var repoIds = <String>[];
|
var repoIds = <String>[];
|
||||||
|
@ -9,11 +9,11 @@
|
|||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
|
|
||||||
import 'package:dart_git/utils/file_extensions.dart';
|
import 'package:dart_git/utils/file_extensions.dart';
|
||||||
import 'package:dart_git/utils/result.dart';
|
|
||||||
import 'package:universal_io/io.dart';
|
import 'package:universal_io/io.dart';
|
||||||
|
|
||||||
import 'package:gitjournal/logger/logger.dart';
|
import 'package:gitjournal/logger/logger.dart';
|
||||||
import 'package:gitjournal/settings/settings.dart';
|
import 'package:gitjournal/settings/settings.dart';
|
||||||
|
import 'package:gitjournal/utils/result.dart';
|
||||||
|
|
||||||
Future<Result<void>> gitFetchViaExecutable({
|
Future<Result<void>> gitFetchViaExecutable({
|
||||||
required String repoPath,
|
required String repoPath,
|
||||||
|
7
lib/utils/result.dart
Normal file
7
lib/utils/result.dart
Normal file
@ -0,0 +1,7 @@
|
|||||||
|
/*
|
||||||
|
* SPDX-FileCopyrightText: 2022 Vishesh Handa <me@vhanda.in>
|
||||||
|
*
|
||||||
|
* SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
|
*/
|
||||||
|
|
||||||
|
export 'package:dart_git/utils/result.dart';
|
@ -8,7 +8,6 @@ import 'package:flutter/foundation.dart' as foundation;
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
import 'package:dart_date/dart_date.dart';
|
import 'package:dart_date/dart_date.dart';
|
||||||
import 'package:dart_git/utils/result.dart';
|
|
||||||
import 'package:easy_localization/easy_localization.dart';
|
import 'package:easy_localization/easy_localization.dart';
|
||||||
import 'package:package_info_plus/package_info_plus.dart';
|
import 'package:package_info_plus/package_info_plus.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
@ -19,6 +18,7 @@ import 'package:gitjournal/core/folder/notes_folder_fs.dart';
|
|||||||
import 'package:gitjournal/core/note_storage.dart';
|
import 'package:gitjournal/core/note_storage.dart';
|
||||||
import 'package:gitjournal/generated/locale_keys.g.dart';
|
import 'package:gitjournal/generated/locale_keys.g.dart';
|
||||||
import 'package:gitjournal/settings/settings.dart';
|
import 'package:gitjournal/settings/settings.dart';
|
||||||
|
import 'package:gitjournal/utils/result.dart';
|
||||||
import '../core/note.dart';
|
import '../core/note.dart';
|
||||||
import '../editors/common_types.dart';
|
import '../editors/common_types.dart';
|
||||||
import '../logger/logger.dart';
|
import '../logger/logger.dart';
|
||||||
|
@ -5,7 +5,6 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
import 'package:dart_git/git.dart';
|
import 'package:dart_git/git.dart';
|
||||||
import 'package:dart_git/utils/result.dart';
|
|
||||||
import 'package:path/path.dart' as p;
|
import 'package:path/path.dart' as p;
|
||||||
import 'package:shared_preferences/shared_preferences.dart';
|
import 'package:shared_preferences/shared_preferences.dart';
|
||||||
import 'package:test/test.dart';
|
import 'package:test/test.dart';
|
||||||
@ -17,6 +16,7 @@ import 'package:gitjournal/core/file/file_storage.dart';
|
|||||||
import 'package:gitjournal/core/folder/notes_folder_config.dart';
|
import 'package:gitjournal/core/folder/notes_folder_config.dart';
|
||||||
import 'package:gitjournal/core/folder/notes_folder_fs.dart';
|
import 'package:gitjournal/core/folder/notes_folder_fs.dart';
|
||||||
import 'package:gitjournal/core/note_storage.dart';
|
import 'package:gitjournal/core/note_storage.dart';
|
||||||
|
import 'package:gitjournal/utils/result.dart';
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
group('Note', () {
|
group('Note', () {
|
||||||
|
@ -4,12 +4,12 @@
|
|||||||
* SPDX-License-Identifier: AGPL-3.0-or-later
|
* SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import 'package:dart_git/utils/result.dart';
|
|
||||||
import 'package:path/path.dart' as p;
|
import 'package:path/path.dart' as p;
|
||||||
import 'package:test/test.dart';
|
import 'package:test/test.dart';
|
||||||
import 'package:universal_io/io.dart';
|
import 'package:universal_io/io.dart';
|
||||||
|
|
||||||
import 'package:gitjournal/core/markdown/md_yaml_doc_loader.dart';
|
import 'package:gitjournal/core/markdown/md_yaml_doc_loader.dart';
|
||||||
|
import 'package:gitjournal/utils/result.dart';
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
group('MdYamlDocLoader', () {
|
group('MdYamlDocLoader', () {
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
* SPDX-License-Identifier: AGPL-3.0-or-later
|
* SPDX-License-Identifier: AGPL-3.0-or-later
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import 'package:dart_git/utils/result.dart';
|
|
||||||
import 'package:path/path.dart' as p;
|
import 'package:path/path.dart' as p;
|
||||||
import 'package:shared_preferences/shared_preferences.dart';
|
import 'package:shared_preferences/shared_preferences.dart';
|
||||||
import 'package:test/test.dart';
|
import 'package:test/test.dart';
|
||||||
@ -16,6 +15,7 @@ import 'package:gitjournal/core/folder/notes_folder_config.dart';
|
|||||||
import 'package:gitjournal/core/folder/notes_folder_fs.dart';
|
import 'package:gitjournal/core/folder/notes_folder_fs.dart';
|
||||||
import 'package:gitjournal/core/note.dart';
|
import 'package:gitjournal/core/note.dart';
|
||||||
import 'package:gitjournal/core/note_storage.dart';
|
import 'package:gitjournal/core/note_storage.dart';
|
||||||
|
import 'package:gitjournal/utils/result.dart';
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
group('Note', () {
|
group('Note', () {
|
||||||
|
@ -6,7 +6,6 @@
|
|||||||
|
|
||||||
import 'dart:math';
|
import 'dart:math';
|
||||||
|
|
||||||
import 'package:dart_git/utils/result.dart';
|
|
||||||
import 'package:path/path.dart' as p;
|
import 'package:path/path.dart' as p;
|
||||||
import 'package:shared_preferences/shared_preferences.dart';
|
import 'package:shared_preferences/shared_preferences.dart';
|
||||||
import 'package:test/test.dart';
|
import 'package:test/test.dart';
|
||||||
@ -19,6 +18,7 @@ import 'package:gitjournal/core/folder/notes_folder_fs.dart';
|
|||||||
import 'package:gitjournal/core/folder/sorted_notes_folder.dart';
|
import 'package:gitjournal/core/folder/sorted_notes_folder.dart';
|
||||||
import 'package:gitjournal/core/folder/sorting_mode.dart';
|
import 'package:gitjournal/core/folder/sorting_mode.dart';
|
||||||
import 'package:gitjournal/core/note_storage.dart';
|
import 'package:gitjournal/core/note_storage.dart';
|
||||||
|
import 'package:gitjournal/utils/result.dart';
|
||||||
|
|
||||||
void main() {
|
void main() {
|
||||||
group('Sorted Notes Folder Test', () {
|
group('Sorted Notes Folder Test', () {
|
||||||
|
Reference in New Issue
Block a user