Peaceultime/obsidian-visualiser
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add sync, Tree, Markdown, content editor.

Browse Source
This commit is contained in:
Peaceultime
2024-11-10 15:41:47 +01:00
parent 41951d7603
commit 721e7ff3db
32 changed files with 658 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/api/admin/jobs/[id].post.ts
View File

@@ -7,5 +7,12 @@ export default defineEventHandler(async (e) => {
return;
}
return await runTask(id);
const result = await runTask(id);
if(!result.result)
{
setResponseStatus(e, 500);
throw result.error ?? new Error('Erreur inconnue');
}
return
});

3
server/api/auth/login.post.ts
View File

@@ -1,11 +1,10 @@
import useDatabase from '~/composables/useDatabase';
import { schema } from '~/schemas/login';
import type { User, UserExtendedData, UserRawData, UserSession, UserSessionRequired } from '~/types/auth';
import type { UserSession, UserSessionRequired } from '~/types/auth';
import { ZodError } from 'zod';
import { checkSession, logSession } from '~/server/utils/user';
import { usersTable } from '~/db/schema';
import { eq, or, sql } from 'drizzle-orm';
import type { BunSQLiteDatabase } from 'drizzle-orm/bun-sqlite';
interface SuccessHandler
{

7
server/api/file.get.ts
View File

@@ -1,7 +1,7 @@
import useDatabase from '~/composables/useDatabase';
import type { File } from '~/types/api';
export default defineCachedEventHandler(async (e) => {
export default defineEventHandler(async (e) => {
const project = getRouterParam(e, "projectId");
const query = getQuery(e);
@@ -48,7 +48,4 @@ export default defineCachedEventHandler(async (e) => {
}
setResponseStatus(e, 404);
}, {
maxAge: 60*60*24,
getKey: (e) => `${getRouterParam(e, "projectId")}-${JSON.stringify(getQuery(e))}`
});
});

25
server/api/file.post.ts
View File

@@ -0,0 +1,25 @@
import useDatabase from '~/composables/useDatabase';
import { explorerContentTable } from '~/db/schema';
import { schema } from '~/schemas/file';
export default defineEventHandler(async (e) => {
const body = await readValidatedBody(e, schema.safeParse);
if(!body.success)
{
setResponseStatus(e, 403);
throw body.error;
}
const buffer = Buffer.from(body.data.content, 'utf-8');
const db = useDatabase();
const content = db.insert(explorerContentTable).values({ ...body.data, content: buffer }).onConflictDoUpdate({ target: explorerContentTable.path, set: { ...body.data, content: buffer } });
if(content !== undefined)
{
return content;
}
setResponseStatus(e, 404);
return;
});

36
server/api/file/[path].get.ts
View File

@@ -1,7 +1,8 @@
import { eq, sql } from 'drizzle-orm';
import useDatabase from '~/composables/useDatabase';
import type { CommentedFile, CommentSearch, File } from '~/types/api';
import { explorerContentTable } from '~/db/schema';
export default defineCachedEventHandler(async (e) => {
export default defineEventHandler(async (e) => {
const path = decodeURIComponent(getRouterParam(e, "path") ?? '');
if(!path)
@@ -10,26 +11,23 @@ export default defineCachedEventHandler(async (e) => {
return;
}
const where = ["path = $path"];
const criteria: Record<string, any> = { $path: path };
const db = useDatabase();
if(where.length > 1)
const content = db.select({
'path': explorerContentTable.path,
'owner': explorerContentTable.owner,
'title': explorerContentTable.title,
'type': explorerContentTable.type,
'content': sql<string>`cast(${explorerContentTable.content} as TEXT)`.as('content'),
'navigable': explorerContentTable.navigable,
'private': explorerContentTable.private,
}).from(explorerContentTable).where(eq(explorerContentTable.path, sql.placeholder('path'))).prepare().get({ path });
if(content !== undefined)
{
const db = useDatabase();
const content = db.query(`SELECT * FROM explorer_files WHERE ${where.join(" and ")}`).get(criteria) as File;
if(content !== undefined)
{
const comments = db.query(`SELECT comment.*, user.username FROM explorer_comments comment LEFT JOIN users user ON comment.user_id = user.id WHERE ${where.join(" and ")}`).all(criteria) as CommentSearch[];
return { ...content, comments } as CommentedFile;
}
return content;
}
setResponseStatus(e, 404);
return;
}, {
maxAge: 60*60*24,
getKey: (e) => `file-${getRouterParam(e, "path")}`
});
});

23
server/api/navigation.get.ts
View File

@@ -1,21 +1,17 @@
import useDatabase from '~/composables/useDatabase';
import { Navigation } from '~/types/api';
type NavigatioNExtension = Navigation & { owner: number, navigable: boolean };
import { explorerContentTable } from '~/db/schema';
import type { Navigation } from '~/types/api';
export default defineEventHandler(async (e) => {
const project = getRouterParam(e, "projectId");
const { user } = await getUserSession(e);
if(!project)
/*if(!user)
{
setResponseStatus(e, 404);
return;
}
throw createError({ statusCode: 401, statusText: 'Unauthorized' });
}*/
const db = useDatabase();
const content = db.query(`SELECT "path", "title", "type", "order", "private", "navigable", "owner" FROM explorer_files`).sort((a: any, b: any) => a.path.length - b.path.length) as NavigatioNExtension[];
const content = db.select({ path: explorerContentTable.path, title: explorerContentTable.title, type: explorerContentTable.type, private: explorerContentTable.private, navigable: explorerContentTable.navigable, owner: explorerContentTable.owner }).from(explorerContentTable).prepare().all() as (Navigation & { owner: number, navigable: boolean })[];
if(content.length > 0)
{
@@ -62,11 +58,6 @@ function addChild(arr: Navigation[], e: Navigation): void
}
else
{
arr.push({ title: e.title, path: e.path, type: e.type, order: e.order, private: e.private });
arr.sort((a, b) => {
if(a.order && b.order)
return a.order - b.order;
return a.title.localeCompare(b.title);
});
arr.push({ title: e.title, path: e.path, type: e.type, private: e.private });
}
}

53
server/tasks/sync.ts
View File

@@ -2,20 +2,20 @@ import useDatabase from "~/composables/useDatabase";
import { extname, basename } from 'node:path';
import type { File, FileType, Tag } from '~/types/api';
import type { CanvasColor, CanvasContent } from "~/types/canvas";
import { explorerContentTable } from "~/db/schema";
const typeMapping: Record<string, FileType> = {
".md": "Markdown",
".canvas": "Canvas"
".md": "markdown",
".canvas": "canvas"
};
export default defineTask({
meta: {
name: 'sync',
description: 'Synchronise the project 1 with Obsidian',
description: 'Synchronise the project with Obsidian',
},
async run(event) {
console.log('Task "sync" executed');
/* try {
try {
const tree = await $fetch('https://git.peaceultime.com/api/v1/repos/peaceultime/system-aspect/git/trees/master', {
method: 'get',
headers: {
@@ -27,7 +27,8 @@ export default defineTask({
}
}) as any;
const files: File[] = await Promise.all(tree.tree.filter((e: any) => !e.path.startsWith(".")).map(async (e: any) => {
const files: typeof explorerContentTable.$inferInsert = await Promise.all(tree.tree.filter((e: any) => !e.path.startsWith(".")).map(async (e: any) => {
if(e.type === 'tree')
{
const title = basename(e.path);
@@ -35,10 +36,13 @@ export default defineTask({
const path = (e.path as string).split('/').map(f => { const check = /(\d+)\. ?(.+)/gsmi.exec(f); return check && check[2] ? check[2] : f }).join('/');
return {
path: path.toLowerCase().replaceAll(" ", "-").normalize("NFD").replace(/[\u0300-\u036f]/g, ""),
order: order && order[1] ? order[1] : 50,
//order: order && order[1] ? order[1] : 50,
title: order && order[2] ? order[2] : title,
type: 'Folder',
content: null
type: 'folder',
content: null,
owner: '1',
navigable: true,
private: e.path.startsWith('98.Privé')
}
}
@@ -50,14 +54,17 @@ export default defineTask({
return {
path: (extension === '.md' ? path.replace(extension, '') : path).toLowerCase().replaceAll(" ", "-").normalize("NFD").replace(/[\u0300-\u036f]/g, ""),
order: order && order[1] ? order[1] : 50,
//order: order && order[1] ? order[1] : 50,
title: order && order[2] ? order[2] : title,
type: (typeMapping[extension] ?? 'File'),
content: reshapeContent(content as string, typeMapping[extension] ?? 'File')
type: (typeMapping[extension] ?? 'file'),
content: reshapeContent(content as string, typeMapping[extension] ?? 'File'),
owner: '1',
navigable: true,
private: e.path.startsWith('98.Privé')
}
}));
let tags: Tag[] = [];
/*let tags: Tag[] = [];
const tagFile = files.find(e => e.path === "tags");
if(tagFile)
@@ -70,11 +77,13 @@ export default defineTask({
const end = titles.length === i + 1 ? tagFile.content.length : titles[i + 1].position.start.offset - 1;
tags.push({ tag: titles[i].properties.id, description: tagFile.content.substring(titles[i].position?.end.offset + 1, end) });
}
}
}*/
const db = useDatabase();
db.delete(explorerContentTable).run();
db.insert(explorerContentTable).values(files).run();
const oldFiles = db.prepare(`SELECT * FROM explorer_files WHERE project = ?1`).all('1') as File[];
/*const oldFiles = db.prepare(`SELECT * FROM explorer_files WHERE project = ?1`).all('1') as File[];
const removeFiles = db.prepare(`DELETE FROM explorer_files WHERE project = ?1 AND path = ?2`);
db.transaction((data: File[]) => data.forEach(e => removeFiles.run('1', e.path)))(oldFiles.filter(e => !files.find(f => f.path = e.path)));
removeFiles.finalize();
@@ -118,7 +127,7 @@ export default defineTask({
})(tags);
insertTags.finalize();
updateTags.finalize();
updateTags.finalize();*/
useStorage('cache').clear();
@@ -126,8 +135,8 @@ export default defineTask({
}
catch(e)
{
return { result: false };
} */
return { result: false, error: e };
}
},
})
@@ -135,16 +144,16 @@ function reshapeContent(content: string, type: FileType): string | null
{
switch(type)
{
case "Markdown":
case "File":
case "markdown":
case "file":
return content;
case "Canvas":
case "canvas":
const data = JSON.parse(content) as CanvasContent;
data.edges.forEach(e => e.color = typeof e.color === 'string' ? getColor(e.color) : undefined);
data.nodes.forEach(e => e.color = typeof e.color === 'string' ? getColor(e.color) : undefined);
return JSON.stringify(data);
default:
case 'Folder':
case 'folder':
return null;
}
}