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

fix: make sync to cloud non-blocking

Browse source
This commit is contained in:
tiddlygit-test 2021-07-28 01:50:22 +08:00
parent 2c780be582
commit ac797cdb8e
3 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -366,15 +366,16 @@ export class Wiki implements IWikiService {
// wiki-startup.ts
private readonly justStartedWiki: Record<string, boolean> = {};
private setWikiStarted(wikiPath: string): void {
private setWikiStartLockOn(wikiPath: string): void {
this.justStartedWiki[wikiPath] = true;
setTimeout(() => {
delete this.justStartedWiki[wikiPath];
}, 5000);
}
private setWikiStartLockOff(wikiPath: string): void {
delete this.justStartedWiki[wikiPath];
}
public async wikiStartup(workspace: IWorkspace): Promise<void> {
const { wikiFolderLocation, gitUrl: githubRepoUrl, port, isSubWiki, id, mainWikiToLink, storageService } = workspace;
const { wikiFolderLocation, gitUrl: githubRepoUrl, port, isSubWiki, mainWikiToLink, storageService } = workspace;
// remove $:/StoryList, otherwise it sometimes cause $__StoryList_1.tid to be generated
try {
@ -395,10 +396,11 @@ export class Wiki implements IWikiService {
};
// if is main wiki
if (!isSubWiki) {
this.setWikiStarted(wikiFolderLocation);
this.setWikiStartLockOn(wikiFolderLocation);
await this.startWiki(wikiFolderLocation, port, userName);
// sync to cloud
await tryWatchForSync(path.join(wikiFolderLocation, TIDDLERS_PATH));
// sync to cloud, do this in a non-blocking way
void tryWatchForSync(path.join(wikiFolderLocation, TIDDLERS_PATH));
this.setWikiStartLockOff(wikiFolderLocation);
} else {
// if is private repo wiki
// if we are creating a sub-wiki just now, restart the main wiki to load content from private wiki
@ -410,10 +412,11 @@ export class Wiki implements IWikiService {
await this.stopWatchWiki(mainWikiToLink);
await this.stopWiki(mainWikiToLink);
await this.startWiki(mainWikiToLink, mainWorkspace.port, userName);
// sync main wiki to cloud, do this in a non-blocking way
await tryWatchForSync(path.join(mainWikiToLink, TIDDLERS_PATH));
// sync self to cloud, subwiki's content is all in root folder path, do this in a non-blocking way
await tryWatchForSync();
}
// sync to cloud
await tryWatchForSync();
}
}

9
src/services/workspacesView/index.ts
View file

@ -37,11 +37,10 @@ export class WorkspaceView implements IWorkspaceViewService {
}
public async initializeAllWorkspaceView(): Promise<void> {
const workspaces = await this.workspaceService.getWorkspaces();
for (const workspaceID in workspaces) {
const workspace = workspaces[workspaceID];
await this.initializeWorkspaceView(workspace);
}
const workspacesList = await this.workspaceService.getWorkspacesAsList();
await Promise.all(
workspacesList.sort((a, b) => (a.isSubWiki && !b.isSubWiki ? 1 : -1)).map(async (workspace) => await this.initializeWorkspaceView(workspace)),
);
}
public async initializeWorkspaceView(workspace: IWorkspace): Promise<void> {

2
src/services/workspacesView/interface.ts
View file

@ -14,7 +14,7 @@ export interface IWorkspaceViewService {
*/
initializeAllWorkspaceView(): Promise<void>;
/**
* prepare view and wiki for a workspace, call by `initializeAllWorkspaceView()` for all workspaces.
* prepare view and wiki for a workspace, work for both public and private wiki, call by `initializeAllWorkspaceView()` for all workspaces.
*/
initializeWorkspaceView(workspace: IWorkspace): Promise<void>;
setWorkspaceView(id: string, workspaceOptions: IWorkspace): Promise<void>;