From 098bfc6ef1e0e25761c09fa69bef31d45efee2b7 Mon Sep 17 00:00:00 2001 From: maxichrome Date: Thu, 3 Mar 2022 16:30:32 -0800 Subject: [PATCH] fix build errors --- packages/core/src/crypto/encryption.rs | 3 +-- packages/core/src/db/mod.rs | 2 +- packages/core/src/library/locations.rs | 3 +-- yarn.lock | 24 ++++++++++++++++++++++++ 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/packages/core/src/crypto/encryption.rs b/packages/core/src/crypto/encryption.rs index 56764dca7..98737447f 100644 --- a/packages/core/src/crypto/encryption.rs +++ b/packages/core/src/crypto/encryption.rs @@ -1,8 +1,7 @@ -use sea_orm::entity::prelude::*; use serde::{Deserialize, Serialize}; use ts_rs::TS; -#[derive(Serialize, Deserialize, Clone, Debug, PartialEq, EnumIter, TS)] +#[derive(Serialize, Deserialize, Clone, Debug, TS)] pub enum Encryption { None = 0, AES128, diff --git a/packages/core/src/db/mod.rs b/packages/core/src/db/mod.rs index 084d03b02..e92457473 100644 --- a/packages/core/src/db/mod.rs +++ b/packages/core/src/db/mod.rs @@ -35,7 +35,7 @@ pub async fn get() -> Result<&'static PrismaClient, String> { const INIT_MIGRATION: &str = include_str!("../../prisma/migrations/migration_table/migration.sql"); static MIGRATIONS_DIR: Dir = include_dir!("$CARGO_MANIFEST_DIR/prisma/migrations"); -pub async fn init(db_url: &str) -> Result<(), sqlx::Error> { +pub async fn init(db_url: &str) -> Result<()> { let client = PrismaClient::new_with_url(&format!("file:{}", &db_url)).await; match client diff --git a/packages/core/src/library/locations.rs b/packages/core/src/library/locations.rs index 48bc3378b..a4abdcd3d 100644 --- a/packages/core/src/library/locations.rs +++ b/packages/core/src/library/locations.rs @@ -1,10 +1,9 @@ use anyhow::{anyhow, Result}; use serde::{Deserialize, Serialize}; use std::io::Write; -use std::path::Path; use crate::{ - db, library, + db, native::methods::get_mounts, prisma::{File, Location, LocationData}, }; diff --git a/yarn.lock b/yarn.lock index 1604d5d18..5c8f9c5f0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -769,6 +769,23 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" +"@prisma/client@^3.10.0": + version "3.10.0" + resolved "https://registry.yarnpkg.com/@prisma/client/-/client-3.10.0.tgz#4782fe6f1b0e43c2a11a75ad4bb1098599d1dfb1" + integrity sha512-6P4sV7WFuODSfSoSEzCH1qfmWMrCUBk1LIIuTbQf6m1LI/IOpLN4lnqGDmgiBGprEzuWobnGLfe9YsXLn0inrg== + dependencies: + "@prisma/engines-version" "3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86" + +"@prisma/engines-version@3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86": + version "3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86" + resolved "https://registry.yarnpkg.com/@prisma/engines-version/-/engines-version-3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86.tgz#82750856fa637dd89b8f095d2dcc6ac0631231c6" + integrity sha512-cVYs5gyQH/qyut24hUvDznCfPrWiNMKNfPb9WmEoiU6ihlkscIbCfkmuKTtspVLWRdl0LqjYEC7vfnPv17HWhw== + +"@prisma/engines@3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86": + version "3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86" + resolved "https://registry.yarnpkg.com/@prisma/engines/-/engines-3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86.tgz#2964113729a78b8b21e186b5592affd1fde73c16" + integrity sha512-LjRssaWu9w2SrXitofnutRIyURI7l0veQYIALz7uY4shygM9nMcK3omXcObRm7TAcw3Z+9ytfK1B+ySOsOesxQ== + "@radix-ui/number@0.1.0": version "0.1.0" resolved "https://registry.yarnpkg.com/@radix-ui/number/-/number-0.1.0.tgz#73ad13d5cc5f75fa5e147d72e5d5d5e50d688256" @@ -7099,6 +7116,13 @@ prism-react-renderer@^1.1.1, prism-react-renderer@^1.3.1: resolved "https://registry.yarnpkg.com/prism-react-renderer/-/prism-react-renderer-1.3.1.tgz#88fc9d0df6bed06ca2b9097421349f8c2f24e30d" integrity sha512-xUeDMEz074d0zc5y6rxiMp/dlC7C+5IDDlaEUlcBOFE2wddz7hz5PNupb087mPwTt7T9BrFmewObfCBuf/LKwQ== +prisma@^3.10.0: + version "3.10.0" + resolved "https://registry.yarnpkg.com/prisma/-/prisma-3.10.0.tgz#872d87afbeb1cbcaa77c3d6a63c125e0d704b04d" + integrity sha512-dAld12vtwdz9Rz01nOjmnXe+vHana5PSog8t0XGgLemKsUVsaupYpr74AHaS3s78SaTS5s2HOghnJF+jn91ZrA== + dependencies: + "@prisma/engines" "3.10.0-50.73e60b76d394f8d37d8ebd1f8918c79029f0db86" + prismjs@^1.26.0: version "1.26.0" resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.26.0.tgz#16881b594828bb6b45296083a8cbab46b0accd47"