mirrors/TidGi-Desktop
1
Fork 0
mirror of https://github.com/tiddly-gittly/TidGi-Desktop.git synced 2026-01-25 22:11:35 -08:00
Code Issues Projects Releases Packages Wiki Activity

feat: upgrade git-sync

Browse source
This commit is contained in:
tiddlygit-test 2021-05-06 00:52:56 +08:00
parent 9a8123fbf1
commit 2e339cc792
3 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
package-lock.json generated
View file

@ -12114,9 +12114,9 @@
}
},
"git-sync-js": {
"version": "0.1.6",
"resolved": "https://registry.npmjs.org/git-sync-js/-/git-sync-js-0.1.6.tgz",
"integrity": "sha512-J1tB1BHLqOZmhWIlIJ0xHthhlAxgbkdZ9V8CzNOmSxsvikF7//tH2AFjlpnJyCG23DC2aReETAuDvzTizhCZZQ==",
"version": "0.1.7",
"resolved": "https://registry.npmjs.org/git-sync-js/-/git-sync-js-0.1.7.tgz",
"integrity": "sha512-YyyEA68c+O78WFbHSLBwQCJuad9T143B3n3+Z14uh318FGqll3qmNhhJ/hqrHom1Mww6XjK5kg3ofORxsLAoAg==",
"requires": {
"dugite": "^1.103.0",
"fs-extra": "^9.1.0",

2
package.json
View file

@ -104,7 +104,7 @@
"electron-window-state": "5.0.3",
"errio": "1.2.2",
"fs-extra": "9.1.0",
"git-sync-js": "^0.1.6",
"git-sync-js": "^0.1.7",
"i18next": "20.2.2",
"i18next-electron-fs-backend": "1.3.6",
"i18next-fs-backend": "1.1.1",

9
src/services/git/gitWorker.ts
View file

@ -12,7 +12,8 @@ function initWikiGit(wikiFolderPath: string, isSyncedWiki?: boolean, remoteUrl?:
dir: wikiFolderPath,
remoteUrl,
syncImmediately: isSyncedWiki,
userInfo: { ...defaultGitInfo, ...userInfo },
userInfo,
defaultGitInfo,
logger: {
log: (message: string, context: ILoggerContext): unknown =>
observer.next({ message, level: 'log', meta: { callerFunction: 'initWikiGit', ...context } }),
@ -40,7 +41,8 @@ function commitAndSyncWiki(wikiFolderPath: string, remoteUrl: string, userInfo:
void commitAndSync({
dir: wikiFolderPath,
remoteUrl,
userInfo: { ...defaultGitInfo, ...userInfo },
userInfo,
defaultGitInfo,
logger: {
log: (message: string, context: ILoggerContext): unknown =>
observer.next({ message, level: 'log', meta: { callerFunction: 'commitAndSync', ...context } }),
@ -62,7 +64,8 @@ function cloneWiki(remoteUrl: string, repoFolderPath: string, userInfo: IGitUser
void clone({
dir: repoFolderPath,
remoteUrl,
userInfo: { ...defaultGitInfo, ...userInfo },
userInfo,
defaultGitInfo,
logger: {
log: (message: string, context: ILoggerContext): unknown => observer.next({ message, level: 'log', meta: { callerFunction: 'clone', ...context } }),
warn: (message: string, context: ILoggerContext): unknown => observer.next({ message, level: 'warn', meta: { callerFunction: 'clone', ...context } }),