mirrors/TidGi-Desktop
1
Fork 0
mirror of https://github.com/tiddly-gittly/TidGi-Desktop.git synced 2025-12-27 04:11:57 -08:00
Code Issues Projects Releases Packages Wiki Activity

fix: bind missing theme and wiki service

Browse source
This commit is contained in:
tiddlygit-test 2021-03-20 19:10:22 +08:00
parent 583601121a
commit 8a7fe45da2
3 changed files with 19 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/services/libs/bindServiceAndProxy.ts
View file

@ -1,5 +1,5 @@
/**
* Don't forget to edit ./src/preload/common/services.ts to export service to renderer process
* Don't forget to edit src/preload/common/services.ts to export service to renderer process
*/
import { registerProxy } from '@/helpers/electron-ipc-proxy/server';
@ -14,6 +14,7 @@ import { NativeService } from '@services/native';
import { NotificationService } from '@services/notifications';
import { Preference } from '@services/preferences';
import { SystemPreference } from '@services/systemPreferences';
import { ThemeService } from '@services/theme';
import { Updater } from '@services/updater';
import { View } from '@services/view';
import { Wiki } from '@services/wiki';
@ -30,15 +31,16 @@ import { INativeService, NativeServiceIPCDescriptor } from '@services/native/int
import { INotificationService, NotificationServiceIPCDescriptor } from '@services/notifications/interface';
import { IPreferenceService, PreferenceServiceIPCDescriptor } from '@services/preferences/interface';
import { ISystemPreferenceService, SystemPreferenceServiceIPCDescriptor } from '@services/systemPreferences/interface';
import { IThemeService, ThemeServiceIPCDescriptor } from '@services/theme/interface';
import { IUpdaterService, UpdaterServiceIPCDescriptor } from '@services/updater/interface';
import { IViewService, ViewServiceIPCDescriptor } from '@services/view/interface';
import { IWikiService, WikiServiceIPCDescriptor } from '@services/wiki/interface';
import { IWikiGitWorkspaceService, WikiGitWorkspaceServiceIPCDescriptor } from '@services/wikiGitWorkspace/interface';
import { IWikiService, WikiServiceIPCDescriptor } from '@services/wiki/interface';
import { IWindowService, WindowServiceIPCDescriptor } from '@services/windows/interface';
import { IWorkspaceService, WorkspaceServiceIPCDescriptor } from '@services/workspaces/interface';
import { IWorkspaceViewService, WorkspaceViewServiceIPCDescriptor } from '@services/workspacesView/interface';
export function bindServiceAndProxy() {
export function bindServiceAndProxy(): void {
container.bind<IAuthenticationService>(serviceIdentifier.Authentication).to(Authentication).inSingletonScope();
container.bind<IContextService>(serviceIdentifier.Context).to(ContextService).inSingletonScope();
container.bind<IGitService>(serviceIdentifier.Git).to(Git).inSingletonScope();
@ -47,10 +49,11 @@ export function bindServiceAndProxy() {
container.bind<INotificationService>(serviceIdentifier.NotificationService).to(NotificationService).inSingletonScope();
container.bind<IPreferenceService>(serviceIdentifier.Preference).to(Preference).inSingletonScope();
container.bind<ISystemPreferenceService>(serviceIdentifier.SystemPreference).to(SystemPreference).inSingletonScope();
container.bind<IThemeService>(serviceIdentifier.ThemeService).to(ThemeService).inSingletonScope();
container.bind<IUpdaterService>(serviceIdentifier.Updater).to(Updater).inSingletonScope();
container.bind<IViewService>(serviceIdentifier.View).to(View).inSingletonScope();
container.bind<IWikiService>(serviceIdentifier.Wiki).to(Wiki).inSingletonScope();
container.bind<IWikiGitWorkspaceService>(serviceIdentifier.WikiGitWorkspace).to(WikiGitWorkspace).inSingletonScope();
container.bind<IWikiService>(serviceIdentifier.Wiki).to(Wiki).inSingletonScope();
container.bind<IWindowService>(serviceIdentifier.Window).to(Window).inSingletonScope();
container.bind<IWorkspaceService>(serviceIdentifier.Workspace).to(Workspace).inSingletonScope();
container.bind<IWorkspaceViewService>(serviceIdentifier.WorkspaceView).to(WorkspaceView).inSingletonScope();
@ -63,10 +66,11 @@ export function bindServiceAndProxy() {
const notificationService = container.get<INotificationService>(serviceIdentifier.NotificationService);
const preferenceService = container.get<IPreferenceService>(serviceIdentifier.Preference);
const systemPreferenceService = container.get<ISystemPreferenceService>(serviceIdentifier.SystemPreference);
const viewService = container.get<IViewService>(serviceIdentifier.View);
const themeService = container.get<IThemeService>(serviceIdentifier.ThemeService);
const updaterService = container.get<IUpdaterService>(serviceIdentifier.Updater);
const wikiService = container.get<IWikiService>(serviceIdentifier.Wiki);
const viewService = container.get<IViewService>(serviceIdentifier.View);
const wikiGitWorkspaceService = container.get<IWikiGitWorkspaceService>(serviceIdentifier.WikiGitWorkspace);
const wikiService = container.get<IWikiService>(serviceIdentifier.Wiki);
const windowService = container.get<IWindowService>(serviceIdentifier.Window);
const workspaceService = container.get<IWorkspaceService>(serviceIdentifier.Workspace);
const workspaceViewService = container.get<IWorkspaceViewService>(serviceIdentifier.WorkspaceView);
@ -79,10 +83,11 @@ export function bindServiceAndProxy() {
registerProxy(notificationService, NotificationServiceIPCDescriptor);
registerProxy(preferenceService, PreferenceServiceIPCDescriptor);
registerProxy(systemPreferenceService, SystemPreferenceServiceIPCDescriptor);
registerProxy(viewService, ViewServiceIPCDescriptor);
registerProxy(themeService, ThemeServiceIPCDescriptor);
registerProxy(updaterService, UpdaterServiceIPCDescriptor);
registerProxy(wikiService, WikiServiceIPCDescriptor);
registerProxy(viewService, ViewServiceIPCDescriptor);
registerProxy(wikiGitWorkspaceService, WikiGitWorkspaceServiceIPCDescriptor);
registerProxy(wikiService, WikiServiceIPCDescriptor);
registerProxy(windowService, WindowServiceIPCDescriptor);
registerProxy(workspaceService, WorkspaceServiceIPCDescriptor);
registerProxy(workspaceViewService, WorkspaceViewServiceIPCDescriptor);

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

@ -22,9 +22,10 @@ import i18n from '@services/libs/i18n';
import { lazyInject } from '@services/container';
import { TIDDLYWIKI_TEMPLATE_FOLDER_PATH, TIDDLERS_PATH } from '@services/constants/paths';
import { updateSubWikiPluginContent, getSubWikiPluginContent, ISubWikiPluginContent } from './update-plugin-content';
import { IWikiService } from './interface';
@injectable()
export class Wiki {
export class Wiki implements IWikiService {
@lazyInject(serviceIdentifier.Authentication) private readonly authService!: IAuthenticationService;
@lazyInject(serviceIdentifier.Window) private readonly windowService!: IWindowService;
@lazyInject(serviceIdentifier.Git) private readonly gitService!: IGitService;

8
src/services/wiki/interface.ts
View file

@ -1,7 +1,7 @@
import { ProxyPropertyType } from '@/helpers/electron-ipc-proxy/common';
import { WikiChannel } from '@/constants/channels';
import { IWorkspace } from '@services/workspaces/interface';
import { IAuthingUserInfo } from '@services/types';
import { IGitUserInfos } from '@services/git/interface';
import type { ISubWikiPluginContent } from './update-plugin-content';
/**
@ -21,18 +21,18 @@ export interface IWikiService {
createSubWiki(newFolderPath: string, folderName: string, mainWikiPath: string, tagName?: string, onlyLink?: boolean): Promise<void>;
removeWiki(wikiPath: string, mainWikiToUnLink?: string, onlyRemoveLink?: boolean): Promise<void>;
ensureWikiExist(wikiPath: string, shouldBeMainWiki: boolean): Promise<void>;
cloneWiki(parentFolderLocation: string, wikiFolderName: string, githubWikiUrl: string, userInfo: IAuthingUserInfo): Promise<void>;
cloneWiki(parentFolderLocation: string, wikiFolderName: string, githubWikiUrl: string, userInfo: IGitUserInfos): Promise<void>;
cloneSubWiki(
parentFolderLocation: string,
wikiFolderName: string,
mainWikiPath: string,
githubWikiUrl: string,
userInfo: IAuthingUserInfo,
userInfo: IGitUserInfos,
tagName?: string,
): Promise<void>;
wikiStartup(workspace: IWorkspace): Promise<void>;
startNodeJSWiki(homePath: string, port: number, userName: string, workspaceID: string): Promise<void>;
watchWiki(wikiRepoPath: string, githubRepoUrl: string, userInfo: IAuthingUserInfo, wikiFolderPath?: string): Promise<void>;
watchWiki(wikiRepoPath: string, githubRepoUrl: string, userInfo: IGitUserInfos, wikiFolderPath?: string): Promise<void>;
stopWatchWiki(wikiRepoPath: string): Promise<void>;
stopWatchAllWiki(): Promise<void>;
}