mirrors/TidGi-Desktop
1
Fork 0
mirror of https://github.com/tiddly-gittly/TidGi-Desktop.git synced 2026-01-26 14:31:23 -08:00
Code Issues Projects Releases Packages Wiki Activity

fix: log not shown in UI

Browse source
This commit is contained in:
tiddlygit-test 2021-05-04 17:02:49 +08:00
parent d5a9c1a6c6
commit 205049ebbc
4 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/constants/channels.ts
View file

@ -45,7 +45,9 @@ export enum WikiChannel {
addTiddlerDone = 'wiki-add-tiddler-done',
getTiddlerText = 'wiki-get-tiddler-text',
getTiddlerTextDone = 'wiki-get-tiddler-text-done',
/** show message inside tiddlywiki to show git sync progress */
syncProgress = 'wiki-sync-progress',
/** used to show wiki creation messages in the TiddlyGit UI for user to read */
createProgress = 'wiki-create-progress',
openTiddler = 'wiki-open-tiddler',
sendActionMessage = 'wiki-send-action-message',

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

@ -19,7 +19,7 @@ function initWikiGit(wikiFolderPath: string, isSyncedWiki?: boolean, remoteUrl?:
warn: (message: string, context: ILoggerContext): unknown =>
observer.next({ message, level: 'warn', meta: { callerFunction: 'initWikiGit', ...context } }),
info: (message: GitStep, context: ILoggerContext): void => {
observer.next({ message, level: 'warn', meta: { handler: WikiChannel.syncProgress, callerFunction: 'initWikiGit', ...context } });
observer.next({ message, level: 'notice', meta: { handler: WikiChannel.createProgress, callerFunction: 'initWikiGit', ...context } });
},
},
}).then(
@ -47,7 +47,7 @@ function commitAndSyncWiki(wikiFolderPath: string, remoteUrl: string, userInfo:
warn: (message: string, context: ILoggerContext): unknown =>
observer.next({ message, level: 'warn', meta: { callerFunction: 'commitAndSync', ...context } }),
info: (message: GitStep, context: ILoggerContext): void => {
observer.next({ message, level: 'warn', meta: { handler: WikiChannel.syncProgress, callerFunction: 'commitAndSync', ...context } });
observer.next({ message, level: 'notice', meta: { handler: WikiChannel.syncProgress, callerFunction: 'commitAndSync', ...context } });
},
},
}).then(
@ -67,7 +67,7 @@ function cloneWiki(remoteUrl: string, repoFolderPath: string, userInfo: IGitUser
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 } }),
info: (message: GitStep, context: ILoggerContext): void => {
observer.next({ message, level: 'warn', meta: { handler: WikiChannel.syncProgress, callerFunction: 'clone', ...context } });
observer.next({ message, level: 'notice', meta: { handler: WikiChannel.createProgress, callerFunction: 'clone', ...context } });
},
},
}).then(

4
src/services/libs/log/rendererTransport.ts
View file

@ -9,12 +9,12 @@ import { WindowNames } from '@services/windows/WindowProperties';
import { WikiChannel } from '@/constants/channels';
const handlers = {
createWikiProgress: (message: string) => {
[WikiChannel.createProgress]: (message: string) => {
const windowService = container.get<IWindowService>(serviceIdentifier.Window);
const createWorkspaceWindow = windowService.get(WindowNames.addWorkspace);
createWorkspaceWindow?.webContents?.send(WikiChannel.createProgress, message);
},
wikiSyncProgress: async (message: string) => {
[WikiChannel.syncProgress]: async (message: string) => {
const viewService = container.get<IViewService>(serviceIdentifier.View);
const browserView = await viewService.getActiveBrowserView();
browserView?.webContents?.send(WikiChannel.syncProgress, message);

11
src/services/wiki/index.ts
View file

@ -174,13 +174,12 @@ export class Wiki implements IWikiService {
logger.info('All wiki-worker is stopped', { function: 'stopAllWiki' });
}
// create-wiki.ts
/**
* Send message to UI via WikiChannel.createProgress
* @param message will show in the UI
*/
private readonly logProgress = (message: string): void => {
logger.notice({
type: 'progress',
payload: { message, handler: 'createWikiProgress' },
});
logger.notice(message, { handler: WikiChannel.createProgress });
};
private readonly folderToContainSymlinks = 'subwiki';