Skip to content

Commit

Permalink
typo fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
Brendonovich committed Sep 23, 2022
1 parent 6e07435 commit 5e30331
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 13 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
13 changes: 9 additions & 4 deletions core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -64,4 +68,5 @@ enumflags2 = "0.7.5"

[dev-dependencies]
tempfile = "^3.3.0"
tracing-test = "^0.2.3"
tracing-test = "^0.2.3"

4 changes: 2 additions & 2 deletions core/src/util/db.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ pub enum MigrationError {
#[error("An error occurred while initialising a new database connection: {0}")]
NewClient(#[from] Box<NewClientError>),
#[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),
}

Expand Down
4 changes: 2 additions & 2 deletions docs/architecture/search.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Search can be filtered by `ObjectKind`, as well as dates.
4 changes: 2 additions & 2 deletions docs/architecture/spaces.md
Original file line number Diff line number Diff line change
@@ -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, .
Spacedrive comes with pre-defined Spaces, such as: photos, videos, screenshots, documents, .
4 changes: 2 additions & 2 deletions docs/architecture/sync.md
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand All @@ -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.
Built in Rust on top of Prisma, it uses the schema file to determine these sync rules.

1 comment on commit 5e30331

@vercel
Copy link

@vercel vercel bot commented on 5e30331 Sep 23, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.