bug fix

ylc395 · Oct 18, 2021 · 4183755 · 4183755
1 parent cc1cc91
commit 4183755
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/domain/service/PublishService.ts b/src/domain/service/PublishService.ts
@@ -110,6 +110,7 @@ export class PublishService {
  this.git.on(GitEvents.Progress, this.refreshPublishingProgress.bind(this));
  this.git.on(GitEvents.Message, (message) => this.refreshPublishingProgress({ message }));
  this.git.on(GitEvents.LocalRepoStatusChanged, this.handleLocalRepoStatusChanged.bind(this));
+ this.github.on(GithubClientEvents.InfoChanged, () => this.refreshPublishingProgress());
  this.generator.on(GeneratorEvents.PageGenerated, this.refreshGeneratingProgress.bind(this));
 
  this.githubInfo.value = {
@@ -147,11 +148,11 @@ export class PublishService {
  return Object.keys(keyInfos).length === requiredKeys.length && !some(keyInfos, isEmpty);
  });
 
- async saveGithubInfo(githubInfo: Partial<Github>) {
+ saveGithubInfo(githubInfo: Partial<Github>) {
  const githubInfo_ = omit(githubInfo, ['token']);
 
  Object.assign(this.githubInfo.value, githubInfo_);
- await this.pluginDataRepository.saveGithubInfo(omit(toRaw(this.githubInfo.value), ['token']));
+ this.pluginDataRepository.saveGithubInfo(omit(toRaw(this.githubInfo.value), ['token']));
  this.initGithubClient();
  }
 
@@ -189,6 +190,7 @@ export class PublishService {
  this.git.terminate();
  }
 
+ // must confirmed by user to create repo. so we can not use `isRepositoryMissing` instead
  async publish(needToCreateRepo = false) {
  if (this.isPublishing.value) {
  return;

diff --git a/src/driver/git/webviewApi.ts b/src/driver/git/webviewApi.ts
@@ -58,7 +58,8 @@ class Git extends EventEmitter<GitEvents> {
  return this.initRepo();
  }
 
- private initRepo(byPublishing = false) {
+ private initRepo(byPushing = false) {
+ this.emit(GitEvents.LocalRepoStatusChanged, LocalRepoStatus.Initializing);
  // always init worker when init repo
  this.initWorker();
 
@@ -86,7 +87,6 @@ class Git extends EventEmitter<GitEvents> {
  };
 
  this.rejectInitRepoPromise = reject_;
- this.emit(GitEvents.LocalRepoStatusChanged, LocalRepoStatus.Initializing);
  workerGit
  .initRepo({
  githubInfo: github.getGithubInfo(),
@@ -96,7 +96,7 @@ class Git extends EventEmitter<GitEvents> {
  url: github.getRepositoryUrl(),
  remote: Git.remote,
  },
- keepDir: byPublishing,
+ keepDir: byPushing,
  })
  .then(resolve_, reject_);
  });

diff --git a/src/driver/github/webviewApi.ts b/src/driver/github/webviewApi.ts
@@ -59,8 +59,7 @@ export class Github extends EventEmitter<GithubClientEvents> implements GithubCl
  return;
  }
 
- this.emit(GithubClientEvents.InfoChanged, githubInfo);
- this.githubInfo = githubInfo;
+ this.emit(GithubClientEvents.InfoChanged, this.githubInfo);
  }
 
  async createRepository() {