Restructure file structure (#49)

* Restructure packages to crates, combine common and db

* Fix docker image for new file structure

Cargo.toml

@@ -1,10 +1,4 @@
 [workspace]
-members = [
-    "packages/db",
-    "packages/vod",
-    "packages/queue",
-    "services/forge-queue",
-    "services/silo-api", "packages/common",
-]
+members = ["crates/*", "services/forge-queue", "services/silo-api"]
 
 resolver = "2"

config/api.Dockerfile

@@ -14,7 +14,7 @@ WORKDIR /app
 COPY Cargo.toml Cargo.lock ./
 
 # Copy all workspace members
-COPY packages/ ./packages/
+COPY crates/ ./crates/
 COPY services/forge-queue ./services/forge-queue
 COPY services/silo-api ./services/silo-api
 

config/queue.Dockerfile

@@ -14,7 +14,7 @@ WORKDIR /app
 COPY Cargo.toml Cargo.lock ./
 
 # Copy all workspace members
-COPY packages/ ./packages/
+COPY crates/ ./crates/
 COPY services/forge-queue ./services/forge-queue
 COPY services/silo-api ./services/silo-api
 

packages/db/Cargo.toml → crates/common/Cargo.toml

@@ -1,9 +1,13 @@
 [package]
-name = "db"
+name = "common"
 version = "0.1.0"
 edition = "2021"
 
 [dependencies]
+aws-sdk-s3 = "1.66.0"
+aws-config = { version = "1.5.11", features = ["behavior-version-latest"] }
+aws-types = "1.3.3"
+walkdir = "2.5.0"
 argon2 = { version = "0.5", features = ["password-hash"] }
 chrono = { version = "0.4", features = ["serde"] }
 serde = { version = "1.0", features = ["derive"] }

packages/common/src/lib.rs → crates/common/src/lib.rs

@@ -1,3 +1,4 @@
+pub mod db;
 pub mod s3;
 
 /// Get the directory for where to store videos

packages/queue/Cargo.toml → crates/queue/Cargo.toml

@@ -7,7 +7,7 @@ edition = "2021"
 anyhow = "1"
 async-trait = "0.1"
 chrono = "0.4"
-db = { path = "../../packages/db" }
+common = { path = "../common" }
 futures = "0.3"
 serde = { version = "1", features = ["derive"] }
 thiserror = "1"
@@ -22,6 +22,5 @@ tokio = { version = "1", features = ["full"] }
 tracing = "0.1"
 ulid = { version = "1", features = ["uuid"] }
 uuid = { version = "1", features = ["serde", "v4"] }
-vod = { path = "../../packages/vod" }
+vod = { path = "../vod" }
 zip = "0.6"
-common = { path = "../common" }

packages/queue/src/runner.rs → crates/queue/src/runner.rs

@@ -4,7 +4,7 @@ use crate::queue::{Job, Message, Queue};
 use anyhow::anyhow;
 use common::get_storage_dir;
 use common::s3::sync_directory_to_bucket;
-use db::Video;
+use common::db::Video;
 use futures::{stream, StreamExt};
 use sqlx::{Pool, Postgres};
 use std::fs;

packages/vod/Cargo.toml → crates/vod/Cargo.toml

@@ -6,6 +6,5 @@ edition = "2021"
 [dependencies]
 anyhow = "1.0"
 tracing = "0.1"
-db = { path = "../db" }
 aws-sdk-s3 = "1.71.0"
 common = { path = "../common" }

packages/vod/src/lib.rs → crates/vod/src/lib.rs

@@ -2,7 +2,7 @@ use std::path::PathBuf;
 
 use anyhow::anyhow;
 use aws_sdk_s3::Client;
-use db::{DBPool, Video};
+use common::db::{DBPool, Video};
 use stream::{get_ffmpeg_location, HLSConverter};
 
 pub mod stream;

justfile

@@ -28,7 +28,7 @@ create-db:
 drop-db:
     sqlx database drop
 
-mig_source := "packages/db/migrations"
+mig_source := "crates/common/migrations"
 
 mig: migrate
 migrate:

services/forge-queue/Cargo.toml

@@ -6,8 +6,8 @@ edition = "2021"
 [dependencies]
 anyhow = "1"
 axum = { version = "0.7.9", features = ["tracing"] }
-db = { path = "../../packages/db" }
-queue = { path = "../../packages/queue" }
+common = { path = "../../crates/common" }
+queue = { path = "../../crates/queue" }
 tokio = { version = "1", features = ["full"] }
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }

services/forge-queue/src/main.rs

@@ -1,4 +1,4 @@
-use db::connect_to_database;
+use common::db::connect_to_database;
 use queue::{runner, PostgresQueue, Queue};
 use std::sync::Arc;
 use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};

services/silo-api/Cargo.toml

@@ -7,14 +7,13 @@ edition = "2021"
 axum = { version = "0.7", features = ["multipart", "tracing", "ws", "macros"] }
 axum-extra = "0.3"
 chrono = { version = "0.4.31", features = ["serde"] }
-db = { path = "../../packages/db" }
 futures = "0.3"
 hex = "0.4"
 sha2 = "0.10"
 jsonwebtoken = "8.1"
 lazy_static = "1.4"
 nanoid = "0.4.0"
-queue = { path = "../../packages/queue" }
+queue = { path = "../../crates/queue" }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 sqlx = { version = "0.8", features = [
@@ -35,4 +34,4 @@ reqwest = { version = "0.12.9", features = ["json"] }
 aws-sdk-s3 = "1.66.0"
 aws-config = { version = "1.5.11", features = ["behavior-version-latest"] }
 aws-types = "1.3.3"
-common = { path = "../../packages/common" }
+common = { path = "../../crates/common" }

services/silo-api/src/app_state.rs

@@ -17,7 +17,7 @@ pub struct AppState {
 impl AppState {
     pub async fn new(config: Config) -> Result<Self, Box<dyn std::error::Error>> {
         // Initialize a connection to the database
-        let db = db::connect_to_database()
+        let db = common::db::connect_to_database()
             .await
             .expect("Could not connect to database");
         // Initialize the queue

services/silo-api/src/main.rs

@@ -6,16 +6,12 @@ mod routes;
 
 pub use app_state::AppState;
 use axum::{
-    extract::State,
     middleware as axum_mw,
     response::IntoResponse,
     routing::{delete, get, post},
-    Json, Router,
+    Router,
 };
 use config::Config;
-use reqwest::StatusCode;
-
-use serde_json::json;
 
 use std::sync::Arc;
 use tower_http::{

services/silo-api/src/middleware/auth.rs

@@ -7,7 +7,7 @@ use axum::{
     http::{self, Response, StatusCode},
     middleware::Next,
 };
-use db::users::User;
+use common::db::users::User;
 use uuid::Uuid;
 
 /// A middleware for checking the validity of the JWT token

services/silo-api/src/routes/auth/mod.rs

@@ -3,7 +3,7 @@ pub mod oauth;
 use std::sync::Arc;
 
 use axum::{extract::State, http::StatusCode, response::IntoResponse, Json};
-use db::users::User;
+use common::db::users::User;
 use serde::{Deserialize, Serialize};
 
 use crate::{jwt::encode_jwt, AppState};

services/silo-api/src/routes/auth/oauth/twitch.rs

@@ -5,7 +5,7 @@ use axum::{
     Extension,
 };
 use chrono::{Duration, Utc};
-use db::{accounts::Account, users::User};
+use common::db::{accounts::Account, users::User};
 use reqwest::Client;
 use serde::{Deserialize, Serialize};
 use std::{env, sync::Arc};

services/silo-api/src/routes/upload/cloud.rs

@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use aws_sdk_s3::types::{CompletedMultipartUpload, CompletedPart};
 use axum::{extract::State, Extension, Json};
-use db::{User, Video};
+use common::db::{User, Video};
 use reqwest::StatusCode;
 use serde::{Deserialize, Serialize};
 

services/silo-api/src/routes/upload/on_disk.rs

@@ -3,7 +3,7 @@ use axum::{
     http::StatusCode,
     Extension,
 };
-use db::{users::User, Video};
+use common::db::{users::User, Video};
 use sha2::{Digest, Sha256};
 use std::sync::atomic::{AtomicU64, Ordering};
 use std::{collections::HashMap, path::Path, sync::Arc};

services/silo-api/src/routes/user.rs

@@ -6,7 +6,7 @@ use axum::{
     response::IntoResponse,
     Extension, Json,
 };
-use db::users::{User, UserRole};
+use common::db::users::{User, UserRole};
 use serde::{Deserialize, Serialize};
 
 use crate::AppState;

services/silo-api/src/routes/video.rs

@@ -4,7 +4,7 @@ use axum::{
     response::IntoResponse,
     Extension, Json,
 };
-use db::{ProcessingStatus, User, Video};
+use common::db::{self, ProcessingStatus, User, Video};
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;