flutter/GitJournal
1
0
Fork 0
mirror of https://github.com/GitJournal/GitJournal.git synced 2025-06-28 09:47:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix reset repo

Browse Source
This commit is contained in:
Vishesh Handa
2020-10-21 04:29:01 +02:00
parent c54b612368
commit 018dd4ca36
5 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/screens/settings_git_remote.dart
View File

@ -3,6 +3,7 @@ import 'dart:io';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; import 'package:flutter/services.dart';
import 'package:dart_git/dart_git.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';
@ -134,6 +135,7 @@ class _GitRemoteSettingsScreenState extends State<GitRemoteSettingsScreen> {
while (true) { while (true) {
var repoFolderPath = p.join(gitDir, "$repoFolderName$num"); var repoFolderPath = p.join(gitDir, "$repoFolderName$num");
if (!Directory(repoFolderPath).existsSync()) { if (!Directory(repoFolderPath).existsSync()) {
await GitRepository.init(repoFolderPath);
break; break;
} }
num++; num++;

3
lib/setup/screens.dart
View File

@ -495,8 +495,7 @@ class GitHostSetupScreenState extends State<GitHostSetupScreen> {
var basePath = stateContainer.appState.gitBaseDirectory; var basePath = stateContainer.appState.gitBaseDirectory;
var settings = Provider.of<Settings>(context, listen: false); var settings = Provider.of<Settings>(context, listen: false);
var repoName = settings.folderName; var repoPath = p.join(basePath, widget.repoFolderName);
var repoPath = p.join(basePath, repoName);
Log.i("RepoPath: $repoPath"); Log.i("RepoPath: $repoPath");
String error; String error;

15
lib/state_container.dart
View File

@ -327,7 +327,12 @@ class StateContainer with ChangeNotifier {
void completeGitHostSetup(String repoFolderName, String remoteName) { void completeGitHostSetup(String repoFolderName, String remoteName) {
() async { () async {
var repo = await GitRepository.load(_gitRepo.gitDirPath); var repoPath = p.join(appState.gitBaseDirectory, repoFolderName);
Log.i("completeGitHostSetup repoPath: $repoPath");
_gitRepo = GitNoteRepository(gitDirPath: repoPath, settings: settings);
var repo = await GitRepository.load(repoPath);
var remote = repo.config.remote(remoteName); var remote = repo.config.remote(remoteName);
var remoteBranch = await repo.guessRemoteHead(remoteName); var remoteBranch = await repo.guessRemoteHead(remoteName);
var remoteBranchName = remoteBranch.name.branchName(); var remoteBranchName = remoteBranch.name.branchName();
@ -359,6 +364,14 @@ class StateContainer with ChangeNotifier {
} }
this.repoPath = repoPath;
_notesCache.clear();
appState.remoteGitRepoConfigured = true;
appState.notesFolder.reset(repoPath);
settings.folderName = repoFolderName;
settings.save();
await _persistConfig(); await _persistConfig();
_loadNotes(); _loadNotes();
_syncNotes(); _syncNotes();

2
pubspec.lock
View File

@ -438,7 +438,7 @@ packages:
name: git_bindings name: git_bindings
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.0.17" version: "0.0.18"
git_url_parse2: git_url_parse2:
dependency: "direct main" dependency: "direct main"
description: description:

2
pubspec.yaml
View File

@ -29,7 +29,7 @@ dependencies:
dynamic_theme: ^1.0.0 dynamic_theme: ^1.0.0
flutter_staggered_grid_view: ^0.3.0 flutter_staggered_grid_view: ^0.3.0
provider: ^4.3.2+2 provider: ^4.3.2+2
git_bindings: ^0.0.17 git_bindings: ^0.0.18
dart_git: dart_git:
git: https://github.com/GitJournal/dart_git.git git: https://github.com/GitJournal/dart_git.git
#path: /Users/vishesh/src/gitjournal/dart_git #path: /Users/vishesh/src/gitjournal/dart_git