diff --git a/.cargo/config.toml b/.cargo/config.toml index 75c37b6..b02098b 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -4,8 +4,8 @@ git-fetch-with-cli = true #[patch."https://github.com/OMGeeky/backup_config.git"] #backup-config = { path = "../backup_config" } # -#[patch."https://github.com/OMGeeky/twitch_backup.local_db.git"] -#local-db = { path = "../local_db" } +[patch."https://github.com/OMGeeky/twitch_backup.local_db.git"] +twba-local-db = { path = "../twitch_backup.local_db" } # #[patch."https://github.com/OMGeeky/twba_reqwest_backoff.git"] #reqwest-backoff = { path = "../reqwest_backoff" } diff --git a/Cargo.lock b/Cargo.lock index d1e06da..6127d42 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3323,7 +3323,6 @@ dependencies = [ [[package]] name = "twba-local-db" version = "0.2.1" -source = "git+https://github.com/OMGeeky/twitch_backup.local_db.git#3cbb175182d5f01b150ca07ad184ef99315f45c5" dependencies = [ "futures", "sea-orm", diff --git a/src/client.rs b/src/client.rs index ac69f3f..af0bf46 100644 --- a/src/client.rs +++ b/src/client.rs @@ -3,17 +3,17 @@ use crate::CONF; use anyhow::{anyhow, Context}; use google_youtube3::api::Scope; use lazy_static::lazy_static; +use std::collections::HashMap; +use std::ffi::OsStr; +use std::path::{Path, PathBuf}; +use tracing::instrument; +use tracing_subscriber::fmt::format; use twba_local_db::entities::video_upload::{ActiveModel as VideoUploadActiveModel, UploadStatus}; use twba_local_db::prelude::*; use twba_local_db::re_exports::sea_orm::{ ActiveModelTrait, ActiveValue, ColumnTrait, DatabaseConnection, EntityTrait, IntoActiveModel, Order, QueryFilter, QueryOrder, }; -use std::collections::HashMap; -use std::ffi::OsStr; -use std::path::{Path, PathBuf}; -use tracing::instrument; -use tracing_subscriber::fmt::format; mod youtube; diff --git a/src/client/youtube.rs b/src/client/youtube.rs index 096fe3f..858a870 100644 --- a/src/client/youtube.rs +++ b/src/client/youtube.rs @@ -16,10 +16,10 @@ use google_youtube3::{ hyper_rustls::{HttpsConnector, HttpsConnectorBuilder}, Error as YoutubeError, }; -use twba_local_db::entities::videos::Model; -use twba_local_db::prelude::{UsersModel, VideosModel}; use tokio::fs; use tracing::instrument; +use twba_local_db::entities::videos::Model; +use twba_local_db::prelude::{UsersModel, VideosModel}; mod auth; mod flow_delegate; diff --git a/src/client/youtube/auth.rs b/src/client/youtube/auth.rs index 1c563c3..53abc4c 100644 --- a/src/client/youtube/auth.rs +++ b/src/client/youtube/auth.rs @@ -4,6 +4,7 @@ use anyhow::{anyhow, Context}; use google_youtube3::api::Scope; use google_youtube3::{hyper::client::HttpConnector, hyper_rustls::HttpsConnector, oauth2}; use std::collections::HashMap; +use std::fmt::Debug; use std::path::{Path, PathBuf}; use tokio::fs; use tracing::instrument; diff --git a/src/main.rs b/src/main.rs index 7a209ab..584ec82 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,6 +1,6 @@ #![allow(unused)] -use twba_backup_config::prelude::*; use lazy_static::lazy_static; +use twba_backup_config::prelude::*; use prelude::*; @@ -34,7 +34,7 @@ lazy_static! { async fn main() -> Result<()> { tracing_subscriber::fmt() .with_max_level(tracing::Level::INFO) - .with_env_filter("warn,uploader=trace") + .with_env_filter("warn,twba_uploader=trace") .init(); let args = std::env::args().collect::>(); let presentation_mode = args.len() > 1;