-
+
We believe file management should be universal.
diff --git a/apps/server/k8s/infrastructure.yaml b/apps/server/k8s/infrastructure.yaml
deleted file mode 100644
index a5e44b4ee..000000000
--- a/apps/server/k8s/infrastructure.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-# Infrastructure setups up the Kubernetes cluster for Spacedrive!
-#
-# To get the service account token use the following:
-# ```bash
-# TOKENNAME=`kubectl -n spacedrive get sa/spacedrive-ci -o jsonpath='{.secrets[0].name}'`
-# kubectl -n spacedrive get secret $TOKENNAME -o jsonpath='{.data.token}' | base64 -d
-# ```
-
-apiVersion: v1
-kind: Namespace
-metadata:
- name: spacedrive
----
-apiVersion: v1
-kind: ServiceAccount
-metadata:
- name: spacedrive-ci
- namespace: spacedrive
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
- name: spacedrive-ns-full
- namespace: spacedrive
-rules:
- - apiGroups: ['apps']
- resources: ['deployments']
- verbs: ['get', 'patch']
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
- name: spacedrive-ci-rb
- namespace: spacedrive
-subjects:
- - kind: ServiceAccount
- name: spacedrive-ci
- namespace: spacedrive
-roleRef:
- apiGroup: rbac.authorization.k8s.io
- kind: Role
- name: spacedrive-ns-full
diff --git a/apps/server/k8s/sdserver.yaml b/apps/server/k8s/sdserver.yaml
deleted file mode 100644
index 00f02c1c1..000000000
--- a/apps/server/k8s/sdserver.yaml
+++ /dev/null
@@ -1,118 +0,0 @@
-# This will deploy the Spacedrive Server container to the `spacedrive`` namespace on Kubernetes.
-
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
- name: sdserver-ingress
- namespace: spacedrive
- labels:
- app.kubernetes.io/name: sdserver
- app.kubernetes.io/component: webserver
- annotations:
- traefik.ingress.kubernetes.io/router.tls.certresolver: le
- traefik.ingress.kubernetes.io/router.middlewares: kube-system-antiseo@kubernetescrd
-spec:
- rules:
- - host: spacedrive.otbeaumont.me
- http:
- paths:
- - path: /
- pathType: Prefix
- backend:
- service:
- name: sdserver-service
- port:
- number: 8080
----
-apiVersion: v1
-kind: Service
-metadata:
- name: sdserver-service
- namespace: spacedrive
- labels:
- app.kubernetes.io/name: sdserver
- app.kubernetes.io/component: webserver
-spec:
- ports:
- - port: 8080
- targetPort: 8080
- protocol: TCP
- selector:
- app.kubernetes.io/name: sdserver
- app.kubernetes.io/component: webserver
----
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
- name: sdserver-pvc
- namespace: spacedrive
-spec:
- accessModes:
- - ReadWriteOnce
- storageClassName: local-path
- resources:
- requests:
- storage: 512M
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
- name: sdserver-deployment
- namespace: spacedrive
- labels:
- app.kubernetes.io/name: sdserver
- app.kubernetes.io/component: webserver
-spec:
- replicas: 1
- selector:
- matchLabels:
- app.kubernetes.io/name: sdserver
- app.kubernetes.io/component: webserver
- template:
- metadata:
- labels:
- app.kubernetes.io/name: sdserver
- app.kubernetes.io/component: webserver
- spec:
- restartPolicy: Always
- # refer to Dockerfile to find securityContext values
- securityContext:
- runAsUser: 101
- runAsGroup: 101
- fsGroup: 101
- containers:
- - name: sdserver
- image: ghcr.io/oscartbeaumont/spacedrive/server:staging
- imagePullPolicy: Always
- ports:
- - containerPort: 8080
- volumeMounts:
- - name: data-volume
- mountPath: /data
- securityContext:
- allowPrivilegeEscalation: false
- resources:
- limits:
- memory: 100Mi
- cpu: 100m
- requests:
- memory: 5Mi
- cpu: 10m
- readinessProbe:
- httpGet:
- path: /health
- port: 8080
- initialDelaySeconds: 10
- failureThreshold: 4
- periodSeconds: 5
- livenessProbe:
- httpGet:
- path: /health
- port: 8080
- initialDelaySeconds: 20
- failureThreshold: 3
- periodSeconds: 10
- volumes:
- - name: data-volume
- persistentVolumeClaim:
- claimName: sdserver-pvc
diff --git a/apps/server/src/main.rs b/apps/server/src/main.rs
index 7e9c4683e..5d7c85331 100644
--- a/apps/server/src/main.rs
+++ b/apps/server/src/main.rs
@@ -1,4 +1,4 @@
-use sdcore::{ClientCommand, ClientQuery, CoreController, CoreEvent, CoreResponse, Node};
+use sdcore::{ClientCommand, ClientQuery, CoreEvent, CoreResponse, Node, NodeController};
use std::{env, path::Path};
use actix::{
@@ -19,7 +19,7 @@ const DATA_DIR_ENV_VAR: &'static str = "DATA_DIR";
/// Define HTTP actor
struct Socket {
_event_receiver: web::Data>,
- core: web::Data,
+ core: web::Data,
}
impl Actor for Socket {
@@ -52,7 +52,15 @@ impl StreamHandler> for Socket {
match msg {
Ok(ws::Message::Ping(msg)) => ctx.pong(&msg),
Ok(ws::Message::Text(text)) => {
- let msg: SocketMessage = serde_json::from_str(&text).unwrap();
+ let msg = serde_json::from_str::(&text);
+
+ let msg = match msg {
+ Ok(msg) => msg,
+ Err(err) => {
+ println!("Error parsing message: {}", err);
+ return;
+ },
+ };
let core = self.core.clone();
@@ -133,7 +141,7 @@ async fn ws_handler(
req: HttpRequest,
stream: web::Payload,
event_receiver: web::Data>,
- controller: web::Data,
+ controller: web::Data,
) -> Result {
let resp = ws::start(
Socket {
@@ -178,7 +186,7 @@ async fn main() -> std::io::Result<()> {
async fn setup() -> (
web::Data>,
- web::Data,
+ web::Data,
) {
let data_dir_path = match env::var(DATA_DIR_ENV_VAR) {
Ok(path) => Path::new(&path).to_path_buf(),
@@ -196,15 +204,8 @@ async fn setup() -> (
},
};
- let (mut node, event_receiver) = Node::new(data_dir_path).await;
-
- node.initializer().await;
-
- let controller = node.get_controller();
-
- tokio::spawn(async move {
- node.start().await;
- });
+ let (controller, event_receiver, node) = Node::new(data_dir_path).await;
+ tokio::spawn(node.start());
(web::Data::new(event_receiver), web::Data::new(controller))
}
diff --git a/apps/web/src/App.tsx b/apps/web/src/App.tsx
index 72560e3ff..f53220197 100644
--- a/apps/web/src/App.tsx
+++ b/apps/web/src/App.tsx
@@ -1,20 +1,47 @@
import { BaseTransport } from '@sd/client';
-import { ClientCommand, ClientQuery, CoreEvent } from '@sd/core';
+import { ClientCommand, ClientQuery } from '@sd/core';
import SpacedriveInterface from '@sd/interface';
import React, { useEffect } from 'react';
-const websocket = new WebSocket(import.meta.env.VITE_SDSERVER_BASE_URL || 'ws://localhost:8080/ws');
+const timeouts = [1000, 2000, 5000, 10000]; // In milliseconds
const randomId = () => Math.random().toString(36).slice(2);
// bind state to core via Tauri
class Transport extends BaseTransport {
+ websocket: WebSocket;
requestMap = new Map void>();
constructor() {
super();
+ this.websocket = new WebSocket(
+ import.meta.env.VITE_SDSERVER_BASE_URL || 'ws://localhost:8080/ws'
+ );
+ this.attachEventListeners();
+ }
- websocket.addEventListener('message', (event) => {
+ async reconnect(timeoutIndex = 0) {
+ let timeout =
+ (timeouts[timeoutIndex] ?? timeouts[timeouts.length - 1]) +
+ (Math.floor(Math.random() * 5000 /* 5 Seconds */) + 1);
+
+ setTimeout(() => {
+ let ws = new WebSocket(import.meta.env.VITE_SDSERVER_BASE_URL || 'ws://localhost:8080/ws');
+ new Promise(function (resolve, reject) {
+ ws.addEventListener('open', () => resolve(null));
+ ws.addEventListener('close', reject);
+ })
+ .then(() => {
+ this.websocket = ws;
+ this.attachEventListeners();
+ console.log('Reconnected!');
+ })
+ .catch((err) => this.reconnect(timeoutIndex++));
+ }, timeout);
+ }
+
+ attachEventListeners() {
+ this.websocket.addEventListener('message', (event) => {
if (!event.data) return;
const { id, payload } = JSON.parse(event.data);
@@ -29,8 +56,24 @@ class Transport extends BaseTransport {
}
}
});
+
+ this.websocket.addEventListener('close', () => {
+ console.log('GONE');
+ this.reconnect();
+ });
}
+
async query(query: ClientQuery) {
+ if (websocket.readyState == 0) {
+ let resolve: () => void;
+ const promise = new Promise((res) => {
+ resolve = () => res(undefined);
+ });
+ // @ts-ignore
+ websocket.addEventListener('open', resolve);
+ await promise;
+ }
+
const id = randomId();
let resolve: (data: any) => void;
@@ -41,7 +84,7 @@ class Transport extends BaseTransport {
// @ts-ignore
this.requestMap.set(id, resolve);
- websocket.send(JSON.stringify({ id, payload: { type: 'query', data: query } }));
+ this.websocket.send(JSON.stringify({ id, payload: { type: 'query', data: query } }));
return await promise;
}
@@ -56,12 +99,14 @@ class Transport extends BaseTransport {
// @ts-ignore
this.requestMap.set(id, resolve);
- websocket.send(JSON.stringify({ id, payload: { type: 'command', data: command } }));
+ this.websocket.send(JSON.stringify({ id, payload: { type: 'command', data: command } }));
return await promise;
}
}
+const transport = new Transport();
+
function App() {
useEffect(() => {
window.parent.postMessage('spacedrive-hello', '*');
@@ -72,7 +117,7 @@ function App() {
{/* */}
} | { key: "SysGetLocation", data: LocationResource } | { key: "SysGetLocations", data: Array } | { key: "LibGetExplorerDir", data: DirectoryWithContents } | { key: "NodeGetState", data: NodeState } | { key: "LocCreate", data: LocationResource } | { key: "JobGetRunning", data: Array } | { key: "JobGetHistory", data: Array } | { key: "GetLibraryStatistics", data: Statistics };
\ No newline at end of file
+export type CoreResponse = { key: "Success", data: null } | { key: "Error", data: string } | { key: "NodeGetLibraries", data: Array } | { key: "SysGetVolumes", data: Array } | { key: "SysGetLocation", data: LocationResource } | { key: "SysGetLocations", data: Array } | { key: "LibGetExplorerDir", data: DirectoryWithContents } | { key: "NodeGetState", data: NodeState } | { key: "LocCreate", data: LocationResource } | { key: "JobGetRunning", data: Array } | { key: "JobGetHistory", data: Array } | { key: "GetLibraryStatistics", data: Statistics };
\ No newline at end of file
diff --git a/core/bindings/LibraryCommand.ts b/core/bindings/LibraryCommand.ts
new file mode 100644
index 000000000..713fc8989
--- /dev/null
+++ b/core/bindings/LibraryCommand.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type LibraryCommand = { key: "FileReadMetaData", params: { id: number, } } | { key: "FileSetNote", params: { id: number, note: string | null, } } | { key: "FileDelete", params: { id: number, } } | { key: "TagCreate", params: { name: string, color: string, } } | { key: "TagUpdate", params: { name: string, color: string, } } | { key: "TagAssign", params: { file_id: number, tag_id: number, } } | { key: "TagDelete", params: { id: number, } } | { key: "LocCreate", params: { path: string, } } | { key: "LocUpdate", params: { id: number, name: string | null, } } | { key: "LocDelete", params: { id: number, } } | { key: "LocRescan", params: { id: number, } } | { key: "SysVolumeUnmount", params: { id: number, } } | { key: "GenerateThumbsForLocation", params: { id: number, path: string, } } | { key: "IdentifyUniqueFiles", params: { id: number, path: string, } };
\ No newline at end of file
diff --git a/core/bindings/LibraryConfig.ts b/core/bindings/LibraryConfig.ts
new file mode 100644
index 000000000..8a371014b
--- /dev/null
+++ b/core/bindings/LibraryConfig.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface LibraryConfig { version: string | null, name: string, description: string, }
\ No newline at end of file
diff --git a/core/bindings/LibraryConfigWrapped.ts b/core/bindings/LibraryConfigWrapped.ts
new file mode 100644
index 000000000..ee5b5ccfe
--- /dev/null
+++ b/core/bindings/LibraryConfigWrapped.ts
@@ -0,0 +1,4 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+import type { LibraryConfig } from "./LibraryConfig";
+
+export interface LibraryConfigWrapped { uuid: string, config: LibraryConfig, }
\ No newline at end of file
diff --git a/core/bindings/LibraryQuery.ts b/core/bindings/LibraryQuery.ts
new file mode 100644
index 000000000..2aa14279c
--- /dev/null
+++ b/core/bindings/LibraryQuery.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export type LibraryQuery = { key: "LibGetTags" } | { key: "JobGetHistory" } | { key: "SysGetLocations" } | { key: "SysGetLocation", params: { id: number, } } | { key: "LibGetExplorerDir", params: { location_id: number, path: string, limit: number, } } | { key: "GetLibraryStatistics" };
\ No newline at end of file
diff --git a/core/bindings/NodeConfig.ts b/core/bindings/NodeConfig.ts
new file mode 100644
index 000000000..512f0202c
--- /dev/null
+++ b/core/bindings/NodeConfig.ts
@@ -0,0 +1,3 @@
+// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
+
+export interface NodeConfig { version: string | null, id: string, name: string, p2p_port: number | null, }
\ No newline at end of file
diff --git a/core/bindings/NodeState.ts b/core/bindings/NodeState.ts
index 6fc2d5c22..978fb3103 100644
--- a/core/bindings/NodeState.ts
+++ b/core/bindings/NodeState.ts
@@ -1,4 +1,3 @@
// This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually.
-import type { LibraryState } from "./LibraryState";
-export interface NodeState { node_pub_id: string, node_id: number, node_name: string, data_path: string, tcp_port: number, libraries: Array, current_library_uuid: string, }
\ No newline at end of file
+export interface NodeState { version: string | null, id: string, name: string, p2p_port: number | null, data_path: string, }
\ No newline at end of file
diff --git a/core/index.ts b/core/index.ts
index 85eee6629..60cc1bc54 100644
--- a/core/index.ts
+++ b/core/index.ts
@@ -2,6 +2,7 @@ export * from './bindings/Client';
export * from './bindings/ClientCommand';
export * from './bindings/ClientQuery';
export * from './bindings/ClientState';
+export * from './bindings/ConfigMetadata';
export * from './bindings/CoreEvent';
export * from './bindings/CoreResource';
export * from './bindings/CoreResponse';
@@ -12,9 +13,14 @@ export * from './bindings/FileKind';
export * from './bindings/FilePath';
export * from './bindings/JobReport';
export * from './bindings/JobStatus';
+export * from './bindings/LibraryCommand';
+export * from './bindings/LibraryConfig';
+export * from './bindings/LibraryConfigWrapped';
export * from './bindings/LibraryNode';
+export * from './bindings/LibraryQuery';
export * from './bindings/LibraryState';
export * from './bindings/LocationResource';
+export * from './bindings/NodeConfig';
export * from './bindings/NodeState';
export * from './bindings/Platform';
export * from './bindings/Statistics';
diff --git a/core/prisma/migrations/20220625180107_remove_library/migration.sql b/core/prisma/migrations/20220625180107_remove_library/migration.sql
new file mode 100644
index 000000000..63e4f056f
--- /dev/null
+++ b/core/prisma/migrations/20220625180107_remove_library/migration.sql
@@ -0,0 +1,29 @@
+/*
+ Warnings:
+
+ - You are about to drop the `libraries` table. If the table is not empty, all the data it contains will be lost.
+ - You are about to drop the `library_statistics` table. If the table is not empty, all the data it contains will be lost.
+
+*/
+-- DropTable
+PRAGMA foreign_keys=off;
+DROP TABLE "libraries";
+PRAGMA foreign_keys=on;
+
+-- DropTable
+PRAGMA foreign_keys=off;
+DROP TABLE "library_statistics";
+PRAGMA foreign_keys=on;
+
+-- CreateTable
+CREATE TABLE "statistics" (
+ "id" INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
+ "date_captured" DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
+ "total_file_count" INTEGER NOT NULL DEFAULT 0,
+ "library_db_size" TEXT NOT NULL DEFAULT '0',
+ "total_bytes_used" TEXT NOT NULL DEFAULT '0',
+ "total_bytes_capacity" TEXT NOT NULL DEFAULT '0',
+ "total_unique_bytes" TEXT NOT NULL DEFAULT '0',
+ "total_bytes_free" TEXT NOT NULL DEFAULT '0',
+ "preview_media_bytes" TEXT NOT NULL DEFAULT '0'
+);
diff --git a/core/prisma/schema.prisma b/core/prisma/schema.prisma
index e8f911004..130151f62 100644
--- a/core/prisma/schema.prisma
+++ b/core/prisma/schema.prisma
@@ -35,21 +35,9 @@ model SyncEvent {
@@map("sync_events")
}
-model Library {
- id Int @id @default(autoincrement())
- pub_id String @unique
- name String
- is_primary Boolean @default(true)
- date_created DateTime @default(now())
- timezone String?
-
- @@map("libraries")
-}
-
-model LibraryStatistics {
+model Statistics {
id Int @id @default(autoincrement())
date_captured DateTime @default(now())
- library_id Int @unique
total_file_count Int @default(0)
library_db_size String @default("0")
total_bytes_used String @default("0")
@@ -58,7 +46,7 @@ model LibraryStatistics {
total_bytes_free String @default("0")
preview_media_bytes String @default("0")
- @@map("library_statistics")
+ @@map("statistics")
}
model Node {
diff --git a/core/src/encode/thumb.rs b/core/src/encode/thumb.rs
index 989859506..b20d8f728 100644
--- a/core/src/encode/thumb.rs
+++ b/core/src/encode/thumb.rs
@@ -1,8 +1,8 @@
+use crate::library::LibraryContext;
use crate::{
- job::{Job, JobReportUpdate, WorkerContext},
- node::get_nodestate,
+ job::{Job, JobReportUpdate, JobResult, WorkerContext},
prisma::file_path,
- sys, CoreContext, CoreEvent,
+ sys, CoreEvent,
};
use image::{self, imageops, DynamicImage, GenericImageView};
use log::{error, info};
@@ -28,11 +28,15 @@ impl Job for ThumbnailJob {
fn name(&self) -> &'static str {
"thumbnailer"
}
+ async fn run(&self, ctx: WorkerContext) -> JobResult {
+ let library_ctx = ctx.library_ctx();
+ let thumbnail_dir = library_ctx
+ .config()
+ .data_directory()
+ .join(THUMBNAIL_CACHE_DIR_NAME)
+ .join(self.location_id.to_string());
- async fn run(&self, ctx: WorkerContext) -> Result<(), Box> {
- let config = get_nodestate();
-
- let location = sys::get_location(&ctx.core_ctx, self.location_id).await?;
+ let location = sys::get_location(&library_ctx, self.location_id).await?;
info!(
"Searching for images in location {} at path {:#?}",
@@ -40,19 +44,11 @@ impl Job for ThumbnailJob {
);
// create all necessary directories if they don't exist
- fs::create_dir_all(
- config
- .data_path
- .as_ref()
- .unwrap()
- .join(THUMBNAIL_CACHE_DIR_NAME)
- .join(format!("{}", self.location_id)),
- )
- .await?;
+ fs::create_dir_all(&thumbnail_dir).await?;
let root_path = location.path.unwrap();
// query database for all files in this location that need thumbnails
- let image_files = get_images(&ctx.core_ctx, self.location_id, &self.path).await?;
+ let image_files = get_images(&library_ctx, self.location_id, &self.path).await?;
info!("Found {:?} files", image_files.len());
ctx.progress(vec![
@@ -86,14 +82,7 @@ impl Job for ThumbnailJob {
};
// Define and write the WebP-encoded file to a given path
- let output_path = config
- .data_path
- .as_ref()
- .unwrap()
- .join(THUMBNAIL_CACHE_DIR_NAME)
- .join(format!("{}", location.id))
- .join(&cas_id)
- .with_extension("webp");
+ let output_path = thumbnail_dir.join(&cas_id).with_extension("webp");
// check if file exists at output path
if !output_path.exists() {
@@ -105,7 +94,9 @@ impl Job for ThumbnailJob {
ctx.progress(vec![JobReportUpdate::CompletedTaskCount(i + 1)]);
if !self.background {
- ctx.core_ctx.emit(CoreEvent::NewThumbnail { cas_id }).await;
+ ctx.library_ctx()
+ .emit(CoreEvent::NewThumbnail { cas_id })
+ .await;
};
} else {
info!("Thumb exists, skipping... {}", output_path.display());
@@ -145,7 +136,7 @@ pub async fn generate_thumbnail>(
}
pub async fn get_images(
- ctx: &CoreContext,
+ ctx: &LibraryContext,
location_id: i32,
path: impl AsRef,
) -> Result, std::io::Error> {
@@ -167,7 +158,7 @@ pub async fn get_images(
}
let image_files = ctx
- .database
+ .db
.file_path()
.find_many(params)
.with(file_path::file::fetch())
diff --git a/core/src/file/cas/identifier.rs b/core/src/file/cas/identifier.rs
index 855352385..a05684eda 100644
--- a/core/src/file/cas/identifier.rs
+++ b/core/src/file/cas/identifier.rs
@@ -2,10 +2,10 @@ use super::checksum::generate_cas_id;
use crate::{
file::FileError,
job::JobReportUpdate,
- job::{Job, WorkerContext},
+ job::{Job, JobResult, WorkerContext},
+ library::LibraryContext,
prisma::{file, file_path},
sys::get_location,
- CoreContext,
};
use chrono::{DateTime, FixedOffset};
use futures::future::join_all;
@@ -13,7 +13,6 @@ use log::{error, info};
use prisma_client_rust::{prisma_models::PrismaValue, raw, raw::Raw, Direction};
use serde::{Deserialize, Serialize};
use std::collections::{HashMap, HashSet};
-use std::error::Error;
use std::path::{Path, PathBuf};
use tokio::{fs, io};
@@ -35,13 +34,13 @@ impl Job for FileIdentifierJob {
"file_identifier"
}
- async fn run(&self, ctx: WorkerContext) -> Result<(), Box> {
+ async fn run(&self, ctx: WorkerContext) -> JobResult {
info!("Identifying orphan file paths...");
- let location = get_location(&ctx.core_ctx, self.location_id).await?;
+ let location = get_location(&ctx.library_ctx(), self.location_id).await?;
let location_path = location.path.unwrap_or_else(|| "".to_string());
- let total_count = count_orphan_file_paths(&ctx.core_ctx, location.id.into()).await?;
+ let total_count = count_orphan_file_paths(&ctx.library_ctx(), location.id.into()).await?;
info!("Found {} orphan file paths", total_count);
let task_count = (total_count as f64 / CHUNK_SIZE as f64).ceil() as usize;
@@ -59,7 +58,7 @@ impl Job for FileIdentifierJob {
let mut cas_lookup: HashMap = HashMap::new();
// get chunk of orphans to process
- let file_paths = match get_orphan_file_paths(&ctx.core_ctx, cursor).await {
+ let file_paths = match get_orphan_file_paths(&ctx.library_ctx(), cursor).await {
Ok(file_paths) => file_paths,
Err(e) => {
info!("Error getting orphan file paths: {:#?}", e);
@@ -93,8 +92,8 @@ impl Job for FileIdentifierJob {
// find all existing files by cas id
let generated_cas_ids = chunk.values().map(|c| c.cas_id.clone()).collect();
let existing_files = ctx
- .core_ctx
- .database
+ .library_ctx()
+ .db
.file()
.find_many(vec![file::cas_id::in_vec(generated_cas_ids)])
.exec()
@@ -104,7 +103,8 @@ impl Job for FileIdentifierJob {
// link those existing files to their file paths
// Had to put the file_path in a variable outside of the closure, to satisfy the borrow checker
- let prisma_file_path = ctx.core_ctx.database.file_path();
+ let library_ctx = ctx.library_ctx();
+ let prisma_file_path = library_ctx.db.file_path();
for result in join_all(existing_files.iter().map(|file| {
prisma_file_path
.find_unique(file_path::id::equals(
@@ -133,7 +133,7 @@ impl Job for FileIdentifierJob {
.collect::>();
// assemble prisma values for new unique files
- let mut values: Vec = Vec::new();
+ let mut values = Vec::with_capacity(new_files.len() * 3);
for file in &new_files {
values.extend([
PrismaValue::String(file.cas_id.clone()),
@@ -144,8 +144,8 @@ impl Job for FileIdentifierJob {
// create new file records with assembled values
let created_files: Vec = ctx
- .core_ctx
- .database
+ .library_ctx()
+ .db
._query_raw(Raw::new(
&format!(
"INSERT INTO files (cas_id, size_in_bytes, date_created) VALUES {}
@@ -210,10 +210,10 @@ struct CountRes {
}
pub async fn count_orphan_file_paths(
- ctx: &CoreContext,
+ ctx: &LibraryContext,
location_id: i64,
) -> Result {
- let files_count = ctx.database
+ let files_count = ctx.db
._query_raw::(raw!(
"SELECT COUNT(*) AS count FROM file_paths WHERE file_id IS NULL AND is_dir IS FALSE AND location_id = {}",
PrismaValue::Int(location_id)
@@ -223,14 +223,14 @@ pub async fn count_orphan_file_paths(
}
pub async fn get_orphan_file_paths(
- ctx: &CoreContext,
+ ctx: &LibraryContext,
cursor: i32,
) -> Result, FileError> {
info!(
"discovering {} orphan file paths at cursor: {:?}",
CHUNK_SIZE, cursor
);
- ctx.database
+ ctx.db
.file_path()
.find_many(vec![
file_path::file_id::equals(None),
diff --git a/core/src/file/explorer/open.rs b/core/src/file/explorer/open.rs
index 901fa3589..2237e0deb 100644
--- a/core/src/file/explorer/open.rs
+++ b/core/src/file/explorer/open.rs
@@ -1,28 +1,25 @@
use crate::{
encode::THUMBNAIL_CACHE_DIR_NAME,
file::{DirectoryWithContents, FileError, FilePath},
- node::get_nodestate,
+ library::LibraryContext,
prisma::file_path,
sys::get_location,
- CoreContext,
};
use log::info;
use std::path::Path;
pub async fn open_dir(
- ctx: &CoreContext,
+ ctx: &LibraryContext,
location_id: i32,
path: impl AsRef,
) -> Result {
- let config = get_nodestate();
-
// get location
let location = get_location(ctx, location_id).await?;
let path_str = path.as_ref().to_string_lossy().to_string();
let directory = ctx
- .database
+ .db
.file_path()
.find_first(vec![
file_path::location_id::equals(Some(location.id)),
@@ -36,7 +33,7 @@ pub async fn open_dir(
info!("DIRECTORY: {:?}", directory);
let mut file_paths: Vec = ctx
- .database
+ .db
.file_path()
.find_many(vec![
file_path::location_id::equals(Some(location.id)),
@@ -49,17 +46,17 @@ pub async fn open_dir(
.map(Into::into)
.collect();
- if let Some(ref data_path) = config.data_path {
- for file_path in &mut file_paths {
- if let Some(file) = &mut file_path.file {
- let thumb_path = data_path
- .join(THUMBNAIL_CACHE_DIR_NAME)
- .join(location.id.to_string())
- .join(file.cas_id.clone())
- .with_extension("webp");
+ for file_path in &mut file_paths {
+ if let Some(file) = &mut file_path.file {
+ let thumb_path = ctx
+ .config()
+ .data_directory()
+ .join(THUMBNAIL_CACHE_DIR_NAME)
+ .join(location.id.to_string())
+ .join(&file.cas_id)
+ .with_extension("webp");
- file.has_thumbnail = thumb_path.exists();
- }
+ file.has_thumbnail = thumb_path.exists();
}
}
diff --git a/core/src/file/indexer/mod.rs b/core/src/file/indexer/mod.rs
index d4e428a4d..942a1e3b8 100644
--- a/core/src/file/indexer/mod.rs
+++ b/core/src/file/indexer/mod.rs
@@ -1,5 +1,4 @@
-use crate::job::{Job, JobReportUpdate, WorkerContext};
-use std::error::Error;
+use crate::job::{Job, JobReportUpdate, JobResult, WorkerContext};
use std::path::PathBuf;
use self::scan::ScanProgress;
@@ -20,8 +19,8 @@ impl Job for IndexerJob {
fn name(&self) -> &'static str {
"indexer"
}
- async fn run(&self, ctx: WorkerContext) -> Result<(), Box> {
- scan_path(&ctx.core_ctx.clone(), &self.path, move |p| {
+ async fn run(&self, ctx: WorkerContext) -> JobResult {
+ scan_path(&ctx.library_ctx(), &self.path, move |p| {
ctx.progress(
p.iter()
.map(|p| match p.clone() {
diff --git a/core/src/file/indexer/scan.rs b/core/src/file/indexer/scan.rs
index 6dd7a5bb7..87c830f6a 100644
--- a/core/src/file/indexer/scan.rs
+++ b/core/src/file/indexer/scan.rs
@@ -1,8 +1,6 @@
-use crate::{
- sys::{create_location, LocationResource},
- CoreContext,
-};
-
+use crate::job::JobResult;
+use crate::library::LibraryContext;
+use crate::sys::{create_location, LocationResource};
use chrono::{DateTime, Utc};
use log::{error, info};
use prisma_client_rust::prisma_models::PrismaValue;
@@ -30,10 +28,10 @@ static BATCH_SIZE: usize = 100;
// creates a vector of valid path buffers from a directory
pub async fn scan_path(
- ctx: &CoreContext,
+ ctx: &LibraryContext,
path: impl AsRef + Debug,
on_progress: impl Fn(Vec) + Send + Sync + 'static,
-) -> Result<(), Box> {
+) -> JobResult {
let location = create_location(ctx, &path).await?;
// query db to highers id, so we can increment it for the new files indexed
@@ -43,7 +41,7 @@ pub async fn scan_path(
}
// grab the next id so we can increment in memory for batch inserting
let first_file_id = match ctx
- .database
+ .db
._query_raw::(raw!("SELECT MAX(id) id FROM file_paths"))
.await
{
@@ -168,7 +166,7 @@ pub async fn scan_path(
files
);
- let count = ctx.database._execute_raw(raw).await;
+ let count = ctx.db._execute_raw(raw).await;
info!("Inserted {:?} records", count);
}
diff --git a/core/src/file/mod.rs b/core/src/file/mod.rs
index 9959af3ed..1829e3fa7 100644
--- a/core/src/file/mod.rs
+++ b/core/src/file/mod.rs
@@ -1,13 +1,15 @@
-use std::path::PathBuf;
+use chrono::{DateTime, Utc};
use int_enum::IntEnum;
use serde::{Deserialize, Serialize};
+use std::path::PathBuf;
use thiserror::Error;
use ts_rs::TS;
use crate::{
+ library::LibraryContext,
prisma::{self, file, file_path},
sys::SysError,
- ClientQuery, CoreContext, CoreError, CoreEvent, CoreResponse,
+ ClientQuery, CoreError, CoreEvent, CoreResponse, LibraryQuery,
};
pub mod cas;
pub mod explorer;
@@ -33,9 +35,9 @@ pub struct File {
pub ipfs_id: Option,
pub note: Option,
- pub date_created: chrono::DateTime,
- pub date_modified: chrono::DateTime,
- pub date_indexed: chrono::DateTime,
+ pub date_created: DateTime,
+ pub date_modified: DateTime,
+ pub date_indexed: DateTime,
pub paths: Vec,
// pub media_data: Option,
@@ -56,9 +58,9 @@ pub struct FilePath {
pub file_id: Option,
pub parent_id: Option,
- pub date_created: chrono::DateTime,
- pub date_modified: chrono::DateTime,
- pub date_indexed: chrono::DateTime,
+ pub date_created: DateTime,
+ pub date_modified: DateTime,
+ pub date_indexed: DateTime,
pub file: Option,
}
@@ -148,12 +150,12 @@ pub enum FileError {
}
pub async fn set_note(
- ctx: CoreContext,
+ ctx: LibraryContext,
id: i32,
note: Option,
) -> Result {
let _response = ctx
- .database
+ .db
.file()
.find_unique(file::id::equals(id))
.update(vec![file::note::set(note.clone())])
@@ -161,10 +163,13 @@ pub async fn set_note(
.await
.unwrap();
- ctx.emit(CoreEvent::InvalidateQuery(ClientQuery::LibGetExplorerDir {
- limit: 0,
- path: "".to_string(),
- location_id: 0,
+ ctx.emit(CoreEvent::InvalidateQuery(ClientQuery::LibraryQuery {
+ library_id: ctx.id.to_string(),
+ query: LibraryQuery::LibGetExplorerDir {
+ limit: 0,
+ path: PathBuf::new(),
+ location_id: 0,
+ },
}))
.await;
diff --git a/core/src/job/jobs.rs b/core/src/job/jobs.rs
index 3a0b56c5a..0cca9b8ad 100644
--- a/core/src/job/jobs.rs
+++ b/core/src/job/jobs.rs
@@ -3,48 +3,69 @@ use super::{
JobError,
};
use crate::{
- node::get_nodestate,
+ library::LibraryContext,
prisma::{job, node},
- CoreContext,
};
use int_enum::IntEnum;
-use log::info;
+use log::{error, info};
use serde::{Deserialize, Serialize};
use std::{
collections::{HashMap, VecDeque},
+ error::Error,
fmt::Debug,
sync::Arc,
};
-use tokio::sync::Mutex;
+use tokio::sync::{mpsc, Mutex, RwLock};
use ts_rs::TS;
// db is single threaded, nerd
const MAX_WORKERS: usize = 1;
+pub type JobResult = Result<(), Box>;
+
#[async_trait::async_trait]
pub trait Job: Send + Sync + Debug {
fn name(&self) -> &'static str;
- async fn run(&self, ctx: WorkerContext) -> Result<(), Box>;
+ async fn run(&self, ctx: WorkerContext) -> JobResult;
+}
+
+pub enum JobManagerEvent {
+ IngestJob(LibraryContext, Box),
}
// jobs struct is maintained by the core
-pub struct Jobs {
- job_queue: VecDeque>,
+pub struct JobManager {
+ job_queue: RwLock>>,
// workers are spawned when jobs are picked off the queue
- running_workers: HashMap>>,
+ running_workers: RwLock>>>,
+ internal_sender: mpsc::UnboundedSender,
}
-impl Jobs {
- pub fn new() -> Self {
- Self {
- job_queue: VecDeque::new(),
- running_workers: HashMap::new(),
- }
+impl JobManager {
+ pub fn new() -> Arc {
+ let (internal_sender, mut internal_receiver) = mpsc::unbounded_channel();
+ let this = Arc::new(Self {
+ job_queue: RwLock::new(VecDeque::new()),
+ running_workers: RwLock::new(HashMap::new()),
+ internal_sender,
+ });
+
+ let this2 = this.clone();
+ tokio::spawn(async move {
+ while let Some(event) = internal_receiver.recv().await {
+ match event {
+ JobManagerEvent::IngestJob(ctx, job) => this2.clone().ingest(&ctx, job).await,
+ }
+ }
+ });
+
+ this
}
- pub async fn ingest(&mut self, ctx: &CoreContext, job: Box) {
+ pub async fn ingest(self: Arc, ctx: &LibraryContext, job: Box) {
// create worker to process job
- if self.running_workers.len() < MAX_WORKERS {
+ let mut running_workers = self.running_workers.write().await;
+ if running_workers.len() < MAX_WORKERS {
info!("Running job: {:?}", job.name());
let worker = Worker::new(job);
@@ -52,51 +73,57 @@ impl Jobs {
let wrapped_worker = Arc::new(Mutex::new(worker));
- Worker::spawn(Arc::clone(&wrapped_worker), ctx).await;
+ Worker::spawn(Arc::clone(&self), Arc::clone(&wrapped_worker), ctx.clone()).await;
- self.running_workers.insert(id, wrapped_worker);
+ running_workers.insert(id, wrapped_worker);
} else {
- self.job_queue.push_back(job);
+ self.job_queue.write().await.push_back(job);
}
}
- pub fn ingest_queue(&mut self, _ctx: &CoreContext, job: Box) {
- self.job_queue.push_back(job);
+ pub async fn ingest_queue(&self, _ctx: &LibraryContext, job: Box) {
+ self.job_queue.write().await.push_back(job);
}
- pub async fn complete(&mut self, ctx: &CoreContext, job_id: String) {
+
+ pub async fn complete(self: Arc, ctx: &LibraryContext, job_id: String) {
// remove worker from running workers
- self.running_workers.remove(&job_id);
+ self.running_workers.write().await.remove(&job_id);
// continue queue
- let job = self.job_queue.pop_front();
+ let job = self.job_queue.write().await.pop_front();
if let Some(job) = job {
- self.ingest(ctx, job).await;
+ // We can't directly execute `self.ingest` here because it would cause an async cycle.
+ self.internal_sender
+ .send(JobManagerEvent::IngestJob(ctx.clone(), job))
+ .unwrap_or_else(|_| {
+ error!("Failed to ingest job!");
+ });
}
}
pub async fn get_running(&self) -> Vec {
let mut ret = vec![];
- for worker in self.running_workers.values() {
+ for worker in self.running_workers.read().await.values() {
let worker = worker.lock().await;
ret.push(worker.job_report.clone());
}
ret
}
- pub async fn queue_pending_job(ctx: &CoreContext) -> Result<(), JobError> {
- let _next_job = ctx
- .database
- .job()
- .find_first(vec![job::status::equals(JobStatus::Queued.int_value())])
- .exec()
- .await?;
+ // pub async fn queue_pending_job(ctx: &LibraryContext) -> Result<(), JobError> {
+ // let _next_job = ctx
+ // .db
+ // .job()
+ // .find_first(vec![job::status::equals(JobStatus::Queued.int_value())])
+ // .exec()
+ // .await?;
- Ok(())
- }
+ // Ok(())
+ // }
- pub async fn get_history(ctx: &CoreContext) -> Result, JobError> {
+ pub async fn get_history(ctx: &LibraryContext) -> Result, JobError> {
let jobs = ctx
- .database
+ .db
.job()
.find_many(vec![job::status::not(JobStatus::Running.int_value())])
.exec()
@@ -171,30 +198,29 @@ impl JobReport {
seconds_elapsed: 0,
}
}
- pub async fn create(&self, ctx: &CoreContext) -> Result<(), JobError> {
- let config = get_nodestate();
+ pub async fn create(&self, ctx: &LibraryContext) -> Result<(), JobError> {
let mut params = Vec::new();
if self.data.is_some() {
params.push(job::data::set(self.data.clone()))
}
- ctx.database
+ ctx.db
.job()
.create(
job::id::set(self.id.clone()),
job::name::set(self.name.clone()),
job::action::set(1),
- job::nodes::link(node::id::equals(config.node_id)),
+ job::nodes::link(node::id::equals(ctx.node_local_id)),
params,
)
.exec()
.await?;
Ok(())
}
- pub async fn update(&self, ctx: &CoreContext) -> Result<(), JobError> {
- ctx.database
+ pub async fn update(&self, ctx: &LibraryContext) -> Result<(), JobError> {
+ ctx.db
.job()
.find_unique(job::id::equals(self.id.clone()))
.update(vec![
diff --git a/core/src/job/worker.rs b/core/src/job/worker.rs
index 1acf4f250..ddfd17ca2 100644
--- a/core/src/job/worker.rs
+++ b/core/src/job/worker.rs
@@ -1,8 +1,8 @@
use super::{
jobs::{JobReport, JobReportUpdate, JobStatus},
- Job,
+ Job, JobManager,
};
-use crate::{ClientQuery, CoreContext, CoreEvent, InternalEvent};
+use crate::{library::LibraryContext, ClientQuery, CoreEvent, LibraryQuery};
use log::error;
use std::{sync::Arc, time::Duration};
use tokio::{
@@ -29,8 +29,8 @@ enum WorkerState {
#[derive(Clone)]
pub struct WorkerContext {
pub uuid: String,
- pub core_ctx: CoreContext,
- pub sender: UnboundedSender,
+ library_ctx: LibraryContext,
+ sender: UnboundedSender,
}
impl WorkerContext {
@@ -39,9 +39,13 @@ impl WorkerContext {
.send(WorkerEvent::Progressed(updates))
.unwrap_or(());
}
+
+ pub fn library_ctx(&self) -> LibraryContext {
+ self.library_ctx.clone()
+ }
+
// save the job data to
// pub fn save_data () {
-
// }
}
@@ -66,7 +70,11 @@ impl Worker {
}
}
// spawns a thread and extracts channel sender to communicate with it
- pub async fn spawn(worker: Arc>, ctx: &CoreContext) {
+ pub async fn spawn(
+ job_manager: Arc,
+ worker: Arc>,
+ ctx: LibraryContext,
+ ) {
// we capture the worker receiver channel so state can be updated from inside the worker
let mut worker_mut = worker.lock().await;
// extract owned job and receiver from Self
@@ -79,25 +87,26 @@ impl Worker {
WorkerState::Running => unreachable!(),
};
let worker_sender = worker_mut.worker_sender.clone();
- let core_ctx = ctx.clone();
worker_mut.job_report.status = JobStatus::Running;
- worker_mut.job_report.create(ctx).await.unwrap_or(());
+ worker_mut.job_report.create(&ctx).await.unwrap_or(());
// spawn task to handle receiving events from the worker
+ let library_ctx = ctx.clone();
tokio::spawn(Worker::track_progress(
worker.clone(),
worker_receiver,
- ctx.clone(),
+ library_ctx.clone(),
));
let uuid = worker_mut.job_report.id.clone();
// spawn task to handle running the job
+
tokio::spawn(async move {
let worker_ctx = WorkerContext {
uuid,
- core_ctx,
+ library_ctx,
sender: worker_sender,
};
let job_start = Instant::now();
@@ -116,20 +125,15 @@ impl Worker {
}
});
- let result = job.run(worker_ctx.clone()).await;
-
- if let Err(e) = result {
- error!("job failed {:?}", e);
+ if let Err(e) = job.run(worker_ctx.clone()).await {
+ error!("job '{}' failed with error: {}", worker_ctx.uuid, e);
worker_ctx.sender.send(WorkerEvent::Failed).unwrap_or(());
} else {
// handle completion
worker_ctx.sender.send(WorkerEvent::Completed).unwrap_or(());
}
- worker_ctx
- .core_ctx
- .internal_sender
- .send(InternalEvent::JobComplete(worker_ctx.uuid.clone()))
- .unwrap_or(());
+
+ job_manager.complete(&ctx, worker_ctx.uuid).await;
});
}
@@ -140,7 +144,7 @@ impl Worker {
async fn track_progress(
worker: Arc>,
mut channel: UnboundedReceiver,
- ctx: CoreContext,
+ ctx: LibraryContext,
) {
while let Some(command) = channel.recv().await {
let mut worker = worker.lock().await;
@@ -179,16 +183,23 @@ impl Worker {
ctx.emit(CoreEvent::InvalidateQuery(ClientQuery::JobGetRunning))
.await;
- ctx.emit(CoreEvent::InvalidateQuery(ClientQuery::JobGetHistory))
- .await;
+
+ ctx.emit(CoreEvent::InvalidateQuery(ClientQuery::LibraryQuery {
+ library_id: ctx.id.to_string(),
+ query: LibraryQuery::JobGetHistory,
+ }))
+ .await;
break;
}
WorkerEvent::Failed => {
worker.job_report.status = JobStatus::Failed;
worker.job_report.update(&ctx).await.unwrap_or(());
- ctx.emit(CoreEvent::InvalidateQuery(ClientQuery::JobGetHistory))
- .await;
+ ctx.emit(CoreEvent::InvalidateQuery(ClientQuery::LibraryQuery {
+ library_id: ctx.id.to_string(),
+ query: LibraryQuery::JobGetHistory,
+ }))
+ .await;
break;
}
}
diff --git a/core/src/lib.rs b/core/src/lib.rs
index f0b0833d2..887d1526a 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -1,13 +1,13 @@
-use crate::{
- file::cas::FileIdentifierJob, library::get_library_path, node::NodeState,
- prisma::file as prisma_file, prisma::location, util::db::create_connection,
-};
-use job::{Job, JobReport, Jobs};
-use log::{error, info};
-use prisma::PrismaClient;
+use crate::{file::cas::FileIdentifierJob, prisma::file as prisma_file, prisma::location};
+use job::{JobManager, JobReport};
+use library::{LibraryConfig, LibraryConfigWrapped, LibraryManager};
+use log::error;
+use node::{NodeConfig, NodeConfigManager};
use serde::{Deserialize, Serialize};
-use std::path::PathBuf;
-use std::sync::Arc;
+use std::{
+ path::{Path, PathBuf},
+ sync::Arc,
+};
use thiserror::Error;
use tokio::{
fs,
@@ -37,12 +37,12 @@ pub struct ReturnableMessage> {
}
// core controller is passed to the client to communicate with the core which runs in a dedicated thread
-pub struct CoreController {
+pub struct NodeController {
query_sender: UnboundedSender>,
command_sender: UnboundedSender>,
}
-impl CoreController {
+impl NodeController {
pub async fn query(&self, query: ClientQuery) -> Result {
// a one time use channel to send and await a response
let (sender, recv) = oneshot::channel();
@@ -69,48 +69,25 @@ impl CoreController {
}
}
-#[derive(Debug)]
-pub enum InternalEvent {
- JobIngest(Box),
- JobQueue(Box),
- JobComplete(String),
-}
-
#[derive(Clone)]
-pub struct CoreContext {
- pub database: Arc,
+pub struct NodeContext {
pub event_sender: mpsc::Sender,
- pub internal_sender: UnboundedSender,
+ pub config: Arc,
+ pub jobs: Arc,
}
-impl CoreContext {
- pub fn spawn_job(&self, job: Box) {
- self.internal_sender
- .send(InternalEvent::JobIngest(job))
- .unwrap_or_else(|e| {
- error!("Failed to spawn job. {:?}", e);
- });
- }
- pub fn queue_job(&self, job: Box) {
- self.internal_sender
- .send(InternalEvent::JobQueue(job))
- .unwrap_or_else(|e| {
- error!("Failed to queue job. {:?}", e);
- });
- }
+impl NodeContext {
pub async fn emit(&self, event: CoreEvent) {
self.event_sender.send(event).await.unwrap_or_else(|e| {
- error!("Failed to emit event. {:?}", e);
+ error!("Failed to emit event. {:#?}", e);
});
}
}
pub struct Node {
- state: NodeState,
- jobs: job::Jobs,
- database: Arc,
- // filetype_registry: library::TypeRegistry,
- // extension_registry: library::ExtensionRegistry,
+ config: Arc,
+ library_manager: Arc,
+ jobs: Arc,
// global messaging channels
query_channel: (
@@ -122,73 +99,56 @@ pub struct Node {
UnboundedReceiver>,
),
event_sender: mpsc::Sender,
-
- // a channel for child threads to send events back to the core
- internal_channel: (
- UnboundedSender,
- UnboundedReceiver,
- ),
}
impl Node {
// create new instance of node, run startup tasks
- pub async fn new(mut data_dir: PathBuf) -> (Node, mpsc::Receiver) {
- let (event_sender, event_recv) = mpsc::channel(100);
-
- data_dir.push("spacedrive");
- // create data directory if it doesn't exist
+ pub async fn new(
+ data_dir: impl AsRef,
+ ) -> (NodeController, mpsc::Receiver, Node) {
fs::create_dir_all(&data_dir).await.unwrap();
- // prepare basic client state
- let mut state = NodeState::new(data_dir.clone(), "diamond-mastering-space-dragon").unwrap();
- // load from disk
- state
- .read_disk()
+
+ let (event_sender, event_recv) = mpsc::channel(100);
+ let config = NodeConfigManager::new(data_dir.as_ref().to_owned())
.await
- .unwrap_or_else(|_| error!("Error: No node state found, creating new one..."));
-
- state.save().await;
-
- info!("Node State: {:?}", state);
-
- // connect to default library
- let database = Arc::new(
- create_connection(&get_library_path(&data_dir))
- .await
- .unwrap(),
- );
-
- let internal_channel = unbounded_channel::();
-
- let node = Node {
- state,
- query_channel: unbounded_channel(),
- command_channel: unbounded_channel(),
- jobs: Jobs::new(),
- event_sender,
- database,
- internal_channel,
+ .unwrap();
+ let jobs = JobManager::new();
+ let node_ctx = NodeContext {
+ event_sender: event_sender.clone(),
+ config: config.clone(),
+ jobs: jobs.clone(),
};
- (node, event_recv)
+ let node = Node {
+ config,
+ library_manager: LibraryManager::new(data_dir.as_ref().join("libraries"), node_ctx)
+ .await
+ .unwrap(),
+ query_channel: unbounded_channel(),
+ command_channel: unbounded_channel(),
+ jobs,
+ event_sender,
+ };
+
+ (
+ NodeController {
+ query_sender: node.query_channel.0.clone(),
+ command_sender: node.command_channel.0.clone(),
+ },
+ event_recv,
+ node,
+ )
}
- pub fn get_context(&self) -> CoreContext {
- CoreContext {
- database: self.database.clone(),
+ pub fn get_context(&self) -> NodeContext {
+ NodeContext {
event_sender: self.event_sender.clone(),
- internal_sender: self.internal_channel.0.clone(),
+ config: Arc::clone(&self.config),
+ jobs: Arc::clone(&self.jobs),
}
}
- pub fn get_controller(&self) -> CoreController {
- CoreController {
- query_sender: self.query_channel.0.clone(),
- command_sender: self.command_channel.0.clone(),
- }
- }
-
- pub async fn start(&mut self) {
- let ctx = self.get_context();
+ pub async fn start(mut self) {
loop {
// listen on global messaging channels for incoming messages
tokio::select! {
@@ -200,174 +160,200 @@ impl Node {
let res = self.exec_command(msg.data).await;
msg.return_sender.send(res).unwrap_or(());
}
- Some(event) = self.internal_channel.1.recv() => {
- match event {
- InternalEvent::JobIngest(job) => {
- self.jobs.ingest(&ctx, job).await;
- },
- InternalEvent::JobQueue(job) => {
- self.jobs.ingest_queue(&ctx, job);
- },
- InternalEvent::JobComplete(id) => {
- self.jobs.complete(&ctx, id).await;
- },
- }
- }
}
}
}
- // load library database + initialize client with db
- pub async fn initializer(&self) {
- info!("Initializing...");
- let ctx = self.get_context();
-
- if self.state.libraries.is_empty() {
- match library::create(&ctx, None).await {
- Ok(library) => info!("Created new library: {:?}", library),
- Err(e) => error!("Error creating library: {:?}", e),
- }
- } else {
- for library in self.state.libraries.iter() {
- // init database for library
- match library::load(&ctx, &library.library_path, &library.library_uuid).await {
- Ok(library) => info!("Loaded library: {:?}", library),
- Err(e) => error!("Error loading library: {:?}", e),
- }
- }
- }
- // init node data within library
- match node::LibraryNode::create(self).await {
- Ok(_) => info!("Spacedrive online"),
- Err(e) => error!("Error initializing node: {:?}", e),
- };
- }
async fn exec_command(&mut self, cmd: ClientCommand) -> Result {
- info!("Core command: {:?}", cmd);
- let ctx = self.get_context();
Ok(match cmd {
- // CRUD for locations
- ClientCommand::LocCreate { path } => {
- let loc = sys::new_location_and_scan(&ctx, &path).await?;
- // ctx.queue_job(Box::new(FileIdentifierJob));
- CoreResponse::LocCreate(loc)
+ ClientCommand::CreateLibrary { name } => {
+ self.library_manager
+ .create(LibraryConfig {
+ name: name.to_string(),
+ ..Default::default()
+ })
+ .await
+ .unwrap();
+ CoreResponse::Success(())
}
- ClientCommand::LocUpdate { id, name } => {
- ctx.database
- .location()
- .find_unique(location::id::equals(id))
- .update(vec![location::name::set(name)])
- .exec()
- .await?;
+ ClientCommand::EditLibrary {
+ id,
+ name,
+ description,
+ } => {
+ self.library_manager
+ .edit_library(id, name, description)
+ .await
+ .unwrap();
+ CoreResponse::Success(())
+ }
+ ClientCommand::DeleteLibrary { id } => {
+ self.library_manager.delete_library(id).await.unwrap();
+ CoreResponse::Success(())
+ }
+ ClientCommand::LibraryCommand {
+ library_id,
+ command,
+ } => {
+ let ctx = self.library_manager.get_ctx(library_id).await.unwrap();
+ match command {
+ // CRUD for locations
+ LibraryCommand::LocCreate { path } => {
+ let loc = sys::new_location_and_scan(&ctx, &path).await?;
+ // ctx.queue_job(Box::new(FileIdentifierJob));
+ CoreResponse::LocCreate(loc)
+ }
+ LibraryCommand::LocUpdate { id, name } => {
+ ctx.db
+ .location()
+ .find_unique(location::id::equals(id))
+ .update(vec![location::name::set(name)])
+ .exec()
+ .await?;
- CoreResponse::Success(())
- }
- ClientCommand::LocDelete { id } => {
- sys::delete_location(&ctx, id).await?;
- CoreResponse::Success(())
- }
- ClientCommand::LocRescan { id } => {
- sys::scan_location(&ctx, id, String::new());
- CoreResponse::Success(())
- }
- // CRUD for files
- ClientCommand::FileReadMetaData { id: _ } => todo!(),
- ClientCommand::FileSetNote { id, note } => file::set_note(ctx, id, note).await?,
- // ClientCommand::FileEncrypt { id: _, algorithm: _ } => todo!(),
- ClientCommand::FileDelete { id } => {
- ctx.database
- .file()
- .find_unique(prisma_file::id::equals(id))
- .delete()
- .exec()
- .await?;
+ CoreResponse::Success(())
+ }
+ LibraryCommand::LocDelete { id } => {
+ sys::delete_location(&ctx, id).await?;
+ CoreResponse::Success(())
+ }
+ LibraryCommand::LocRescan { id } => {
+ sys::scan_location(&ctx, id, String::new()).await;
+ CoreResponse::Success(())
+ }
+ // CRUD for files
+ LibraryCommand::FileReadMetaData { id: _ } => todo!(),
+ LibraryCommand::FileSetNote { id, note } => {
+ file::set_note(ctx, id, note).await?
+ }
+ // ClientCommand::FileEncrypt { id: _, algorithm: _ } => todo!(),
+ LibraryCommand::FileDelete { id } => {
+ ctx.db
+ .file()
+ .find_unique(prisma_file::id::equals(id))
+ .delete()
+ .exec()
+ .await?;
- CoreResponse::Success(())
- }
- // CRUD for tags
- ClientCommand::TagCreate { name: _, color: _ } => todo!(),
- ClientCommand::TagAssign {
- file_id: _,
- tag_id: _,
- } => todo!(),
- ClientCommand::TagDelete { id: _ } => todo!(),
- // CRUD for libraries
- ClientCommand::SysVolumeUnmount { id: _ } => todo!(),
- ClientCommand::LibDelete { id: _ } => todo!(),
- ClientCommand::TagUpdate { name: _, color: _ } => todo!(),
- ClientCommand::GenerateThumbsForLocation { id, path } => {
- ctx.spawn_job(Box::new(ThumbnailJob {
- location_id: id,
- path,
- background: false, // fix
- }));
- CoreResponse::Success(())
- }
- // ClientCommand::PurgeDatabase => {
- // info!("Purging database...");
- // fs::remove_file(Path::new(&self.state.data_path).join("library.db")).unwrap();
- // CoreResponse::Success(())
- // }
- ClientCommand::IdentifyUniqueFiles { id, path } => {
- ctx.spawn_job(Box::new(FileIdentifierJob {
- location_id: id,
- path,
- }));
- CoreResponse::Success(())
+ CoreResponse::Success(())
+ }
+ // CRUD for tags
+ LibraryCommand::TagCreate { name: _, color: _ } => todo!(),
+ LibraryCommand::TagAssign {
+ file_id: _,
+ tag_id: _,
+ } => todo!(),
+ LibraryCommand::TagUpdate { name: _, color: _ } => todo!(),
+ LibraryCommand::TagDelete { id: _ } => todo!(),
+ // CRUD for libraries
+ LibraryCommand::SysVolumeUnmount { id: _ } => todo!(),
+ LibraryCommand::GenerateThumbsForLocation { id, path } => {
+ ctx.spawn_job(Box::new(ThumbnailJob {
+ location_id: id,
+ path,
+ background: false, // fix
+ }))
+ .await;
+ CoreResponse::Success(())
+ }
+ LibraryCommand::IdentifyUniqueFiles { id, path } => {
+ ctx.spawn_job(Box::new(FileIdentifierJob {
+ location_id: id,
+ path,
+ }))
+ .await;
+ CoreResponse::Success(())
+ }
+ }
}
})
}
// query sources of data
async fn exec_query(&self, query: ClientQuery) -> Result {
- let ctx = self.get_context();
Ok(match query {
- // return the client state from memory
- ClientQuery::NodeGetState => CoreResponse::NodeGetState(self.state.clone()),
- // get system volumes without saving to library
- ClientQuery::SysGetVolumes => CoreResponse::SysGetVolumes(sys::Volume::get_volumes()?),
- ClientQuery::SysGetLocations => {
- CoreResponse::SysGetLocations(sys::get_locations(&ctx).await?)
- }
- // get location from library
- ClientQuery::SysGetLocation { id } => {
- CoreResponse::SysGetLocation(sys::get_location(&ctx, id).await?)
- }
- // return contents of a directory for the explorer
- ClientQuery::LibGetExplorerDir {
- path,
- location_id,
- limit: _,
- } => CoreResponse::LibGetExplorerDir(
- file::explorer::open_dir(&ctx, location_id, &path).await?,
+ ClientQuery::NodeGetLibraries => CoreResponse::NodeGetLibraries(
+ self.library_manager.get_all_libraries_config().await,
),
- ClientQuery::LibGetTags => todo!(),
+ ClientQuery::NodeGetState => CoreResponse::NodeGetState(NodeState {
+ config: self.config.get().await,
+ data_path: self.config.data_directory().to_str().unwrap().to_string(),
+ }),
+ ClientQuery::SysGetVolumes => CoreResponse::SysGetVolumes(sys::Volume::get_volumes()?),
ClientQuery::JobGetRunning => {
CoreResponse::JobGetRunning(self.jobs.get_running().await)
}
- ClientQuery::JobGetHistory => {
- CoreResponse::JobGetHistory(Jobs::get_history(&ctx).await?)
- }
- ClientQuery::GetLibraryStatistics => {
- CoreResponse::GetLibraryStatistics(library::Statistics::calculate(&ctx).await?)
- }
ClientQuery::GetNodes => todo!(),
+ ClientQuery::LibraryQuery { library_id, query } => {
+ let ctx = match self.library_manager.get_ctx(library_id.clone()).await {
+ Some(ctx) => ctx,
+ None => {
+ println!("Library '{}' not found!", library_id);
+ return Ok(CoreResponse::Error("Library not found".into()));
+ }
+ };
+ match query {
+ LibraryQuery::SysGetLocations => {
+ CoreResponse::SysGetLocations(sys::get_locations(&ctx).await?)
+ }
+ // get location from library
+ LibraryQuery::SysGetLocation { id } => {
+ CoreResponse::SysGetLocation(sys::get_location(&ctx, id).await?)
+ }
+ // return contents of a directory for the explorer
+ LibraryQuery::LibGetExplorerDir {
+ location_id,
+ path,
+ limit: _,
+ } => CoreResponse::LibGetExplorerDir(Box::new(
+ file::explorer::open_dir(&ctx, location_id, path).await?,
+ )),
+ LibraryQuery::LibGetTags => todo!(),
+ LibraryQuery::JobGetHistory => {
+ CoreResponse::JobGetHistory(JobManager::get_history(&ctx).await?)
+ }
+ LibraryQuery::GetLibraryStatistics => CoreResponse::GetLibraryStatistics(
+ library::Statistics::calculate(&ctx).await?,
+ ),
+ }
+ }
})
}
}
-// represents an event this library can emit
+/// is a command destined for the core
#[derive(Serialize, Deserialize, Debug, TS)]
#[serde(tag = "key", content = "params")]
#[ts(export)]
pub enum ClientCommand {
+ // Libraries
+ CreateLibrary {
+ name: String,
+ },
+ EditLibrary {
+ id: String,
+ name: Option,
+ description: Option,
+ },
+ DeleteLibrary {
+ id: String,
+ },
+ LibraryCommand {
+ library_id: String,
+ command: LibraryCommand,
+ },
+}
+
+/// is a command destined for a specific library which is loaded into the core.
+#[derive(Serialize, Deserialize, Debug, TS)]
+#[serde(tag = "key", content = "params")]
+#[ts(export)]
+pub enum LibraryCommand {
// Files
FileReadMetaData { id: i32 },
FileSetNote { id: i32, note: Option },
// FileEncrypt { id: i32, algorithm: EncryptionAlgorithm },
FileDelete { id: i32 },
- // Library
- LibDelete { id: i32 },
// Tags
TagCreate { name: String, color: String },
TagUpdate { name: String, color: String },
@@ -385,15 +371,28 @@ pub enum ClientCommand {
IdentifyUniqueFiles { id: i32, path: PathBuf },
}
-// represents an event this library can emit
+/// is a query destined for the core
#[derive(Serialize, Deserialize, Debug, TS)]
#[serde(tag = "key", content = "params")]
#[ts(export)]
pub enum ClientQuery {
+ NodeGetLibraries,
NodeGetState,
SysGetVolumes,
- LibGetTags,
JobGetRunning,
+ GetNodes,
+ LibraryQuery {
+ library_id: String,
+ query: LibraryQuery,
+ },
+}
+
+/// is a query destined for a specific library which is loaded into the core.
+#[derive(Serialize, Deserialize, Debug, TS)]
+#[serde(tag = "key", content = "params")]
+#[ts(export)]
+pub enum LibraryQuery {
+ LibGetTags,
JobGetHistory,
SysGetLocations,
SysGetLocation {
@@ -401,11 +400,10 @@ pub enum ClientQuery {
},
LibGetExplorerDir {
location_id: i32,
- path: String,
+ path: PathBuf,
limit: i32,
},
GetLibraryStatistics,
- GetNodes,
}
// represents an event this library can emit
@@ -422,15 +420,25 @@ pub enum CoreEvent {
DatabaseDisconnected { reason: Option },
}
+#[derive(Serialize, Deserialize, Debug, TS)]
+#[ts(export)]
+pub struct NodeState {
+ #[serde(flatten)]
+ pub config: NodeConfig,
+ pub data_path: String,
+}
+
#[derive(Serialize, Deserialize, Debug, TS)]
#[serde(tag = "key", content = "data")]
#[ts(export)]
pub enum CoreResponse {
Success(()),
+ Error(String),
+ NodeGetLibraries(Vec),
SysGetVolumes(Vec),
SysGetLocation(sys::LocationResource),
SysGetLocations(Vec),
- LibGetExplorerDir(file::DirectoryWithContents),
+ LibGetExplorerDir(Box),
NodeGetState(NodeState),
LocCreate(sys::LocationResource),
JobGetRunning(Vec),
diff --git a/core/src/library/library_config.rs b/core/src/library/library_config.rs
new file mode 100644
index 000000000..f3ab140f1
--- /dev/null
+++ b/core/src/library/library_config.rs
@@ -0,0 +1,69 @@
+use std::{
+ fs::File,
+ io::{BufReader, Seek, SeekFrom},
+ path::PathBuf,
+};
+
+use serde::{Deserialize, Serialize};
+use std::io::Write;
+use ts_rs::TS;
+
+use crate::node::ConfigMetadata;
+
+use super::LibraryManagerError;
+
+/// LibraryConfig holds the configuration for a specific library. This is stored as a '{uuid}.sdlibrary' file.
+#[derive(Debug, Serialize, Deserialize, Clone, TS, Default)]
+#[ts(export)]
+pub struct LibraryConfig {
+ #[serde(flatten)]
+ pub metadata: ConfigMetadata,
+ /// name is the display name of the library. This is used in the UI and is set by the user.
+ pub name: String,
+ /// description is a user set description of the library. This is used in the UI and is set by the user.
+ pub description: String,
+}
+
+impl LibraryConfig {
+ /// read will read the configuration from disk and return it.
+ pub(super) async fn read(file_dir: PathBuf) -> Result {
+ let mut file = File::open(&file_dir)?;
+ let base_config: ConfigMetadata = serde_json::from_reader(BufReader::new(&mut file))?;
+
+ Self::migrate_config(base_config.version, file_dir)?;
+
+ file.seek(SeekFrom::Start(0))?;
+ Ok(serde_json::from_reader(BufReader::new(&mut file))?)
+ }
+
+ /// save will write the configuration back to disk
+ pub(super) async fn save(
+ file_dir: PathBuf,
+ config: &LibraryConfig,
+ ) -> Result<(), LibraryManagerError> {
+ File::create(file_dir)?.write_all(serde_json::to_string(config)?.as_bytes())?;
+ Ok(())
+ }
+
+ /// migrate_config is a function used to apply breaking changes to the library config file.
+ fn migrate_config(
+ current_version: Option,
+ config_path: PathBuf,
+ ) -> Result<(), LibraryManagerError> {
+ match current_version {
+ None => Err(LibraryManagerError::Migration(format!(
+ "Your Spacedrive library at '{}' is missing the `version` field",
+ config_path.display()
+ ))),
+ _ => Ok(()),
+ }
+ }
+}
+
+// used to return to the frontend with uuid context
+#[derive(Serialize, Deserialize, Debug, TS)]
+#[ts(export)]
+pub struct LibraryConfigWrapped {
+ pub uuid: String,
+ pub config: LibraryConfig,
+}
diff --git a/core/src/library/library_ctx.rs b/core/src/library/library_ctx.rs
new file mode 100644
index 000000000..50bc5ea94
--- /dev/null
+++ b/core/src/library/library_ctx.rs
@@ -0,0 +1,46 @@
+use std::sync::Arc;
+
+use uuid::Uuid;
+
+use crate::{job::Job, node::NodeConfigManager, prisma::PrismaClient, CoreEvent, NodeContext};
+
+use super::LibraryConfig;
+
+/// LibraryContext holds context for a library which can be passed around the application.
+#[derive(Clone)]
+pub struct LibraryContext {
+ /// id holds the ID of the current library.
+ pub id: Uuid,
+ /// config holds the configuration of the current library.
+ pub config: LibraryConfig,
+ /// db holds the database client for the current library.
+ pub db: Arc,
+ /// node_local_id holds the local ID of the node which is running the library.
+ pub node_local_id: i32,
+ /// node_context holds the node context for the node which this library is running on.
+ pub(super) node_context: NodeContext,
+}
+
+impl LibraryContext {
+ pub(crate) async fn spawn_job(&self, job: Box) {
+ self.node_context.jobs.clone().ingest(self, job).await;
+ }
+
+ pub(crate) async fn queue_job(&self, job: Box) {
+ self.node_context.jobs.ingest_queue(self, job).await;
+ }
+
+ pub(crate) async fn emit(&self, event: CoreEvent) {
+ self.node_context
+ .event_sender
+ .send(event)
+ .await
+ .unwrap_or_else(|e| {
+ println!("Failed to emit event. {:?}", e);
+ });
+ }
+
+ pub(crate) fn config(&self) -> Arc {
+ self.node_context.config.clone()
+ }
+}
diff --git a/core/src/library/library_manager.rs b/core/src/library/library_manager.rs
new file mode 100644
index 000000000..ffabb814a
--- /dev/null
+++ b/core/src/library/library_manager.rs
@@ -0,0 +1,264 @@
+use std::{
+ env, fs, io,
+ path::{Path, PathBuf},
+ str::FromStr,
+ sync::Arc,
+};
+
+use thiserror::Error;
+use tokio::sync::RwLock;
+use uuid::Uuid;
+
+use crate::{
+ node::Platform,
+ prisma::{self, node},
+ util::db::load_and_migrate,
+ ClientQuery, CoreEvent, NodeContext,
+};
+
+use super::{LibraryConfig, LibraryConfigWrapped, LibraryContext};
+
+/// LibraryManager is a singleton that manages all libraries for a node.
+pub struct LibraryManager {
+ /// libraries_dir holds the path to the directory where libraries are stored.
+ libraries_dir: PathBuf,
+ /// libraries holds the list of libraries which are currently loaded into the node.
+ libraries: RwLock>,
+ /// node_context holds the context for the node which this library manager is running on.
+ node_context: NodeContext,
+}
+
+#[derive(Error, Debug)]
+pub enum LibraryManagerError {
+ #[error("error saving or loading the config from the filesystem")]
+ IO(#[from] io::Error),
+ #[error("error serializing or deserializing the JSON in the config file")]
+ Json(#[from] serde_json::Error),
+ #[error("Database error")]
+ Database(#[from] prisma::QueryError),
+ #[error("Library not found error")]
+ LibraryNotFound,
+ #[error("error migrating the config file")]
+ Migration(String),
+ #[error("failed to parse uuid")]
+ Uuid(#[from] uuid::Error),
+}
+
+impl LibraryManager {
+ pub(crate) async fn new(
+ libraries_dir: PathBuf,
+ node_context: NodeContext,
+ ) -> Result, LibraryManagerError> {
+ fs::create_dir_all(&libraries_dir)?;
+
+ let mut libraries = Vec::new();
+ for entry in fs::read_dir(&libraries_dir)?
+ .into_iter()
+ .filter_map(|entry| entry.ok())
+ .filter(|entry| {
+ entry.path().is_file()
+ && entry
+ .path()
+ .extension()
+ .map(|v| &*v == "sdlibrary")
+ .unwrap_or(false)
+ }) {
+ let config_path = entry.path();
+ let library_id = match Path::new(&config_path)
+ .file_stem()
+ .map(|v| v.to_str().map(Uuid::from_str))
+ {
+ Some(Some(Ok(id))) => id,
+ _ => {
+ println!("Attempted to load library from path '{}' but it has an invalid filename. Skipping...", config_path.display());
+ continue;
+ }
+ };
+
+ let db_path = config_path.clone().with_extension("db");
+ if !db_path.exists() {
+ println!(
+ "Found library '{}' but no matching database file was found. Skipping...",
+ config_path.display()
+ );
+ continue;
+ }
+
+ let config = LibraryConfig::read(config_path).await?;
+ libraries.push(
+ Self::load(
+ library_id,
+ db_path.to_str().unwrap(),
+ config,
+ node_context.clone(),
+ )
+ .await?,
+ );
+ }
+
+ let this = Arc::new(Self {
+ libraries: RwLock::new(libraries),
+ libraries_dir,
+ node_context,
+ });
+
+ // TODO: Remove this before merging PR -> Currently it exists to make the app usable
+ if this.libraries.read().await.len() == 0 {
+ this.create(LibraryConfig {
+ name: "My Default Library".into(),
+ ..Default::default()
+ })
+ .await
+ .unwrap();
+ }
+
+ Ok(this)
+ }
+
+ /// create creates a new library with the given config and mounts it into the running [LibraryManager].
+ pub(crate) async fn create(&self, config: LibraryConfig) -> Result<(), LibraryManagerError> {
+ let id = Uuid::new_v4();
+ LibraryConfig::save(
+ Path::new(&self.libraries_dir).join(format!("{id}.sdlibrary")),
+ &config,
+ )
+ .await?;
+
+ let library = Self::load(
+ id,
+ self.libraries_dir.join(format!("{id}.db")),
+ config,
+ self.node_context.clone(),
+ )
+ .await?;
+
+ self.libraries.write().await.push(library);
+
+ self.node_context
+ .emit(CoreEvent::InvalidateQuery(ClientQuery::NodeGetLibraries))
+ .await;
+
+ Ok(())
+ }
+
+ pub(crate) async fn get_all_libraries_config(&self) -> Vec {
+ self.libraries
+ .read()
+ .await
+ .iter()
+ .map(|lib| LibraryConfigWrapped {
+ config: lib.config.clone(),
+ uuid: lib.id.to_string(),
+ })
+ .collect()
+ }
+
+ pub(crate) async fn edit_library(
+ &self,
+ id: String,
+ name: Option,
+ description: Option,
+ ) -> Result<(), LibraryManagerError> {
+ // check library is valid
+ let mut libraries = self.libraries.write().await;
+ let library = libraries
+ .iter_mut()
+ .find(|lib| lib.id == Uuid::from_str(&id).unwrap())
+ .ok_or(LibraryManagerError::LibraryNotFound)?;
+
+ // update the library
+ if let Some(name) = name {
+ library.config.name = name;
+ }
+ if let Some(description) = description {
+ library.config.description = description;
+ }
+
+ LibraryConfig::save(
+ Path::new(&self.libraries_dir).join(format!("{id}.sdlibrary")),
+ &library.config,
+ )
+ .await?;
+
+ self.node_context
+ .emit(CoreEvent::InvalidateQuery(ClientQuery::NodeGetLibraries))
+ .await;
+ Ok(())
+ }
+
+ pub async fn delete_library(&self, id: String) -> Result<(), LibraryManagerError> {
+ let mut libraries = self.libraries.write().await;
+
+ let id = Uuid::parse_str(&id)?;
+
+ let library = libraries
+ .iter()
+ .find(|l| l.id == id)
+ .ok_or(LibraryManagerError::LibraryNotFound)?;
+
+ fs::remove_file(Path::new(&self.libraries_dir).join(format!("{}.db", library.id)))?;
+ fs::remove_file(Path::new(&self.libraries_dir).join(format!("{}.sdlibrary", library.id)))?;
+
+ libraries.retain(|l| l.id != id);
+
+ self.node_context
+ .emit(CoreEvent::InvalidateQuery(ClientQuery::NodeGetLibraries))
+ .await;
+ Ok(())
+ }
+
+ // get_ctx will return the library context for the given library id.
+ pub(crate) async fn get_ctx(&self, library_id: String) -> Option {
+ self.libraries
+ .read()
+ .await
+ .iter()
+ .find(|lib| lib.id.to_string() == library_id)
+ .map(Clone::clone)
+ }
+
+ /// load the library from a given path
+ pub(crate) async fn load(
+ id: Uuid,
+ db_path: impl AsRef,
+ config: LibraryConfig,
+ node_context: NodeContext,
+ ) -> Result {
+ let db = Arc::new(
+ load_and_migrate(&format!("file:{}", db_path.as_ref().to_string_lossy()))
+ .await
+ .unwrap(),
+ );
+
+ let node_config = node_context.config.get().await;
+
+ let platform = match env::consts::OS {
+ "windows" => Platform::Windows,
+ "macos" => Platform::MacOS,
+ "linux" => Platform::Linux,
+ _ => Platform::Unknown,
+ };
+
+ let node_data = db
+ .node()
+ .upsert(
+ node::pub_id::equals(id.to_string()),
+ (
+ node::pub_id::set(id.to_string()),
+ node::name::set(node_config.name.clone()),
+ vec![node::platform::set(platform as i32)],
+ ),
+ vec![node::name::set(node_config.name.clone())],
+ )
+ .exec()
+ .await?;
+
+ Ok(LibraryContext {
+ id,
+ config,
+ db,
+ node_local_id: node_data.id,
+ node_context,
+ })
+ }
+}
diff --git a/core/src/library/loader.rs b/core/src/library/loader.rs
index da4826f7b..8b1378917 100644
--- a/core/src/library/loader.rs
+++ b/core/src/library/loader.rs
@@ -1,102 +1 @@
-use log::info;
-use std::fmt::Debug;
-use std::path::{Path, PathBuf};
-use uuid::Uuid;
-use crate::{
- node::{get_nodestate, LibraryState},
- prisma::library,
- util::db::{run_migrations, DatabaseError},
- CoreContext,
-};
-
-pub static LIBRARY_DB_NAME: &str = "library.db";
-pub static DEFAULT_NAME: &str = "My Library";
-
-pub fn get_library_path(data_path: impl AsRef) -> PathBuf {
- data_path.as_ref().join(LIBRARY_DB_NAME)
-}
-
-// pub async fn get(core: &Node) -> Result {
-// let config = get_nodestate();
-// let db = &core.database;
-
-// let library_state = config.get_current_library();
-
-// info!("{:?}", library_state);
-
-// // get library from db
-// let library = match db
-// .library()
-// .find_unique(library::pub_id::equals(library_state.library_uuid.clone()))
-// .exec()
-// .await?
-// {
-// Some(library) => Ok(library),
-// None => {
-// // update config library state to offline
-// // config.libraries
-
-// Err(anyhow::anyhow!("library_not_found"))
-// }
-// };
-
-// Ok(library.unwrap())
-// }
-
-pub async fn load(
- ctx: &CoreContext,
- library_path: impl AsRef + Debug,
- library_id: &str,
-) -> Result<(), DatabaseError> {
- let mut config = get_nodestate();
-
- info!("Initializing library: {} {:#?}", &library_id, library_path);
-
- if config.current_library_uuid != library_id {
- config.current_library_uuid = library_id.to_string();
- config.save().await;
- }
- // create connection with library database & run migrations
- run_migrations(ctx).await?;
- // if doesn't exist, mark as offline
- Ok(())
-}
-
-pub async fn create(ctx: &CoreContext, name: Option) -> Result<(), ()> {
- let mut config = get_nodestate();
-
- let uuid = Uuid::new_v4().to_string();
-
- info!("Creating library {:?}, UUID: {:?}", name, uuid);
-
- let library_state = LibraryState {
- library_uuid: uuid.clone(),
- library_path: get_library_path(config.data_path.as_ref().unwrap()),
- ..LibraryState::default()
- };
-
- run_migrations(ctx).await.unwrap();
-
- config.libraries.push(library_state);
-
- config.current_library_uuid = uuid;
-
- config.save().await;
-
- let library = ctx
- .database
- .library()
- .create(
- library::pub_id::set(config.current_library_uuid),
- library::name::set(name.unwrap_or_else(|| DEFAULT_NAME.into())),
- vec![],
- )
- .exec()
- .await
- .unwrap();
-
- info!("library created in database: {:?}", library);
-
- Ok(())
-}
diff --git a/core/src/library/mod.rs b/core/src/library/mod.rs
index 17dc6db10..23aed8efa 100644
--- a/core/src/library/mod.rs
+++ b/core/src/library/mod.rs
@@ -1,7 +1,11 @@
-mod loader;
+mod library_config;
+mod library_ctx;
+mod library_manager;
mod statistics;
-pub use loader::*;
+pub use library_config::*;
+pub use library_ctx::*;
+pub use library_manager::*;
pub use statistics::*;
use thiserror::Error;
diff --git a/core/src/library/statistics.rs b/core/src/library/statistics.rs
index 91157286c..5c078e30b 100644
--- a/core/src/library/statistics.rs
+++ b/core/src/library/statistics.rs
@@ -1,16 +1,10 @@
-use crate::{
- node::get_nodestate,
- prisma::{library, library_statistics::*},
- sys::Volume,
- CoreContext,
-};
+use crate::{prisma::statistics::*, sys::Volume};
use fs_extra::dir::get_size;
-use log::info;
use serde::{Deserialize, Serialize};
use tokio::fs;
use ts_rs::TS;
-use super::LibraryError;
+use super::{LibraryContext, LibraryError};
#[derive(Debug, Serialize, Deserialize, TS, Clone, Default)]
#[ts(export)]
@@ -39,46 +33,22 @@ impl From for Statistics {
}
impl Statistics {
- pub async fn retrieve(ctx: &CoreContext) -> Result {
- let config = get_nodestate();
- let library_data = config.get_current_library();
-
+ pub async fn retrieve(ctx: &LibraryContext) -> Result {
let library_statistics_db = ctx
- .database
- .library_statistics()
- .find_unique(id::equals(library_data.library_id))
+ .db
+ .statistics()
+ .find_unique(id::equals(ctx.node_local_id))
.exec()
.await?
.map_or_else(Default::default, Into::into);
Ok(library_statistics_db)
}
- pub async fn calculate(ctx: &CoreContext) -> Result {
- let config = get_nodestate();
- // get library from client state
- let library_data = config.get_current_library();
- info!(
- "Calculating library statistics {:?}",
- library_data.library_uuid
- );
- // get library from db
- let library = ctx
- .database
- .library()
- .find_unique(library::pub_id::equals(
- library_data.library_uuid.to_string(),
- ))
- .exec()
- .await?;
-
- if library.is_none() {
- return Err(LibraryError::LibraryNotFound);
- }
-
- let library_statistics = ctx
- .database
- .library_statistics()
- .find_unique(id::equals(library_data.library_id))
+ pub async fn calculate(ctx: &LibraryContext) -> Result {
+ let _statistics = ctx
+ .db
+ .statistics()
+ .find_unique(id::equals(ctx.node_local_id))
.exec()
.await?;
@@ -97,14 +67,12 @@ impl Statistics {
}
}
- let library_db_size = match fs::metadata(library_data.library_path).await {
+ let library_db_size = match fs::metadata(ctx.config().data_directory()).await {
Ok(metadata) => metadata.len(),
Err(_) => 0,
};
- info!("{:?}", library_statistics);
-
- let thumbnail_folder_size = get_size(config.data_path.unwrap().join("thumbnails"));
+ let thumbnail_folder_size = get_size(ctx.config().data_directory().join("thumbnails"));
let statistics = Statistics {
library_db_size: library_db_size.to_string(),
@@ -114,19 +82,11 @@ impl Statistics {
..Statistics::default()
};
- let library_local_id = match library {
- Some(library) => library.id,
- None => library_data.library_id,
- };
-
- ctx.database
- .library_statistics()
+ ctx.db
+ .statistics()
.upsert(
- library_id::equals(library_local_id),
- (
- library_id::set(library_local_id),
- vec![library_db_size::set(statistics.library_db_size.clone())],
- ),
+ id::equals(1),
+ vec![library_db_size::set(statistics.library_db_size.clone())],
vec![
total_file_count::set(statistics.total_file_count),
total_bytes_used::set(statistics.total_bytes_used.clone()),
diff --git a/core/src/node/config.rs b/core/src/node/config.rs
new file mode 100644
index 000000000..ea1a09f1a
--- /dev/null
+++ b/core/src/node/config.rs
@@ -0,0 +1,149 @@
+use serde::{Deserialize, Serialize};
+use std::fs::File;
+use std::io::{self, BufReader, Seek, SeekFrom, Write};
+use std::path::{Path, PathBuf};
+use std::sync::Arc;
+use thiserror::Error;
+use tokio::sync::{RwLock, RwLockWriteGuard};
+use ts_rs::TS;
+use uuid::Uuid;
+
+/// NODE_STATE_CONFIG_NAME is the name of the file which stores the NodeState
+pub const NODE_STATE_CONFIG_NAME: &str = "node_state.sdconfig";
+
+/// ConfigMetadata is a part of node configuration that is loaded before the main configuration and contains information about the schema of the config.
+/// This allows us to migrate breaking changes to the config format between Spacedrive releases.
+#[derive(Debug, Serialize, Deserialize, Clone, TS)]
+#[ts(export)]
+pub struct ConfigMetadata {
+ /// version of Spacedrive. Determined from `CARGO_PKG_VERSION` environment variable.
+ pub version: Option,
+}
+
+impl Default for ConfigMetadata {
+ fn default() -> Self {
+ Self {
+ version: Some(env!("CARGO_PKG_VERSION").into()),
+ }
+ }
+}
+
+/// NodeConfig is the configuration for a node. This is shared between all libraries and is stored in a JSON file on disk.
+#[derive(Debug, Serialize, Deserialize, Clone, TS)]
+#[ts(export)]
+pub struct NodeConfig {
+ #[serde(flatten)]
+ pub metadata: ConfigMetadata,
+ /// id is a unique identifier for the current node. Each node has a public identifier (this one) and is given a local id for each library (done within the library code).
+ pub id: Uuid,
+ /// name is the display name of the current node. This is set by the user and is shown in the UI. // TODO: Length validation so it can fit in DNS record
+ pub name: String,
+ // the port this node uses for peer to peer communication. By default a random free port will be chosen each time the application is started.
+ pub p2p_port: Option,
+}
+
+#[derive(Error, Debug)]
+pub enum NodeConfigError {
+ #[error("error saving or loading the config from the filesystem")]
+ IO(#[from] io::Error),
+ #[error("error serializing or deserializing the JSON in the config file")]
+ Json(#[from] serde_json::Error),
+ #[error("error migrating the config file")]
+ Migration(String),
+}
+
+impl NodeConfig {
+ fn default() -> Self {
+ NodeConfig {
+ id: Uuid::new_v4(),
+ name: match hostname::get() {
+ Ok(hostname) => hostname.to_string_lossy().into_owned(),
+ Err(err) => {
+ eprintln!("Falling back to default node name as an error occurred getting your systems hostname: '{}'", err);
+ "my-spacedrive".into()
+ }
+ },
+ p2p_port: None,
+ metadata: ConfigMetadata {
+ version: Some(env!("CARGO_PKG_VERSION").into()),
+ },
+ }
+ }
+}
+
+pub struct NodeConfigManager(RwLock, PathBuf);
+
+impl NodeConfigManager {
+ /// new will create a new NodeConfigManager with the given path to the config file.
+ pub(crate) async fn new(data_path: PathBuf) -> Result, NodeConfigError> {
+ Ok(Arc::new(Self(
+ RwLock::new(Self::read(&data_path).await?),
+ data_path,
+ )))
+ }
+
+ /// get will return the current NodeConfig in a read only state.
+ pub(crate) async fn get(&self) -> NodeConfig {
+ self.0.read().await.clone()
+ }
+
+ /// data_directory returns the path to the directory storing the configuration data.
+ pub(crate) fn data_directory(&self) -> PathBuf {
+ self.1.clone()
+ }
+
+ /// write allows the user to update the configuration. This is done in a closure while a Mutex lock is held so that the user can't cause a race condition if the config were to be updated in multiple parts of the app at the same time.
+ #[allow(unused)]
+ pub(crate) async fn write)>(
+ &self,
+ mutation_fn: F,
+ ) -> Result {
+ mutation_fn(self.0.write().await);
+ let config = self.0.read().await;
+ Self::save(&self.1, &config).await?;
+ Ok(config.clone())
+ }
+
+ /// read will read the configuration from disk and return it.
+ async fn read(base_path: &PathBuf) -> Result {
+ let path = Path::new(base_path).join(NODE_STATE_CONFIG_NAME);
+
+ match path.exists() {
+ true => {
+ let mut file = File::open(&path)?;
+ let base_config: ConfigMetadata =
+ serde_json::from_reader(BufReader::new(&mut file))?;
+
+ Self::migrate_config(base_config.version, path)?;
+
+ file.seek(SeekFrom::Start(0))?;
+ Ok(serde_json::from_reader(BufReader::new(&mut file))?)
+ }
+ false => {
+ let config = NodeConfig::default();
+ Self::save(base_path, &config).await?;
+ Ok(config)
+ }
+ }
+ }
+
+ /// save will write the configuration back to disk
+ async fn save(base_path: &PathBuf, config: &NodeConfig) -> Result<(), NodeConfigError> {
+ let path = Path::new(base_path).join(NODE_STATE_CONFIG_NAME);
+ File::create(path)?.write_all(serde_json::to_string(config)?.as_bytes())?;
+ Ok(())
+ }
+
+ /// migrate_config is a function used to apply breaking changes to the config file.
+ fn migrate_config(
+ current_version: Option,
+ config_path: PathBuf,
+ ) -> Result<(), NodeConfigError> {
+ match current_version {
+ None => {
+ Err(NodeConfigError::Migration(format!("Your Spacedrive config file stored at '{}' is missing the `version` field. If you just upgraded please delete the file and restart Spacedrive! Please note this upgrade will stop using your old 'library.db' as the folder structure has changed.", config_path.display())))
+ }
+ _ => Ok(()),
+ }
+ }
+}
diff --git a/core/src/node/mod.rs b/core/src/node/mod.rs
index 309815c97..5276ab015 100644
--- a/core/src/node/mod.rs
+++ b/core/src/node/mod.rs
@@ -1,18 +1,10 @@
-use crate::{
- prisma::{self, node},
- Node,
-};
use chrono::{DateTime, Utc};
use int_enum::IntEnum;
-use log::info;
use serde::{Deserialize, Serialize};
-use std::env;
-use thiserror::Error;
use ts_rs::TS;
-
-mod state;
-
-pub use state::*;
+mod config;
+use crate::prisma::node;
+pub use config::*;
#[derive(Debug, Clone, Serialize, Deserialize, TS)]
#[ts(export)]
@@ -52,64 +44,3 @@ pub enum Platform {
IOS = 4,
Android = 5,
}
-
-impl LibraryNode {
- pub async fn create(node: &Node) -> Result<(), NodeError> {
- info!("Creating node...");
- let mut config = state::get_nodestate();
-
- let hostname = match hostname::get() {
- Ok(hostname) => hostname.to_str().unwrap_or_default().to_owned(),
- Err(_) => "unknown".to_owned(),
- };
-
- let platform = match env::consts::OS {
- "windows" => Platform::Windows,
- "macos" => Platform::MacOS,
- "linux" => Platform::Linux,
- _ => Platform::Unknown,
- };
-
- let node = if let Some(node) = node
- .database
- .node()
- .find_unique(node::pub_id::equals(config.node_pub_id.clone()))
- .exec()
- .await?
- {
- node
- } else {
- node.database
- .node()
- .create(
- node::pub_id::set(config.node_pub_id.clone()),
- node::name::set(hostname.clone()),
- vec![node::platform::set(platform as i32)],
- )
- .exec()
- .await?
- };
-
- config.node_name = hostname;
- config.node_id = node.id;
- config.save().await;
-
- info!("node: {:?}", node);
-
- Ok(())
- }
-
- // pub async fn get_nodes(ctx: &CoreContext) -> Result, NodeError> {
- // let db = &ctx.database;
-
- // let _node = db.node().find_many(vec![]).exec().await?;
-
- // Ok(_node)
- // }
-}
-
-#[derive(Error, Debug)]
-pub enum NodeError {
- #[error("Database error")]
- DatabaseError(#[from] prisma::QueryError),
-}
diff --git a/core/src/node/state.rs b/core/src/node/state.rs
index 6892b0d37..8b1378917 100644
--- a/core/src/node/state.rs
+++ b/core/src/node/state.rs
@@ -1,109 +1 @@
-use lazy_static::lazy_static;
-use serde::{Deserialize, Serialize};
-use std::path::PathBuf;
-use std::sync::RwLock;
-use tokio::io::AsyncReadExt;
-use tokio::{
- fs,
- io::{AsyncWriteExt, BufReader},
-};
-use ts_rs::TS;
-use uuid::Uuid;
-#[derive(Debug, Serialize, Deserialize, Clone, Default, TS)]
-#[ts(export)]
-pub struct NodeState {
- pub node_pub_id: String,
- pub node_id: i32,
- pub node_name: String,
- // config path is stored as struct can exist only in memory during startup and be written to disk later without supplying path
- pub data_path: Option,
- // the port this node uses to listen for incoming connections
- pub tcp_port: u32,
- // all the libraries loaded by this node
- pub libraries: Vec,
- // used to quickly find the default library
- pub current_library_uuid: String,
-}
-
-pub static NODE_STATE_CONFIG_NAME: &str = "node_state.json";
-
-#[derive(Debug, Serialize, Deserialize, Clone, Default, TS)]
-#[ts(export)]
-pub struct LibraryState {
- pub library_uuid: String,
- pub library_id: i32,
- pub library_path: PathBuf,
- pub offline: bool,
-}
-
-// global, thread-safe storage for node state
-lazy_static! {
- static ref CONFIG: RwLock> = RwLock::new(None);
-}
-
-pub fn get_nodestate() -> NodeState {
- if let Ok(guard) = CONFIG.read() {
- guard.clone().unwrap_or_default()
- } else {
- NodeState::default()
- }
-}
-
-impl NodeState {
- pub fn new(data_path: PathBuf, node_name: &str) -> Result {
- let uuid = Uuid::new_v4().to_string();
- // create struct and assign defaults
- let config = Self {
- node_pub_id: uuid,
- data_path: Some(data_path),
- node_name: node_name.to_string(),
- ..Default::default()
- };
- Ok(config)
- }
-
- pub async fn save(&self) {
- self.write_memory();
- // only write to disk if config path is set
- if let Some(ref data_path) = self.data_path {
- let config_path = data_path.join(NODE_STATE_CONFIG_NAME);
- let mut file = fs::File::create(config_path).await.unwrap();
- let json = serde_json::to_string(&self).unwrap();
- file.write_all(json.as_bytes()).await.unwrap();
- }
- }
-
- pub async fn read_disk(&mut self) -> Result<(), ()> {
- if let Some(ref data_path) = self.data_path {
- let config_path = data_path.join(NODE_STATE_CONFIG_NAME);
- // open the file and parse json
- if let Ok(file) = fs::File::open(config_path).await {
- let mut buf = vec![];
- let bytes = BufReader::new(file).read_to_end(&mut buf).await.unwrap();
- let data = serde_json::from_slice(&buf[..bytes]).unwrap();
- // assign to self
- *self = data;
- }
- }
-
- Ok(())
- }
-
- fn write_memory(&self) {
- let mut writeable = CONFIG.write().unwrap();
- *writeable = Some(self.clone());
- }
-
- pub fn get_current_library(&self) -> LibraryState {
- self.libraries
- .iter()
- .find(|lib| lib.library_uuid == self.current_library_uuid)
- .cloned()
- .unwrap_or_default()
- }
-
- pub fn get_current_library_db_path(&self) -> PathBuf {
- self.get_current_library().library_path.join("library.db")
- }
-}
diff --git a/core/src/sys/locations.rs b/core/src/sys/locations.rs
index 162c80b91..6b99c20ee 100644
--- a/core/src/sys/locations.rs
+++ b/core/src/sys/locations.rs
@@ -1,8 +1,9 @@
use crate::{
file::{cas::FileIdentifierJob, indexer::IndexerJob},
- node::{get_nodestate, LibraryNode},
+ library::LibraryContext,
+ node::LibraryNode,
prisma::{file_path, location},
- ClientQuery, CoreContext, CoreEvent,
+ ClientQuery, CoreEvent, LibraryQuery,
};
use log::info;
@@ -10,10 +11,9 @@ use serde::{Deserialize, Serialize};
use std::fmt::Debug;
use std::path::{Path, PathBuf};
use thiserror::Error;
-use tokio::io::AsyncWriteExt;
use tokio::{
fs::{metadata, File},
- io,
+ io::{self, AsyncWriteExt},
};
use ts_rs::TS;
use uuid::Uuid;
@@ -73,11 +73,11 @@ static DOTFILE_NAME: &str = ".spacedrive";
// }
pub async fn get_location(
- ctx: &CoreContext,
+ ctx: &LibraryContext,
location_id: i32,
) -> Result {
// get location by location_id from db and include location_paths
- ctx.database
+ ctx.db
.location()
.find_unique(location::id::equals(location_id))
.exec()
@@ -86,15 +86,17 @@ pub async fn get_location(
.ok_or_else(|| LocationError::IdNotFound(location_id).into())
}
-pub fn scan_location(ctx: &CoreContext, location_id: i32, path: impl AsRef) {
+pub async fn scan_location(ctx: &LibraryContext, location_id: i32, path: impl AsRef) {
let path_buf = path.as_ref().to_path_buf();
ctx.spawn_job(Box::new(IndexerJob {
path: path_buf.clone(),
- }));
+ }))
+ .await;
ctx.queue_job(Box::new(FileIdentifierJob {
location_id,
path: path_buf,
- }));
+ }))
+ .await;
// TODO: make a way to stop jobs so this can be canceled without rebooting app
// ctx.queue_job(Box::new(ThumbnailJob {
// location_id,
@@ -104,19 +106,19 @@ pub fn scan_location(ctx: &CoreContext, location_id: i32, path: impl AsRef
}
pub async fn new_location_and_scan(
- ctx: &CoreContext,
+ ctx: &LibraryContext,
path: impl AsRef + Debug,
) -> Result {
let location = create_location(ctx, &path).await?;
- scan_location(ctx, location.id, path);
+ scan_location(ctx, location.id, path).await;
Ok(location)
}
-pub async fn get_locations(ctx: &CoreContext) -> Result, SysError> {
+pub async fn get_locations(ctx: &LibraryContext) -> Result, SysError> {
let locations = ctx
- .database
+ .db
.location()
.find_many(vec![])
.with(location::node::fetch())
@@ -128,7 +130,7 @@ pub async fn get_locations(ctx: &CoreContext) -> Result, S
}
pub async fn create_location(
- ctx: &CoreContext,
+ ctx: &LibraryContext,
path: impl AsRef + Debug,
) -> Result {
let path = path.as_ref();
@@ -151,7 +153,7 @@ pub async fn create_location(
// check if location already exists
let location_resource = if let Some(location) = ctx
- .database
+ .db
.location()
.find_first(vec![location::local_path::equals(Some(
path_string.clone(),
@@ -162,15 +164,13 @@ pub async fn create_location(
location.into()
} else {
info!(
- "Location does not exist, creating new location for '{:#?}'",
- path
+ "Location does not exist, creating new location for '{}'",
+ path_string
);
let uuid = Uuid::new_v4();
- let config = get_nodestate();
-
let location = ctx
- .database
+ .db
.location()
.create(
location::pub_id::set(uuid.to_string()),
@@ -180,7 +180,7 @@ pub async fn create_location(
)),
location::is_online::set(true),
location::local_path::set(Some(path_string)),
- location::node_id::set(Some(config.node_id)),
+ location::node_id::set(Some(ctx.node_local_id)),
],
)
.exec()
@@ -195,7 +195,7 @@ pub async fn create_location(
let data = DotSpacedrive {
location_uuid: uuid,
- library_uuid: config.current_library_uuid,
+ library_uuid: ctx.id.to_string(),
};
let json_bytes = serde_json::to_vec(&data)
@@ -206,8 +206,8 @@ pub async fn create_location(
.await
.map_err(|e| LocationError::DotfileWriteFailure(e, path.to_owned()))?;
- ctx.emit(CoreEvent::InvalidateQuery(ClientQuery::SysGetLocations))
- .await;
+ // ctx.emit(CoreEvent::InvalidateQuery(ClientQuery::SysGetLocations))
+ // .await;
location.into()
};
@@ -215,23 +215,26 @@ pub async fn create_location(
Ok(location_resource)
}
-pub async fn delete_location(ctx: &CoreContext, location_id: i32) -> Result<(), SysError> {
- ctx.database
+pub async fn delete_location(ctx: &LibraryContext, location_id: i32) -> Result<(), SysError> {
+ ctx.db
.file_path()
.find_many(vec![file_path::location_id::equals(Some(location_id))])
.delete()
.exec()
.await?;
- ctx.database
+ ctx.db
.location()
.find_unique(location::id::equals(location_id))
.delete()
.exec()
.await?;
- ctx.emit(CoreEvent::InvalidateQuery(ClientQuery::SysGetLocations))
- .await;
+ ctx.emit(CoreEvent::InvalidateQuery(ClientQuery::LibraryQuery {
+ library_id: ctx.id.to_string(),
+ query: LibraryQuery::SysGetLocations,
+ }))
+ .await;
info!("Location {} deleted", location_id);
diff --git a/core/src/sys/volumes.rs b/core/src/sys/volumes.rs
index ffb235c05..ca9666e5c 100644
--- a/core/src/sys/volumes.rs
+++ b/core/src/sys/volumes.rs
@@ -1,5 +1,5 @@
// use crate::native;
-use crate::{node::get_nodestate, prisma::volume::*, CoreContext};
+use crate::{library::LibraryContext, prisma::volume::*};
use serde::{Deserialize, Serialize};
use ts_rs::TS;
// #[cfg(not(target_os = "macos"))]
@@ -24,23 +24,21 @@ pub struct Volume {
}
impl Volume {
- pub async fn save(ctx: &CoreContext) -> Result<(), SysError> {
- let config = get_nodestate();
-
+ pub async fn save(ctx: &LibraryContext) -> Result<(), SysError> {
let volumes = Self::get_volumes()?;
// enter all volumes associate with this client add to db
for volume in volumes {
- ctx.database
+ ctx.db
.volume()
.upsert(
node_id_mount_point_name(
- config.node_id,
+ ctx.node_local_id,
volume.mount_point.to_string(),
volume.name.to_string(),
),
(
- node_id::set(config.node_id),
+ node_id::set(ctx.node_local_id),
name::set(volume.name),
mount_point::set(volume.mount_point),
vec![
diff --git a/core/src/util/db.rs b/core/src/util/db.rs
index e299c7b94..39e1a9a55 100644
--- a/core/src/util/db.rs
+++ b/core/src/util/db.rs
@@ -1,165 +1,121 @@
use crate::prisma::{self, migration, PrismaClient};
-use crate::CoreContext;
use data_encoding::HEXLOWER;
use include_dir::{include_dir, Dir};
-use log::{error, info};
-use prisma_client_rust::raw;
-use ring::digest::{Context, Digest, SHA256};
-use std::ffi::OsStr;
-use std::fmt::Debug;
-use std::io::{self, BufReader, Read};
-use std::path::Path;
+use prisma_client_rust::{raw, NewClientError};
+use ring::digest::{Context, SHA256};
use thiserror::Error;
const INIT_MIGRATION: &str = include_str!("../../prisma/migrations/migration_table/migration.sql");
static MIGRATIONS_DIR: Dir = include_dir!("$CARGO_MANIFEST_DIR/prisma/migrations");
+/// MigrationError represents an error that occurring while opening a initialising and running migrations on the database.
#[derive(Error, Debug)]
-pub enum DatabaseError {
- #[error("Unable to initialize the Prisma client")]
- ClientError(#[from] prisma::NewClientError),
+pub enum MigrationError {
+ #[error("An error occurred while initialising a new database connection")]
+ DatabaseInitialization(#[from] NewClientError),
+ #[error("An error occurred with the database while applying migrations")]
+ DatabaseError(#[from] prisma_client_rust::queries::Error),
+ #[error("An error occured reading the embedded migration files. {0}. Please report to Spacedrive developers!")]
+ InvalidEmbeddedMigration(&'static str),
}
-pub async fn create_connection(
- path: impl AsRef + Debug,
-) -> Result {
- info!("Creating database connection: {:?}", path);
- let client =
- prisma::new_client_with_url(&format!("file:{}", path.as_ref().to_string_lossy())).await?;
+/// load_and_migrate will load the database from the given path and migrate it to the latest version of the schema.
+pub async fn load_and_migrate(db_url: &str) -> Result {
+ let client = prisma::new_client_with_url(db_url).await?;
- Ok(client)
-}
-
-pub fn sha256_digest(mut reader: R) -> Result {
- let mut context = Context::new(&SHA256);
- let mut buffer = [0; 1024];
- loop {
- let count = reader.read(&mut buffer)?;
- if count == 0 {
- break;
- }
- context.update(&buffer[..count]);
- }
- Ok(context.finish())
-}
-
-pub async fn run_migrations(ctx: &CoreContext) -> Result<(), DatabaseError> {
- let client = &ctx.database;
-
- match client
+ let migrations_table_missing = client
._query_raw::(raw!(
"SELECT name FROM sqlite_master WHERE type='table' AND name='_migrations'"
))
- .await
- {
- Ok(data) => {
- if data.is_empty() {
- // execute migration
- match client._execute_raw(raw!(INIT_MIGRATION)).await {
- Ok(_) => {}
- Err(e) => {
- info!("Failed to create migration table: {}", e);
- }
- };
+ .await?
+ .is_empty();
- let value: Vec = client
- ._query_raw(raw!(
- "SELECT name FROM sqlite_master WHERE type='table' AND name='_migrations'"
- ))
- .await
- .unwrap();
+ if migrations_table_missing {
+ client._execute_raw(raw!(INIT_MIGRATION)).await?;
+ }
- #[cfg(debug_assertions)]
- info!("Migration table created: {:?}", value);
- }
-
- let mut migration_subdirs = MIGRATIONS_DIR
- .dirs()
- .filter(|subdir| {
- subdir
- .path()
- .file_name()
- .map(|name| name != OsStr::new("migration_table"))
- .unwrap_or(false)
+ let mut migration_directories = MIGRATIONS_DIR
+ .dirs()
+ .map(|dir| {
+ dir.path()
+ .file_name()
+ .ok_or(MigrationError::InvalidEmbeddedMigration(
+ "File has malformed name",
+ ))
+ .and_then(|name| {
+ name.to_str()
+ .ok_or(MigrationError::InvalidEmbeddedMigration(
+ "File name contains malformed characters",
+ ))
+ .map(|name| (name, dir))
})
- .collect::>();
+ })
+ .filter_map(|v| match v {
+ Ok((name, _)) if name == "migration_table" => None,
+ Ok((name, dir)) => match name[..14].parse::() {
+ Ok(timestamp) => Some(Ok((name, timestamp, dir))),
+ Err(_) => Some(Err(MigrationError::InvalidEmbeddedMigration(
+ "File name is incorrectly formatted",
+ ))),
+ },
+ Err(v) => Some(Err(v)),
+ })
+ .collect::, _>>()?;
- migration_subdirs.sort_by(|a, b| {
- let a_name = a.path().file_name().unwrap().to_str().unwrap();
- let b_name = b.path().file_name().unwrap().to_str().unwrap();
+ // We sort the migrations so they are always applied in the correct order
+ migration_directories.sort_by(|(_, a_time, _), (_, b_time, _)| a_time.cmp(b_time));
- let a_time = a_name[..14].parse::().unwrap();
- let b_time = b_name[..14].parse::().unwrap();
+ for (name, _, dir) in migration_directories {
+ let migration_file_raw = dir
+ .get_file(dir.path().join("./migration.sql"))
+ .ok_or(MigrationError::InvalidEmbeddedMigration(
+ "Failed to find 'migration.sql' file in '{}' migration subdirectory",
+ ))?
+ .contents_utf8()
+ .ok_or(
+ MigrationError::InvalidEmbeddedMigration(
+ "Failed to open the contents of 'migration.sql' file in '{}' migration subdirectory",
+ )
+ )?;
- a_time.cmp(&b_time)
- });
+ // Generate SHA256 checksum of migration
+ let mut checksum = Context::new(&SHA256);
+ checksum.update(migration_file_raw.as_bytes());
+ let checksum = HEXLOWER.encode(checksum.finish().as_ref());
- for subdir in migration_subdirs {
- info!("{:?}", subdir.path());
- let migration_file = subdir
- .get_file(subdir.path().join("./migration.sql"))
- .unwrap();
- let migration_sql = migration_file.contents_utf8().unwrap();
+ // get existing migration by checksum, if it doesn't exist run the migration
+ if client
+ .migration()
+ .find_unique(migration::checksum::equals(checksum.clone()))
+ .exec()
+ .await?
+ .is_none()
+ {
+ // Create migration record
+ client
+ .migration()
+ .create(
+ migration::name::set(name.to_string()),
+ migration::checksum::set(checksum.clone()),
+ vec![],
+ )
+ .exec()
+ .await?;
- let digest = sha256_digest(BufReader::new(migration_file.contents())).unwrap();
- // create a lowercase hash from
- let checksum = HEXLOWER.encode(digest.as_ref());
- let name = subdir.path().file_name().unwrap().to_str().unwrap();
-
- // get existing migration by checksum, if it doesn't exist run the migration
- let existing_migration = client
+ // Split the migrations file up into each individual step and apply them all
+ let steps = migration_file_raw.split(';').collect::>();
+ let steps = &steps[0..steps.len() - 1];
+ for (i, step) in steps.iter().enumerate() {
+ client._execute_raw(raw!(*step)).await?;
+ client
.migration()
.find_unique(migration::checksum::equals(checksum.clone()))
+ .update(vec![migration::steps_applied::set(i as i32 + 1)])
.exec()
- .await
- .unwrap();
-
- if existing_migration.is_none() {
- #[cfg(debug_assertions)]
- info!("Running migration: {}", name);
-
- let steps = migration_sql.split(';').collect::>();
- let steps = &steps[0..steps.len() - 1];
-
- client
- .migration()
- .create(
- migration::name::set(name.to_string()),
- migration::checksum::set(checksum.clone()),
- vec![],
- )
- .exec()
- .await
- .unwrap();
-
- for (i, step) in steps.iter().enumerate() {
- match client._execute_raw(raw!(*step)).await {
- Ok(_) => {
- client
- .migration()
- .find_unique(migration::checksum::equals(checksum.clone()))
- .update(vec![migration::steps_applied::set(i as i32 + 1)])
- .exec()
- .await
- .unwrap();
- }
- Err(e) => {
- error!("Error running migration: {}", name);
- error!("{:?}", e);
- break;
- }
- }
- }
-
- #[cfg(debug_assertions)]
- info!("Migration {} recorded successfully", name);
- }
+ .await?;
}
}
- Err(err) => {
- panic!("Failed to check migration table existence: {:?}", err);
- }
}
- Ok(())
+ Ok(client)
}
diff --git a/packages/client/package.json b/packages/client/package.json
index 03ee06fc3..db68bbf13 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -13,25 +13,27 @@
"lint": "TIMING=1 eslint src --fix",
"clean": "rm -rf .turbo && rm -rf node_modules && rm -rf dist"
},
- "devDependencies": {
- "@types/react": "^18.0.9",
- "scripts": "*",
- "tsconfig": "*",
- "typescript": "^4.7.2"
- },
"jest": {
"preset": "scripts/jest/node"
},
"dependencies": {
"@sd/config": "workspace:*",
"@sd/core": "workspace:*",
+ "@sd/interface": "workspace:*",
"eventemitter3": "^4.0.7",
"immer": "^9.0.14",
- "react-query": "^3.39.1",
+ "lodash": "^4.17.21",
+ "react-query": "^3.34.19",
"zustand": "4.0.0-rc.1"
},
+ "devDependencies": {
+ "@types/react": "^18.0.9",
+ "scripts": "*",
+ "tsconfig": "*",
+ "typescript": "^4.7.2",
+ "@types/lodash": "^4.14.182"
+ },
"peerDependencies": {
- "react": "^18.0.0",
- "react-query": "^3.34.19"
+ "react": "^18.0.0"
}
}
diff --git a/packages/client/src/bridge.ts b/packages/client/src/bridge.ts
index 712cbddde..41e430c66 100644
--- a/packages/client/src/bridge.ts
+++ b/packages/client/src/bridge.ts
@@ -1,12 +1,8 @@
-import { ClientCommand, ClientQuery, CoreResponse } from '@sd/core';
+import { ClientCommand, ClientQuery, CoreResponse, LibraryCommand, LibraryQuery } from '@sd/core';
import { EventEmitter } from 'eventemitter3';
-import {
- UseMutationOptions,
- UseQueryOptions,
- UseQueryResult,
- useMutation,
- useQuery
-} from 'react-query';
+import { UseMutationOptions, UseQueryOptions, useMutation, useQuery } from 'react-query';
+
+import { useLibraryStore } from './stores';
// global var to store the transport TODO: not global :D
export let transport: BaseTransport | null = null;
@@ -23,11 +19,15 @@ export function setTransport(_transport: BaseTransport) {
// extract keys from generated Rust query/command types
type QueryKeyType = ClientQuery['key'];
+type LibraryQueryKeyType = LibraryQuery['key'];
type CommandKeyType = ClientCommand['key'];
+type LibraryCommandKeyType = LibraryCommand['key'];
// extract the type from the union
type CQType = Extract;
+type LQType = Extract;
type CCType = Extract;
+type LCType = Extract;
type CRType = Extract;
// extract payload type
@@ -35,20 +35,18 @@ type ExtractParams = P extends { params: any } ? P['params'] : never;
type ExtractData = D extends { data: any } ? D['data'] : never;
// vanilla method to call the transport
-export async function queryBridge<
- K extends QueryKeyType,
- CQ extends CQType,
- CR extends CRType
->(key: K, params?: ExtractParams): Promise> {
+async function queryBridge, CR extends CRType>(
+ key: K,
+ params?: ExtractParams
+): Promise> {
const result = (await transport?.query({ key, params } as any)) as any;
return result?.data;
}
-export async function commandBridge<
- K extends CommandKeyType,
- CC extends CCType,
- CR extends CRType
->(key: K, params?: ExtractParams): Promise> {
+async function commandBridge, CR extends CRType>(
+ key: K,
+ params?: ExtractParams
+): Promise> {
const result = (await transport?.command({ key, params } as any)) as any;
return result?.data;
}
@@ -66,6 +64,21 @@ export function useBridgeQuery, CR
);
}
+export function useLibraryQuery<
+ K extends LibraryQueryKeyType,
+ CQ extends LQType,
+ CR extends CRType
+>(key: K, params?: ExtractParams, options: UseQueryOptions> = {}) {
+ const library_id = useLibraryStore((state) => state.currentLibraryUuid);
+ if (!library_id) throw new Error(`Attempted to do library query '${key}' with no library set!`);
+
+ return useQuery>(
+ [library_id, key, params],
+ async () => await queryBridge('LibraryQuery', { library_id, query: { key, params } as any }),
+ options
+ );
+}
+
export function useBridgeCommand<
K extends CommandKeyType,
CC extends CCType,
@@ -78,9 +91,35 @@ export function useBridgeCommand<
);
}
+export function useLibraryCommand<
+ K extends LibraryCommandKeyType,
+ LC extends LCType,
+ CR extends CRType
+>(key: K, options: UseMutationOptions> = {}) {
+ const library_id = useLibraryStore((state) => state.currentLibraryUuid);
+ if (!library_id) throw new Error(`Attempted to do library command '${key}' with no library set!`);
+
+ return useMutation, unknown, ExtractParams>(
+ [library_id, key],
+ async (vars?: ExtractParams) =>
+ await commandBridge('LibraryCommand', { library_id, command: { key, params: vars } as any }),
+ options
+ );
+}
+
export function command, CR extends CRType>(
key: K,
vars: ExtractParams
): Promise> {
return commandBridge(key, vars);
}
+
+export function libraryCommand<
+ K extends LibraryCommandKeyType,
+ LC extends LCType,
+ CR extends CRType
+>(key: K, vars: ExtractParams): Promise> {
+ const library_id = useLibraryStore((state) => state.currentLibraryUuid);
+ if (!library_id) throw new Error(`Attempted to do library command '${key}' with no library set!`);
+ return commandBridge('LibraryCommand', { library_id, command: { key, params: vars } as any });
+}
diff --git a/packages/interface/src/AppPropsContext.tsx b/packages/client/src/context/AppPropsContext.tsx
similarity index 100%
rename from packages/interface/src/AppPropsContext.tsx
rename to packages/client/src/context/AppPropsContext.tsx
diff --git a/packages/client/src/context/index.ts b/packages/client/src/context/index.ts
new file mode 100644
index 000000000..70d70d64e
--- /dev/null
+++ b/packages/client/src/context/index.ts
@@ -0,0 +1 @@
+export * from './AppPropsContext';
diff --git a/packages/client/src/files/index.ts b/packages/client/src/files/index.ts
deleted file mode 100644
index 1b09d522d..000000000
--- a/packages/client/src/files/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './query';
-export * from './state';
diff --git a/packages/client/src/files/query.ts b/packages/client/src/files/query.ts
deleted file mode 100644
index a8ce691f0..000000000
--- a/packages/client/src/files/query.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { useState } from 'react';
-import { useQuery } from 'react-query';
-
-import { useBridgeCommand, useBridgeQuery } from '../bridge';
-import { useFileExplorerState } from './state';
-
-// this hook initializes the explorer state and queries the core
-export function useFileExplorer(initialPath = '/', initialLocation: number | null = null) {
- const fileState = useFileExplorerState();
- // file explorer hooks maintain their own local state relative to exploration
- const [path, setPath] = useState(initialPath);
- const [locationId, setLocationId] = useState(initialPath);
-
- // const { data: volumes } = useQuery(['sys_get_volumes'], () => bridge('sys_get_volumes'));
-
- return { setPath, setLocationId };
-}
-
-// export function useVolumes() {
-// return useQuery(['SysGetVolumes'], () => bridge('SysGetVolumes'));
-// }
diff --git a/packages/client/src/files/state.ts b/packages/client/src/files/state.ts
deleted file mode 100644
index d817daee4..000000000
--- a/packages/client/src/files/state.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import produce from 'immer';
-import create from 'zustand';
-
-export interface FileExplorerState {
- current_location_id: number | null;
- row_limit: number;
-}
-
-interface FileExplorerStore extends FileExplorerState {
- update_row_limit: (new_limit: number) => void;
-}
-
-export const useFileExplorerState = create((set, get) => ({
- current_location_id: null,
- row_limit: 10,
- update_row_limit: (new_limit: number) => {
- set((store) =>
- produce(store, (draft) => {
- draft.row_limit = new_limit;
- })
- );
- }
-}));
diff --git a/packages/client/src/hooks/index.ts b/packages/client/src/hooks/index.ts
new file mode 100644
index 000000000..25c15a805
--- /dev/null
+++ b/packages/client/src/hooks/index.ts
@@ -0,0 +1 @@
+export * from './useCoreEvents';
diff --git a/packages/client/src/hooks/useCoreEvents.tsx b/packages/client/src/hooks/useCoreEvents.tsx
new file mode 100644
index 000000000..178153c2c
--- /dev/null
+++ b/packages/client/src/hooks/useCoreEvents.tsx
@@ -0,0 +1,59 @@
+import { CoreEvent } from '@sd/core';
+import { useContext, useEffect } from 'react';
+import { useQueryClient } from 'react-query';
+
+import { transport, useExplorerStore } from '..';
+
+export function useCoreEvents() {
+ const client = useQueryClient();
+
+ const { addNewThumbnail } = useExplorerStore();
+ useEffect(() => {
+ function handleCoreEvent(e: CoreEvent) {
+ switch (e?.key) {
+ case 'NewThumbnail':
+ addNewThumbnail(e.data.cas_id);
+ break;
+ case 'InvalidateQuery':
+ case 'InvalidateQueryDebounced':
+ let query = [];
+ if (e.data.key === 'LibraryQuery') {
+ query = [e.data.params.library_id, e.data.params.query.key];
+
+ // TODO: find a way to make params accessible in TS
+ // also this method will only work for queries that use the whole params obj as the second key
+ // @ts-expect-error
+ if (e.data.params.query.params) {
+ // @ts-expect-error
+ query.push(e.data.params.query.params);
+ }
+ } else {
+ query = [e.data.key];
+
+ // TODO: find a way to make params accessible in TS
+ // also this method will only work for queries that use the whole params obj as the second key
+ // @ts-expect-error
+ if (e.data.params) {
+ // @ts-expect-error
+ query.push(e.data.params);
+ }
+ }
+
+ client.invalidateQueries(query);
+ break;
+
+ default:
+ break;
+ }
+ }
+ // check Tauri Event type
+ transport?.on('core_event', handleCoreEvent);
+
+ return () => {
+ transport?.off('core_event', handleCoreEvent);
+ };
+
+ // listen('core_event', (e: { payload: CoreEvent }) => {
+ // });
+ }, [transport]);
+}
diff --git a/packages/client/src/index.ts b/packages/client/src/index.ts
index 75d5861c4..673524d79 100644
--- a/packages/client/src/index.ts
+++ b/packages/client/src/index.ts
@@ -1,3 +1,5 @@
export * from './bridge';
-export * from './files';
export * from './ClientProvider';
+export * from './stores';
+export * from './hooks';
+export * from './context';
diff --git a/packages/client/src/stores/index.ts b/packages/client/src/stores/index.ts
new file mode 100644
index 000000000..c38ebef11
--- /dev/null
+++ b/packages/client/src/stores/index.ts
@@ -0,0 +1,4 @@
+export * from './useLibraryStore';
+export * from './useExplorerStore';
+export * from './useInspectorStore';
+export * from './useInspectorStore';
diff --git a/packages/interface/src/hooks/useExplorerState.ts b/packages/client/src/stores/useExplorerStore.ts
similarity index 81%
rename from packages/interface/src/hooks/useExplorerState.ts
rename to packages/client/src/stores/useExplorerStore.ts
index ef2a5ce17..185d88dd1 100644
--- a/packages/interface/src/hooks/useExplorerState.ts
+++ b/packages/client/src/stores/useExplorerStore.ts
@@ -1,15 +1,16 @@
import create from 'zustand';
-type ExplorerState = {
+type ExplorerStore = {
selectedRowIndex: number;
setSelectedRowIndex: (index: number) => void;
locationId: number;
setLocationId: (index: number) => void;
newThumbnails: Record;
addNewThumbnail: (cas_id: string) => void;
+ reset: () => void;
};
-export const useExplorerState = create((set) => ({
+export const useExplorerStore = create((set) => ({
selectedRowIndex: 1,
setSelectedRowIndex: (index) => set((state) => ({ ...state, selectedRowIndex: index })),
locationId: -1,
@@ -19,5 +20,6 @@ export const useExplorerState = create((set) => ({
set((state) => ({
...state,
newThumbnails: { ...state.newThumbnails, [cas_id]: true }
- }))
+ })),
+ reset: () => set(() => ({}))
}));
diff --git a/packages/interface/src/hooks/useInspectorState.tsx b/packages/client/src/stores/useInspectorStore.ts
similarity index 82%
rename from packages/interface/src/hooks/useInspectorState.tsx
rename to packages/client/src/stores/useInspectorStore.ts
index 7a7450645..97e9f29b8 100644
--- a/packages/interface/src/hooks/useInspectorState.tsx
+++ b/packages/client/src/stores/useInspectorStore.ts
@@ -1,17 +1,18 @@
-import { command } from '@sd/client';
import produce from 'immer';
import { debounce } from 'lodash';
import create from 'zustand';
+import { libraryCommand } from '../bridge';
+
export type UpdateNoteFN = (vars: { id: number; note: string }) => void;
-interface UseInspectorState {
+interface InspectorStore {
notes: Record;
setNote: (file_id: number, note: string) => void;
unCacheNote: (file_id: number) => void;
}
-export const useInspectorState = create((set) => ({
+export const useInspectorStore = create((set) => ({
notes: {},
// set the note locally
setNote: (file_id, note) => {
@@ -35,7 +36,7 @@ export const useInspectorState = create((set) => ({
// direct command call to update note
export const updateNote = debounce(async (file_id: number, note: string) => {
- return await command('FileSetNote', {
+ return await libraryCommand('FileSetNote', {
id: file_id,
note
});
diff --git a/packages/client/src/stores/useLibraryStore.ts b/packages/client/src/stores/useLibraryStore.ts
new file mode 100644
index 000000000..53a8a4e55
--- /dev/null
+++ b/packages/client/src/stores/useLibraryStore.ts
@@ -0,0 +1,67 @@
+import { LibraryConfigWrapped } from '@sd/core';
+import produce from 'immer';
+import { useMemo } from 'react';
+import { useQueryClient } from 'react-query';
+import create from 'zustand';
+import { devtools, persist } from 'zustand/middleware';
+
+import { useBridgeQuery } from '../bridge';
+import { useExplorerStore } from './useExplorerStore';
+
+type LibraryStore = {
+ // the uuid of the currently active library
+ currentLibraryUuid: string | null;
+ // for full functionality this should be triggered along-side query invalidation
+ switchLibrary: (uuid: string) => void;
+ // a function
+ init: (libraries: LibraryConfigWrapped[]) => Promise