mirrors/TidGi-Desktop
1
Fork 0
mirror of https://github.com/tiddly-gittly/TidGi-Desktop.git synced 2025-12-06 02:30:47 -08:00
Code Issues Projects Releases Packages Wiki Activity

fix: getWorkspacesRemote

Browse source
This commit is contained in:
tiddlygit-test 2022-02-14 00:07:05 +08:00
parent ad1995e2b1
commit b5b8ab7cce
1 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/services/git/index.ts
View file

@ -1,6 +1,6 @@
import { ipcMain, dialog, net, shell } from 'electron';
import { injectable, inject } from 'inversify';
import { compact, debounce } from 'lodash';
import { compact } from 'lodash';
import {
AssumeSyncError,
CantSyncGitNotInitializedError,
@ -10,7 +10,8 @@ import {
ModifiedFileList,
SyncParameterMissingError,
SyncScriptIsInDeadLoopError,
hasGit,
getRemoteName,
getRemoteUrl,
} from 'git-sync-js';
import { spawn, Worker, ModuleThread } from 'threads';
@ -33,10 +34,11 @@ import { LOCAL_GIT_DIRECTORY } from '@/constants/appPaths';
import { WindowNames } from '@services/windows/WindowProperties';
import { lazyInject } from '@services/container';
import { githubDesktopUrl } from '@/constants/urls';
import { defaultGitInfo } from './defaultGitInfo';
import type { IAuthenticationService, ServiceBranchTypes } from '@services/auth/interface';
@injectable()
export class Git implements IGitService {
@lazyInject(serviceIdentifier.Authentication) private readonly authService!: IAuthenticationService;
@lazyInject(serviceIdentifier.Window) private readonly windowService!: IWindowService;
@lazyInject(serviceIdentifier.View) private readonly viewService!: IViewService;
@lazyInject(serviceIdentifier.NativeService) private readonly nativeService!: INativeService;
@ -58,6 +60,13 @@ export class Git implements IGitService {
return list ?? [];
}
public async getWorkspacesRemote(wikiFolderPath: string): Promise<string | undefined> {
const branch = (await this.authService.get('git-branch' as ServiceBranchTypes)) ?? 'main';
const defaultRemoteName = (await getRemoteName(wikiFolderPath, branch)) ?? 'origin';
const remoteUrl = await getRemoteUrl(wikiFolderPath, defaultRemoteName);
return remoteUrl;
}
/**
*
* @param {string} githubRepoName similar to "linonetwo/wiki", string after "https://com/"