Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions apps/desktop/app/hooks/export.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { useAdapter } from '~/hooks/useAdapter';
import useSWRMutation from 'swr/mutation';

interface ExportKey {
type: 'export';
}

/**
* プロジェクトをエクスポートする(保存ダイアログを含む)
*/
export function useExportProject() {
const adapter = useAdapter();
return useSWRMutation<undefined, Error, ExportKey, string>(
{ type: 'export' },
async (_, { arg: projectId }) => {
await adapter.export.exportProject(projectId);
return undefined;
},
);
}
16 changes: 16 additions & 0 deletions apps/desktop/app/routes/(private)/home/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { useState } from 'react';
import { useNavigate, type MetaFunction } from 'react-router';
import { useProjects, useCreateProject } from '~/hooks/projects';
import { useLogout } from '~/hooks/auth';
import { useExportProject } from '~/hooks/export';
import {
ProjectList,
Button,
Expand Down Expand Up @@ -37,10 +38,14 @@ export default function Page() {
const { data: projects, isLoading } = useProjects();
const { trigger: createProject, isMutating: isCreating } = useCreateProject();
const { trigger: logout, isMutating: isLoggingOut } = useLogout();
const { trigger: exportProject } = useExportProject();

const [isCreateDialogOpen, setIsCreateDialogOpen] = useState(false);
const [newProjectTitle, setNewProjectTitle] = useState('untitled');
const [error, setError] = useState<string | null>(null);
const [exportingProjectId, setExportingProjectId] = useState<string | null>(
null,
);

const defaultWorkDir = '~/TsumugiProjects';

Expand Down Expand Up @@ -73,6 +78,15 @@ export default function Page() {
navigate(`${PATH_WORKSPACE}/${encodeURIComponent(project.id)}`);
};

const handleExportProject = async (project: ProjectItem) => {
setExportingProjectId(project.id);
try {
await exportProject(project.id);
} finally {
setExportingProjectId(null);
}
};

return (
<div className="flex min-h-screen justify-center bg-background">
<div className="flex-1 p-4 md:p-6">
Expand Down Expand Up @@ -122,6 +136,8 @@ export default function Page() {
projects={toProjectItems(projects)}
isLoading={isLoading}
onSelect={handleSelectProject}
onExport={handleExportProject}
exportingProjectId={exportingProjectId}
/>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useCallback } from 'react';
import { useProject, useUpdateProject } from '~/hooks/projects';
import { useExportProject } from '~/hooks/export';
import { ProjectEditor, type ProjectEditorData } from '@tsumugi/ui';
import { useDebouncedSave } from '~/routes/(private)/workspace/[projectId]/_hooks/useDebouncedSave';
import type { Project } from '@tsumugi/adapter';
Expand Down Expand Up @@ -30,6 +31,8 @@ export function ProjectEditorWrapper({
}: ProjectEditorWrapperProps) {
const { data: project, mutate } = useProject(projectId, NO_REVALIDATE);
const { trigger: updateProject } = useUpdateProject(projectId);
const { trigger: exportProject, isMutating: isExporting } =
useExportProject();

const onSave = useCallback(
async (field: string, value: unknown) => {
Expand Down Expand Up @@ -57,7 +60,18 @@ export function ProjectEditorWrapper({
[mutate, debouncedSave, onNameChange],
);

const handleExport = useCallback(async () => {
await exportProject(projectId);
}, [exportProject, projectId]);

if (!project) return null;

return <ProjectEditor data={toEditorData(project)} onChange={handleChange} />;
return (
<ProjectEditor
data={toEditorData(project)}
onChange={handleChange}
onExport={handleExport}
isExporting={isExporting}
/>
);
}
15 changes: 11 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion packages/adapter/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"test": "TZ=Asia/Tokyo jest"
},
"dependencies": {
"@tsumugi-chan/client": "1.0.7",
"@tsumugi-chan/client": "1.0.9",
"@tsumugi/adapter": "*"
},
"devDependencies": {
Expand Down
2 changes: 2 additions & 0 deletions packages/adapter/api/src/adapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { createMemoAdapter } from '@/adapters/memo';
import { createWritingAdapter } from '@/adapters/writing';
import { createSettingsAdapter } from '@/adapters/settings';
import { createAIAdapter } from '@/adapters/ai';
import { createExportAdapter } from '@/adapters/export';
import { TokenManager } from '@/token-manager';

export function createAdapter(config: AdapterConfig = {}): Adapter {
Expand All @@ -33,5 +34,6 @@ export function createAdapter(config: AdapterConfig = {}): Adapter {
memos: createMemoAdapter(clients),
writings: createWritingAdapter(clients),
ai: createAIAdapter(clients),
export: createExportAdapter(clients),
};
}
38 changes: 38 additions & 0 deletions packages/adapter/api/src/adapters/export.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import type { ExportAdapter, ExportOptions } from '@tsumugi/adapter';
import type { ApiClients } from '@/client';

function triggerBrowserDownload(blob: Blob, filename: string): void {
const url = URL.createObjectURL(blob);
const a = document.createElement('a');
a.href = url;
a.download = filename;
document.body.appendChild(a);
a.click();
document.body.removeChild(a);
URL.revokeObjectURL(url);
}

function extractFilename(headers: Headers): string {
const disposition = headers.get('Content-Disposition');
if (disposition) {
const rfcMatch = disposition.match(/filename\*=UTF-8''([^;]+)/i);
if (rfcMatch) return decodeURIComponent(rfcMatch[1]);
const match = disposition.match(/filename="?([^";\n]+)"?/i);
if (match) return match[1].trim();
}
return 'export.zip';
}

export function createExportAdapter(clients: ApiClients): ExportAdapter {
return {
async exportProject(
projectId: string,
_options?: ExportOptions,
): Promise<void> {
const response = await clients.projects.exportProjectRaw({ projectId });
const blob = await response.raw.blob();
const filename = extractFilename(response.raw.headers);
triggerBrowserDownload(blob, filename);
},
};
}
2 changes: 1 addition & 1 deletion packages/adapter/api/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"compilerOptions": {
"target": "ES2020",
"lib": ["ES2020"],
"lib": ["ES2020", "DOM"],
"module": "ESNext",
"moduleResolution": "bundler",
"strict": true,
Expand Down
14 changes: 14 additions & 0 deletions packages/adapter/core/src/adapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import type {
AIProjectUsage,
AuthState,
GoogleAuthUrl,
ExportOptions,
} from './types';

/**
Expand Down Expand Up @@ -243,6 +244,18 @@ export interface AuthAdapter {
refreshAccessToken(): Promise<AuthState>;
}

/**
* エクスポート操作のインターフェース
*/
export interface ExportAdapter {
/**
* プロジェクトをエクスポート
* @param projectId - エクスポートするプロジェクトID
* @param options - エクスポートオプション(省略時はすべてのコンテンツを zip-markdown でエクスポート)
*/
exportProject(projectId: string, options?: ExportOptions): Promise<void>;
}

/**
* 統合アダプター
*/
Expand All @@ -255,4 +268,5 @@ export interface Adapter {
readonly memos: MemoAdapter;
readonly writings: WritingAdapter;
readonly ai: AIAdapter;
readonly export: ExportAdapter;
}
3 changes: 3 additions & 0 deletions packages/adapter/core/src/stub.ts
Original file line number Diff line number Diff line change
Expand Up @@ -92,5 +92,8 @@ export function createAdapter(_: AdapterConfig = {}): Adapter {
deleteMemory: () => notImplemented(),
getUsage: () => notImplemented(),
},
export: {
exportProject: () => notImplemented(),
},
};
}
21 changes: 21 additions & 0 deletions packages/adapter/core/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -507,3 +507,24 @@ export interface GoogleAuthUrl {
/** Google OAuth認可URL */
url: string;
}

/**
* エクスポートのフォーマット
*/
export type ExportFormat = 'zip-markdown';

/**
* エクスポートオプション
*/
export interface ExportOptions {
/** エクスポートフォーマット(デフォルト: 'zip-markdown') */
format?: ExportFormat;
/** 執筆データを含めるか(デフォルト: true) */
includeWritings?: boolean;
/** プロットデータを含めるか(デフォルト: true) */
includePlots?: boolean;
/** キャラクターデータを含めるか(デフォルト: true) */
includeCharacters?: boolean;
/** メモデータを含めるか(デフォルト: true) */
includeMemos?: boolean;
}
1 change: 1 addition & 0 deletions packages/adapter/local/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"@ai-sdk/openai": "3.0.30",
"@tsumugi/adapter": "*",
"ai": "6.0.94",
"fflate": "0.8.2",
"zod": "4.3.6"
},
"peerDependencies": {
Expand Down
8 changes: 8 additions & 0 deletions packages/adapter/local/src/adapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { createMemoAdapter } from '@/adapters/memo';
import { createWritingAdapter } from '@/adapters/writing';
import { createAIAdapter } from '@/adapters/ai';
import { createSettingsAdapter } from '@/adapters/settings';
import { createExportAdapter } from '@/adapters/export';

export function createAdapter(config: AdapterConfig = {}): Adapter {
const workDir = config.local?.workDir;
Expand All @@ -32,5 +33,12 @@ export function createAdapter(config: AdapterConfig = {}): Adapter {
memos,
writings,
}),
export: createExportAdapter({
projects,
plots,
characters,
memos,
writings,
}),
};
}
Loading
Loading