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
91 changes: 33 additions & 58 deletions Cargo.lock

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

5 changes: 2 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ hypr-tcc = { path = "crates/tcc", package = "tcc" }
hypr-template-app = { path = "crates/template-app", package = "template-app" }
hypr-template-app-legacy = { path = "crates/template-app-legacy", package = "template-app-legacy" }
hypr-template-eval = { path = "crates/template-eval", package = "template-eval" }
hypr-tiptap = { path = "crates/tiptap", package = "tiptap" }
hypr-transcribe-aws = { path = "crates/transcribe-aws", package = "transcribe-aws" }
hypr-transcribe-azure = { path = "crates/transcribe-azure", package = "transcribe-azure" }
hypr-transcribe-deepgram = { path = "crates/transcribe-deepgram", package = "transcribe-deepgram" }
Expand Down Expand Up @@ -138,10 +139,8 @@ tauri-plugin-cli2 = { path = "plugins/cli2" }
tauri-plugin-db2 = { path = "plugins/db2" }
tauri-plugin-deeplink2 = { path = "plugins/deeplink2" }
tauri-plugin-detect = { path = "plugins/detect" }
tauri-plugin-export = { path = "plugins/export" }
tauri-plugin-extensions = { path = "plugins/extensions" }
tauri-plugin-folder = { path = "plugins/folder" }
tauri-plugin-frontmatter = { path = "plugins/frontmatter" }
tauri-plugin-fs-sync = { path = "plugins/fs-sync" }
tauri-plugin-hooks = { path = "plugins/hooks" }
tauri-plugin-icon = { path = "plugins/icon" }
tauri-plugin-importer = { path = "plugins/importer" }
Expand Down
4 changes: 1 addition & 3 deletions apps/desktop/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,8 @@
"@hypr/plugin-db2": "workspace:*",
"@hypr/plugin-deeplink2": "workspace:*",
"@hypr/plugin-detect": "workspace:*",
"@hypr/plugin-export": "workspace:*",
"@hypr/plugin-extensions": "workspace:*",
"@hypr/plugin-folder": "workspace:*",
"@hypr/plugin-frontmatter": "workspace:*",
"@hypr/plugin-fs-sync": "workspace:*",
"@hypr/plugin-hooks": "workspace:*",
"@hypr/plugin-icon": "workspace:*",
"@hypr/plugin-importer": "workspace:*",
Expand Down
4 changes: 1 addition & 3 deletions apps/desktop/src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,9 @@ tauri-plugin-deep-link = { workspace = true }
tauri-plugin-deeplink2 = { workspace = true }
tauri-plugin-detect = { workspace = true }
tauri-plugin-dialog = { workspace = true }
tauri-plugin-export = { workspace = true }
tauri-plugin-extensions = { workspace = true }
tauri-plugin-folder = { workspace = true }
tauri-plugin-frontmatter = { workspace = true }
tauri-plugin-fs = { workspace = true }
tauri-plugin-fs-sync = { workspace = true }
tauri-plugin-hooks = { workspace = true }
tauri-plugin-http = { workspace = true }
tauri-plugin-icon = { workspace = true }
Expand Down
4 changes: 1 addition & 3 deletions apps/desktop/src-tauri/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,7 @@ pub async fn main() {
.plugin(tauri_plugin_updater::Builder::new().build())
.plugin(tauri_plugin_deep_link::init())
.plugin(tauri_plugin_deeplink2::init())
.plugin(tauri_plugin_export::init())
.plugin(tauri_plugin_folder::init())
.plugin(tauri_plugin_frontmatter::init())
.plugin(tauri_plugin_fs_sync::init())
.plugin(tauri_plugin_os::init())
.plugin(tauri_plugin_fs::init())
.plugin(tauri_plugin_path2::init())
Expand Down
10 changes: 5 additions & 5 deletions apps/desktop/src/store/tinybase/persister/folder/ops.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { commands as folderCommands } from "@hypr/plugin-folder";
import { commands as fsSyncCommands } from "@hypr/plugin-fs-sync";

import type { Store } from "../../store/main";

Expand Down Expand Up @@ -28,7 +28,7 @@ export async function moveSessionToFolder(

store.setCell("sessions", sessionId, "folder_id", targetFolderId);

const result = await folderCommands.moveSession(sessionId, targetFolderId);
const result = await fsSyncCommands.moveSession(sessionId, targetFolderId);

if (result.status === "error") {
console.error("[FolderOps] moveSession failed:", result.error);
Expand All @@ -44,7 +44,7 @@ export async function createFolder(
): Promise<{ status: "ok" } | { status: "error"; error: string }> {
const { reloadFolders } = getConfig();

const result = await folderCommands.createFolder(folderPath);
const result = await fsSyncCommands.createFolder(folderPath);

if (result.status === "error") {
console.error("[FolderOps] createFolder failed:", result.error);
Expand All @@ -61,7 +61,7 @@ export async function renameFolder(
): Promise<{ status: "ok" } | { status: "error"; error: string }> {
const { reloadFolders } = getConfig();

const result = await folderCommands.renameFolder(oldPath, newPath);
const result = await fsSyncCommands.renameFolder(oldPath, newPath);

if (result.status === "error") {
console.error("[FolderOps] renameFolder failed:", result.error);
Expand All @@ -77,7 +77,7 @@ export async function deleteFolder(
): Promise<{ status: "ok" } | { status: "error"; error: string }> {
const { reloadFolders } = getConfig();

const result = await folderCommands.deleteFolder(folderPath);
const result = await fsSyncCommands.deleteFolder(folderPath);

if (result.status === "error") {
console.error("[FolderOps] deleteFolder failed:", result.error);
Expand Down
4 changes: 2 additions & 2 deletions apps/desktop/src/store/tinybase/persister/folder/persister.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { createCustomPersister } from "tinybase/persisters/with-schemas";
import type { MergeableStore, OptionalSchemas } from "tinybase/with-schemas";

import { commands as folderCommands } from "@hypr/plugin-folder";
import { commands as fsSyncCommands } from "@hypr/plugin-fs-sync";
import {
commands as notifyCommands,
events as notifyEvents,
Expand All @@ -16,7 +16,7 @@ export function createFolderPersister<Schemas extends OptionalSchemas>(
) {
const loadFn = async () => {
try {
const result = await folderCommands.listFolders();
const result = await fsSyncCommands.listFolders();
if (result.status === "error") {
console.error("[FolderPersister] list error:", result.error);
return undefined;
Expand Down
2 changes: 1 addition & 1 deletion apps/desktop/src/store/tinybase/persister/human/collect.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { MergeableStore, OptionalSchemas } from "tinybase/with-schemas";

import type { ParsedDocument } from "@hypr/plugin-frontmatter";
import type { ParsedDocument } from "@hypr/plugin-fs-sync";
import type { HumanStorage } from "@hypr/store";

import type { CollectorResult, TablesContent } from "../utils";
Expand Down
Loading
Loading