From 5e30331dad93f657f3129f9e7bf58369d25692fc Mon Sep 17 00:00:00 2001 From: Brendan Allan Date: Fri, 23 Sep 2022 13:46:23 +0800 Subject: [PATCH] typo fixes --- README.md | 2 +- core/Cargo.toml | 13 +++++++++---- core/src/util/db.rs | 4 ++-- docs/architecture/search.md | 4 ++-- docs/architecture/spaces.md | 4 ++-- docs/architecture/sync.md | 4 ++-- 6 files changed, 18 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index beab6318f..01a60a903 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ This project is using what I'm calling the **"PRRTT"** stack (Prisma, Rust, Reac - Prisma on the front-end? 🤯 Made possible thanks to [prisma-client-rust](https://github.com/brendonovich/prisma-client-rust), developed by [Brendonovich](https://github.com/brendonovich). Gives us access to the powerful migration CLI in development, along with the Prisma syntax for our schema. The application bundles with the Prisma query engine and codegen for a beautiful Rust API. Our lightweight migration runner is custom built for a desktop app context. - Tauri allows us to create a pure Rust native OS webview, without the overhead of your average Electron app. This brings the bundle size and average memory usage down dramatically. It also contributes to a more native feel, especially on macOS due to Safari's close integration with the OS. -- We also use [rspc](https://rspc.otbeaumont.me) which allows us to define functions in Rust and call them on the Typescript frontend in a completly typesafe manner, so no unnecessary bugs make it into production! +- We also use [rspc](https://rspc.otbeaumont.me) which allows us to define functions in Rust and call them on the Typescript frontend in a completely typesafe manner, so no unnecessary bugs make it into production! - The core (`sdcore`) is written in pure Rust. ## Monorepo structure: diff --git a/core/Cargo.toml b/core/Cargo.toml index b5e419a58..0dcc6d30c 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -10,9 +10,13 @@ rust-version = "1.63.0" [features] default = ["p2p"] -p2p = [] # This feature controlls whether the Spacedrive Core contains the Peer to Peer syncing engine (It isn't required for the hosted core so we can disable it). -mobile = [] # This feature allows features to be disabled when the Core is running on mobile. -ffmpeg = ["dep:ffmpeg-next"] # This feature controls whether the Spacedrive Core contains functionality which requires FFmpeg. +p2p = [ +] # This feature controls whether the Spacedrive Core contains the Peer to Peer syncing engine (It isn't required for the hosted core so we can disable it). +mobile = [ +] # This feature allows features to be disabled when the Core is running on mobile. +ffmpeg = [ + "dep:ffmpeg-next", +] # This feature controls whether the Spacedrive Core contains functionality which requires FFmpeg. [dependencies] hostname = "0.3.1" @@ -64,4 +68,5 @@ enumflags2 = "0.7.5" [dev-dependencies] tempfile = "^3.3.0" -tracing-test = "^0.2.3" \ No newline at end of file +tracing-test = "^0.2.3" + diff --git a/core/src/util/db.rs b/core/src/util/db.rs index ceeee7cdb..d7caf2037 100644 --- a/core/src/util/db.rs +++ b/core/src/util/db.rs @@ -8,10 +8,10 @@ pub enum MigrationError { #[error("An error occurred while initialising a new database connection: {0}")] NewClient(#[from] Box), #[cfg(debug_assertions)] - #[error("An error occured during migartion: {0}")] + #[error("An error occurred during migartion: {0}")] MigrateFailed(#[from] DbPushError), #[cfg(not(debug_assertions))] - #[error("An error occured during migration: {0}")] + #[error("An error occurred during migration: {0}")] MigrateFailed(#[from] MigrateDeployError), } diff --git a/docs/architecture/search.md b/docs/architecture/search.md index 8a0071c40..6ca2734ab 100644 --- a/docs/architecture/search.md +++ b/docs/architecture/search.md @@ -2,8 +2,8 @@ Press CTRL+F while on a Spacedrive window to access search. -By default you will search the active library, however by checking "Search all Libraries" you can perform a simotanious search of all libraries loaded on a Node. +By default you will search the active library, however by checking "Search all Libraries" you can perform a simultaneous search of all libraries loaded on a Node. Search results return Objects, Locations, Albums, Tags and Spaces -Search can be filtered by `ObjectKind`, as well as dates. \ No newline at end of file +Search can be filtered by `ObjectKind`, as well as dates. diff --git a/docs/architecture/spaces.md b/docs/architecture/spaces.md index b2ae5a0e4..a79ad98c2 100644 --- a/docs/architecture/spaces.md +++ b/docs/architecture/spaces.md @@ -1,9 +1,9 @@ # Spaces -Spaces are virtual folders that can be shared publically on the internet, or privately with friends, family and teams. Spaces contain [Objects]() which can be physically stored on any connected Node, or by Spacedrive as a service. Objects can be organised and presented spacially, with various layouts and variable grid placements. Color theme, icon packs and typeogrpahy can be customized per Space. +Spaces are virtual folders that can be shared publicly on the internet, or privately with friends, family and teams. Spaces contain [Objects]() which can be physically stored on any connected Node, or by Spacedrive as a service. Objects can be organised and presented spatially, with various layouts and variable grid placements. Color theme, icon packs and typography can be customized per Space. Objects can be added to a Space manually, or by matching a defined ruleset, similar to Tags. -Spacedrive comes with pre-defined Spaces, such as: photos, videos, screenshots, documents, . \ No newline at end of file +Spacedrive comes with pre-defined Spaces, such as: photos, videos, screenshots, documents, . diff --git a/docs/architecture/sync.md b/docs/architecture/sync.md index 0b3f809af..cb32553a6 100644 --- a/docs/architecture/sync.md +++ b/docs/architecture/sync.md @@ -2,7 +2,7 @@ Spacedrive synchronizes library data in realtime across the distributed network of Nodes. -Using a Unique Hybrid Logicial Clock for distributed time synchronization. +Using a Unique Hybrid Logical Clock for distributed time synchronization. A combination of several property level CRDT types: @@ -11,4 +11,4 @@ A combination of several property level CRDT types: - **Shared data** - objects, tags, spaces, jobs - **Relationship data** - many to many tables -Built in Rust on top of Prisma, it uses the schema file to determine these sync rules. \ No newline at end of file +Built in Rust on top of Prisma, it uses the schema file to determine these sync rules.