diff --git a/Cargo.toml b/Cargo.toml index 6be7f8d4c..fd2c52a5e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = [ "screenpipe-core", "screenpipe-vision", "screenpipe-audio", - "screenpipe-server", "external-cloud-integrations", + "screenpipe-server", "screenpipe-integrations", ] exclude = [ diff --git a/external-cloud-integrations/Cargo.toml b/external-cloud-integrations/Cargo.toml deleted file mode 100644 index 9bc756716..000000000 --- a/external-cloud-integrations/Cargo.toml +++ /dev/null @@ -1,15 +0,0 @@ -[package] -name = "external-cloud-integrations" -version.workspace = true -authors.workspace = true -description.workspace = true -repository.workspace = true -license.workspace = true -edition.workspace = true - -[dependencies] -curl = "0.4.46" -serde_json = "1.0" -uuid = { version = "1.3", features = ["v4"] } -chrono = "0.4" -log = "0.4" \ No newline at end of file diff --git a/screenpipe-integrations/Cargo.toml b/screenpipe-integrations/Cargo.toml new file mode 100644 index 000000000..c1c715ef2 --- /dev/null +++ b/screenpipe-integrations/Cargo.toml @@ -0,0 +1,15 @@ +[package] +name = "screenpipe-integrations" +version = { workspace = true } +authors = { workspace = true } +description = { workspace = true } +repository = { workspace = true } +license = { workspace = true } +edition = { workspace = true } + +[dependencies] +curl = "0.4.46" +serde_json = "1.0" +uuid = { version = "1.3", features = ["v4"] } +chrono = "0.4" +log = "0.4" \ No newline at end of file diff --git a/external-cloud-integrations/src/friend_wearable.rs b/screenpipe-integrations/src/friend_wearable.rs similarity index 100% rename from external-cloud-integrations/src/friend_wearable.rs rename to screenpipe-integrations/src/friend_wearable.rs diff --git a/external-cloud-integrations/src/lib.rs b/screenpipe-integrations/src/lib.rs similarity index 100% rename from external-cloud-integrations/src/lib.rs rename to screenpipe-integrations/src/lib.rs diff --git a/external-cloud-integrations/src/mod.rs b/screenpipe-integrations/src/mod.rs similarity index 100% rename from external-cloud-integrations/src/mod.rs rename to screenpipe-integrations/src/mod.rs diff --git a/screenpipe-server/Cargo.toml b/screenpipe-server/Cargo.toml index d9b5b7209..60ecce857 100644 --- a/screenpipe-server/Cargo.toml +++ b/screenpipe-server/Cargo.toml @@ -90,7 +90,7 @@ reqwest = { version = "0.12.5", features = ["json"] } crossbeam = { workspace = true } # Friend integration -external-cloud-integrations = { path = "../external-cloud-integrations" } +screenpipe-integrations = { path = "../screenpipe-integrations" } [dev-dependencies] tempfile = "3.3.0" diff --git a/screenpipe-server/src/core.rs b/screenpipe-server/src/core.rs index d450fe77a..0c938d937 100644 --- a/screenpipe-server/src/core.rs +++ b/screenpipe-server/src/core.rs @@ -2,12 +2,12 @@ use crate::{DatabaseManager, VideoCapture}; use anyhow::Result; use chrono::Utc; use crossbeam::queue::SegQueue; -use external_cloud_integrations::friend_wearable::send_data_to_friend_wearable; use log::{debug, error, info, warn}; use screenpipe_audio::{ create_whisper_channel, record_and_transcribe, AudioDevice, AudioInput, DeviceControl, TranscriptionResult, }; +use screenpipe_integrations::friend_wearable::send_data_to_friend_wearable; use screenpipe_vision::OcrEngine; use std::collections::HashMap; use std::path::PathBuf;